Merge pull request #657 from Ikaros-521/owner

更新ChatGPT模型
Ikaros-521 · Feb 25, 2024 · dcbc206 · dcbc206
2 parents 3a20ab0 + 68e81b3
commit dcbc206
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -16,8 +16,6 @@ protobuf_inspector
 websocket-client
 websocket-client-py3
 langchain==0.0.142
-PyQt5
-pyqt5-tools
 tiktoken
 pyahocorasick
 webuiapi
@@ -58,7 +56,6 @@ nicegui
 pytchat
 PySocks
 pure-protobuf==3.0.0a5
-pyaudio
 flask
 flask_cors
 xingchen

diff --git a/requirements_common.txt b/requirements_common.txt
@@ -102,13 +102,6 @@ websocket-client==1.6.3
 yarl
 zope.event==4.6
 zope.interface==6.0
-PyQt5==5.15.9
-PyQt5-Qt5==5.15.2
-PyQt5-sip==12.12.1
-pyqt5-plugins==5.15.9.2.3
-pyqt5-tools==5.15.9.3.3
-qt5-applications==5.15.2.2.3
-qt5-tools==5.15.2.1.3
 tiktoken==0.4.0
 pyahocorasick==2.0.0
 sentence_transformers==2.2.2

diff --git a/utils/my_handle.py b/utils/my_handle.py
@@ -1700,7 +1700,7 @@ def comment_handle(self, data):
             data (dict): 包含用户名,弹幕内容
 
         Returns:
-            _type_: 寂寞
+            dict: 传递给音频合成的JSON数据
         """
 
         try:
@@ -1918,8 +1918,11 @@ def comment_handle(self, data):
             }
 
             self.audio_synthesis_handle(message)
+
+            return message
         except Exception as e:
             logging.error(traceback.format_exc())
+            return None
 
 
     # 礼物处理

diff --git a/webui.py b/webui.py
@@ -2138,21 +2138,24 @@ def common_textarea_handle(content):
                     with ui.row():
                         chatgpt_models = [
                             "gpt-3.5-turbo",
+                            "gpt-3.5-turbo-instruct",
+                            "gpt-3.5-turbo-instruct-0914",
                             "gpt-3.5-turbo-0301",
-                            "gpt-3.5-turbo-0613",
                             "gpt-3.5-turbo-1106",
+                            "gpt-3.5-turbo-0125",
                             "gpt-3.5-turbo-16k",
                             "gpt-3.5-turbo-16k-0613",
                             "gpt-3.5-turbo-instruct",
                             "gpt-3.5-turbo-instruct-0914",
                             "gpt-4",
-                            "gpt-4-0314",
+                            "gpt-4-turbo-preview",
                             "gpt-4-0613",
                             "gpt-4-32k",
-                            "gpt-4-32k-0314",
                             "gpt-4-32k-0613",
                             "gpt-4-1106-preview",
-                            "text-embedding-ada-002",
+                            "gpt-4-0125-preview",
+                            "text-embedding-3-large",
+                            "text-embedding-3-small",
                             "text-davinci-003",
                             "text-davinci-002",
                             "text-curie-001",