Update bridge_all.py

supports gpt-4-turbo-preview

config.py

@@ -86,9 +86,9 @@ DEFAULT_FN_GROUPS = ['对话', '编程', '学术', '智能体']
 
 
 # 模型选择是 (注意: LLM_MODEL是默认选中的模型, 它*必须*被包含在AVAIL_LLM_MODELS列表中 )
-LLM_MODEL = "gpt-3.5-turbo-16k" # 可选 ↓↓↓
-AVAIL_LLM_MODELS = ["gpt-4-1106-preview", "gpt-4-turbo-preview", "gpt-4-vision-preview",
-                    "gpt-3.5-turbo-1106", "gpt-3.5-turbo-16k", "gpt-3.5-turbo", "azure-gpt-3.5",
+LLM_MODEL = "gpt-3.5-turbo" # 可选 ↓↓↓
+AVAIL_LLM_MODELS = ["gpt-3.5-turbo-1106","gpt-4-1106-preview","gpt-4-vision-preview",
+                    "gpt-3.5-turbo-16k", "gpt-3.5-turbo", "azure-gpt-3.5",
                     "gpt-4", "gpt-4-32k", "azure-gpt-4", "api2d-gpt-4",
                     "gemini-pro", "chatglm3", "claude-2", "zhipuai"]
 # P.S. 其他可用的模型还包括 [

docs/GithubAction+NoLocal+AudioAssistant

@@ -13,7 +13,7 @@ COPY . .
 RUN pip3 install -r requirements.txt
 
 # 安装语音插件的额外依赖
-RUN pip3 install aliyun-python-sdk-core==2.13.3 pyOpenSSL webrtcvad scipy git+https://github.com/aliyun/alibabacloud-nls-python-sdk.git
+RUN pip3 install pyOpenSSL scipy git+https://github.com/aliyun/alibabacloud-nls-python-sdk.git
 
 # 可选步骤，用于预热模块
 RUN python3  -c 'from check_proxy import warm_up_modules; warm_up_modules()'

docs/use_audio.md

@@ -3,7 +3,7 @@
 
 ## 1. 安装额外依赖
 ```
-pip install --upgrade pyOpenSSL webrtcvad scipy git+https://github.com/aliyun/alibabacloud-nls-python-sdk.git
+pip install --upgrade pyOpenSSL scipy git+https://github.com/aliyun/alibabacloud-nls-python-sdk.git
 ```
 
 如果因为特色网络问题导致上述命令无法执行：

main.py

@@ -15,7 +15,7 @@ help_menu_description = \
 
 def main():
     import gradio as gr
-    if gr.__version__ not in ['3.32.6', '3.32.7', '3.32.8']:
+    if gr.__version__ not in ['3.32.6', '3.32.7']: 
         raise ModuleNotFoundError("使用项目内置Gradio获取最优体验! 请运行 `pip install -r requirements.txt` 指令安装内置Gradio及其他依赖, 详情信息见requirements.txt.")
     from request_llms.bridge_all import predict
     from toolbox import format_io, find_free_port, on_file_uploaded, on_report_generated, get_conf, ArgsGeneralWrapper, load_chat_cookies, DummyWith

requirements.txt

@@ -1,5 +1,4 @@
-https://public.gpt-academic.top/publish/gradio-3.32.7-py3-none-any.whl
-gradio-client==0.8
+https://fastly.jsdelivr.net/gh/binary-husky/gradio-fix@gpt-academic/release/gradio-3.32.7-py3-none-any.whl
 pypdf2==2.12.1
 zhipuai<2
 tiktoken>=0.3.3

shared_utils/key_pattern_manager.py

@@ -14,7 +14,7 @@ def is_openai_api_key(key):
     if len(CUSTOM_API_KEY_PATTERN) != 0:
         API_MATCH_ORIGINAL = re.match(CUSTOM_API_KEY_PATTERN, key)
     else:
-        API_MATCH_ORIGINAL = re.match(r"sk-[a-zA-Z0-9]{48}$|sess-[a-zA-Z0-9]{40}$", key)
+        API_MATCH_ORIGINAL = re.match(r"sk-[a-zA-Z0-9]{48}$", key)
     return bool(API_MATCH_ORIGINAL)
 
 

tests/test_key_pattern_manager.py

@@ -1,41 +0,0 @@
-import unittest
-
-def validate_path():
-    import os, sys
-
-    os.path.dirname(__file__)
-    root_dir_assume = os.path.abspath(os.path.dirname(__file__) + "/..")
-    os.chdir(root_dir_assume)
-    sys.path.append(root_dir_assume)
-
-
-validate_path()  # validate path so you can run from base directory
-
-from shared_utils.key_pattern_manager import is_openai_api_key
-
-class TestKeyPatternManager(unittest.TestCase):
-    def test_is_openai_api_key_with_valid_key(self):
-        key = "sk-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-        self.assertTrue(is_openai_api_key(key))
-
-        key = "sx-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-        self.assertFalse(is_openai_api_key(key))
-
-        key = "sess-wg61ZafYHpNz7FFwIH7HGZlbVqUVaeV5tatHCWpl"
-        self.assertTrue(is_openai_api_key(key))
-
-        key = "sess-wg61ZafYHpNz7FFwIH7HGZlbVqUVa5tatHCWpl"
-        self.assertFalse(is_openai_api_key(key))
-
-
-    def test_is_openai_api_key_with_invalid_key(self):
-        key = "invalid_key"
-        self.assertFalse(is_openai_api_key(key))
-
-    def test_is_openai_api_key_with_custom_pattern(self):
-        # Assuming you have set a custom pattern in your configuration
-        key = "custom-pattern-key"
-        self.assertFalse(is_openai_api_key(key))
-
-if __name__ == '__main__':
-    unittest.main()

themes/common.js

@@ -349,7 +349,7 @@ function get_elements(consider_state_panel = false) {
     var chatbot_height = chatbot.style.height;
     // 交换输入区位置，使得输入区始终可用
     if (!swapped) {
-        if (panel1.top != 0 && (0.9 * panel1.bottom + 0.1 * panel1.top) < 0) { swap_input_area(); }
+        if (panel1.top != 0 && (panel1.bottom + panel1.top) / 2 < 0) { swap_input_area(); }
     }
     else if (swapped) {
         if (panel2.top != 0 && panel2.top > 0) { swap_input_area(); }