调试采用brnie-bot-sdk，未完成

ChuanhuChatbot.py

@@ -788,7 +788,7 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
 
 logging.info(
     colorama.Back.GREEN
-    + "\n小原同学的温馨提示：访问 http://localhost:7860 查看界面"
+    + f"\n小原同学的温馨提示：访问 http://localhost:{server_port} 查看界面"
     + colorama.Style.RESET_ALL
 )
 # 默认开启本地服务器，默认可以直接从IP访问，默认不创建公开分享链接

modules/config.py

@@ -1,6 +1,5 @@
 from collections import defaultdict
 from contextlib import contextmanager
-from json import JSONDecodeError
 import os
 import logging
 import sys
@@ -39,11 +38,10 @@ with open("config.json" if os.path.exists("config.json") else "config_example.js
     config = json.load(f)
 
 
-def load_config_to_environ(key_list):
+def load_config_to_environ():
     global config
-    for key in key_list:
-        if key in config:
-            os.environ[key.upper()] = os.environ.get(key.upper(), config[key])
+    for key in config:
+        os.environ[key.upper()] = os.environ.get(key.upper(), str(config[key]))
 
 
 def load_environ_to_config():
@@ -155,8 +153,7 @@ ernie_secret_key = config.get("ernie_secret_key", "")
 os.environ["ERNIE_SECRETKEY"] = ernie_secret_key
 
 load_environ_to_config()
-load_config_to_environ(["openai_api_type", "azure_openai_api_key", "azure_openai_api_base_url",
-                       "azure_openai_api_version", "azure_deployment_name", "azure_embedding_deployment_name", "azure_embedding_model_name"])
+load_config_to_environ()
 
 
 usage_limit = os.environ.get("USAGE_LIMIT", config.get("usage_limit", 120))

modules/models/ERNIE.py

@@ -1,3 +1,4 @@
+import os
 import erniebot as eb
 
 from ..presets import *
@@ -9,40 +10,11 @@ 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:
         super().__init__(model_name=model_name)
-        self.auth_config = {
-            "api_type": api_type,
-        }
-        self.auth_config["ak"] = api_key
-        self.auth_config["sk"] = secret_key
+        self.auth_config = {"api_type": api_type, "ak": api_key, "sk": secret_key}
         if access_token:
             self.auth_config["access_token"] = access_token
-        self.eb = eb.ChatCompletion
-
-        if self.model_name == "ERNIE-Bot-turbo":
-            self.ERNIE_url = "https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/eb-instant?access_token="
-        elif self.model_name == "ERNIE-Bot":
-            self.ERNIE_url = "https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/completions?access_token="
-        elif self.model_name == "ERNIE-Bot-4":
-            self.ERNIE_url = "https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/completions_pro?access_token="
 
-    def get_access_token(self):
-        """
-        使用 AK，SK 生成鉴权签名（Access Token）
-        :return: access_token，或是None(如果错误)
-        """
-        url = "https://aip.baidubce.com/oauth/2.0/token?client_id=" + self.api_key + "&client_secret=" + self.api_secret + "&grant_type=client_credentials"
-
-        payload = json.dumps("")
-        headers = {
-            'Content-Type': 'application/json',
-            'Accept': 'application/json'
-        }
-
-        response = requests.request("POST", url, headers=headers, data=payload)
-
-        return response.json()["access_token"]
     def get_answer_stream_iter(self):
-        url = self.ERNIE_url + self.get_access_token()
         system_prompt = self.system_prompt
         history = self.history
         if system_prompt is not None:
@@ -51,30 +23,23 @@ class ERNIE_Client(BaseLLMModel):
         # 去除history中 history的role为system的
         history = [i for i in history if i["role"] != "system"]
 
-        payload = json.dumps({
-            "messages":history,
-            "stream": True
-        })
-        headers = {
-            'Content-Type': 'application/json'
+        data = {
+            "messages": history,
+            "top_p": self.top_p,
+            "temperature": self.temperature,
         }
 
-        response = requests.request("POST", url, headers=headers, data=payload, stream=True)
-
-        if response.status_code == 200:
-            partial_text = ""
-            for line in response.iter_lines():
-                if len(line) == 0:
-                    continue
-                line = json.loads(line[5:])
-                partial_text += line['result']
-                yield partial_text
+        if self.model_name == "chat_file":
+            response = eb.ChatFile.create(_config_=self.auth_config, **data, stream=True)
         else:
-            yield STANDARD_ERROR_MSG + GENERAL_ERROR_MSG
+            response = eb.ChatCompletion.create(
+                _config_=self.auth_config, model=self.model_name, **data, stream=True
+            )
+        for result in response:
+            yield result.get_result()
 
 
     def get_answer_at_once(self):
-        url = self.ERNIE_url + self.get_access_token()
         system_prompt = self.system_prompt
         history = self.history
         if system_prompt is not None:
@@ -83,20 +48,16 @@ class ERNIE_Client(BaseLLMModel):
         # 去除history中 history的role为system的
         history = [i for i in history if i["role"] != "system"]
 
-        payload = json.dumps({
+
+        data = {
             "messages": history,
-            "stream": True
-        })
-        headers = {
-            'Content-Type': 'application/json'
+            "top_p": self.top_p,
+            "temperature": self.temperature,
         }
 
-        response = requests.request("POST", url, headers=headers, data=payload, stream=True)
-
-        if response.status_code == 200:
-
-            return str(response.json()["result"]),len(response.json()["result"])
+        if self.model_name == "chat_file":
+            return eb.ChatFile.create(_config_=self.auth_config, **data, stream=False).get_result()
         else:
-            return "获取资源错误", 0
-
-
+            return eb.ChatCompletion.create(
+                _config_=self.auth_config, model=self.model_name, **data, stream=False
+            ).get_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"))
+            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"))
         elif model_type == ModelType.DALLE3:
             from .DALLE3 import OpenAI_DALLE3_Client
             access_key = os.environ.get("OPENAI_API_KEY", access_key)

modules/presets.py

@@ -84,9 +84,9 @@ ONLINE_MODELS = [
     "讯飞星火大模型V2.0",
     "讯飞星火大模型V1.5",
     "Claude",
-    "ERNIE-Bot-turbo",
-    "ERNIE-Bot",
-    "ERNIE-Bot-4",
+    "ernie-bot-turbo",
+    "ernie-bot",
+    "ernie-bot-4",
 ]
 
 LOCAL_MODELS = [
@@ -164,17 +164,17 @@ MODEL_METADATA = {
         "model_name": "Claude",
         "token_limit": 4096,
     },
-    "ERNIE-Bot-turbo": {
-        "model_name": "ERNIE-Bot-turbo",
-        "token_limit": 1024,
+    "ernie-bot-turbo": {
+        "model_name": "ernie-bot-turbo",
+        "token_limit": 3000,
     },
-    "ERNIE-Bot": {
-        "model_name": "ERNIE-Bot",
-        "token_limit": 1024,
+    "ernie-bot": {
+        "model_name": "ernie-bot",
+        "token_limit": 3000,
     },
-    "ERNIE-Bot-4": {
-        "model_name": "ERNIE-Bot-4",
-        "token_limit": 7000,
+    "ernie-bot-4": {
+        "model_name": "ernie-bot-4",
+        "token_limit": 3000,
     },
 }