From a8d981880ad3e73457104444fee4a28c48af0cb3 Mon Sep 17 00:00:00 2001 From: Tuchuanhuhuhu Date: Sat, 18 Nov 2023 14:20:42 +0800 Subject: [PATCH] =?UTF-8?q?fix=20[=E5=8A=9F=E8=83=BD=E8=AF=B7=E6=B1=82]:?= =?UTF-8?q?=20GPT-4=20Turbo=E6=A8=A1=E5=9E=8B=E7=9A=84Token=E9=95=BF?= =?UTF-8?q?=E5=BA=A6=E9=99=90=E5=88=B6=E4=BC=BC=E4=B9=8E=E6=9C=89=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9F=20#953?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/models/OpenAI.py | 2 -- modules/models/OpenAIVision.py | 2 +- modules/models/base_model.py | 5 ++++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/models/OpenAI.py b/modules/models/OpenAI.py index 5a6055bd..797d2382 100644 --- a/modules/models/OpenAI.py +++ b/modules/models/OpenAI.py @@ -25,8 +25,6 @@ def __init__( top_p=1.0, user_name="" ) -> None: - if model_name in MODEL_METADATA: - model_name = MODEL_METADATA[model_name]["model_name"] super().__init__( model_name=model_name, temperature=temperature, diff --git a/modules/models/OpenAIVision.py b/modules/models/OpenAIVision.py index 1f8ae00d..ec61e115 100644 --- a/modules/models/OpenAIVision.py +++ b/modules/models/OpenAIVision.py @@ -32,7 +32,7 @@ def __init__( user_name="" ) -> None: super().__init__( - model_name=MODEL_METADATA[model_name]["model_name"], + model_name=model_name, temperature=temperature, top_p=top_p, system_prompt=system_prompt, diff --git a/modules/models/base_model.py b/modules/models/base_model.py index b24d6939..8535d008 100644 --- a/modules/models/base_model.py +++ b/modules/models/base_model.py @@ -213,7 +213,10 @@ def __init__( ) -> None: self.history = [] self.all_token_counts = [] - self.model_name = model_name + if model_name in MODEL_METADATA: + self.model_name = MODEL_METADATA[model_name]["model_name"] + else: + self.model_name = model_name self.model_type = ModelType.get_type(model_name) try: self.token_upper_limit = MODEL_METADATA[model_name]["token_limit"]