调试qianfan成功，支持qianfan所有模型

modules/models/ERNIE.py

@@ -1,5 +1,5 @@
 import os
-import erniebot as eb
+import qianfan
 
 from ..presets import *
 from ..utils import *
@@ -8,11 +8,9 @@ from .base_model import BaseLLMModel
 
 
 class ERNIE_Client(BaseLLMModel):
-    def __init__(self, model_name, api_key, secret_key, api_type: str = "aistudio", access_token: str = None) -> None:
+    def __init__(self, model_name, api_key, secret_key) -> None:
         super().__init__(model_name=model_name)
-        self.auth_config = {"api_type": api_type, "ak": api_key, "sk": secret_key}
-        if access_token:
-            self.auth_config["access_token"] = access_token
+        self.chat_completion = qianfan.ChatCompletion(ak=api_key, sk=secret_key)
 
     def get_answer_stream_iter(self):
         system_prompt = self.system_prompt
@@ -29,15 +27,11 @@ class ERNIE_Client(BaseLLMModel):
             "temperature": self.temperature,
         }
 
-        if self.model_name == "chat_file":
-            response = eb.ChatFile.create(_config_=self.auth_config, **data, stream=True)
-        else:
-            response = eb.ChatCompletion.create(
-                _config_=self.auth_config, model=self.model_name, **data, stream=True
-            )
+        response = self.chat_completion.do(model=self.model_name, **data, stream=True)
+        partial_text = ""
         for result in response:
-            yield result.get_result()
-
+            partial_text += result['result']
+            yield partial_text
 
     def get_answer_at_once(self):
         system_prompt = self.system_prompt
@@ -48,16 +42,10 @@ class ERNIE_Client(BaseLLMModel):
         # 去除history中 history的role为system的
         history = [i for i in history if i["role"] != "system"]
 
-
         data = {
             "messages": history,
             "top_p": self.top_p,
             "temperature": self.temperature,
         }
 
-        if self.model_name == "chat_file":
-            return eb.ChatFile.create(_config_=self.auth_config, **data, stream=False).get_result()
-        else:
-            return eb.ChatCompletion.create(
-                _config_=self.auth_config, model=self.model_name, **data, stream=False
-            ).get_result()
+        return self.chat_completion.do(model=self.model_name, **data)['result']

modules/models/models.py

@@ -128,7 +128,7 @@ def get_model(
             model = Qwen_Client(model_name, user_name=user_name)
         elif model_type == ModelType.ERNIE:
             from .ERNIE import ERNIE_Client
-            model = ERNIE_Client(model_name, api_key=os.getenv("ERNIE_APIKEY"),secret_key=os.getenv("ERNIE_SECRETKEY"), api_type=os.getenv("ERNIE_API_TYPE"), access_token=os.getenv("ERNIE_ACCESS_TOKEN"))
+            model = ERNIE_Client(model_name, api_key=os.getenv("ERNIE_APIKEY"),secret_key=os.getenv("ERNIE_SECRETKEY"))
         elif model_type == ModelType.DALLE3:
             from .DALLE3 import OpenAI_DALLE3_Client
             access_key = os.environ.get("OPENAI_API_KEY", access_key)

requirements.txt

@@ -33,4 +33,4 @@ pydantic==2.5.2
 google-search-results
 anthropic==0.3.11
 Pillow>=10.1.0
-erniebot
+qianfan>=0.2.2