refactor: model

Author: wxg0103

apps/models_provider/impl/aliyun_bai_lian_model_provider/model/image.py

@@ -18,6 +18,6 @@ def new_instance(model_type, model_name, model_credential: Dict[str, object], **
             # stream_options={"include_usage": True},
             streaming=True,
             stream_usage=True,
-            **optional_params,
+            extra_body=optional_params
         )
         return chat_tong_yi

apps/models_provider/impl/ollama_model_provider/model/image.py

@@ -28,5 +28,5 @@ def new_instance(model_type, model_name, model_credential: Dict[str, object], **
             # stream_options={"include_usage": True},
             streaming=True,
             stream_usage=True,
-            **optional_params,
+            extra_body=optional_params
         )

apps/models_provider/impl/openai_model_provider/model/image.py

@@ -16,5 +16,5 @@ def new_instance(model_type, model_name, model_credential: Dict[str, object], **
             # stream_options={"include_usage": True},
             streaming=True,
             stream_usage=True,
-            **optional_params,
+            extra_body=optional_params
         )

apps/models_provider/impl/openai_model_provider/model/llm.py

@@ -35,8 +35,8 @@ def new_instance(model_type, model_name, model_credential: Dict[str, object], **
             streaming = False
         chat_open_ai = OpenAIChatModel(
             model=model_name,
-            openai_api_base=model_credential.get('api_base'),
-            openai_api_key=model_credential.get('api_key'),
+            api_base=model_credential.get('api_base'),
+            api_key=model_credential.get('api_key'),
             extra_body=optional_params,
             streaming=streaming,
             custom_get_token_ids=custom_get_token_ids

apps/models_provider/impl/qwen_model_provider/__init__.py

@@ -16,5 +16,5 @@ def new_instance(model_type, model_name, model_credential: Dict[str, object], **
             # stream_options={"include_usage": True},
             streaming=True,
             stream_usage=True,
-            **optional_params,
+            extra_body=optional_params
         )

apps/models_provider/impl/qwen_model_provider/credential/__init__.py

@@ -33,21 +33,8 @@ def new_instance(model_type, model_name, model_credential: Dict[str, object], **
             model=model_name,
             openai_api_base=model_credential.get('api_base'),
             openai_api_key=model_credential.get('api_key'),
-            **optional_params,
+            extra_body=optional_params,
             custom_get_token_ids=custom_get_token_ids
         )
         return azure_chat_open_ai
 
-    def get_num_tokens_from_messages(self, messages: List[BaseMessage]) -> int:
-        try:
-            return super().get_num_tokens_from_messages(messages)
-        except Exception as e:
-            tokenizer = TokenizerManage.get_tokenizer()
-            return sum([len(tokenizer.encode(get_buffer_string([m]))) for m in messages])
-
-    def get_num_tokens(self, text: str) -> int:
-        try:
-            return super().get_num_tokens(text)
-        except Exception as e:
-            tokenizer = TokenizerManage.get_tokenizer()
-            return len(tokenizer.encode(text))

apps/models_provider/impl/qwen_model_provider/model/__init__.py

@@ -11,10 +11,10 @@ def new_instance(model_type, model_name, model_credential: Dict[str, object], **
         optional_params = MaxKBBaseModel.filter_optional_params(model_kwargs)
         return TencentVision(
             model_name=model_name,
-            openai_api_base='https://api.hunyuan.cloud.tencent.com/v1',
-            openai_api_key=model_credential.get('api_key'),
+            api_base='https://api.hunyuan.cloud.tencent.com/v1',
+            api_key=model_credential.get('api_key'),
             # stream_options={"include_usage": True},
             streaming=True,
             stream_usage=True,
-            **optional_params,
+            extra_body=optional_params
         )