Revert "Update README.md (#1581)"

This reverts commit 0665eb75ed.

.gitignore

@@ -153,4 +153,3 @@ media
 flagged
 request_llms/ChatGLM-6b-onnx-u8s8
 .pre-commit-config.yaml
-themes/common.js.min.*.js

README.md

@@ -1,7 +1,7 @@
 > [!IMPORTANT]  
-> 2024.5.1: 加入Doc2x翻译PDF论文的功能，[查看详情](https://github.com/binary-husky/gpt_academic/wiki/Doc2x)  
+> 2024.1.18: 更新3.70版本，支持Mermaid绘图库（让大模型绘制脑图）  
-> 2024.4.30: 3.75版本引入Edge-TTS和SoVits语音克隆模块，[查看详情](https://www.bilibili.com/video/BV1Rp421S7tF/)  
+> 2024.1.17: 恭迎GLM4，全力支持Qwen、GLM、DeepseekCoder等国内中文大语言基座模型！  
-> 2024.3.11: 恭迎Claude3和Moonshot，全力支持Qwen、GLM、DeepseekCoder等中文大语言模型！  
+> 2024.1.17: 某些依赖包尚不兼容python 3.12，推荐python 3.11。  
 > 2024.1.17: 安装依赖时，请选择`requirements.txt`中**指定的版本**。 安装命令：`pip install -r requirements.txt`。本项目完全开源免费，您可通过订阅[在线服务](https://github.com/binary-husky/gpt_academic/wiki/online)的方式鼓励本项目的发展。
 
 <br>
@@ -87,10 +87,6 @@ Latex论文一键校对 | [插件] 仿Grammarly对Latex文章进行语法、拼
 <img src="https://user-images.githubusercontent.com/96192199/279702205-d81137c3-affd-4cd1-bb5e-b15610389762.gif" width="700" >
 </div>
 
-<div align="center">
-<img src="https://github.com/binary-husky/gpt_academic/assets/96192199/70ff1ec5-e589-4561-a29e-b831079b37fb.gif" width="700" >
-</div>
-
 
 - 所有按钮都通过读取functional.py动态生成，可随意加自定义功能，解放剪贴板
 <div align="center">
@@ -257,7 +253,8 @@ P.S. 如果需要依赖Latex的插件功能，请见Wiki。另外，您也可以
 # Advanced Usage
 ### I：自定义新的便捷按钮（学术快捷键）
 
-现在已可以通过UI中的`界面外观`菜单中的`自定义菜单`添加新的便捷按钮。如果需要在代码中定义，请使用任意文本编辑器打开`core_functional.py`，添加如下条目即可：
+任意文本编辑器打开`core_functional.py`，添加如下条目，然后重启程序。（如果按钮已存在，那么可以直接修改（前缀、后缀都已支持热修改），无需重启程序即可生效。）
+例如
 
 ```python
 "超级英译中": {

check_proxy.py

@@ -47,7 +47,7 @@ def backup_and_download(current_version, remote_version):
     shutil.copytree('./', backup_dir, ignore=lambda x, y: ['history'])
     proxies = get_conf('proxies')
     try:    r = requests.get('https://github.com/binary-husky/chatgpt_academic/archive/refs/heads/master.zip', proxies=proxies, stream=True)
-    except: r = requests.get('https://public.agent-matrix.com/publish/master.zip', proxies=proxies, stream=True)
+    except: r = requests.get('https://public.gpt-academic.top/publish/master.zip', proxies=proxies, stream=True)
     zip_file_path = backup_dir+'/master.zip'
     with open(zip_file_path, 'wb+') as f:
         f.write(r.content)
@@ -113,7 +113,7 @@ def auto_update(raise_error=False):
         import json
         proxies = get_conf('proxies')
         try:    response = requests.get("https://raw.githubusercontent.com/binary-husky/chatgpt_academic/master/version", proxies=proxies, timeout=5)
-        except: response = requests.get("https://public.agent-matrix.com/publish/version", proxies=proxies, timeout=5)
+        except: response = requests.get("https://public.gpt-academic.top/publish/version", proxies=proxies, timeout=5)
         remote_json_data = json.loads(response.text)
         remote_version = remote_json_data['version']
         if remote_json_data["show_feature"]:

config.py

@@ -30,37 +30,11 @@ if USE_PROXY:
 else:
     proxies = None
 
-# [step 3]>> 模型选择是 (注意: 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-4-turbo", "gpt-4-turbo-2024-04-09",
-                    "gpt-3.5-turbo-1106", "gpt-3.5-turbo-16k", "gpt-3.5-turbo", "azure-gpt-3.5",
-                    "gpt-4", "gpt-4-32k", "azure-gpt-4", "glm-4", "glm-4v", "glm-3-turbo",
-                    "gemini-pro", "chatglm3"
-                    ]
-# --- --- --- ---
-# P.S. 其他可用的模型还包括
-# AVAIL_LLM_MODELS = [
-#   "qianfan", "deepseekcoder",
-#   "spark", "sparkv2", "sparkv3", "sparkv3.5",
-#   "qwen-turbo", "qwen-plus", "qwen-max", "qwen-local",
-#   "moonshot-v1-128k", "moonshot-v1-32k", "moonshot-v1-8k",
-#   "gpt-3.5-turbo-0613", "gpt-3.5-turbo-16k-0613", "gpt-3.5-turbo-0125"
-#   "claude-3-haiku-20240307","claude-3-sonnet-20240229","claude-3-opus-20240229", "claude-2.1", "claude-instant-1.2",
-#   "moss", "llama2", "chatglm_onnx", "internlm", "jittorllms_pangualpha", "jittorllms_llama",
-#   "yi-34b-chat-0205", "yi-34b-chat-200k"
-# ]
-# --- --- --- ---
-# 此外，您还可以在接入one-api/vllm/ollama时，
-# 使用"one-api-*","vllm-*","ollama-*"前缀直接使用非标准方式接入的模型，例如
-# AVAIL_LLM_MODELS = ["one-api-claude-3-sonnet-20240229(max_token=100000)", "ollama-phi3(max_token=4096)"]
-# --- --- --- ---
-
-
-# --------------- 以下配置可以优化体验 ---------------
 
 # 重新URL重新定向，实现更换API_URL的作用（高危设置! 常规情况下不要修改! 通过修改此设置，您将把您的API-KEY和对话隐私完全暴露给您设定的中间人！）
 # 格式: API_URL_REDIRECT = {"https://api.openai.com/v1/chat/completions": "在这里填写重定向的api.openai.com的URL"}
-# 举例: API_URL_REDIRECT = {"https://api.openai.com/v1/chat/completions": "https://reverse-proxy-url/v1/chat/completions", "http://localhost:11434/api/chat": "在这里填写您ollama的URL"}
+# 举例: API_URL_REDIRECT = {"https://api.openai.com/v1/chat/completions": "https://reverse-proxy-url/v1/chat/completions"}
 API_URL_REDIRECT = {}
 
 
@@ -111,6 +85,20 @@ MAX_RETRY = 2
 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",
+                    "gpt-4", "gpt-4-32k", "azure-gpt-4", "glm-4", "glm-3-turbo",
+                    "gemini-pro", "chatglm3", "claude-2"]
+# P.S. 其他可用的模型还包括 [
+# "moss", "qwen-turbo", "qwen-plus", "qwen-max"
+# "zhipuai", "qianfan", "deepseekcoder", "llama2", "qwen-local", "gpt-3.5-turbo-0613",
+# "gpt-3.5-turbo-16k-0613",  "gpt-3.5-random", "api2d-gpt-3.5-turbo", 'api2d-gpt-3.5-turbo-16k',
+# "spark", "sparkv2", "sparkv3", "chatglm_onnx", "claude-1-100k", "claude-2", "internlm", "jittorllms_pangualpha", "jittorllms_llama"
+# ]
+
+
 # 定义界面上“询问多个GPT模型”插件应该使用哪些模型，请从AVAIL_LLM_MODELS中选择，并在不同模型之间用`&`间隔，例如"gpt-3.5-turbo&chatglm3&azure-gpt-4"
 MULTI_QUERY_LLM_MODELS = "gpt-3.5-turbo&chatglm3"
 
@@ -139,7 +127,6 @@ CHATGLM_PTUNING_CHECKPOINT = "" # 例如"/home/hmp/ChatGLM2-6B/ptuning/output/6b
 LOCAL_MODEL_DEVICE = "cpu" # 可选 "cuda"
 LOCAL_MODEL_QUANT = "FP16" # 默认 "FP16" "INT4" 启用量化INT4版本 "INT8" 启用量化INT8版本
 
-
 # 设置gradio的并行线程数（不需要修改）
 CONCURRENT_COUNT = 100
 
@@ -157,8 +144,7 @@ ADD_WAIFU = False
 AUTHENTICATION = []
 
 
-# 如果需要在二级路径下运行（常规情况下，不要修改!!）
+# 如果需要在二级路径下运行（常规情况下，不要修改!!）（需要配合修改main.py才能生效!）
-# （举例 CUSTOM_PATH = "/gpt_academic"，可以让软件运行在 http://ip:port/gpt_academic/ 下。）
 CUSTOM_PATH = "/"
 
 
@@ -186,8 +172,14 @@ AZURE_ENGINE = "填入你亲手写的部署名"            # 读 docs\use_azure.
 AZURE_CFG_ARRAY = {}
 
 
-# 阿里云实时语音识别 配置难度较高
+# 使用Newbing (不推荐使用，未来将删除)
-# 参考 https://github.com/binary-husky/gpt_academic/blob/master/docs/use_audio.md
+NEWBING_STYLE = "creative"  # ["creative", "balanced", "precise"]
+NEWBING_COOKIES = """
+put your new bing cookies here
+"""
+
+
+# 阿里云实时语音识别 配置难度较高 仅建议高手用户使用 参考 https://github.com/binary-husky/gpt_academic/blob/master/docs/use_audio.md
 ENABLE_AUDIO = False
 ALIYUN_TOKEN=""     # 例如 f37f30e0f9934c34a992f6f64f7eba4f
 ALIYUN_APPKEY=""    # 例如 RoPlZrM88DnAFkZK
@@ -195,12 +187,6 @@ ALIYUN_ACCESSKEY="" # （无需填写）
 ALIYUN_SECRET=""    # （无需填写）
 
 
-# GPT-SOVITS 文本转语音服务的运行地址（将语言模型的生成文本朗读出来）
-TTS_TYPE = "DISABLE" # LOCAL / LOCAL_SOVITS_API / DISABLE
-GPT_SOVITS_URL = ""
-EDGE_TTS_VOICE = "zh-CN-XiaoxiaoNeural"
-
-
 # 接入讯飞星火大模型 https://console.xfyun.cn/services/iat
 XFYUN_APPID = "00000000"
 XFYUN_API_SECRET = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
@@ -212,27 +198,21 @@ ZHIPUAI_API_KEY = ""
 ZHIPUAI_MODEL = "" # 此选项已废弃，不再需要填写
 
 
+# # 火山引擎YUNQUE大模型
+# YUNQUE_SECRET_KEY = ""
+# YUNQUE_ACCESS_KEY = ""
+# YUNQUE_MODEL = ""
+
+
 # Claude API KEY
 ANTHROPIC_API_KEY = ""
 
 
-# 月之暗面 API KEY
-MOONSHOT_API_KEY = ""
-
-
-# 零一万物(Yi Model) API KEY
-YIMODEL_API_KEY = ""
-
-
 # Mathpix 拥有执行PDF的OCR功能，但是需要注册账号
 MATHPIX_APPID = ""
 MATHPIX_APPKEY = ""
 
 
-# DOC2X的PDF解析服务，注册账号并获取API KEY: https://doc2x.noedgeai.com/login
-DOC2X_API_KEY = ""
-
-
 # 自定义API KEY格式
 CUSTOM_API_KEY_PATTERN = ""
 
@@ -286,11 +266,7 @@ PLUGIN_HOT_RELOAD = False
 # 自定义按钮的最大数量限制
 NUM_CUSTOM_BASIC_BTN = 4
 
-
-
 """
---------------- 配置关联关系说明 ---------------
-
 在线大模型配置关联关系示意图
 │
 ├── "gpt-3.5-turbo" 等openai模型
@@ -314,7 +290,7 @@ NUM_CUSTOM_BASIC_BTN = 4
 │   ├── XFYUN_API_SECRET
 │   └── XFYUN_API_KEY
 │
-├── "claude-3-opus-20240229" 等claude模型
+├── "claude-1-100k" 等claude模型
 │   └── ANTHROPIC_API_KEY
 │
 ├── "stack-claude"
@@ -329,19 +305,15 @@ NUM_CUSTOM_BASIC_BTN = 4
 ├── "glm-4", "glm-3-turbo", "zhipuai" 智谱AI大模型
 │   └── ZHIPUAI_API_KEY
 │
-├── "yi-34b-chat-0205", "yi-34b-chat-200k" 等零一万物(Yi Model)大模型
-│   └── YIMODEL_API_KEY
-│
 ├── "qwen-turbo" 等通义千问大模型
 │   └──  DASHSCOPE_API_KEY
 │
 ├── "Gemini"
 │   └──  GEMINI_API_KEY
 │
-└── "one-api-...(max_token=...)" 用一种更方便的方式接入one-api多模型管理界面
+└── "newbing" Newbing接口不再稳定，不推荐使用
-    ├── AVAIL_LLM_MODELS
+    ├── NEWBING_STYLE
-    ├── API_KEY
+    └── NEWBING_COOKIES
-    └── API_URL_REDIRECT
 
 
 本地大模型示意图

core_functional.py

@@ -38,12 +38,12 @@ def get_core_functions():
         
         "总结绘制脑图": {
             # 前缀，会被加在你的输入之前。例如，用来描述你的要求，例如翻译、解释代码、润色等等
-            "Prefix":   '''"""\n\n''',
+            "Prefix":   r"",
             # 后缀，会被加在你的输入之后。例如，配合前缀可以把你的输入内容用引号圈起来
             "Suffix":
                 # dedent() 函数用于去除多行字符串的缩进
-                dedent("\n\n"+r'''
+                dedent("\n"+r'''
-                    """
+                    ==============================
 
                     使用mermaid flowchart对以上文本进行总结，概括上述段落的内容以及内在逻辑关系，例如：
 
@@ -57,7 +57,7 @@ def get_core_functions():
                         C --> |"箭头名2"| F["节点名6"]
                     ```
 
-                    注意：
+                    警告：
                     （1）使用中文
                     （2）节点名字使用引号包裹，如["Laptop"]
                     （3）`|` 和 `"`之间不要存在空格

crazy_functional.py

@@ -27,7 +27,7 @@ def get_crazy_functions():
     from crazy_functions.辅助功能 import 清除缓存
     from crazy_functions.批量Markdown翻译 import Markdown英译中
     from crazy_functions.批量总结PDF文档 import 批量总结PDF文档
-    from crazy_functions.PDF批量翻译 import 批量翻译PDF文档
+    from crazy_functions.批量翻译PDF文档_多线程 import 批量翻译PDF文档
     from crazy_functions.谷歌检索小助手 import 谷歌检索小助手
     from crazy_functions.理解PDF文档内容 import 理解PDF文档内容标准文件输入
     from crazy_functions.Latex全文润色 import Latex中文润色

crazy_functions/Latex全文润色.py

@@ -81,8 +81,8 @@ def 多文件润色(file_manifest, project_folder, llm_kwargs, plugin_kwargs, ch
     #  <-------- 多线程润色开始 ----------> 
     if language == 'en':
         if mode == 'polish':
-            inputs_array = [r"Below is a section from an academic paper, polish this section to meet the academic standard, " +
+            inputs_array = ["Below is a section from an academic paper, polish this section to meet the academic standard, " + 
-                            r"improve the grammar, clarity and overall readability, do not modify any latex command such as \section, \cite and equations:" +
+                            "improve the grammar, clarity and overall readability, do not modify any latex command such as \section, \cite and equations:" + 
                             f"\n\n{frag}" for frag in pfg.sp_file_contents]
         else:
             inputs_array = [r"Below is a section from an academic paper, proofread this section." + 
@@ -93,10 +93,10 @@ def 多文件润色(file_manifest, project_folder, llm_kwargs, plugin_kwargs, ch
         sys_prompt_array = ["You are a professional academic paper writer." for _ in range(n_split)]
     elif language == 'zh':
         if mode == 'polish':
-            inputs_array = [r"以下是一篇学术论文中的一段内容，请将此部分润色以满足学术标准，提高语法、清晰度和整体可读性，不要修改任何LaTeX命令，例如\section，\cite和方程式：" +
+            inputs_array = [f"以下是一篇学术论文中的一段内容，请将此部分润色以满足学术标准，提高语法、清晰度和整体可读性，不要修改任何LaTeX命令，例如\section，\cite和方程式：" + 
                             f"\n\n{frag}" for frag in pfg.sp_file_contents]
         else:
-            inputs_array = [r"以下是一篇学术论文中的一段内容，请对这部分内容进行语法矫正。不要修改任何LaTeX命令，例如\section，\cite和方程式：" +
+            inputs_array = [f"以下是一篇学术论文中的一段内容，请对这部分内容进行语法矫正。不要修改任何LaTeX命令，例如\section，\cite和方程式：" + 
                             f"\n\n{frag}" for frag in pfg.sp_file_contents] 
         inputs_show_user_array = [f"润色 {f}" for f in pfg.sp_file_tag]
         sys_prompt_array=["你是一位专业的中文学术论文作家。" for _ in range(n_split)]

crazy_functions/Latex输出PDF.py

@@ -1,4 +1,4 @@
-from toolbox import update_ui, trimmed_format_exc, get_conf, get_log_folder, promote_file_to_downloadzone, check_repeat_upload, map_file_to_sha256
+from toolbox import update_ui, trimmed_format_exc, get_conf, get_log_folder, promote_file_to_downloadzone
 from toolbox import CatchException, report_exception, update_ui_lastest_msg, zip_result, gen_time_str
 from functools import partial
 import glob, os, requests, time, json, tarfile
@@ -107,10 +107,6 @@ def arxiv_download(chatbot, history, txt, allow_cache=True):
         except ValueError:
             return False
 
-    if txt.startswith('https://arxiv.org/pdf/'):
-        arxiv_id = txt.split('/')[-1]   # 2402.14207v2.pdf
-        txt = arxiv_id.split('v')[0]  # 2402.14207
-
     if ('.' in txt) and ('/' not in txt) and is_float(txt):  # is arxiv ID
         txt = 'https://arxiv.org/abs/' + txt.strip()
     if ('.' in txt) and ('/' not in txt) and is_float(txt[:10]):  # is arxiv ID
@@ -125,7 +121,6 @@ def arxiv_download(chatbot, history, txt, allow_cache=True):
     time.sleep(1)  # 刷新界面
 
     url_ = txt  # https://arxiv.org/abs/1707.06690
-
     if not txt.startswith('https://arxiv.org/abs/'):
         msg = f"解析arxiv网址失败, 期望格式例如: https://arxiv.org/abs/1707.06690。实际得到格式: {url_}。"
         yield from update_ui_lastest_msg(msg, chatbot=chatbot, history=history)  # 刷新界面
@@ -443,101 +438,47 @@ def PDF翻译中文并重新编译PDF(txt, llm_kwargs, plugin_kwargs, chatbot, h
         yield from update_ui(chatbot=chatbot, history=history)  # 刷新界面
         return
 
-    hash_tag = map_file_to_sha256(file_manifest[0])
+    # <-------------- convert pdf into tex ------------->
+    project_folder = pdf2tex_project(file_manifest[0])
 
-    # <-------------- check repeated pdf ------------->
+    # Translate English Latex to Chinese Latex, and compile it
-    chatbot.append([f"检查PDF是否被重复上传", "正在检查..."])
+    file_manifest = [f for f in glob.glob(f'{project_folder}/**/*.tex', recursive=True)]
-    yield from update_ui(chatbot=chatbot, history=history)
+    if len(file_manifest) == 0:
-    repeat, project_folder = check_repeat_upload(file_manifest[0], hash_tag)
+        report_exception(chatbot, history, a=f"解析项目: {txt}", b=f"找不到任何.tex文件: {txt}")
+        yield from update_ui(chatbot=chatbot, history=history)  # 刷新界面
+        return
 
-    except_flag = False
+    # <-------------- if is a zip/tar file ------------->
+    project_folder = desend_to_extracted_folder_if_exist(project_folder)
 
-    if repeat:
+    # <-------------- move latex project away from temp folder ------------->
-        yield from update_ui_lastest_msg(f"发现重复上传，请查收结果（压缩包）...", chatbot=chatbot, history=history)
+    project_folder = move_project(project_folder)
 
-        try:
+    # <-------------- if merge_translate_zh is already generated, skip gpt req ------------->
-            trans_html_file = [f for f in glob.glob(f'{project_folder}/**/*.trans.html', recursive=True)][0]
+    if not os.path.exists(project_folder + '/merge_translate_zh.tex'):
-            promote_file_to_downloadzone(trans_html_file, rename_file=None, chatbot=chatbot)
+        yield from Latex精细分解与转化(file_manifest, project_folder, llm_kwargs, plugin_kwargs,
+                                       chatbot, history, system_prompt, mode='translate_zh',
+                                       switch_prompt=_switch_prompt_)
 
-            translate_pdf = [f for f in glob.glob(f'{project_folder}/**/merge_translate_zh.pdf', recursive=True)][0]
+    # <-------------- compile PDF ------------->
-            promote_file_to_downloadzone(translate_pdf, rename_file=None, chatbot=chatbot)
+    success = yield from 编译Latex(chatbot, history, main_file_original='merge',
+                                   main_file_modified='merge_translate_zh', mode='translate_zh',
+                                   work_folder_original=project_folder, work_folder_modified=project_folder,
+                                   work_folder=project_folder)
 
-            comparison_pdf = [f for f in glob.glob(f'{project_folder}/**/comparison.pdf', recursive=True)][0]
+    # <-------------- zip PDF ------------->
-            promote_file_to_downloadzone(comparison_pdf, rename_file=None, chatbot=chatbot)
+    zip_res = zip_result(project_folder)
+    if success:
+        chatbot.append((f"成功啦", '请查收结果（压缩包）...'))
+        yield from update_ui(chatbot=chatbot, history=history);
+        time.sleep(1)  # 刷新界面
+        promote_file_to_downloadzone(file=zip_res, chatbot=chatbot)
+    else:
+        chatbot.append((f"失败了",
+                        '虽然PDF生成失败了, 但请查收结果（压缩包）, 内含已经翻译的Tex文档, 您可以到Github Issue区, 用该压缩包进行反馈。如系统是Linux，请检查系统字体（见Github wiki） ...'))
+        yield from update_ui(chatbot=chatbot, history=history);
+        time.sleep(1)  # 刷新界面
+        promote_file_to_downloadzone(file=zip_res, chatbot=chatbot)
 
-            zip_res = zip_result(project_folder)
+    # <-------------- we are done ------------->
-            promote_file_to_downloadzone(file=zip_res, chatbot=chatbot)
+    return success
-
-            return True
-
-        except:
-            report_exception(chatbot, history, a=f"解析项目: {txt}", b=f"发现重复上传，但是无法找到相关文件")
-            yield from update_ui(chatbot=chatbot, history=history)
-
-            chatbot.append([f"没有相关文件", '尝试重新翻译PDF...'])
-            yield from update_ui(chatbot=chatbot, history=history)
-
-            except_flag = True
-
-
-    elif not repeat or except_flag:
-        yield from update_ui_lastest_msg(f"未发现重复上传", chatbot=chatbot, history=history)
-
-        # <-------------- convert pdf into tex ------------->
-        chatbot.append([f"解析项目: {txt}", "正在将PDF转换为tex项目，请耐心等待..."])
-        yield from update_ui(chatbot=chatbot, history=history)
-        project_folder = pdf2tex_project(file_manifest[0])
-        if project_folder is None:
-            report_exception(chatbot, history, a=f"解析项目: {txt}", b=f"PDF转换为tex项目失败")
-            yield from update_ui(chatbot=chatbot, history=history)
-            return False
-
-        # <-------------- translate latex file into Chinese ------------->
-        yield from update_ui_lastest_msg("正在tex项目将翻译为中文...", chatbot=chatbot, history=history)
-        file_manifest = [f for f in glob.glob(f'{project_folder}/**/*.tex', recursive=True)]
-        if len(file_manifest) == 0:
-            report_exception(chatbot, history, a=f"解析项目: {txt}", b=f"找不到任何.tex文件: {txt}")
-            yield from update_ui(chatbot=chatbot, history=history)  # 刷新界面
-            return
-
-        # <-------------- if is a zip/tar file ------------->
-        project_folder = desend_to_extracted_folder_if_exist(project_folder)
-
-        # <-------------- move latex project away from temp folder ------------->
-        project_folder = move_project(project_folder)
-
-        # <-------------- set a hash tag for repeat-checking ------------->
-        with open(pj(project_folder, hash_tag + '.tag'), 'w') as f:
-            f.write(hash_tag)
-            f.close()
-
-
-        # <-------------- if merge_translate_zh is already generated, skip gpt req ------------->
-        if not os.path.exists(project_folder + '/merge_translate_zh.tex'):
-            yield from Latex精细分解与转化(file_manifest, project_folder, llm_kwargs, plugin_kwargs,
-                                        chatbot, history, system_prompt, mode='translate_zh',
-                                        switch_prompt=_switch_prompt_)
-
-        # <-------------- compile PDF ------------->
-        yield from update_ui_lastest_msg("正在将翻译好的项目tex项目编译为PDF...", chatbot=chatbot, history=history)
-        success = yield from 编译Latex(chatbot, history, main_file_original='merge',
-                                    main_file_modified='merge_translate_zh', mode='translate_zh',
-                                    work_folder_original=project_folder, work_folder_modified=project_folder,
-                                    work_folder=project_folder)
-
-        # <-------------- zip PDF ------------->
-        zip_res = zip_result(project_folder)
-        if success:
-            chatbot.append((f"成功啦", '请查收结果（压缩包）...'))
-            yield from update_ui(chatbot=chatbot, history=history);
-            time.sleep(1)  # 刷新界面
-            promote_file_to_downloadzone(file=zip_res, chatbot=chatbot)
-        else:
-            chatbot.append((f"失败了",
-                            '虽然PDF生成失败了, 但请查收结果（压缩包）, 内含已经翻译的Tex文档, 您可以到Github Issue区, 用该压缩包进行反馈。如系统是Linux，请检查系统字体（见Github wiki） ...'))
-            yield from update_ui(chatbot=chatbot, history=history);
-            time.sleep(1)  # 刷新界面
-            promote_file_to_downloadzone(file=zip_res, chatbot=chatbot)
-
-        # <-------------- we are done ------------->
-        return success

crazy_functions/crazy_utils.py

@@ -135,25 +135,13 @@ def request_gpt_model_in_new_thread_with_ui_alive(
     yield from update_ui(chatbot=chatbot, history=[]) # 如果最后成功了，则删除报错信息
     return final_result
 
-def can_multi_process(llm) -> bool:
+def can_multi_process(llm):
-    from request_llms.bridge_all import model_info
+    if llm.startswith('gpt-'): return True
-
+    if llm.startswith('api2d-'): return True
-    def default_condition(llm) -> bool:
+    if llm.startswith('azure-'): return True
-        # legacy condition
+    if llm.startswith('spark'): return True
-        if llm.startswith('gpt-'): return True
+    if llm.startswith('zhipuai') or llm.startswith('glm-'): return True
-        if llm.startswith('api2d-'): return True
+    return False
-        if llm.startswith('azure-'): return True
-        if llm.startswith('spark'): return True
-        if llm.startswith('zhipuai') or llm.startswith('glm-'): return True
-        return False
-
-    if llm in model_info:
-        if 'can_multi_thread' in model_info[llm]:
-            return model_info[llm]['can_multi_thread']
-        else:
-            return default_condition(llm)
-    else:
-        return default_condition(llm)
 
 def request_gpt_model_multi_threads_with_very_awesome_ui_and_high_efficiency(
         inputs_array, inputs_show_user_array, llm_kwargs,
@@ -568,7 +556,7 @@ class nougat_interface():
         from toolbox import ProxyNetworkActivate
         logging.info(f'正在执行命令 {command}')
         with ProxyNetworkActivate("Nougat_Download"):
-            process = subprocess.Popen(command, shell=False, cwd=cwd, env=os.environ)
+            process = subprocess.Popen(command, shell=True, cwd=cwd, env=os.environ)
         try:
             stdout, stderr = process.communicate(timeout=timeout)
         except subprocess.TimeoutExpired:
@@ -592,8 +580,7 @@ class nougat_interface():
 
         yield from update_ui_lastest_msg("正在解析论文, 请稍候。进度：正在加载NOUGAT... （提示：首次运行需要花费较长时间下载NOUGAT参数）",
                                          chatbot=chatbot, history=history, delay=0)
-        command = ['nougat', '--out', os.path.abspath(dst), os.path.abspath(fp)]
+        self.nougat_with_timeout(f'nougat --out "{os.path.abspath(dst)}" "{os.path.abspath(fp)}"', os.getcwd(), timeout=3600)
-        self.nougat_with_timeout(command, cwd=os.getcwd(), timeout=3600)
         res = glob.glob(os.path.join(dst,'*.mmd'))
         if len(res) == 0:
             self.threadLock.release()

crazy_functions/json_fns/pydantic_io.py

@@ -62,8 +62,8 @@ class GptJsonIO():
         if "type" in reduced_schema:
             del reduced_schema["type"]
         # Ensure json in context is well-formed with double quotes.
-        schema_str = json.dumps(reduced_schema)
         if self.example_instruction:
+            schema_str = json.dumps(reduced_schema)
             return PYDANTIC_FORMAT_INSTRUCTIONS.format(schema=schema_str)
         else:
             return PYDANTIC_FORMAT_INSTRUCTIONS_SIMPLE.format(schema=schema_str)

crazy_functions/latex_fns/latex_actions.py

@@ -1,11 +1,10 @@
 from toolbox import update_ui, update_ui_lastest_msg, get_log_folder
-from toolbox import get_conf, promote_file_to_downloadzone
+from toolbox import get_conf, objdump, objload, promote_file_to_downloadzone
 from .latex_toolbox import PRESERVE, TRANSFORM
 from .latex_toolbox import set_forbidden_text, set_forbidden_text_begin_end, set_forbidden_text_careful_brace
 from .latex_toolbox import reverse_forbidden_text_careful_brace, reverse_forbidden_text, convert_to_linklist, post_process
 from .latex_toolbox import fix_content, find_main_tex_file, merge_tex_files, compile_latex_with_timeout
 from .latex_toolbox import find_title_and_abs
-from .latex_pickle_io import objdump, objload
 
 import os, shutil
 import re

crazy_functions/latex_fns/latex_pickle_io.py

@@ -1,38 +0,0 @@
-import pickle
-
-
-class SafeUnpickler(pickle.Unpickler):
-
-    def get_safe_classes(self):
-        from .latex_actions import LatexPaperFileGroup, LatexPaperSplit
-        # 定义允许的安全类
-        safe_classes = {
-            # 在这里添加其他安全的类
-            'LatexPaperFileGroup': LatexPaperFileGroup,
-            'LatexPaperSplit' : LatexPaperSplit,
-        }
-        return safe_classes
-
-    def find_class(self, module, name):
-        # 只允许特定的类进行反序列化
-        self.safe_classes = self.get_safe_classes()
-        if f'{module}.{name}' in self.safe_classes:
-            return self.safe_classes[f'{module}.{name}']
-        # 如果尝试加载未授权的类，则抛出异常
-        raise pickle.UnpicklingError(f"Attempted to deserialize unauthorized class '{name}' from module '{module}'")
-
-def objdump(obj, file="objdump.tmp"):
-
-    with open(file, "wb+") as f:
-        pickle.dump(obj, f)
-    return
-
-
-def objload(file="objdump.tmp"):
-    import os
-
-    if not os.path.exists(file):
-        return
-    with open(file, "rb") as f:
-        unpickler = SafeUnpickler(f)
-        return unpickler.load()

crazy_functions/pdf_fns/report_template_v2.html

@@ -1,73 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>GPT-Academic 翻译报告书</title>
-    <style>
-        .centered-a {
-            color: red;
-            text-align: center;
-            margin-bottom: 2%;
-            font-size: 1.5em;
-        }
-        .centered-b {
-            color: red;
-            text-align: center;
-            margin-top: 10%;
-            margin-bottom: 20%;
-            font-size: 1.5em;
-        }
-        .centered-c {
-            color: rgba(255, 0, 0, 0);
-            text-align: center;
-            margin-top: 2%;
-            margin-bottom: 20%;
-            font-size: 7em;
-        }
-    </style>
-<script>
-        // Configure MathJax settings
-        MathJax = {
-            tex: {
-                inlineMath: [
-                    ['$', '$'],
-                    ['\(', '\)']
-                ]
-            }
-        }
-        addEventListener('zero-md-rendered', () => {MathJax.typeset(); console.log('MathJax typeset!');})
-    </script>
-    <!-- Load MathJax library -->
-    <script src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-chtml.js"></script>
-    <script
-        type="module"
-        src="https://cdn.jsdelivr.net/gh/zerodevx/zero-md@2/dist/zero-md.min.js"
-    ></script>
-
-</head>
-
-<body>
-    <div class="test_temp1" style="width:10%; height: 500px; float:left;">
-
-    </div>
-    <div class="test_temp2" style="width:80%; height: 500px; float:left;">
-        <!-- Simply set the `src` attribute to your MD file and win -->
-        <div class="centered-a">
-            请按Ctrl+S保存此页面，否则该页面可能在几分钟后失效。
-        </div>
-        <zero-md src="translated_markdown.md" no-shadow>
-        </zero-md>
-        <div class="centered-b">
-            本报告由GPT-Academic开源项目生成，地址：https://github.com/binary-husky/gpt_academic。
-        </div>
-        <div class="centered-c">
-            本报告由GPT-Academic开源项目生成，地址：https://github.com/binary-husky/gpt_academic。
-        </div>
-    </div>
-    <div class="test_temp3" style="width:10%; height: 500px; float:left;">
-    </div>
-
-    </body>
-
-</html>

crazy_functions/批量Markdown翻译.py

@@ -1,5 +1,5 @@
-import glob, shutil, os, re, logging
+import glob, time, os, re, logging
-from toolbox import update_ui, trimmed_format_exc, gen_time_str
+from toolbox import update_ui, trimmed_format_exc, gen_time_str, disable_auto_promotion
 from toolbox import CatchException, report_exception, get_log_folder
 from toolbox import write_history_to_file, promote_file_to_downloadzone
 fast_debug = False
@@ -18,7 +18,7 @@ class PaperFileGroup():
         def get_token_num(txt): return len(enc.encode(txt, disallowed_special=()))
         self.get_token_num = get_token_num
 
-    def run_file_split(self, max_token_limit=2048):
+    def run_file_split(self, max_token_limit=1900):
         """
         将长文本分离开来
         """
@@ -64,22 +64,22 @@ def 多文件翻译(file_manifest, project_folder, llm_kwargs, plugin_kwargs, ch
             pfg.file_contents.append(file_content)
 
     #  <-------- 拆分过长的Markdown文件 ----------> 
-    pfg.run_file_split(max_token_limit=2048)
+    pfg.run_file_split(max_token_limit=1500)
     n_split = len(pfg.sp_file_contents)
 
     #  <-------- 多线程翻译开始 ----------> 
     if language == 'en->zh':
-        inputs_array = ["This is a Markdown file, translate it into Chinese, do NOT modify any existing Markdown commands, do NOT use code wrapper (```), ONLY answer me with translated results:" +
+        inputs_array = ["This is a Markdown file, translate it into Chinese, do not modify any existing Markdown commands:" + 
                         f"\n\n{frag}" for frag in pfg.sp_file_contents]
         inputs_show_user_array = [f"翻译 {f}" for f in pfg.sp_file_tag]
         sys_prompt_array = ["You are a professional academic paper translator." for _ in range(n_split)]
     elif language == 'zh->en':
-        inputs_array = [f"This is a Markdown file, translate it into English, do NOT modify any existing Markdown commands, do NOT use code wrapper (```), ONLY answer me with translated results:" +
+        inputs_array = [f"This is a Markdown file, translate it into English, do not modify any existing Markdown commands:" + 
                         f"\n\n{frag}" for frag in pfg.sp_file_contents]
         inputs_show_user_array = [f"翻译 {f}" for f in pfg.sp_file_tag]
         sys_prompt_array = ["You are a professional academic paper translator." for _ in range(n_split)]
     else:
-        inputs_array = [f"This is a Markdown file, translate it into {language}, do NOT modify any existing Markdown commands, do NOT use code wrapper (```), ONLY answer me with translated results:" +
+        inputs_array = [f"This is a Markdown file, translate it into {language}, do not modify any existing Markdown commands, only answer me with translated results:" + 
                         f"\n\n{frag}" for frag in pfg.sp_file_contents]
         inputs_show_user_array = [f"翻译 {f}" for f in pfg.sp_file_tag]
         sys_prompt_array = ["You are a professional academic paper translator." for _ in range(n_split)]
@@ -99,12 +99,7 @@ def 多文件翻译(file_manifest, project_folder, llm_kwargs, plugin_kwargs, ch
         for i_say, gpt_say in zip(gpt_response_collection[0::2], gpt_response_collection[1::2]):
             pfg.sp_file_result.append(gpt_say)
         pfg.merge_result()
-        output_file_arr = pfg.write_result(language)
+        pfg.write_result(language)
-        for output_file in output_file_arr:
-            promote_file_to_downloadzone(output_file, chatbot=chatbot)
-            if 'markdown_expected_output_path' in plugin_kwargs:
-                expected_f_name = plugin_kwargs['markdown_expected_output_path']
-                shutil.copyfile(output_file, expected_f_name)
     except:
         logging.error(trimmed_format_exc())
 
@@ -164,6 +159,7 @@ def Markdown英译中(txt, llm_kwargs, plugin_kwargs, chatbot, history, system_p
         "函数插件功能？",
         "对整个Markdown项目进行翻译。函数插件贡献者: Binary-Husky"])
     yield from update_ui(chatbot=chatbot, history=history) # 刷新界面
+    disable_auto_promotion(chatbot)
 
     # 尝试导入依赖，如果缺少依赖，则给出安装建议
     try:
@@ -203,6 +199,7 @@ def Markdown中译英(txt, llm_kwargs, plugin_kwargs, chatbot, history, system_p
         "函数插件功能？",
         "对整个Markdown项目进行翻译。函数插件贡献者: Binary-Husky"])
     yield from update_ui(chatbot=chatbot, history=history) # 刷新界面
+    disable_auto_promotion(chatbot)
 
     # 尝试导入依赖，如果缺少依赖，则给出安装建议
     try:
@@ -235,6 +232,7 @@ def Markdown翻译指定语言(txt, llm_kwargs, plugin_kwargs, chatbot, history,
         "函数插件功能？",
         "对整个Markdown项目进行翻译。函数插件贡献者: Binary-Husky"])
     yield from update_ui(chatbot=chatbot, history=history) # 刷新界面
+    disable_auto_promotion(chatbot)
 
     # 尝试导入依赖，如果缺少依赖，则给出安装建议
     try:

crazy_functions/批量翻译PDF文档_多线程.py

@@ -1,11 +1,9 @@
 from toolbox import CatchException, report_exception, get_log_folder, gen_time_str, check_packages
 from toolbox import update_ui, promote_file_to_downloadzone, update_ui_lastest_msg, disable_auto_promotion
-from toolbox import write_history_to_file, promote_file_to_downloadzone, get_conf, extract_archive
+from toolbox import write_history_to_file, promote_file_to_downloadzone
-from toolbox import generate_file_link, zip_folder, trimmed_format_exc, trimmed_format_exc_markdown
 from .crazy_utils import request_gpt_model_in_new_thread_with_ui_alive
 from .crazy_utils import request_gpt_model_multi_threads_with_very_awesome_ui_and_high_efficiency
 from .crazy_utils import read_and_clean_pdf_text
-from .crazy_utils import get_files_from_everything
 from .pdf_fns.parse_pdf import parse_pdf, get_avail_grobid_url, translate_pdf
 from colorful import *
 import os
@@ -16,7 +14,9 @@ def 批量翻译PDF文档(txt, llm_kwargs, plugin_kwargs, chatbot, history, syst
 
     disable_auto_promotion(chatbot)
     # 基本信息：功能、贡献者
-    chatbot.append([None, "插件功能：批量翻译PDF文档。函数插件贡献者: Binary-Husky"])
+    chatbot.append([
+        "函数插件功能？",
+        "批量翻译PDF文档。函数插件贡献者: Binary-Husky"])
     yield from update_ui(chatbot=chatbot, history=history) # 刷新界面
 
     # 尝试导入依赖，如果缺少依赖，则给出安装建议
@@ -32,6 +32,7 @@ def 批量翻译PDF文档(txt, llm_kwargs, plugin_kwargs, chatbot, history, syst
     # 清空历史，以免输入溢出
     history = []
 
+    from .crazy_utils import get_files_from_everything
     success, file_manifest, project_folder = get_files_from_everything(txt, type='.pdf')
     # 检测输入参数，如没有给定输入参数，直接退出
     if not success:
@@ -45,161 +46,13 @@ def 批量翻译PDF文档(txt, llm_kwargs, plugin_kwargs, chatbot, history, syst
         return
 
     # 开始正式执行任务
-    DOC2X_API_KEY = get_conf("DOC2X_API_KEY")
-    # ------- 第一种方法，效果最好，但是需要DOC2X服务 -------
-    if len(DOC2X_API_KEY) != 0:
-        try:
-            yield from 解析PDF_DOC2X(file_manifest, project_folder, llm_kwargs, plugin_kwargs, chatbot, history, system_prompt, DOC2X_API_KEY, user_request)
-            return
-        except:
-            chatbot.append([None, f"DOC2X服务不可用，现在将执行效果稍差的旧版代码。{trimmed_format_exc_markdown()}"])
-            yield from update_ui(chatbot=chatbot, history=history)
-
-    # ------- 第二种方法，效果次优 -------
     grobid_url = get_avail_grobid_url()
     if grobid_url is not None:
         yield from 解析PDF_基于GROBID(file_manifest, project_folder, llm_kwargs, plugin_kwargs, chatbot, history, system_prompt, grobid_url)
-        return
+    else:
+        yield from update_ui_lastest_msg("GROBID服务不可用，请检查config中的GROBID_URL。作为替代，现在将执行效果稍差的旧版代码。", chatbot, history, delay=3)
+        yield from 解析PDF(file_manifest, project_folder, llm_kwargs, plugin_kwargs, chatbot, history, system_prompt)
 
-    # ------- 第三种方法，早期代码，效果不理想 -------
-    yield from update_ui_lastest_msg("GROBID服务不可用，请检查config中的GROBID_URL。作为替代，现在将执行效果稍差的旧版代码。", chatbot, history, delay=3)
-    yield from 解析PDF(file_manifest, project_folder, llm_kwargs, plugin_kwargs, chatbot, history, system_prompt)
-    return
-
-
-
-def 解析PDF_DOC2X_单文件(fp, project_folder, llm_kwargs, plugin_kwargs, chatbot, history, system_prompt, DOC2X_API_KEY, user_request):
-
-    def pdf2markdown(filepath):
-        import requests, json, os
-        markdown_dir = get_log_folder(plugin_name="pdf_ocr")
-        doc2x_api_key = DOC2X_API_KEY
-        if doc2x_api_key.startswith('sk-'):
-            url = "https://api.doc2x.noedgeai.com/api/v1/pdf"
-        else:
-            url = "https://api.doc2x.noedgeai.com/api/platform/pdf"
-
-        chatbot.append((None, "加载PDF文件，发送至DOC2X解析..."))
-        yield from update_ui(chatbot=chatbot, history=history) # 刷新界面
-
-        res = requests.post(
-            url,
-            files={"file": open(filepath, "rb")},
-            data={"ocr": "1"},
-            headers={"Authorization": "Bearer " + doc2x_api_key}
-        )
-        res_json = []
-        if res.status_code == 200:
-            decoded = res.content.decode("utf-8")
-            for z_decoded in decoded.split('\n'):
-                if len(z_decoded) == 0: continue
-                assert z_decoded.startswith("data: ")
-                z_decoded = z_decoded[len("data: "):]
-                decoded_json = json.loads(z_decoded)
-                res_json.append(decoded_json)
-        else:
-            raise RuntimeError(format("[ERROR] status code: %d, body: %s" % (res.status_code, res.text)))
-        uuid = res_json[0]['uuid']
-        to = "md" # latex, md, docx
-        url = "https://api.doc2x.noedgeai.com/api/export"+"?request_id="+uuid+"&to="+to
-
-        chatbot.append((None, f"读取解析: {url} ..."))
-        yield from update_ui(chatbot=chatbot, history=history) # 刷新界面
-
-        res = requests.get(url, headers={"Authorization": "Bearer " + doc2x_api_key})
-        md_zip_path = os.path.join(markdown_dir, gen_time_str() + '.zip')
-        if res.status_code == 200:
-            with open(md_zip_path, "wb") as f: f.write(res.content)
-        else:
-            raise RuntimeError(format("[ERROR] status code: %d, body: %s" % (res.status_code, res.text)))
-        promote_file_to_downloadzone(md_zip_path, chatbot=chatbot)
-        chatbot.append((None, f"完成解析 {md_zip_path} ..."))
-        yield from update_ui(chatbot=chatbot, history=history) # 刷新界面
-        return md_zip_path
-
-    def deliver_to_markdown_plugin(md_zip_path, user_request):
-        from crazy_functions.批量Markdown翻译 import Markdown英译中
-        import shutil, re
-
-        time_tag = gen_time_str()
-        target_path_base = get_log_folder(chatbot.get_user())
-        file_origin_name = os.path.basename(md_zip_path)
-        this_file_path = os.path.join(target_path_base, file_origin_name)
-        os.makedirs(target_path_base, exist_ok=True)
-        shutil.copyfile(md_zip_path, this_file_path)
-        ex_folder = this_file_path + ".extract"
-        extract_archive(
-            file_path=this_file_path, dest_dir=ex_folder
-        )
-
-        # edit markdown files
-        success, file_manifest, project_folder = get_files_from_everything(ex_folder, type='.md')
-        for generated_fp in file_manifest:
-            # 修正一些公式问题
-            with open(generated_fp, 'r', encoding='utf8') as f:
-                content = f.read()
-            # 将公式中的\[ \]替换成$$
-            content = content.replace(r'\[', r'$$').replace(r'\]', r'$$')
-            # 将公式中的\( \)替换成$
-            content = content.replace(r'\(', r'$').replace(r'\)', r'$')
-            content = content.replace('```markdown', '\n').replace('```', '\n')
-            with open(generated_fp, 'w', encoding='utf8') as f:
-                f.write(content)
-            promote_file_to_downloadzone(generated_fp, chatbot=chatbot)
-            yield from update_ui(chatbot=chatbot, history=history) # 刷新界面
-
-            # 生成在线预览html
-            file_name = '在线预览翻译（原文）' + gen_time_str() + '.html'
-            preview_fp = os.path.join(ex_folder, file_name)
-            from shared_utils.advanced_markdown_format import markdown_convertion_for_file
-            with open(generated_fp, "r", encoding="utf-8") as f:
-                md = f.read()
-                # Markdown中使用不标准的表格，需要在表格前加上一个emoji，以便公式渲染
-                md = re.sub(r'^<table>', r'😃<table>', md, flags=re.MULTILINE)
-            html = markdown_convertion_for_file(md)
-            with open(preview_fp, "w", encoding="utf-8") as f: f.write(html)
-            chatbot.append([None, f"生成在线预览：{generate_file_link([preview_fp])}"])
-            promote_file_to_downloadzone(preview_fp, chatbot=chatbot)
-
-
-
-        chatbot.append((None, f"调用Markdown插件 {ex_folder} ..."))
-        plugin_kwargs['markdown_expected_output_dir'] = ex_folder
-
-        translated_f_name = 'translated_markdown.md'
-        generated_fp = plugin_kwargs['markdown_expected_output_path'] = os.path.join(ex_folder, translated_f_name)
-        yield from update_ui(chatbot=chatbot, history=history) # 刷新界面
-        yield from Markdown英译中(ex_folder, llm_kwargs, plugin_kwargs, chatbot, history, system_prompt, user_request)
-        if os.path.exists(generated_fp):
-            # 修正一些公式问题
-            with open(generated_fp, 'r', encoding='utf8') as f: content = f.read()
-            content = content.replace('```markdown', '\n').replace('```', '\n')
-            # Markdown中使用不标准的表格，需要在表格前加上一个emoji，以便公式渲染
-            content = re.sub(r'^<table>', r'😃<table>', content, flags=re.MULTILINE)
-            with open(generated_fp, 'w', encoding='utf8') as f: f.write(content)
-            # 生成在线预览html
-            file_name = '在线预览翻译' + gen_time_str() + '.html'
-            preview_fp = os.path.join(ex_folder, file_name)
-            from shared_utils.advanced_markdown_format import markdown_convertion_for_file
-            with open(generated_fp, "r", encoding="utf-8") as f:
-                md = f.read()
-            html = markdown_convertion_for_file(md)
-            with open(preview_fp, "w", encoding="utf-8") as f: f.write(html)
-            promote_file_to_downloadzone(preview_fp, chatbot=chatbot)
-            # 生成包含图片的压缩包
-            dest_folder = get_log_folder(chatbot.get_user())
-            zip_name = '翻译后的带图文档.zip'
-            zip_folder(source_folder=ex_folder, dest_folder=dest_folder, zip_name=zip_name)
-            zip_fp = os.path.join(dest_folder, zip_name)
-            promote_file_to_downloadzone(zip_fp, chatbot=chatbot)
-            yield from update_ui(chatbot=chatbot, history=history) # 刷新界面
-    md_zip_path = yield from pdf2markdown(fp)
-    yield from deliver_to_markdown_plugin(md_zip_path, user_request)
-
-def 解析PDF_DOC2X(file_manifest, *args):
-    for index, fp in enumerate(file_manifest):
-        yield from 解析PDF_DOC2X_单文件(fp, *args)
-    return
 
 def 解析PDF_基于GROBID(file_manifest, project_folder, llm_kwargs, plugin_kwargs, chatbot, history, system_prompt, grobid_url):
     import copy, json

crazy_functions/解析项目源代码.py

@@ -345,12 +345,9 @@ def 解析任意code项目(txt, llm_kwargs, plugin_kwargs, chatbot, history, sys
     pattern_except_suffix = [_.lstrip(" ^*.,").rstrip(" ,") for _ in txt_pattern.split(" ") if _ != "" and _.strip().startswith("^*.")]
     pattern_except_suffix += ['zip', 'rar', '7z', 'tar', 'gz'] # 避免解析压缩文件
     # 将要忽略匹配的文件名(例如: ^README.md)
-    pattern_except_name = [_.lstrip(" ^*,").rstrip(" ,").replace(".", r"\.") # 移除左边通配符，移除右侧逗号，转义点号
+    pattern_except_name = [_.lstrip(" ^*,").rstrip(" ,").replace(".", "\.") for _ in txt_pattern.split(" ") if _ != "" and _.strip().startswith("^") and not _.strip().startswith("^*.")]
-                           for _ in txt_pattern.split(" ") # 以空格分割
-                           if (_ != "" and _.strip().startswith("^") and not _.strip().startswith("^*."))   # ^开始，但不是^*.开始
-                           ]
     # 生成正则表达式
-    pattern_except = r'/[^/]+\.(' + "|".join(pattern_except_suffix) + ')$'
+    pattern_except = '/[^/]+\.(' + "|".join(pattern_except_suffix) + ')$'
     pattern_except += '|/(' + "|".join(pattern_except_name) + ')$' if pattern_except_name != [] else ''
 
     history.clear()

docker-compose.yml

@@ -1,12 +1,12 @@
 ## ===================================================
-#                docker-compose.yml
+# docker-compose.yml
 ## ===================================================
 # 1. 请在以下方案中选择任意一种，然后删除其他的方案
 # 2. 修改你选择的方案中的environment环境变量，详情请见github wiki或者config.py
 # 3. 选择一种暴露服务端口的方法，并对相应的配置做出修改：
-    # 「方法1: 适用于Linux，很方便，可惜windows不支持」与宿主的网络融合为一体，这个是默认配置
+    # 【方法1: 适用于Linux，很方便，可惜windows不支持】与宿主的网络融合为一体，这个是默认配置
     # network_mode: "host"
-    # 「方法2: 适用于所有系统包括Windows和MacOS」端口映射，把容器的端口映射到宿主的端口（注意您需要先删除network_mode: "host"，再追加以下内容）
+    # 【方法2: 适用于所有系统包括Windows和MacOS】端口映射，把容器的端口映射到宿主的端口（注意您需要先删除network_mode: "host"，再追加以下内容）
     # ports:
     #   - "12345:12345"  # 注意！12345必须与WEB_PORT环境变量相互对应
 # 4. 最后`docker-compose up`运行
@@ -25,7 +25,7 @@
 ## ===================================================
 
 ## ===================================================
-## 「方案零」 部署项目的全部能力（这个是包含cuda和latex的大型镜像。如果您网速慢、硬盘小或没有显卡，则不推荐使用这个）
+## 【方案零】 部署项目的全部能力（这个是包含cuda和latex的大型镜像。如果您网速慢、硬盘小或没有显卡，则不推荐使用这个）
 ## ===================================================
 version: '3'
 services:
@@ -63,10 +63,10 @@ services:
     #             count: 1
     #             capabilities: [gpu]
 
-    # 「WEB_PORT暴露方法1: 适用于Linux」与宿主的网络融合
+    # 【WEB_PORT暴露方法1: 适用于Linux】与宿主的网络融合
     network_mode: "host"
 
-    # 「WEB_PORT暴露方法2: 适用于所有系统」端口映射
+    # 【WEB_PORT暴露方法2: 适用于所有系统】端口映射
     # ports:
     #   - "12345:12345"  # 12345必须与WEB_PORT相互对应
 
@@ -75,8 +75,10 @@ services:
       bash -c "python3 -u main.py"
 
 
+
+
 ## ===================================================
-## 「方案一」 如果不需要运行本地模型（仅 chatgpt, azure, 星火, 千帆, claude 等在线大模型服务）
+## 【方案一】 如果不需要运行本地模型（仅 chatgpt, azure, 星火, 千帆, claude 等在线大模型服务）
 ## ===================================================
 version: '3'
 services:
@@ -95,16 +97,16 @@ services:
       # DEFAULT_WORKER_NUM:       '    10                                                                                             '
       # AUTHENTICATION:           '    [("username", "passwd"), ("username2", "passwd2")]                                             '
 
-    # 「WEB_PORT暴露方法1: 适用于Linux」与宿主的网络融合
+    # 与宿主的网络融合
     network_mode: "host"
 
-    # 启动命令
+    # 不使用代理网络拉取最新代码
     command: >
       bash -c "python3 -u main.py"
 
 
 ### ===================================================
-### 「方案二」 如果需要运行ChatGLM + Qwen + MOSS等本地模型
+### 【方案二】 如果需要运行ChatGLM + Qwen + MOSS等本地模型
 ### ===================================================
 version: '3'
 services:
@@ -128,10 +130,8 @@ services:
     devices:
       - /dev/nvidia0:/dev/nvidia0
 
-    # 「WEB_PORT暴露方法1: 适用于Linux」与宿主的网络融合
+    # 与宿主的网络融合
     network_mode: "host"
-
-    # 启动命令
     command: >
       bash -c "python3 -u main.py"
 
@@ -139,9 +139,8 @@ services:
     # command: >
     #   bash -c "pip install -r request_llms/requirements_qwen.txt && python3 -u main.py"
 
-
 ### ===================================================
-### 「方案三」 如果需要运行ChatGPT + LLAMA + 盘古 + RWKV本地模型
+### 【方案三】 如果需要运行ChatGPT + LLAMA + 盘古 + RWKV本地模型
 ### ===================================================
 version: '3'
 services:
@@ -165,16 +164,16 @@ services:
     devices:
       - /dev/nvidia0:/dev/nvidia0
 
-    # 「WEB_PORT暴露方法1: 适用于Linux」与宿主的网络融合
+    # 与宿主的网络融合
     network_mode: "host"
 
-    # 启动命令
+    # 不使用代理网络拉取最新代码
     command: >
       python3 -u main.py
 
 
 ## ===================================================
-## 「方案四」 ChatGPT + Latex
+## 【方案四】 ChatGPT + Latex
 ## ===================================================
 version: '3'
 services:
@@ -191,16 +190,16 @@ services:
       DEFAULT_WORKER_NUM:       '    10                                                                               '
       WEB_PORT:                 '    12303                                                                            '
 
-    # 「WEB_PORT暴露方法1: 适用于Linux」与宿主的网络融合
+    # 与宿主的网络融合
     network_mode: "host"
 
-    # 启动命令
+    # 不使用代理网络拉取最新代码
     command: >
       bash -c "python3 -u main.py"
 
 
 ## ===================================================
-## 「方案五」 ChatGPT + 语音助手 （请先阅读 docs/use_audio.md）
+## 【方案五】 ChatGPT + 语音助手 （请先阅读 docs/use_audio.md）
 ## ===================================================
 version: '3'
 services:
@@ -224,9 +223,9 @@ services:
       # (无需填写) ALIYUN_ACCESSKEY:         '    LTAI5q6BrFUzoRXVGUWnekh1                                         '
       # (无需填写) ALIYUN_SECRET:            '    eHmI20AVWIaQZ0CiTD2bGQVsaP9i68                                   '
 
-    # 「WEB_PORT暴露方法1: 适用于Linux」与宿主的网络融合
+    # 与宿主的网络融合
     network_mode: "host"
 
-    # 启动命令
+    # 不使用代理网络拉取最新代码
     command: >
       bash -c "python3 -u main.py"

docs/self_analysis.md

@@ -28,7 +28,7 @@
 | crazy_functions\批量Markdown翻译.py | 将指定目录下的Markdown文件进行中英文翻译 |
 | crazy_functions\批量总结PDF文档.py | 对PDF文件进行切割和摘要生成 |
 | crazy_functions\批量总结PDF文档pdfminer.py | 对PDF文件进行文本内容的提取和摘要生成 |
-| crazy_functions\PDF批量翻译.py | 将指定目录下的PDF文件进行中英文翻译 |
+| crazy_functions\批量翻译PDF文档_多线程.py | 将指定目录下的PDF文件进行中英文翻译 |
 | crazy_functions\理解PDF文档内容.py | 对PDF文件进行摘要生成和问题解答 |
 | crazy_functions\生成函数注释.py | 自动生成Python函数的注释 |
 | crazy_functions\联网的ChatGPT.py | 使用网络爬虫和ChatGPT模型进行聊天回答 |
@@ -187,9 +187,9 @@ toolbox.py是一个工具类库，其中主要包含了一些函数装饰器和
 
 该程序文件是一个用于批量总结PDF文档的函数插件，使用了pdfminer插件和BeautifulSoup库来提取PDF文档的文本内容，对每个PDF文件分别进行处理并生成中英文摘要。同时，该程序文件还包括一些辅助工具函数和处理异常的装饰器。
 
-## [24/48] 请对下面的程序文件做一个概述: crazy_functions\PDF批量翻译.py
+## [24/48] 请对下面的程序文件做一个概述: crazy_functions\批量翻译PDF文档_多线程.py
 
-这个程序文件是一个Python脚本，文件名为“PDF批量翻译.py”。它主要使用了“toolbox”、“request_gpt_model_in_new_thread_with_ui_alive”、“request_gpt_model_multi_threads_with_very_awesome_ui_and_high_efficiency”、“colorful”等Python库和自定义的模块“crazy_utils”的一些函数。程序实现了一个批量翻译PDF文档的功能，可以自动解析PDF文件中的基础信息，递归地切割PDF文件，翻译和处理PDF论文中的所有内容，并生成相应的翻译结果文件（包括md文件和html文件）。功能比较复杂，其中需要调用多个函数和依赖库，涉及到多线程操作和UI更新。文件中有详细的注释和变量命名，代码比较清晰易读。
+这个程序文件是一个Python脚本，文件名为“批量翻译PDF文档_多线程.py”。它主要使用了“toolbox”、“request_gpt_model_in_new_thread_with_ui_alive”、“request_gpt_model_multi_threads_with_very_awesome_ui_and_high_efficiency”、“colorful”等Python库和自定义的模块“crazy_utils”的一些函数。程序实现了一个批量翻译PDF文档的功能，可以自动解析PDF文件中的基础信息，递归地切割PDF文件，翻译和处理PDF论文中的所有内容，并生成相应的翻译结果文件（包括md文件和html文件）。功能比较复杂，其中需要调用多个函数和依赖库，涉及到多线程操作和UI更新。文件中有详细的注释和变量命名，代码比较清晰易读。
 
 ## [25/48] 请对下面的程序文件做一个概述: crazy_functions\理解PDF文档内容.py
 
@@ -331,7 +331,7 @@ check_proxy.py, colorful.py, config.py, config_private.py, core_functional.py, c
 这些程序源文件提供了基础的文本和语言处理功能、工具函数和高级插件，使 Chatbot 能够处理各种复杂的学术文本问题，包括润色、翻译、搜索、下载、解析等。
 
 ## 用一张Markdown表格简要描述以下文件的功能：
-crazy_functions\代码重写为全英文_多线程.py, crazy_functions\图片生成.py, crazy_functions\对话历史存档.py, crazy_functions\总结word文档.py, crazy_functions\总结音视频.py, crazy_functions\批量Markdown翻译.py, crazy_functions\批量总结PDF文档.py, crazy_functions\批量总结PDF文档pdfminer.py, crazy_functions\PDF批量翻译.py, crazy_functions\理解PDF文档内容.py, crazy_functions\生成函数注释.py, crazy_functions\联网的ChatGPT.py, crazy_functions\解析JupyterNotebook.py, crazy_functions\解析项目源代码.py, crazy_functions\询问多个大语言模型.py, crazy_functions\读文章写摘要.py。根据以上分析，用一句话概括程序的整体功能。
+crazy_functions\代码重写为全英文_多线程.py, crazy_functions\图片生成.py, crazy_functions\对话历史存档.py, crazy_functions\总结word文档.py, crazy_functions\总结音视频.py, crazy_functions\批量Markdown翻译.py, crazy_functions\批量总结PDF文档.py, crazy_functions\批量总结PDF文档pdfminer.py, crazy_functions\批量翻译PDF文档_多线程.py, crazy_functions\理解PDF文档内容.py, crazy_functions\生成函数注释.py, crazy_functions\联网的ChatGPT.py, crazy_functions\解析JupyterNotebook.py, crazy_functions\解析项目源代码.py, crazy_functions\询问多个大语言模型.py, crazy_functions\读文章写摘要.py。根据以上分析，用一句话概括程序的整体功能。
 
 | 文件名 | 功能简述 |
 | --- | --- |
@@ -343,7 +343,7 @@ crazy_functions\代码重写为全英文_多线程.py, crazy_functions\图片生
 | 批量Markdown翻译.py | 将指定目录下的Markdown文件进行中英文翻译 |
 | 批量总结PDF文档.py | 对PDF文件进行切割和摘要生成 |
 | 批量总结PDF文档pdfminer.py | 对PDF文件进行文本内容的提取和摘要生成 |
-| PDF批量翻译.py | 将指定目录下的PDF文件进行中英文翻译 |
+| 批量翻译PDF文档_多线程.py | 将指定目录下的PDF文件进行中英文翻译 |
 | 理解PDF文档内容.py | 对PDF文件进行摘要生成和问题解答 |
 | 生成函数注释.py | 自动生成Python函数的注释 |
 | 联网的ChatGPT.py | 使用网络爬虫和ChatGPT模型进行聊天回答 |

docs/translate_english.json

@@ -44,7 +44,7 @@
     "批量总结PDF文档": "BatchSummarizePDFDocuments",
     "批量总结PDF文档pdfminer": "BatchSummarizePDFDocumentsUsingPdfminer",
     "批量翻译PDF文档": "BatchTranslatePDFDocuments",
-    "PDF批量翻译": "BatchTranslatePDFDocuments_MultiThreaded",
+    "批量翻译PDF文档_多线程": "BatchTranslatePDFDocuments_MultiThreaded",
     "谷歌检索小助手": "GoogleSearchAssistant",
     "理解PDF文档内容标准文件输入": "UnderstandPdfDocumentContentStandardFileInput",
     "理解PDF文档内容": "UnderstandPdfDocumentContent",
@@ -1392,7 +1392,7 @@
     "1. 临时解决方案": "1. Temporary Solution",
     "直接在输入区键入api_key": "Enter the api_key Directly in the Input Area",
     "然后回车提交": "Submit after pressing Enter",
-    "2. 长效解决方案": "2. Long-term solution",
+    "2. 长效解决方案": "Long-term solution",
     "在config.py中配置": "Configure in config.py",
     "等待响应": "Waiting for response",
     "api-key不满足要求": "API key does not meet requirements",
@@ -2184,8 +2184,7 @@
     "接驳VoidTerminal": "Connect to VoidTerminal",
     "**很好": "**Very good",
     "对话|编程": "Conversation&ImageGenerating|Programming",
-    "对话|编程|学术": "Conversation|Programming|Academic",
+    "对话|编程|学术": "Conversation&ImageGenerating|Programming|Academic",    "4. 建议使用 GPT3.5 或更强的模型": "4. It is recommended to use GPT3.5 or a stronger model",
-    "4. 建议使用 GPT3.5 或更强的模型": "4. It is recommended to use GPT3.5 or a stronger model",
     "「请调用插件翻译PDF论文": "Please call the plugin to translate the PDF paper",
     "3. 如果您使用「调用插件xxx」、「修改配置xxx」、「请问」等关键词": "3. If you use keywords such as 'call plugin xxx', 'modify configuration xxx', 'please', etc.",
     "以下是一篇学术论文的基本信息": "The following is the basic information of an academic paper",
@@ -3007,746 +3006,5 @@
     "GPT-Academic对话存档": "TranslatedText",
     "Arxiv论文精细翻译": "TranslatedText",
     "from crazy_functions.AdvancedFunctionTemplate import 测试图表渲染": "from crazy_functions.AdvancedFunctionTemplate import test_chart_rendering",
-    "测试图表渲染": "test_chart_rendering",
+    "测试图表渲染": "test_chart_rendering"
-    "请使用「LatexEnglishCorrection+高亮修正位置": "Please use 'LatexEnglishCorrection+highlight corrected positions",
-    "输出代码片段中！": "Output code snippet!",
-    "使用多种方式尝试切分文本": "Attempt to split the text in various ways",
-    "你是一个作家": "You are a writer",
-    "如果无法从中得到答案": "If unable to get an answer from it",
-    "无法读取以下数据": "Unable to read the following data",
-    "不允许直接报错": "Direct error reporting is not allowed",
-    "您也可以使用插件参数指定绘制的图表类型": "You can also specify the type of chart to be drawn using plugin parameters",
-    "不要包含太多情节": "Do not include too many plots",
-    "翻译为中文后重新编译为PDF": "Recompile into PDF after translating into Chinese",
-    "采样温度": "Sampling temperature",
-    "直接修改config.py": "Directly modify config.py",
-    "处理文件": "Handle file",
-    "判断返回是否正确": "Determine if the return is correct",
-    "gemini 不允许对话轮次为偶数": "Gemini does not allow the number of dialogue rounds to be even",
-    "8 象限提示图": "8-quadrant prompt diagram",
-    "基于上下文的prompt模版": "Context-based prompt template",
-    "^开始": "^Start",
-    "输出文本的最大tokens限制": "Maximum tokens limit for output text",
-    "在这个例子中": "In this example",
-    "以及处理PDF文件的示例代码": "And example code for handling PDF files",
-    "更新cookie": "Update cookie",
-    "获取公共缩进": "Get public indentation",
-    "请你给出围绕“{subject}”的序列图": "Please provide a sequence diagram around '{subject}'",
-    "请确保使用小写的模型名称": "Please ensure the use of lowercase model names",
-    "出现人物时": "When characters appear",
-    "azure模型对齐支持 -=-=-=-=-=-=-": "Azure model alignment support -=-=-=-=-=-=-",
-    "请一分钟后重试": "Please try again in one minute",
-    "解析GEMINI消息出错": "Error parsing GEMINI message",
-    "选择提示词": "Select prompt words",
-    "取值范围是": "The value range is",
-    "它会在": "It will be",
-    "加载文件": "Load file",
-    "是预定义按钮": "Is a predefined button",
-    "消息": "Message",
-    "默认搜索5条结果": "Default search for 5 results",
-    "第 2 部分": "Part 2",
-    "我们采样一个特殊的手段": "We sample a special method",
-    "后端开发": "Backend development",
-    "接下来提取md中的一级/二级标题作为摘要": "Next, extract the first/second-level headings in md as summaries",
-    "一个年轻人穿过天安门广场向纪念堂走去": "A young person walks through Tiananmen Square towards the Memorial Hall",
-    "将会使用这些摘要绘制图表": "Will use these summaries to draw charts",
-    "8-象限提示图": "8-quadrant prompt diagram",
-    "首先": "First",
-    "设计了此接口": "Designed this interface",
-    "本地模型": "Local model",
-    "所有图像仅在最后一个问题中提供": "All images are provided only in the last question",
-    "如连续3次判断失败将会使用流程图进行绘制": "If there are 3 consecutive failures, a flowchart will be used to draw",
-    "为了更灵活地接入one-api多模型管理界面": "To access the one-api multi-model management interface more flexibly",
-    "UI设计": "UI design",
-    "不允许在答案中添加编造成分": "Fabrication is not allowed in the answer",
-    "尽可能地": "As much as possible",
-    "先在前端快速清除chatbot&status": "First, quickly clear chatbot & status in the frontend",
-    "You exceeded your current quota. Cohere以账户额度不足为由": "You exceeded your current quota. Cohere due to insufficient account quota",
-    "合并所有的标题": "Merge all headings",
-    "跳过下载": "Skip download",
-    "中生产图表": "Production Chart",
-    "如输入区内容不是文件则直接返回输入区内容": "Return the content of the input area directly if it is not a file",
-    "用温度取样的另一种方法": "Another method of temperature sampling",
-    "不需要解释原因": "No need to explain the reason",
-    "一场延续了两万年的星际战争已接近尾声": "An interstellar war that has lasted for 20,000 years is drawing to a close",
-    "依次处理文件": "Process files in order",
-    "第一幕的字数少于300字": "The first act has fewer than 300 characters",
-    "已成功加载": "Successfully loaded",
-    "还是web渲染": "Web rendering",
-    "解析分辨率": "Resolution parsing",
-    "如果剩余文本的token数大于限制": "If the number of remaining text tokens exceeds the limit",
-    "你可以修改整个句子的顺序以确保翻译后的段落符合中文的语言习惯": "You can change the order of the whole sentence to ensure that the translated paragraph is in line with Chinese language habits",
-    "并同时充分考虑中文的语法、清晰、简洁和整体可读性": "And at the same time, fully consider Chinese grammar, clarity, conciseness, and overall readability",
-    "否则返回": "Otherwise return",
-    "一个特殊标记": "A special mark",
-    "4. 后续剧情发展4": "4. Plot development",
-    "恢复默认": "Restore default",
-    "转义点号": "Escape period",
-    "检查DASHSCOPE_API_KEY": "Check DASHSCOPE_API_KEY",
-    "阿里灵积云API_KEY": "Aliyun API_KEY",
-    "文件是否存在": "Check if the file exists",
-    "您的选择是": "Your choice is",
-    "处理用户对话": "Handle user dialogue",
-    "即": "That is",
-    "将会由对话模型首先判断适合的图表类型": "The dialogue model will first determine the appropriate chart type",
-    "以查看所有的配置信息": "To view all configuration information",
-    "用于初始化包的属性和导入模块": "For initializing package properties and importing modules",
-    "to_markdown_tabs 文件list 转换为 md tab": "to_markdown_tabs Convert file list to MD tab",
-    "更换模型": "Replace Model",
-    "从以下文本中提取摘要": "Extract Summary from the Following Text",
-    "表示捕获任意长度的文本": "Indicates Capturing Text of Arbitrary Length",
-    "可能是一个模块的初始化文件": "May Be an Initialization File for a Module",
-    "处理提问与输出": "Handle Questions and Outputs",
-    "需要的再做些简单调整即可": "Some Simple Adjustments Needed",
-    "所以这个没有用": "So This Is Not Useful",
-    "请配置 DASHSCOPE_API_KEY": "Please Configure DASHSCOPE_API_KEY",
-    "不是预定义按钮": "Not a Predefined Button",
-    "让读者能够感受到你的故事世界": "Let Readers Feel Your Story World",
-    "开始整理headers与message": "Start Organizing Headers and Messages",
-    "兼容最新的智谱Ai": "Compatible with the Latest ZhiPu AI",
-    "对于某些PDF会有第一个段落就以小写字母开头": "For Some PDFs, the First Paragraph May Start with a Lowercase Letter",
-    "问题是": "The Issue Is",
-    "也就是说它会匹配尽可能少的字符": "That Is, It Will Match the Least Amount of Characters Possible",
-    "未能成功加载": "Failed to Load Successfully",
-    "接入通义千问在线大模型 https": "Access TongYi QianWen Online Large Model HTTPS",
-    "用不太优雅的方式处理一个core_functional.py中出现的mermaid渲染特例": "Handle a Mermaid Rendering Special Case in core_functional.py in an Ugly Way",
-    "您也可以选择给出其他故事走向": "You Can Also Choose to Provide Alternative Storylines",
-    "改善非markdown输入的显示效果": "Improve Display Effects for Non-Markdown Input",
-    "在二十二世纪编年史中": "In the Chronicle of the 22nd Century",
-    "docs 为Document列表": "docs Are a List of Documents",
-    "互动写故事": "Interactive Story Writing",
-    "4 饼图": "Pie Chart",
-    "正在生成插图中": "Generating Illustration",
-    "路径不存在": "Path Does Not Exist",
-    "PDF翻译中文": "PDF Translation to Chinese",
-    "进行简短的环境描写": "Conduct a Brief Environmental Description",
-    "学术英中互译": "Academic English-Chinese Translation",
-    "且少于2个段落": "And less than 2 paragraphs",
-    "html_view_blank 超链接": "HTML View Blank Hyperlink",
-    "处理 history": "Handle History",
-    "非Cohere官方接口返回了错误": "Non-Cohere Official Interface Returned an Error",
-    "缺失 MATHPIX_APPID 和 MATHPIX_APPKEY": "Missing MATHPIX_APPID and MATHPIX_APPKEY",
-    "搜索知识库内容条数": "Search Knowledge Base Content Count",
-    "返回数据": "Return Data",
-    "没有相关文件": "No Relevant Files",
-    "知识库路径": "Knowledge Base Path",
-    "质量与风格默认值": "Quality and Style Defaults",
-    "包含了用于文本切分的函数": "Contains Functions for Text Segmentation",
-    "请你给出围绕“{subject}”的逻辑关系图": "Please Provide a Logic Diagram Surrounding '{subject}'",
-    "官方Pro服务器🧪": "Official Pro Server",
-    "不支持同时处理多个pdf文件": "Does Not Support Processing Multiple PDF Files Simultaneously",
-    "查询5天历史事件": "Query 5-Day Historical Events",
-    "你是经验丰富的翻译": "You Are an Experienced Translator",
-    "html输入": "HTML Input",
-    "输入文件不存在": "Input File Does Not Exist",
-    "很多人生来就会莫名其妙地迷上一样东西": "Many People Are Born with an Unexplained Attraction to Something",
-    "默认值为 0.7": "Default Value is 0.7",
-    "值越大": "The Larger the Value",
-    "以下文件未能成功加载": "The Following Files Failed to Load",
-    "在线模型": "Online Model",
-    "切割输入": "Cut Input",
-    "修改docker-compose.yml等价于修改容器内部的环境变量": "Modifying docker-compose.yml is Equivalent to Modifying the Internal Environment Variables of the Container",
-    "以换行符分割": "Split by Line Break",
-    "修复中文乱码的问题": "Fix Chinese Character Encoding Issues",
-    "zhipuai 是glm-4的别名": "zhipuai is an alias for glm-4",
-    "保证其在允许范围内": "Ensure it is within the permissible range",
-    "段尾如果有多余的\\n就去掉它": "Remove any extra \\n at the end of the paragraph",
-    "是否流式输出": "Whether to stream output",
-    "1-流程图": "1-Flowchart",
-    "学术语料润色": "Academic text polishing",
-    "已经超过了模型的最大上下文或是模型格式错误": "Has exceeded the model's maximum context or there is a model format error",
-    "英文省略号": "English ellipsis",
-    "登录成功": "Login successful",
-    "随便切一下吧": "Just cut it randomly",
-    "PDF转换为tex项目失败": "PDF conversion to TeX project failed",
-    "的 max_token 配置不是整数": "The max_token configuration is not an integer",
-    "根据当前聊天历史或指定的路径文件": "According to the current chat history or specified path file",
-    "你必须利用以下文档中包含的信息回答这个问题": "You must use the information contained in the following document to answer this question",
-    "对话、日志记录": "Dialogue, logging",
-    "内容至知识库": "Content to knowledge base",
-    "在银河系的中心": "At the center of the Milky Way",
-    "检查PDF是否被重复上传": "Check if the PDF has been uploaded multiple times",
-    "取最后 max_prompt_tokens 个 token 输入模型": "Take the last max_prompt_tokens tokens as input to the model",
-    "请输入图类型对应的数字": "Please enter the corresponding number for the graph type",
-    "插件主程序3  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=": "Plugin main program 3 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=",
-    "正在tex项目将翻译为中文": "The TeX project is being translated into Chinese",
-    "适配润色区域": "Adapter polishing area",
-    "首先你从历史记录中提取摘要": "First, you extract an abstract from the history",
-    "讯飞星火认知大模型 -=-=-=-=-=-=-": "iFLYTEK Spark Cognitive Model -=-=-=-=-=-=-=-=-=-",
-    "包含了用于构建和管理向量数据库的函数和类包含了用于构建和管理向量数据库的函数和类包含了用于构建和管理向量数据库的函数和类": "Contains functions and classes for building and managing vector databases",
-    "另外": "Additionally",
-    "内部调优参数": "Internal tuning parameters",
-    "输出格式例如": "Example of Output Format",
-    "当回复图像时": "When Responding with an Image",
-    "越权访问!": "Unauthorized Access!",
-    "如果给出的 prompt 的 token 长度超过此限制": "If the Given Prompt's Token Length Exceeds This Limit",
-    "因此你每次写的故事段落应少于300字": "Therefore, Each Story Paragraph You Write Should Be Less Than 300 Words",
-    "尽量短": "As Concise as Possible",
-    "中文提示词就不显示了": "Chinese Keywords Will Not Be Displayed",
-    "请在前文的基础上": "Please Based on the Previous Text",
-    "20张": "20 Sheets",
-    "文件内容优先": "File Content Takes Priority",
-    "状态图": "State Diagram",
-    "开始查找合适切分点的偏移": "Start Looking for the Offset of an Appropriate Split Point",
-    "已知信息": "Known Information",
-    "文心一言大模型": "Wenxin Yanyan Large Model",
-    "传递进来一些奇怪的东西": "Passing in Some Weird Things",
-    "很多规则中会考虑分号": "Many Rules Consider the Semicolon",
-    "请配置YUNQUE_SECRET_KEY": "Please Configure YUNQUE_SECRET_KEY",
-    "6-状态图": "6-State Diagram",
-    "输出文本的最小tokens限制": "Minimum Tokens Limit for Output Text",
-    "服务节点": "Service Node",
-    "云雀大模型": "Lark Large Model",
-    "请配置 GEMINI_API_KEY": "Please Configure GEMINI_API_KEY",
-    "可以让软件运行在 http": "Can Run the Software Over HTTP",
-    "基于当前对话或文件GenerateMultipleMermaidCharts": "Generate Multiple Mermaid Charts Based on the Current Conversation or File",
-    "剧情收尾": "Plot Conclusion",
-    "请开始提问": "Please Begin Your Question",
-    "第一页内容/摘要": "First Page Content/Summary",
-    "无法判断则返回image/jpeg": "Return image/jpeg If Unable to Determine",
-    "仅需要输出单个不带任何标点符号的数字": "Single digit without any punctuation",
-    "以下是每类图表的PROMPT": "Here are the PROMPTS for each type of chart",
-    "状态码": "Status code",
-    "TopP值越大输出的tokens类型越丰富": "The larger the TopP value, the richer the types of output tokens",
-    "files_filter_handler 根据type过滤文件": "files_filter_handler filters files by type",
-    "比较每一页的内容是否相同": "Compare whether each page's content is the same",
-    "前往": "Go to",
-    "请输入剧情走向": "Please enter the plot direction",
-    "故事收尾": "Story ending",
-    "必须说明正在回复哪张图像": "Must specify which image is being replied to",
-    "历史文件继续上传": "Continue uploading historical files",
-    "因此禁用": "Therefore disabled",
-    "使用lru缓存": "Use LRU caching",
-    "该装饰器是大多数功能调用的入口": "This decorator is the entry point for most function calls",
-    "如果需要开启": "If needed to enable",
-    "使用 json 解析库进行处理": "Process using JSON parsing library",
-    "将PDF转换为Latex项目": "Convert PDF to LaTeX project",
-    "7-实体关系图": "7-Entity relationship diagram",
-    "根据用户的提示": "According to the user's prompt",
-    "当前用户的请求信息": "Current user's request information",
-    "配置关联关系说明": "Configuration relationship description",
-    "这段代码是使用Python编程语言中的re模块": "This code uses the re module in the Python programming language",
-    "link_mtime_to_md 文件增加本地时间参数": "link_mtime_to_md adds local time parameter to the file",
-    "从当前对话或路径": "From the current conversation or path",
-    "一起写故事": "Write a story together",
-    "前端开发": "Front-end development",
-    "开区间": "Open interval",
-    "如插件参数不正确则使用对话模型判断": "If the plugin parameters are incorrect, use the dialogue model for judgment",
-    "对字符串进行处理": "Process the string",
-    "简洁和专业的来回答用户的问题": "Answer user questions concisely and professionally",
-    "如输入区不是文件则将输入区内容加入历史记录": "If the input area is not a file, add the content of the input area to the history",
-    "编写一个小说的第一幕": "Write the first act of a novel",
-    "更具创造性；": "More creative;",
-    "用于解析和翻译PDF文件的功能和相关辅助函数用于解析和翻译PDF文件的功能和相关辅助函数用于解析和翻译PDF文件的功能和相关辅助函数": "Functions and related auxiliary functions for parsing and translating PDF files",
-    "月之暗面 -=-=-=-=-=-=-": "The Dark Side of the Moon -=-=-=-=-=-=-",
-    "2. 后续剧情发展2": "2. Subsequent plot development 2",
-    "请先提供文本的更正版本": "Please provide the corrected version of the text first",
-    "修改环境变量": "Modify environment variables",
-    "读取之前的自定义按钮": "Read previous custom buttons",
-    "如果为0": "If it is 0",
-    "函数用于去除多行字符串的缩进": "Function to remove indentation from multiline strings",
-    "请绘制有关“": "Please draw something about \"",
-    "给出4种不同的后续剧情发展方向": "Provide 4 different directions for subsequent plot development",
-    "新调优版本GPT-4🔥": "Newly tuned version GPT-4🔥",
-    "已弃用": "Deprecated",
-    "参考 https": "Refer to https",
-    "发现重复上传": "Duplicate upload detected",
-    "本项目的所有配置都集中在config.py中": "All configurations for this project are centralized in config.py",
-    "默认值为 0.95": "Default value is 0.95",
-    "请查阅": "Please refer to",
-    "此选项已废弃": "This option is deprecated",
-    "找到了.doc文件": ".doc file found",
-    "他们的目的地是南极": "Their destination is Antarctica",
-    "lang_reference这段文字是": "The lang_reference text is",
-    "正在尝试生成对比PDF": "Attempting to generate a comparative PDF",
-    "input_encode_handler 提取input中的文件": "input_encode_handler Extracts files from input",
-    "使用中文": "Use Chinese",
-    "一些垃圾第三方接口会出现这样的错误": "Some crappy third-party interfaces may produce such errors",
-    "例如将空格转换为&nbsp": "For example, converting spaces to &nbsp",
-    "请你给出围绕“{subject}”的类图": "Please provide a class diagram around '{subject}'",
-    "是插件的内部参数": "Is an internal parameter of the plugin",
-    "网络波动时可选其他": "Alternative options when network fluctuates",
-    "非Cohere官方接口的出现这样的报错": "Such errors occur in non-Cohere official interfaces",
-    "是前缀": "Is a prefix",
-    "默认 None": "Default None",
-    "如果几天后能顺利到达那里": "If we can smoothly arrive there in a few days",
-    "输出1": "Output 1",
-    "3-类图": "3-Class Diagram",
-    "如需绘制思维导图请使用参数调用": "Please use parameters to call if you need to draw a mind map",
-    "正在将PDF转换为tex项目": "Converting PDF to TeX project",
-    "列出10个经典名著": "List 10 classic masterpieces",
-    "? 在这里用作非贪婪匹配": "? Used here as a non-greedy match",
-    "左上角更换模型菜单中可切换openai": "Switch to OpenAI in the model change menu in the top left corner",
-    "原样返回": "Return as is",
-    "请配置 MATHPIX_APPID 和 MATHPIX_APPKEY": "Please configure MATHPIX_APPID and MATHPIX_APPKEY",
-    "概括上述段落的内容以及内在逻辑关系": "Summarize the content of the above paragraph and its inherent logical relationship",
-    "cookie相关工具函数": "Cookie-related utility functions",
-    "请你给出围绕“{subject}”的饼图": "Please provide a pie chart around '{subject}'",
-    "原型设计": "Prototype design",
-    "必须为正数": "Must be a positive number",
-    "又一阵剧痛从肝部袭来": "Another wave of severe pain strikes from the liver",
-    "智谱AI": "Zhipu AI",
-    "基础功能区按钮的附加功能": "Additional functions of the basic functional area buttons",
-    "one-api 对齐支持 -=-=-=-=-=-=-": "one-api alignment support -=-=-=-=-=-=-",
-    "5 甘特图": "5 Gantt chart",
-    "用于初始化包的属性和导入模块是一个包的初始化文件": "The file used for initializing package properties and importing modules is an initialization file for the package",
-    "创建并修改config_private.py": "Create and modify config_private.py",
-    "会使输出更随机": "Would make the output more random",
-    "已添加": "Added",
-    "估计一个切分点": "Estimate a split point",
-    "\\n\\n1. 临时解决方案": "\\n\\n1. Temporary solution",
-    "没有回答": "No answer",
-    "尝试重新翻译PDF": "Try to retranslate the PDF",
-    "被这个解码给耍了": "Fooled by this decoding",
-    "再在后端清除history": "Clear history on the backend again",
-    "根据情况选择flowchart LR": "Choose flowchart LR based on the situation",
-    "幻方-深度求索大模型 -=-=-=-=-=-=-": "Deep Seek Large Model -=-=-=-=-=-=-",
-    "即使它们在历史记录中被提及": "Even if they are mentioned in the history",
-    "此处需要进一步优化逻辑": "Further logic optimization is needed here",
-    "借鉴自同目录下的bridge_ChatGPT.py": "Derived from the bridge_ChatGPT.py in the same directory",
-    "正是这样": "That's exactly right",
-    "您也可以给出您心中的其他故事走向": "You can also provide other story directions in your mind",
-    "文本预处理": "Text preprocessing",
-    "请登录": "Please log in",
-    "请修改docker-compose": "Please modify docker-compose",
-    "运行一些异步任务": "Run some asynchronous tasks",
-    "5-甘特图": "5-Gantt chart",
-    "3 类图": "3-Class diagram",
-    "因为你接下来将会与用户互动续写下面的情节": "Because you will interact with the user to continue writing the plot below",
-    "避免把同一个文件添加多次": "Avoid adding the same file multiple times",
-    "可挑选精度": "Selectable precision",
-    "调皮一下": "Play a joke",
-    "并解析": "And parse",
-    "您可以在输入框中输入一些关键词": "You can enter some keywords in the input box",
-    "文件加载失败": "File loading failed",
-    "请你给出围绕“{subject}”的甘特图": "Please provide a Gantt chart around \"{subject}\"",
-    "上传PDF": "Upload PDF",
-    "请判断适合使用的流程图类型": "Please determine the suitable flowchart type",
-    "错误码": "Error code",
-    "非markdown输入": "Non-markdown input",
-    "所以只能通过提示词对第几张图片进行定位": "So can only locate the image by the prompt",
-    "避免下载到缓存文件": "Avoid downloading cached files",
-    "没有思维导图!!!测试发现模型始终会优先选择思维导图": "No mind map!!! Testing found that the model always prioritizes mind maps",
-    "请登录Cohere查看详情 https": "Please log in to Cohere for details https",
-    "检查历史上传的文件是否与新上传的文件相同": "Check if the previously uploaded file is the same as the newly uploaded file",
-    "加载主题相关的工具函数": "Load theme-related utility functions",
-    "图表类型由模型判断": "Chart type is determined by the model",
-    "⭐ 多线程方法": "Multi-threading method",
-    "获取 max_token 的值": "Get the value of max_token",
-    "空白的输入栏": "Blank input field",
-    "根据整理的摘要选择图表类型": "Select chart type based on the organized summary",
-    "返回 True": "Return True",
-    "这里为了区分中英文情景搞复杂了一点": "Here it's a bit complicated to distinguish between Chinese and English contexts",
-    "ZHIPUAI_MODEL 配置项选项已经弃用": "ZHIPUAI_MODEL configuration option is deprecated",
-    "但是这里我把它忽略不计": "But here I ignore it",
-    "非必要": "Not necessary",
-    "思维导图": "Mind map",
-    "插件」": "Plugin",
-    "重复文件路径": "Duplicate file path",
-    "之间不要存在空格": "No spaces between fields",
-    "破折号、英文双引号等同样忽略": "Ignore dashes, English quotes, etc.",
-    "填写 VOLC_ACCESSKEY": "Enter VOLC_ACCESSKEY",
-    "称为核取样": "Called nuclear sampling",
-    "Incorrect API key. 请确保API key有效": "Incorrect API key. Please ensure the API key is valid",
-    "如输入区内容为文件则清空历史记录": "If the input area content is a file, clear the history",
-    "并处理精度问题": "And handle precision issues",
-    "并给出修改的理由": "And provide reasons for the changes",
-    "至此已经超出了正常接口应该进入的范围": "This has exceeded the scope that a normal interface should enter",
-    "并已加载知识库": "And the knowledge base has been loaded",
-    "file_manifest_filter_html 根据type过滤文件": "file_manifest_filter_html filters files by type",
-    "participant B as 系统": "participant B as System",
-    "要留出足够的互动空间": "Leave enough interaction space",
-    "请你给出围绕“{subject}”的实体关系图": "Please provide an entity relationship diagram around '{subject}'",
-    "答案请使用中文": "Please answer in Chinese",
-    "输出会更加稳定或确定": "The output will be more stable or certain",
-    "是一个包的初始化文件": "Is an initialization file for a package",
-    "用于加载和分割文件中的文本的通用文件加载器用于加载和分割文件中的文本的通用文件加载器用于加载和分割文件中的文本的通用文件加载器": "A universal file loader for loading and splitting text in files",
-    "围绕我选定的剧情情节": "Around the plot I have chosen",
-    "Mathpix 拥有执行PDF的OCR功能": "Mathpix has OCR functionality for PDFs",
-    "是否允许暴力切分": "Whether to allow violent segmentation",
-    "清空 txt_tmp 对应的位置方便下次搜索": "Clear the location corresponding to txt_tmp for easier next search",
-    "编写小说的最后一幕": "Write the last scene of the novel",
-    "可能是一个模块的初始化文件根据位置和名称": "May be an initialization file for a module based on position and name",
-    "更新新的自定义按钮": "Update new custom button",
-    "把分句符\\n放到双引号后": "Put the sentence separator \\n after the double quotes",
-    "序列图": "Sequence diagram",
-    "兼容非markdown输入": "Compatible with non-markdown input",
-    "那么就切": "Then cut",
-    "4-饼图": "4-Pie chart",
-    "结束剧情": "End of the plot",
-    "字数要求": "Word count requirement",
-    "以下是对以上文本的总结": "Below is a summary of the above text",
-    "但不要同时调整两个参数": "But do not adjust two parameters at the same time",
-    "📌省略": "Omit",
-    "请查看message": "Please check the message",
-    "如果所有页的内容都相同": "If all pages have the same content",
-    "我将在这4个选择中": "I will choose from these 4 options",
-    "请设置为True": "Please set to True",
-    "当 remain_txt_to_cut": "When remain_txt_to_cut",
-    "后续输出被截断": "Subsequent output is truncated",
-    "检查API_KEY": "Check API_KEY",
-    "阿里云实时语音识别 配置难度较高": "Alibaba Cloud real-time speech recognition has a higher configuration difficulty",
-    "图像生成提示为空白": "Image generation prompt is blank",
-    "由于实体关系图用到了{}符号": "Because the entity relationship diagram uses the {} symbol",
-    "系统繁忙": "System busy",
-    "月之暗面 API KEY": "Dark side of the moon API KEY",
-    "编写小说的下一幕": "Write the next scene of the novel",
-    "选择一种": "Choose one",
-    "或者flowchart TD": "Or flowchart TD",
-    "请把以下学术文章段落翻译成中文": "Please translate the following academic article paragraph into Chinese",
-    "7 实体关系图": "7 Entity relationship diagram",
-    "处理游戏的主体逻辑": "Handle the main logic of the game",
-    "请以“{headstart}”为开头": "Please start with \"{headstart}\"",
-    "匹配后单段上下文长度": "Length of single segment context after matching",
-    "先行者知道": "The pioneer knows",
-    "以及处理PDF文件的示例代码包含了用于文本切分的函数": "Example code for processing PDF files includes functions for text segmentation",
-    "未发现重复上传": "No duplicate uploads found",
-    "那么就不用切了": "Then there's no need to split",
-    "目前来说": "Currently",
-    "请在LLM_MODEL中配置": "Please configure in LLM_MODEL",
-    "是否启用上下文关联": "Whether to enable context association",
-    "为了加速计算": "To speed up calculations",
-    "登录请求": "Login request",
-    "这里解释一下正则表达式中的几个特殊字符": "Explanation of some special characters in regular expressions",
-    "其中数字对应关系为": "The corresponding relationship of the numbers is",
-    "修改配置有三种方法": "There are three ways to modify the configuration",
-    "请前往arxiv打开此论文下载页面": "Please go to arXiv and open the paper download page",
-    "然后download source手动下载latex源码包": "Then manually download the LaTeX source package by downloading the source",
-    "功能单元": "Functional unit",
-    "你需要翻译的文本如下": "The text you need to translate is as follows",
-    "以便于后续快速的匹配和查找操作": "To facilitate rapid matching and search operations later",
-    "文本内容": "Text content",
-    "自动更新、打开浏览器页面、预热tiktoken模块": "Auto-update, open browser page, warm up tiktoken module",
-    "原样传递": "Pass through as is",
-    "但是该文件格式不被支持": "But the file format is not supported",
-    "他现在是全宇宙中唯一的一个人了": "He is now the only person in the entire universe",
-    "取值范围0~1": "Value range 0~1",
-    "搜索匹配score阈值": "Search match score threshold",
-    "当字符串中有掩码tag时": "When there is a mask tag in the string",
-    "错误的不纳入对话": "Errors are not included in the conversation",
-    "英语": "English",
-    "象限提示图": "Quadrant prompt diagram",
-    "由于不管提供文本是什么": "Because regardless of what the provided text is",
-    "确定后续剧情的发展": "Determine the development of the subsequent plot",
-    "处理空输入导致报错的问题 https": "Handle the error caused by empty input",
-    "第 3 部分": "Part 3",
-    "不能等于 0 或 1": "Cannot be equal to 0 or 1",
-    "同时过大的图表可能需要复制到在线编辑器中进行渲染": "Large charts may need to be copied to an online editor for rendering",
-    "装饰器函数ArgsGeneralWrapper": "Decorator function ArgsGeneralWrapper",
-    "写个函数移除所有的换行符": "Write a function to remove all line breaks",
-    "默认为False": "Default is False",
-    "实例化BaiduSpider": "Instantiate BaiduSpider",
-    "9-思维导图": "Mind Map 9",
-    "是否开启跨域": "Whether to enable cross-domain",
-    "随机InteractiveMiniGame": "Random InteractiveMiniGame",
-    "用于构建HTML报告的类和方法用于构建HTML报告的类和方法用于构建HTML报告的类和方法": "Classes and methods for building HTML reports",
-    "这里填一个提示词字符串就行了": "Just fill in a prompt string here",
-    "文本切分": "Text segmentation",
-    "用于在生成mermaid图表时隐藏代码块": "Used to hide code blocks when generating mermaid charts",
-    "如果剩余文本的token数小于限制": "If the number of tokens in the remaining text is less than the limit",
-    "未能在规定时间内完成任务": "Failed to complete the task within the specified time",
-    "API key has been deactivated. Cohere以账户失效为由": "API key has been deactivated. Cohere cited account expiration as the reason",
-    "正在使用讯飞图片理解API": "Using the Xunfei Image Understanding API",
-    "如果您使用docker-compose部署": "If you deploy using docker-compose",
-    "最大输入 token 数": "Maximum input token count",
-    "遇到了控制请求速率限制": "Encountered control request rate limit",
-    "数值范围约为0-1100": "The numerical range is approximately 0-1100",
-    "几乎使他晕厥过去": "Almost made him faint",
-    "识图模型GPT-4V": "Image recognition model GPT-4V",
-    "零一万物模型 -=-=-=-=-=-=-": "Zero-One Universe Model",
-    "所有对话记录将自动保存在本地目录": "All conversation records will be saved automatically in the local directory",
-    "饼图": "Pie Chart",
-    "添加Live2D": "Add Live2D",
-    "⭐ 单线程方法": "Single-threaded Method",
-    "配图": "Illustration",
-    "根据上述已知信息": "Based on the Above Known Information",
-    "1. 后续剧情发展1": "1. Subsequent Plot Development 1",
-    "2-序列图": "Sequence Diagram",
-    "流程图": "Flowchart",
-    "需求分析": "Requirement Analysis",
-    "我认为更合理的是": "I Think a More Reasonable Approach Is",
-    "claude家族": "Claude Family",
-    "”的逻辑关系图": "Logic Relationship Diagram",
-    "给出人物的名字": "Provide the Names of Characters",
-    "无法自动下载该论文的Latex源码": "Unable to Automatically Download the LaTeX Source Code of the Paper",
-    "需要用户手动处理的信息": "Information That Requires Manual Processing by Users",
-    "点击展开“文件下载区”": "Click to Expand 'File Download Area'",
-    "生成长度过长": "Excessive Length Generated",
-    "\\n\\n2. 长效解决方案": "2. Long-term Solution",
-    "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= 插件主程序2 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=": "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= Plugin Main Program 2 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=",
-    "title 项目开发流程": "Title Project Development Process",
-    "如果您希望剧情立即收尾": "If You Want the Plot to End Immediately",
-    "空格转换为&nbsp": "Space Converted to  ",
-    "图片数量超过api上限": "Number of Images Exceeds API Limit",
-    "他知道": "He Knows",
-    "在这里输入自定义参数「分辨率-质量": "Enter Custom Parameters Here 'Resolution-Quality",
-    "例如ChatGLM&gpt-3.5-turbo&gpt-4": "For example ChatGLM, gpt-3.5-turbo, and gpt-4",
-    "账户管理": "Account Management",
-    "正在将翻译好的项目tex项目编译为PDF": "Compiling the Translated Project .tex Project into PDF",
-    "我们把 _max 后的文字转存至 remain_txt_to_cut_storage": "We save the text after _max to the remain_txt_to_cut_storage",
-    "标签之前停止匹配": "Stop matching before the label",
-    "例子": "Example",
-    "遍历检查是否有额外参数": "Iterate to check for extra parameters",
-    "文本分句长度": "Length of text segmentation",
-    "请你给出围绕“{subject}”的状态图": "Please provide a state diagram surrounding \"{subject}\"",
-    "用stream的方法避免中途网线被掐": "Use the stream method to avoid the cable being disconnected midway",
-    "然后在markdown表格中列出修改的内容": "Then list the changes in a Markdown table",
-    "以上是从文章中提取的摘要": "The above is an abstract extracted from the article",
-    "但是无法找到相关文件": "But unable to find the relevant file",
-    "上海AI-LAB书生大模型 -=-=-=-=-=-=-": "Shanghai AI-LAB Shu Sheng Large Model -=-=-=-=-=-=-",
-    "遇到第一个": "Meet the first",
-    "存储在名为const_extract_exp的变量中": "Stored in a variable named const_extract_exp",
-    "括号在正则表达式中表示捕获组": "Parentheses represent capture groups in regular expressions",
-    "那里的太空中渐渐隐现出一个方形区域": "A square area gradually appears in the space there",
-    "智谱GLM4超级模型🔥": "Zhipu GLM4 Super Model🔥",
-    "故事开头": "Beginning of the story",
-    "请检查文件格式是否正确": "Please check if the file format is correct",
-    "这个模式被编译成一个正则表达式对象": "This pattern is compiled into a regular expression object",
-    "单字符断句符": "Single character sentence break",
-    "看后续支持吧": "Let's see the follow-up support",
-    "markdown输入": "Markdown input",
-    "系统": "System",
-    "80字以内": "Within 80 characters",
-    "一个测试mermaid绘制图表的功能": "A function to test the Mermaid chart drawing",
-    "输入部分": "Input section",
-    "移除右侧逗号": "Remove the comma on the right",
-    "因此思维导图仅能通过参数调用": "Therefore, the mind map can only be invoked through parameters",
-    "6 状态图": "State Diagram",
-    "类图": "Class Diagram",
-    "不要重复前文": "Do not repeat the previous text",
-    "但内部": "But internally",
-    "小说的下一幕字数少于300字": "The next scene of the novel has fewer than 300 words",
-    "每个发展方向都精明扼要地用一句话说明": "Each development direction is concisely described in one sentence",
-    "充分考虑其之间的逻辑": "Fully consider the logic between them",
-    "兼顾前端状态的功能": "Take into account the functionality of the frontend state",
-    "1 流程图": "Flowchart",
-    "用户QQ群925365219": "User QQ Group 925365219",
-    "通义-本地模型 -=-=-=-=-=-=-": "Tongyi - Local Model",
-    "取值范围0-1000": "Value range 0-1000",
-    "但不是^*.开始": "But not ^*. Start",
-    "他们将钻出地壳去看诗云": "They will emerge from the crust to see the poetry cloud",
-    "我们正在互相讨论": "We are discussing with each other",
-    "值越小": "The smaller the value",
-    "请在以下几种故事走向中": "Please choose from the following story directions",
-    "请先把模型切换至gpt-*": "Please switch the model to gpt-* first",
-    "不再需要填写": "No longer needs to be filled out",
-    "深夜": "Late at night",
-    "小说的前文回顾": "Review of the previous text of the novel",
-    "项目文件树": "Project file tree",
-    "如果双引号前有终止符": "If there is a terminator before the double quotes",
-    "participant A as 用户": "Participant A as User",
-    "处理游戏初始化等特殊情况": "Handle special cases like game initialization",
-    "然后使用mermaid+llm绘制图表": "Then use mermaid+llm to draw charts",
-    "0表示不生效": "0 means not effective",
-    "在以下的剧情发展中": "In the following plot development",
-    "模型考虑具有 top_p 概率质量 tokens 的结果": "Model considering results with top_p probability quality tokens",
-    "根据字符串要给谁看": "Depending on who is intended to view the string",
-    "没有设置YIMODEL_API_KEY选项": "YIMODEL_API_KEY option is not set",
-    "换行符转换为": "Convert line breaks to",
-    "-风格": "-style",
-    "默认情况下并发量极低": "Default to a very low level of concurrency",
-    "为字符串加上上面定义的前缀和后缀": "Add the defined prefix and suffix to the string",
-    "先切换模型到gpt-*": "Switch the model to gpt-* first",
-    "它确保我们匹配的任意文本是尽可能短的": "It ensures that any text we match is as short as possible",
-    "积极地运用环境描写、人物描写等手法": "Actively use techniques such as environmental and character descriptions",
-    "零一万物": "Zero One Universe",
-    "html_local_file 本地文件取相对路径": "html_local_file takes the relative path of the local file",
-    "伊依一行三人乘坐一艘游艇在南太平洋上做吟诗航行": "Yi Yi and three others set sail on a yacht to recite poetry in the South Pacific",
-    "移除左边通配符": "Remove left wildcard characters",
-    "随后绘制图表": "Draw a chart subsequently",
-    "输入2": "Input 2",
-    "所以用最没有意义的一个点代替": "Therefore, replace it with the most meaningless point",
-    "等": "etc.",
-    "是本地文件": "Is a local file",
-    "正在文本切分": "Text segmentation in progress",
-    "等价于修改容器内部的环境变量": "Equivalent to modifying the environment variables inside the container",
-    "cohere等请求源": "Cohere and other request sources",
-    "我们再把 remain_txt_to_cut_storage 中的部分文字取出": "Then we extract part of the text from remain_txt_to_cut_storage",
-    "生成带掩码tag的字符串": "Generate a string with masked tags",
-    "智谱 -=-=-=-=-=-=-": "ZhiPu -=-=-=-=-=-=-",
-    "前缀字符串": "Prefix string",
-    "Temperature值越大随机性越大": "The larger the Temperature value, the greater the randomness",
-    "借用PDF切割中的函数对文本进行切割": "Use functions from PDF cutting to segment the text",
-    "挑选一种剧情发展": "Choose a plot development",
-    "将换行符转换为": "Convert line breaks to",
-    "0.1 意味着模型解码器只考虑从前 10% 的概率的候选集中取 tokens": "0.1 means the model decoder only considers taking tokens from the top 10% probability candidates",
-    "确定故事的下一步": "Determine the next step of the story",
-    "个文件的显示": "Display of a file",
-    "用于控制输出tokens的多样性": "Used to control the diversity of output tokens",
-    "导入BaiduSpider": "Import BaiduSpider",
-    "不输入则为模型自行判断": "If not entered, the model will judge on its own",
-    "准备下一次迭代": "Prepare for the next iteration",
-    "包含一些用于文本处理和模型微调的函数和装饰器包含一些用于文本处理和模型微调的函数和装饰器包含一些用于文本处理和模型微调的函数和装饰器": "Contains functions and decorators for text processing and model fine-tuning",
-    "由于没有单独的参数保存包含图片的历史": "Since there is no separate parameter to save the history with images",
-    "section 开发": "section development",
-    "注意这里没有掩码tag": "Note that there is no mask tag here",
-    "section 设计": "section design",
-    "对话|编程|学术|智能体": "Dialogue | Programming | Academic | Intelligent Agent",
-    "您只需要选择其中一种即可": "You only need to choose one of them",
-    "添加Live2D形象": "Add Live2D image",
-    "请用以下命令安装": "Please install with the following command",
-    "触发了Google的安全访问策略": "Triggered Google's safe access policy",
-    "参数示例「1024x1024-hd-vivid」 || 分辨率支持 「1024x1024」": "Parameter example '1024x1024-hd-vivid' || Resolution support '1024x1024'",
-    "结局除外": "Excluding the ending",
-    "subgraph 函数调用": "subgraph function call",
-    "项目示意图": "Project diagram",
-    "实体关系图": "Entity relationship diagram",
-    "计算机把他的代号定为M102": "The computer named his code M102",
-    "首先尝试用双空行": "Try using double empty lines first",
-    "接下来将判断适合的图表类型": "Next, determine the appropriate chart type",
-    "注意前面的几句都小心保留了双引号": "Note that the previous sentences have carefully preserved double quotes",
-    "您正在调用插件": "You are calling a plugin",
-    "从上到下": "From top to bottom",
-    "请配置HUOSHAN_API_KEY": "Please configure HUOSHAN_API_KEY",
-    "知识检索内容相关度 Score": "Knowledge retrieval content relevance score",
-    "所以不会被处理": "So it will not be processed",
-    "设置10秒即可": "Set to 10 seconds",
-    "以空格分割": "Separated by space",
-    "根据位置和名称": "According to position and name",
-    "一些垃圾第三方接口出现这样的错误": "Some crappy third-party interfaces have this error",
-    "////////////////////// 输入清除键 ///////////////////////////": "////////////////////// Input Clear Key ///////////////////////////",
-    "并解析为html or md 文本": "And parse as HTML or MD text",
-    "匹配单段内容的连接上下文长度": "Matching single section content connection context length",
-    "控制输出的随机性": "Control the randomness of output",
-    "是模型名": "Is model name",
-    "请检查配置文件": "Please check the configuration file",
-    "如何使用one-api快速接入": "How to quickly access using one-api",
-    "请求失败": "Request failed",
-    "追加列表": "Append list",
-    "////////////////////// 函数插件区 ///////////////////////////": "////////////////////// Function Plugin Area ///////////////////////////",
-    "你是WPSAi": "You are WPSAi",
-    "第五部分 一些文件处理方法": "Part Five Some file processing methods",
-    "圆圆迷上了肥皂泡": "Yuan Yuan is fascinated by soap bubbles",
-    "可选参数": "Optional parameters",
-    "one-api模型": "one-api model",
-    "port/gpt_academic/ 下": "Under port/gpt_academic/",
-    "下一段故事": "Next part of the story",
-    "* 表示前一个字符可以出现0次或多次": "* means the previous character can appear 0 or more times",
-    "向后兼容配置": "Backward compatible configuration",
-    "输出部分": "Output section",
-    "稍后": "Later",
-    "比如比喻、拟人、排比、对偶、夸张等等": "For example, similes, personification, parallelism, antithesis, hyperbole, etc.",
-    "是自定义按钮": "Is a custom button",
-    "你需要根据用户给出的小说段落": "You need to based on the novel paragraph given by the user",
-    "以mermaid flowchart的形式展示": "Display in the form of a mermaid flowchart",
-    "最后一幕的字数少于1000字": "The last scene has fewer than 1000 words",
-    "如没出错则保持为空": "Keep it empty if there are no errors",
-    "建议您根据应用场景调整 top_p 或 temperature 参数": "It is recommended to adjust the top_p or temperature parameters according to the application scenario",
-    "仿佛他的出生就是要和这东西约会似的": "As if his birth was meant to date this thing",
-    "处理特殊的渲染问题": "Handle special rendering issues",
-    "我认为最合理的故事结局是": "I think the most reasonable ending for the story is",
-    "请给出上方内容的思维导图": "Please provide a mind map of the content above",
-    "点other Formats": "Click on other Formats",
-    "文件加载完毕": "File loaded",
-    "Your account is not active. Cohere以账户失效为由": "Your account is not active. Cohere cites the account's inactivation as the reason",
-    "找不到任何.pdf文件": "Cannot find any .pdf files",
-    "请根据判断结果绘制相应的图表": "Please draw the corresponding chart based on the judgment result",
-    "积极地运用修辞手法": "Actively use rhetorical devices",
-    "工具函数 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-": "Utility function -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=",
-    "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= 插件主程序1 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=": "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= Plugin Main Program 1 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=",
-    "在": "In",
-    "即正则表达式库": "That is, the regular expression library",
-    "////////////////////// 基础功能区 ///////////////////////////": "////////////////////// Basic Function Area ///////////////////////////",
-    "并重新编译PDF | 输入参数为路径": "And recompile PDF | Input parameter is the path",
-    "甘特图": "Gantt Chart",
-    "但是需要注册账号": "But registration is required",
-    "获取完整的从Cohere返回的报错": "Get the complete error message returned from Cohere",
-    "合并摘要": "Merge Summary",
-    "这最后一课要提前讲了": "The last lesson will be taught ahead of schedule",
-    "大模型": "Large Model",
-    "查找输入区内容中的文件": "Find files in the input area content",
-    "预处理参数": "Preprocessing Parameters",
-    "这段代码定义了一个名为ProxyNetworkActivate的空上下文管理器": "This code defines an empty context manager named ProxyNetworkActivate",
-    "对话错误": "Dialogue Error",
-    "确定故事的结局": "Determine the ending of the story",
-    "第 1 部分": "Part 1",
-    "直到遇到括号外部最近的限定符": "Until the nearest qualifier outside the parentheses is encountered",
-    "负责向用户前端展示对话": "Responsible for displaying dialogue to the user frontend",
-    "查询内容": "Query Content",
-    "匹配结果更精准": "More accurate matching results",
-    "根据选择的图表类型绘制图表": "Draw a chart based on the selected chart type",
-    "空格、换行、空字符串都会报错": "Spaces, line breaks, and empty strings will all result in errors",
-    "请尝试削减单次输入的文本量": "Please try to reduce the amount of text in a single input",
-    "上传到路径": "Upload to path",
-    "中": "In",
-    "后缀字符串": "Suffix string",
-    "您还可以在接入one-api时": "You can also when accessing one-api",
-    "请说 “根据已知信息无法回答该问题” 或 “没有提供足够的相关信息”": "Please say 'Cannot answer the question based on available information' or 'Not enough relevant information is provided'",
-    "Cohere和API2D不会走这里": "Cohere and API2D will not go here",
-    "节点名字使用引号包裹": "Node names should be enclosed in quotes",
-    "这次的故事开头是": "The beginning of this story is",
-    "你是一个想象力丰富的杰出作家": "You are a brilliant writer with a rich imagination",
-    "正在与你的朋友互动": "Interacting with your friends",
-    "/「-hd」 || 风格支持 「-vivid」": "/ '-hd' || Style supports '-vivid'",
-    "如输入区无内容则直接解析历史记录": "If the input area is empty, parse the history directly",
-    "根据以上的情节": "Based on the above plot",
-    "将图表类型参数赋值为插件参数": "Set the chart type parameter to the plugin parameter",
-    "根据图片类型返回image/jpeg": "Return image/jpeg based on image type",
-    "如果lang_reference是英文": "If lang_reference is English",
-    "示意图": "Schematic diagram",
-    "完整参数列表": "Complete parameter list",
-    "仿佛灿烂的群星的背景被剪出一个方口": "As if the brilliant background of stars has been cut out into a square",
-    "如果没有找到合适的切分点": "If no suitable splitting point is found",
-    "获取数据": "Get data",
-    "内嵌的javascript代码": "Embedded JavaScript code",
-    "绘制多种mermaid图表": "Draw various mermaid charts",
-    "无效": "Invalid",
-    "查找pdf/md/word并获取文本内容并返回状态以及文本": "Search for pdf/md/word, retrieve text content, and return status and text",
-    "总结绘制脑图": "Summarize mind mapping",
-    "禁止杜撰不符合我选择的剧情": "Prohibit making up plots that do not match my choice",
-    "正在生成向量库": "Generating vector library",
-    "是LLM的内部调优参数": "Is an internal tuning parameter of LLM",
-    "请你选择一个合适的图表类型": "Please choose an appropriate chart type",
-    "请在“输入区”输入图像生成提示": "Please enter image generation prompts in the 'input area'",
-    "经测试设置为小于500时": "After testing, set it to less than 500",
-    "当然": "Certainly",
-    "必要": "Necessary",
-    "从左到右": "From left to right",
-    "接下来调用本地Latex翻译插件即可": "Next, call the local Latex translation plugin",
-    "如果相同则返回": "If the same, return",
-    "根据语言": "According to the language",
-    "使用mermaid语法": "Use mermaid syntax",
-    "这是游戏的第一步": "This is the first step of the game",
-    "构建后续剧情引导": "Building subsequent plot guidance",
-    "以满足 token 限制": "To meet the token limit",
-    "也就是说": "That is to say",
-    "mermaid语法举例": "Mermaid syntax example",
-    "发送": "Send",
-    "那么就只显示英文提示词": "Then only display English prompts",
-    "正在检查": "Checking",
-    "返回处理后的字符串": "Return the processed string",
-    "2 序列图": "Sequence diagram 2",
-    "yi-34b-chat-0205只有4k上下文": "yi-34b-chat-0205 has only 4k context",
-    "请检查配置": "Please check the configuration",
-    "请你给出围绕“{subject}”的象限图": "Please provide a quadrant diagram around '{subject}'",
-    "故事该结束了": "The story should end",
-    "修复缩进": "Fix indentation",
-    "请描述给出的图片": "Please describe the given image",
-    "启用插件热加载": "Enable plugin hot reload",
-    "通义-在线模型 -=-=-=-=-=-=-": "Tongyi - Online Model",
-    "比较页数是否相同": "Compare if the number of pages is the same",
-    "正式开始服务": "Officially start the service",
-    "使用mermaid flowchart对以上文本进行总结": "Summarize the above text using a mermaid flowchart",
-    "不是vision 才处理history": "Not only vision but also handle history",
-    "来定义了一个正则表达式模式": "Defined a regular expression pattern",
-    "IP地址等": "IP addresses, etc.",
-    "那么双引号才是句子的终点": "Then the double quotes mark the end of the sentence",
-    "输入1": "Input 1",
-    "/「1792x1024」/「1024x1792」 || 质量支持 「-standard」": "/'1792x1024'/ '1024x1792' || Quality support '-standard'",
-    "为了避免索引错误将其更改为大写": "To avoid indexing errors, change it to uppercase",
-    "搜索网页": "Search the web",
-    "用于控制生成文本的随机性和创造性": "Used to control the randomness and creativity of generated text",
-    "不能等于 0": "Cannot equal 0",
-    "在距地球五万光年的远方": "At a distance of fifty thousand light-years from Earth",
-    ". 表示任意单一字符": ". represents any single character",
-    "选择预测值最大的k个token进行采样": "Select the k tokens with the largest predicted values for sampling",
-    "输出2": "Output 2",
-    "函数示意图": "Function Diagram",
-    "You are associated with a deactivated account. Cohere以账户失效为由": "You are associated with a deactivated account. Cohere due to account deactivation",
-    "3. 后续剧情发展3": "3. Subsequent Plot Development",
-    "并以“剧情收尾”四个字提示程序": "And use the four characters 'Plot Conclusion' as a prompt for the program",
-    "中文省略号": "Chinese Ellipsis",
-    "则不生效": "Will not take effect",
-    "目前是两位小数": "Currently is two decimal places",
-    "Incorrect API key. Cohere以提供了不正确的API_KEY为由": "Incorrect API key. Cohere reports an incorrect API_KEY."
 }

docs/translate_japanese.json

@@ -44,7 +44,7 @@
     "批量总结PDF文档": "BatchSummarizePDFDocuments",
     "批量总结PDF文档pdfminer": "BatchSummarizePDFDocumentsUsingPDFMiner",
     "批量翻译PDF文档": "BatchTranslatePDFDocuments",
-    "PDF批量翻译": "BatchTranslatePDFDocumentsUsingMultiThreading",
+    "批量翻译PDF文档_多线程": "BatchTranslatePDFDocumentsUsingMultiThreading",
     "谷歌检索小助手": "GoogleSearchAssistant",
     "理解PDF文档内容标准文件输入": "StandardFileInputForUnderstandingPDFDocumentContent",
     "理解PDF文档内容": "UnderstandingPDFDocumentContent",

docs/translate_std.json

@@ -6,7 +6,7 @@
     "Latex英文纠错加PDF对比": "CorrectEnglishInLatexWithPDFComparison",
     "下载arxiv论文并翻译摘要": "DownloadArxivPaperAndTranslateAbstract",
     "Markdown翻译指定语言": "TranslateMarkdownToSpecifiedLanguage",
-    "PDF批量翻译": "BatchTranslatePDFDocuments_MultiThreaded",
+    "批量翻译PDF文档_多线程": "BatchTranslatePDFDocuments_MultiThreaded",
     "下载arxiv论文翻译摘要": "DownloadArxivPaperTranslateAbstract",
     "解析一个Python项目": "ParsePythonProject",
     "解析一个Golang项目": "ParseGolangProject",

docs/translate_traditionalchinese.json

@@ -43,7 +43,7 @@
     "批量总结PDF文档": "BatchSummarizePDFDocuments",
     "批量总结PDF文档pdfminer": "BatchSummarizePDFDocumentsPdfminer",
     "批量翻译PDF文档": "BatchTranslatePDFDocuments",
-    "PDF批量翻译": "BatchTranslatePdfDocumentsMultithreaded",
+    "批量翻译PDF文档_多线程": "BatchTranslatePdfDocumentsMultithreaded",
     "谷歌检索小助手": "GoogleSearchAssistant",
     "理解PDF文档内容标准文件输入": "StandardFileInputForUnderstandingPdfDocumentContent",
     "理解PDF文档内容": "UnderstandingPdfDocumentContent",

docs/use_tts.md

@@ -1,58 +0,0 @@
-# 使用TTS文字转语音
-
-
-## 1. 使用EDGE-TTS（简单）
-
-将本项目配置项修改如下即可
-
-```
-TTS_TYPE = "EDGE_TTS"
-EDGE_TTS_VOICE = "zh-CN-XiaoxiaoNeural"
-```
-
-## 2. 使用SoVITS（需要有显卡）
-
-使用以下docker-compose.yml文件，先启动SoVITS服务API
-
-  1. 创建以下文件夹结构
-      ```shell
-      .
-      ├── docker-compose.yml
-      └── reference
-          ├── clone_target_txt.txt
-          └── clone_target_wave.mp3
-      ```
-  2. 其中`docker-compose.yml`为
-      ```yaml
-      version: '3.8'
-      services:
-        gpt-sovits:
-          image: fuqingxu/sovits_gptac_trim:latest
-          container_name: sovits_gptac_container
-          working_dir: /workspace/gpt_sovits_demo
-          environment:
-            - is_half=False
-            - is_share=False
-          volumes:
-            - ./reference:/reference
-          ports:
-            - "19880:9880"  # 19880 为 sovits api 的暴露端口，记住它
-          shm_size: 16G
-          deploy:
-            resources:
-              reservations:
-                devices:
-                - driver: nvidia
-                  count: "all"
-                  capabilities: [gpu]
-          command: bash -c "python3 api.py"
-      ```
-  3. 其中`clone_target_wave.mp3`为需要克隆的角色音频，`clone_target_txt.txt`为该音频对应的文字文本（ https://wiki.biligame.com/ys/%E8%A7%92%E8%89%B2%E8%AF%AD%E9%9F%B3 ）
-  4. 运行`docker-compose up`
-  5. 将本项目配置项修改如下即可
-      (19880 为 sovits api 的暴露端口，与docker-compose.yml中的端口对应)
-      ```
-      TTS_TYPE = "LOCAL_SOVITS_API"
-      GPT_SOVITS_URL = "http://127.0.0.1:19880"
-      ```
-  6. 启动本项目

docs/use_vllm.md

@@ -1,46 +0,0 @@
-# 使用VLLM
-
-
-## 1. 首先启动 VLLM，自行选择模型
-
-```
-python -m vllm.entrypoints.openai.api_server --model /home/hmp/llm/cache/Qwen1___5-32B-Chat --tensor-parallel-size 2 --dtype=half
-```
-
-这里使用了存储在 `/home/hmp/llm/cache/Qwen1___5-32B-Chat` 的本地模型，可以根据自己的需求更改。
-
-## 2. 测试 VLLM
-
-```
-curl http://localhost:8000/v1/chat/completions \
--H "Content-Type: application/json" \
--d '{
-  "model": "/home/hmp/llm/cache/Qwen1___5-32B-Chat",
-  "messages": [
-  {"role": "system", "content": "You are a helpful assistant."},
-  {"role": "user", "content": "怎么实现一个去中心化的控制器?"}
-  ]
-}'
-```
-
-## 3. 配置本项目
-
-```
-API_KEY = "sk-123456789xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx123456789"
-LLM_MODEL = "vllm-/home/hmp/llm/cache/Qwen1___5-32B-Chat(max_token=4096)"
-API_URL_REDIRECT = {"https://api.openai.com/v1/chat/completions": "http://localhost:8000/v1/chat/completions"}
-```
-
-```
-"vllm-/home/hmp/llm/cache/Qwen1___5-32B-Chat(max_token=4096)"
-其中
-  "vllm-"                                     是前缀（必要）
-  "/home/hmp/llm/cache/Qwen1___5-32B-Chat"    是模型名（必要）
-  "(max_token=6666)"                          是配置（非必要）
-```
-
-## 4. 启动！
-
-```
-python main.py
-```

main.py

@@ -1,4 +1,4 @@
-import os, json; os.environ['no_proxy'] = '*' # 避免代理网络产生意外污染
+import os; os.environ['no_proxy'] = '*' # 避免代理网络产生意外污染
 
 help_menu_description = \
 """Github源代码开源和更新[地址🚀](https://github.com/binary-husky/gpt_academic),
@@ -13,41 +13,35 @@ help_menu_description = \
 </br></br>如何语音对话: 请阅读Wiki
 </br></br>如何临时更换API_KEY: 在输入区输入临时API_KEY后提交（网页刷新后失效）"""
 
-def enable_log(PATH_LOGGING):
-    import logging
-    admin_log_path = os.path.join(PATH_LOGGING, "admin")
-    os.makedirs(admin_log_path, exist_ok=True)
-    log_dir = os.path.join(admin_log_path, "chat_secrets.log")
-    try:logging.basicConfig(filename=log_dir, level=logging.INFO, encoding="utf-8", format="%(asctime)s %(levelname)-8s %(message)s", datefmt="%Y-%m-%d %H:%M:%S")
-    except:logging.basicConfig(filename=log_dir, level=logging.INFO,  format="%(asctime)s %(levelname)-8s %(message)s", datefmt="%Y-%m-%d %H:%M:%S")
-    # Disable logging output from the 'httpx' logger
-    logging.getLogger("httpx").setLevel(logging.WARNING)
-    print(f"所有对话记录将自动保存在本地目录{log_dir}, 请注意自我隐私保护哦！")
-
 def main():
     import gradio as gr
-    if gr.__version__ not in ['3.32.9']:
+    if gr.__version__ not in ['3.32.8']:
         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, DummyWith
+    from toolbox import format_io, find_free_port, on_file_uploaded, on_report_generated, get_conf, ArgsGeneralWrapper, load_chat_cookies, DummyWith
     # 建议您复制一个config_private.py放自己的秘密, 如API和代理网址
     proxies, WEB_PORT, LLM_MODEL, CONCURRENT_COUNT, AUTHENTICATION = get_conf('proxies', 'WEB_PORT', 'LLM_MODEL', 'CONCURRENT_COUNT', 'AUTHENTICATION')
     CHATBOT_HEIGHT, LAYOUT, AVAIL_LLM_MODELS, AUTO_CLEAR_TXT = get_conf('CHATBOT_HEIGHT', 'LAYOUT', 'AVAIL_LLM_MODELS', 'AUTO_CLEAR_TXT')
     ENABLE_AUDIO, AUTO_CLEAR_TXT, PATH_LOGGING, AVAIL_THEMES, THEME, ADD_WAIFU = get_conf('ENABLE_AUDIO', 'AUTO_CLEAR_TXT', 'PATH_LOGGING', 'AVAIL_THEMES', 'THEME', 'ADD_WAIFU')
-    NUM_CUSTOM_BASIC_BTN, SSL_KEYFILE, SSL_CERTFILE = get_conf('NUM_CUSTOM_BASIC_BTN', 'SSL_KEYFILE', 'SSL_CERTFILE')
+    DARK_MODE, NUM_CUSTOM_BASIC_BTN, SSL_KEYFILE, SSL_CERTFILE = get_conf('DARK_MODE', 'NUM_CUSTOM_BASIC_BTN', 'SSL_KEYFILE', 'SSL_CERTFILE')
-    DARK_MODE, INIT_SYS_PROMPT, ADD_WAIFU, TTS_TYPE = get_conf('DARK_MODE', 'INIT_SYS_PROMPT', 'ADD_WAIFU', 'TTS_TYPE')
+    INIT_SYS_PROMPT = get_conf('INIT_SYS_PROMPT')
-    if LLM_MODEL not in AVAIL_LLM_MODELS: AVAIL_LLM_MODELS += [LLM_MODEL]
 
     # 如果WEB_PORT是-1, 则随机选取WEB端口
     PORT = find_free_port() if WEB_PORT <= 0 else WEB_PORT
     from check_proxy import get_current_version
     from themes.theme import adjust_theme, advanced_css, theme_declaration, js_code_clear, js_code_reset, js_code_show_or_hide, js_code_show_or_hide_group2
     from themes.theme import js_code_for_css_changing, js_code_for_toggle_darkmode, js_code_for_persistent_cookie_init
-    from themes.theme import load_dynamic_theme, to_cookie_str, from_cookie_str, assign_user_uuid
+    from themes.theme import load_dynamic_theme, to_cookie_str, from_cookie_str, init_cookie
     title_html = f"<h1 align=\"center\">GPT 学术优化 {get_current_version()}</h1>{theme_declaration}"
 
-    # 对话、日志记录
+    # 问询记录, python 版本建议3.9+（越新越好）
-    enable_log(PATH_LOGGING)
+    import logging, uuid
+    os.makedirs(PATH_LOGGING, exist_ok=True)
+    try:logging.basicConfig(filename=f"{PATH_LOGGING}/chat_secrets.log", level=logging.INFO, encoding="utf-8", format="%(asctime)s %(levelname)-8s %(message)s", datefmt="%Y-%m-%d %H:%M:%S")
+    except:logging.basicConfig(filename=f"{PATH_LOGGING}/chat_secrets.log", level=logging.INFO,  format="%(asctime)s %(levelname)-8s %(message)s", datefmt="%Y-%m-%d %H:%M:%S")
+    # Disable logging output from the 'httpx' logger
+    logging.getLogger("httpx").setLevel(logging.WARNING)
+    print(f"所有问询记录将自动保存在本地目录./{PATH_LOGGING}/chat_secrets.log, 请注意自我隐私保护哦！")
 
     # 一些普通功能模块
     from core_functional import get_core_functions
@@ -80,18 +74,15 @@ def main():
     cancel_handles = []
     customize_btns = {}
     predefined_btns = {}
-    from shared_utils.cookie_manager import make_cookie_cache, make_history_cache
+    with gr.Blocks(title="GPT 学术优化", theme=set_theme, analytics_enabled=False, css=advanced_css) as demo:
-    with gr.Blocks(title="GPT 学术优化", theme=set_theme, analytics_enabled=False, css=advanced_css) as app_block:
         gr.HTML(title_html)
-        secret_css = gr.Textbox(visible=False, elem_id="secret_css")
+        secret_css, dark_mode, py_pickle_cookie = gr.Textbox(visible=False), gr.Textbox(DARK_MODE, visible=False), gr.Textbox(visible=False)
-
+        cookies = gr.State(load_chat_cookies())
-
-        cookies, web_cookie_cache = make_cookie_cache() # 定义 后端state（cookies）、前端（web_cookie_cache）两兄弟
         with gr_L1():
             with gr_L2(scale=2, elem_id="gpt-chat"):
                 chatbot = gr.Chatbot(label=f"当前模型：{LLM_MODEL}", elem_id="gpt-chatbot")
                 if LAYOUT == "TOP-DOWN":  chatbot.style(height=CHATBOT_HEIGHT)
-                history, history_cache, history_cache_update = make_history_cache() # 定义 后端state（history）、前端（history_cache）、后端setter（history_cache_update）三兄弟
+                history = gr.State([])
             with gr_L2(scale=1, elem_id="gpt-panel"):
                 with gr.Accordion("输入区", open=True, elem_id="input-panel") as area_input_primary:
                     with gr.Row():
@@ -159,17 +150,11 @@ def main():
                     file_upload_2 = gr.Files(label="任何文件, 推荐上传压缩文件(zip, tar)", file_count="multiple", elem_id="elem_upload_float")
 
                 with gr.Tab("更换模型", elem_id="interact-panel"):
-                    md_dropdown = gr.Dropdown(AVAIL_LLM_MODELS, value=LLM_MODEL, elem_id="elem_model_sel", label="更换LLM模型/请求源").style(container=False)
+                    md_dropdown = gr.Dropdown(AVAIL_LLM_MODELS, value=LLM_MODEL, label="更换LLM模型/请求源").style(container=False)
                     top_p = gr.Slider(minimum=-0, maximum=1.0, value=1.0, step=0.01,interactive=True, label="Top-p (nucleus sampling)",)
-                    temperature = gr.Slider(minimum=-0, maximum=2.0, value=1.0, step=0.01, interactive=True, label="Temperature", elem_id="elem_temperature")
+                    temperature = gr.Slider(minimum=-0, maximum=2.0, value=1.0, step=0.01, interactive=True, label="Temperature",)
                     max_length_sl = gr.Slider(minimum=256, maximum=1024*32, value=4096, step=128, interactive=True, label="Local LLM MaxLength",)
-                    system_prompt = gr.Textbox(show_label=True, lines=2, placeholder=f"System Prompt", label="System prompt", value=INIT_SYS_PROMPT, elem_id="elem_prompt")
+                    system_prompt = gr.Textbox(show_label=True, lines=2, placeholder=f"System Prompt", label="System prompt", value=INIT_SYS_PROMPT)
-                    temperature.change(None, inputs=[temperature], outputs=None,
-                        _js="""(temperature)=>gpt_academic_gradio_saveload("save", "elem_prompt", "js_temperature_cookie", temperature)""")
-                    system_prompt.change(None, inputs=[system_prompt], outputs=None,
-                        _js="""(system_prompt)=>gpt_academic_gradio_saveload("save", "elem_prompt", "js_system_prompt_cookie", system_prompt)""")
-                    md_dropdown.change(None, inputs=[md_dropdown], outputs=None,
-                        _js="""(md_dropdown)=>gpt_academic_gradio_saveload("save", "elem_model_sel", "js_md_dropdown_cookie", md_dropdown)""")
 
                 with gr.Tab("界面外观", elem_id="interact-panel"):
                     theme_dropdown = gr.Dropdown(AVAIL_THEMES, value=THEME, label="更换UI主题").style(container=False)
@@ -209,19 +194,64 @@ def main():
                     with gr.Column(scale=1, min_width=70):
                         basic_fn_confirm = gr.Button("确认并保存", variant="primary"); basic_fn_confirm.style(size="sm")
                         basic_fn_clean   = gr.Button("恢复默认", variant="primary"); basic_fn_clean.style(size="sm")
+                        def assign_btn(persistent_cookie_, cookies_, basic_btn_dropdown_, basic_fn_title, basic_fn_prefix, basic_fn_suffix, clean_up=False):
+                            ret = {}
+                            # 读取之前的自定义按钮
+                            customize_fn_overwrite_ = cookies_['customize_fn_overwrite']
+                            # 更新新的自定义按钮
+                            customize_fn_overwrite_.update({
+                                basic_btn_dropdown_:
+                                    {
+                                        "Title":basic_fn_title,
+                                        "Prefix":basic_fn_prefix,
+                                        "Suffix":basic_fn_suffix,
+                                    }
+                                }
+                            )
+                            if clean_up:
+                                customize_fn_overwrite_ = {}
+                            cookies_.update(customize_fn_overwrite_)    # 更新cookie
+                            visible = (not clean_up) and (basic_fn_title != "")
+                            if basic_btn_dropdown_ in customize_btns:
+                                # 是自定义按钮，不是预定义按钮
+                                ret.update({customize_btns[basic_btn_dropdown_]: gr.update(visible=visible, value=basic_fn_title)})
+                            else:
+                                # 是预定义按钮
+                                ret.update({predefined_btns[basic_btn_dropdown_]: gr.update(visible=visible, value=basic_fn_title)})
+                            ret.update({cookies: cookies_})
+                            try: persistent_cookie_ = from_cookie_str(persistent_cookie_)   # persistent cookie to dict
+                            except: persistent_cookie_ = {}
+                            persistent_cookie_["custom_bnt"] = customize_fn_overwrite_      # dict update new value
+                            persistent_cookie_ = to_cookie_str(persistent_cookie_)          # persistent cookie to dict
+                            ret.update({py_pickle_cookie: persistent_cookie_})             # write persistent cookie
+                            return ret
 
-                        from shared_utils.cookie_manager import assign_btn__fn_builder
-                        assign_btn = assign_btn__fn_builder(customize_btns, predefined_btns, cookies, web_cookie_cache)
                         # update btn
-                        h = basic_fn_confirm.click(assign_btn, [web_cookie_cache, cookies, basic_btn_dropdown, basic_fn_title, basic_fn_prefix, basic_fn_suffix],
+                        h = basic_fn_confirm.click(assign_btn, [py_pickle_cookie, cookies, basic_btn_dropdown, basic_fn_title, basic_fn_prefix, basic_fn_suffix],
-                                                   [web_cookie_cache, cookies, *customize_btns.values(), *predefined_btns.values()])
+                                                   [py_pickle_cookie, cookies, *customize_btns.values(), *predefined_btns.values()])
-                        h.then(None, [web_cookie_cache], None, _js="""(web_cookie_cache)=>{setCookie("web_cookie_cache", web_cookie_cache, 365);}""")
+                        h.then(None, [py_pickle_cookie], None, _js="""(py_pickle_cookie)=>{setCookie("py_pickle_cookie", py_pickle_cookie, 365);}""")
                         # clean up btn
-                        h2 = basic_fn_clean.click(assign_btn, [web_cookie_cache, cookies, basic_btn_dropdown, basic_fn_title, basic_fn_prefix, basic_fn_suffix, gr.State(True)],
+                        h2 = basic_fn_clean.click(assign_btn, [py_pickle_cookie, cookies, basic_btn_dropdown, basic_fn_title, basic_fn_prefix, basic_fn_suffix, gr.State(True)],
-                                                   [web_cookie_cache, cookies, *customize_btns.values(), *predefined_btns.values()])
+                                                   [py_pickle_cookie, cookies, *customize_btns.values(), *predefined_btns.values()])
-                        h2.then(None, [web_cookie_cache], None, _js="""(web_cookie_cache)=>{setCookie("web_cookie_cache", web_cookie_cache, 365);}""")
+                        h2.then(None, [py_pickle_cookie], None, _js="""(py_pickle_cookie)=>{setCookie("py_pickle_cookie", py_pickle_cookie, 365);}""")
 
+                        def persistent_cookie_reload(persistent_cookie_, cookies_):
+                            ret = {}
+                            for k in customize_btns:
+                                ret.update({customize_btns[k]: gr.update(visible=False, value="")})
 
+                            try: persistent_cookie_ = from_cookie_str(persistent_cookie_)    # persistent cookie to dict
+                            except: return ret
+
+                            customize_fn_overwrite_ = persistent_cookie_.get("custom_bnt", {})
+                            cookies_['customize_fn_overwrite'] = customize_fn_overwrite_
+                            ret.update({cookies: cookies_})
+
+                            for k,v in persistent_cookie_["custom_bnt"].items():
+                                if v['Title'] == "": continue
+                                if k in customize_btns: ret.update({customize_btns[k]: gr.update(visible=True, value=v['Title'])})
+                                else: ret.update({predefined_btns[k]: gr.update(visible=True, value=v['Title'])})
+                            return ret
 
         # 功能区显示开关与功能区的互动
         def fn_area_visibility(a):
@@ -253,10 +283,8 @@ def main():
         cancel_handles.append(submitBtn2.click(**predict_args))
         resetBtn.click(None, None, [chatbot, history, status], _js=js_code_reset)   # 先在前端快速清除chatbot&status
         resetBtn2.click(None, None, [chatbot, history, status], _js=js_code_reset)  # 先在前端快速清除chatbot&status
-        reset_server_side_args = (lambda history: ([], [], "已重置", json.dumps(history)),
+        resetBtn.click(lambda: ([], [], "已重置"), None, [chatbot, history, status])    # 再在后端清除history
-                                  [history], [chatbot, history, status, history_cache])
+        resetBtn2.click(lambda: ([], [], "已重置"), None, [chatbot, history, status])   # 再在后端清除history
-        resetBtn.click(*reset_server_side_args)    # 再在后端清除history，把history转存history_cache备用
-        resetBtn2.click(*reset_server_side_args)   # 再在后端清除history，把history转存history_cache备用
         clearBtn.click(None, None, [txt, txt2], _js=js_code_clear)
         clearBtn2.click(None, None, [txt, txt2], _js=js_code_clear)
         if AUTO_CLEAR_TXT:
@@ -279,7 +307,7 @@ def main():
         for k in plugins:
             if not plugins[k].get("AsButton", True): continue
             click_handle = plugins[k]["Button"].click(ArgsGeneralWrapper(plugins[k]["Function"]), [*input_combo], output_combo)
-            click_handle.then(on_report_generated, [cookies, file_upload, chatbot], [cookies, file_upload, chatbot]).then(None, [plugins[k]["Button"]], None, _js=r"(fn)=>on_plugin_exe_complete(fn)")
+            click_handle.then(on_report_generated, [cookies, file_upload, chatbot], [cookies, file_upload, chatbot])
             cancel_handles.append(click_handle)
         # 函数插件-下拉菜单与随变按钮的互动
         def on_dropdown_changed(k):
@@ -317,7 +345,7 @@ def main():
             if k in [r"打开插件列表", r"请先从插件列表中选择"]: return
             yield from ArgsGeneralWrapper(plugins[k]["Function"])(request, *args, **kwargs)
         click_handle = switchy_bt.click(route,[switchy_bt, *input_combo], output_combo)
-        click_handle.then(on_report_generated, [cookies, file_upload, chatbot], [cookies, file_upload, chatbot]).then(None, [switchy_bt], None, _js=r"(fn)=>on_plugin_exe_complete(fn)")
+        click_handle.then(on_report_generated, [cookies, file_upload, chatbot], [cookies, file_upload, chatbot])
         cancel_handles.append(click_handle)
         # 终止按钮的回调函数注册
         stopBtn.click(fn=None, inputs=None, outputs=None, cancels=cancel_handles)
@@ -343,14 +371,11 @@ def main():
             audio_mic.stream(deal_audio, inputs=[audio_mic, cookies])
 
 
-        app_block.load(assign_user_uuid, inputs=[cookies], outputs=[cookies])
+        demo.load(init_cookie, inputs=[cookies], outputs=[cookies])
-
+        demo.load(persistent_cookie_reload, inputs = [py_pickle_cookie, cookies],
-        from shared_utils.cookie_manager import load_web_cookie_cache__fn_builder
+            outputs = [py_pickle_cookie, cookies, *customize_btns.values(), *predefined_btns.values()], _js=js_code_for_persistent_cookie_init)
-        load_web_cookie_cache = load_web_cookie_cache__fn_builder(customize_btns, cookies, predefined_btns)
+        demo.load(None, inputs=[dark_mode], outputs=None, _js="""(dark_mode)=>{apply_cookie_for_checkbox(dark_mode);}""")    # 配置暗色主题或亮色主题
-        app_block.load(load_web_cookie_cache, inputs = [web_cookie_cache, cookies],
+        demo.load(None, inputs=[gr.Textbox(LAYOUT, visible=False)], outputs=None, _js='(LAYOUT)=>{GptAcademicJavaScriptInit(LAYOUT);}')
-            outputs = [web_cookie_cache, cookies, *customize_btns.values(), *predefined_btns.values()], _js=js_code_for_persistent_cookie_init)
-
-        app_block.load(None, inputs=[], outputs=None, _js=f"""()=>GptAcademicJavaScriptInit("{DARK_MODE}","{INIT_SYS_PROMPT}","{ADD_WAIFU}","{LAYOUT}","{TTS_TYPE}")""")    # 配置暗色主题或亮色主题
 
     # gradio的inbrowser触发不太稳定，回滚代码到原始的浏览器打开函数
     def run_delayed_tasks():
@@ -365,15 +390,28 @@ def main():
 
         threading.Thread(target=auto_updates, name="self-upgrade", daemon=True).start() # 查看自动更新
         threading.Thread(target=open_browser, name="open-browser", daemon=True).start() # 打开浏览器页面
-        threading.Thread(target=warm_up_mods, name="warm-up",      daemon=True).start() # 预热tiktoken模块
+        threading.Thread(target=warm_up_mods, name="warm-up", daemon=True).start()      # 预热tiktoken模块
 
-    # 运行一些异步任务：自动更新、打开浏览器页面、预热tiktoken模块
     run_delayed_tasks()
+    demo.queue(concurrency_count=CONCURRENT_COUNT).launch(
+        quiet=True,
+        server_name="0.0.0.0",
+        ssl_keyfile=None if SSL_KEYFILE == "" else SSL_KEYFILE,
+        ssl_certfile=None if SSL_CERTFILE == "" else SSL_CERTFILE,
+        ssl_verify=False,
+        server_port=PORT,
+        favicon_path=os.path.join(os.path.dirname(__file__), "docs/logo.png"),
+        auth=AUTHENTICATION if len(AUTHENTICATION) != 0 else None,
+        blocked_paths=["config.py","config_private.py","docker-compose.yml","Dockerfile",f"{PATH_LOGGING}/admin"])
 
-    # 最后，正式开始服务
+    # 如果需要在二级路径下运行
-    from shared_utils.fastapi_server import start_app
+    # CUSTOM_PATH = get_conf('CUSTOM_PATH')
-    start_app(app_block, CONCURRENT_COUNT, AUTHENTICATION, PORT, SSL_KEYFILE, SSL_CERTFILE)
+    # if CUSTOM_PATH != "/":
-
+    #     from toolbox import run_gradio_in_subpath
+    #     run_gradio_in_subpath(demo, auth=AUTHENTICATION, port=PORT, custom_path=CUSTOM_PATH)
+    # else:
+    #     demo.launch(server_name="0.0.0.0", server_port=PORT, auth=AUTHENTICATION, favicon_path="docs/logo.png",
+    #                 blocked_paths=["config.py","config_private.py","docker-compose.yml","Dockerfile",f"{PATH_LOGGING}/admin"])
 
 if __name__ == "__main__":
     main()

request_llms/bridge_all.py

@@ -8,10 +8,10 @@
     具备多线程调用能力的函数：在函数插件中被调用，灵活而简洁
     2. predict_no_ui_long_connection(...)
 """
-import tiktoken, copy, re
+import tiktoken, copy
 from functools import lru_cache
 from concurrent.futures import ThreadPoolExecutor
-from toolbox import get_conf, trimmed_format_exc, apply_gpt_academic_string_mask, read_one_api_model_name
+from toolbox import get_conf, trimmed_format_exc, apply_gpt_academic_string_mask
 
 from .bridge_chatgpt import predict_no_ui_long_connection as chatgpt_noui
 from .bridge_chatgpt import predict as chatgpt_ui
@@ -34,9 +34,6 @@ from .bridge_google_gemini import predict_no_ui_long_connection  as genai_noui
 from .bridge_zhipu import predict_no_ui_long_connection as zhipu_noui
 from .bridge_zhipu import predict as zhipu_ui
 
-from .bridge_cohere import predict as cohere_ui
-from .bridge_cohere import predict_no_ui_long_connection as cohere_noui
-
 colors = ['#FF00FF', '#00FFFF', '#FF0000', '#990099', '#009999', '#990044']
 
 class LazyloadTiktoken(object):
@@ -64,12 +61,6 @@ API_URL_REDIRECT, AZURE_ENDPOINT, AZURE_ENGINE = get_conf("API_URL_REDIRECT", "A
 openai_endpoint = "https://api.openai.com/v1/chat/completions"
 api2d_endpoint = "https://openai.api2d.net/v1/chat/completions"
 newbing_endpoint = "wss://sydney.bing.com/sydney/ChatHub"
-gemini_endpoint = "https://generativelanguage.googleapis.com/v1beta/models"
-claude_endpoint = "https://api.anthropic.com/v1/messages"
-yimodel_endpoint = "https://api.lingyiwanwu.com/v1/chat/completions"
-cohere_endpoint = "https://api.cohere.ai/v1/chat"
-ollama_endpoint = "http://localhost:11434/api/chat"
-
 if not AZURE_ENDPOINT.endswith('/'): AZURE_ENDPOINT += '/'
 azure_endpoint = AZURE_ENDPOINT + f'openai/deployments/{AZURE_ENGINE}/chat/completions?api-version=2023-05-15'
 # 兼容旧版的配置
@@ -84,11 +75,7 @@ except:
 if openai_endpoint in API_URL_REDIRECT: openai_endpoint = API_URL_REDIRECT[openai_endpoint]
 if api2d_endpoint in API_URL_REDIRECT: api2d_endpoint = API_URL_REDIRECT[api2d_endpoint]
 if newbing_endpoint in API_URL_REDIRECT: newbing_endpoint = API_URL_REDIRECT[newbing_endpoint]
-if gemini_endpoint in API_URL_REDIRECT: gemini_endpoint = API_URL_REDIRECT[gemini_endpoint]
+
-if claude_endpoint in API_URL_REDIRECT: claude_endpoint = API_URL_REDIRECT[claude_endpoint]
-if yimodel_endpoint in API_URL_REDIRECT: yimodel_endpoint = API_URL_REDIRECT[yimodel_endpoint]
-if cohere_endpoint in API_URL_REDIRECT: cohere_endpoint = API_URL_REDIRECT[cohere_endpoint]
-if ollama_endpoint in API_URL_REDIRECT: ollama_endpoint = API_URL_REDIRECT[ollama_endpoint]
 
 # 获取tokenizer
 tokenizer_gpt35 = LazyloadTiktoken("gpt-3.5-turbo")
@@ -107,7 +94,7 @@ model_info = {
         "fn_with_ui": chatgpt_ui,
         "fn_without_ui": chatgpt_noui,
         "endpoint": openai_endpoint,
-        "max_token": 16385,
+        "max_token": 4096,
         "tokenizer": tokenizer_gpt35,
         "token_cnt": get_token_num_gpt35,
     },
@@ -139,16 +126,7 @@ model_info = {
         "token_cnt": get_token_num_gpt35,
     },
 
-    "gpt-3.5-turbo-1106": { #16k
+    "gpt-3.5-turbo-1106": {#16k
-        "fn_with_ui": chatgpt_ui,
-        "fn_without_ui": chatgpt_noui,
-        "endpoint": openai_endpoint,
-        "max_token": 16385,
-        "tokenizer": tokenizer_gpt35,
-        "token_cnt": get_token_num_gpt35,
-    },
-
-    "gpt-3.5-turbo-0125": { #16k
         "fn_with_ui": chatgpt_ui,
         "fn_without_ui": chatgpt_noui,
         "endpoint": openai_endpoint,
@@ -202,25 +180,6 @@ model_info = {
         "token_cnt": get_token_num_gpt4,
     },
 
-    "gpt-4-turbo": {
-        "fn_with_ui": chatgpt_ui,
-        "fn_without_ui": chatgpt_noui,
-        "endpoint": openai_endpoint,
-        "max_token": 128000,
-        "tokenizer": tokenizer_gpt4,
-        "token_cnt": get_token_num_gpt4,
-    },
-
-    "gpt-4-turbo-2024-04-09": {
-        "fn_with_ui": chatgpt_ui,
-        "fn_without_ui": chatgpt_noui,
-        "endpoint": openai_endpoint,
-        "max_token": 128000,
-        "tokenizer": tokenizer_gpt4,
-        "token_cnt": get_token_num_gpt4,
-    },
-
-
     "gpt-3.5-random": {
         "fn_with_ui": chatgpt_ui,
         "fn_without_ui": chatgpt_noui,
@@ -268,14 +227,6 @@ model_info = {
         "tokenizer": tokenizer_gpt35,
         "token_cnt": get_token_num_gpt35,
     },
-    "glm-4v": {
-        "fn_with_ui": zhipu_ui,
-        "fn_without_ui": zhipu_noui,
-        "endpoint": None,
-        "max_token": 1000,
-        "tokenizer": tokenizer_gpt35,
-        "token_cnt": get_token_num_gpt35,
-    },
     "glm-3-turbo": {
         "fn_with_ui": zhipu_ui,
         "fn_without_ui": zhipu_noui,
@@ -331,7 +282,7 @@ model_info = {
     "gemini-pro": {
         "fn_with_ui": genai_ui,
         "fn_without_ui": genai_noui,
-        "endpoint": gemini_endpoint,
+        "endpoint": None,
         "max_token": 1024 * 32,
         "tokenizer": tokenizer_gpt35,
         "token_cnt": get_token_num_gpt35,
@@ -339,56 +290,13 @@ model_info = {
     "gemini-pro-vision": {
         "fn_with_ui": genai_ui,
         "fn_without_ui": genai_noui,
-        "endpoint": gemini_endpoint,
+        "endpoint": None,
         "max_token": 1024 * 32,
         "tokenizer": tokenizer_gpt35,
         "token_cnt": get_token_num_gpt35,
     },
-
-    # cohere
-    "cohere-command-r-plus": {
-        "fn_with_ui": cohere_ui,
-        "fn_without_ui": cohere_noui,
-        "can_multi_thread": True,
-        "endpoint": cohere_endpoint,
-        "max_token": 1024 * 4,
-        "tokenizer": tokenizer_gpt35,
-        "token_cnt": get_token_num_gpt35,
-    },
-
 }
-# -=-=-=-=-=-=- 月之暗面 -=-=-=-=-=-=-
+
-from request_llms.bridge_moonshot import predict as moonshot_ui
-from request_llms.bridge_moonshot import predict_no_ui_long_connection as moonshot_no_ui
-model_info.update({
-    "moonshot-v1-8k": {
-        "fn_with_ui": moonshot_ui,
-        "fn_without_ui": moonshot_no_ui,
-        "can_multi_thread": True,
-        "endpoint": None,
-        "max_token": 1024 * 8,
-        "tokenizer": tokenizer_gpt35,
-        "token_cnt": get_token_num_gpt35,
-    },
-    "moonshot-v1-32k": {
-        "fn_with_ui": moonshot_ui,
-        "fn_without_ui": moonshot_no_ui,
-        "can_multi_thread": True,
-        "endpoint": None,
-        "max_token": 1024 * 32,
-        "tokenizer": tokenizer_gpt35,
-        "token_cnt": get_token_num_gpt35,
-    },
-    "moonshot-v1-128k": {
-        "fn_with_ui": moonshot_ui,
-        "fn_without_ui": moonshot_no_ui,
-        "can_multi_thread": True,
-        "endpoint": None,
-        "max_token": 1024 * 128,
-        "tokenizer": tokenizer_gpt35,
-        "token_cnt": get_token_num_gpt35,
-    }
-})
 # -=-=-=-=-=-=- api2d 对齐支持 -=-=-=-=-=-=-
 for model in AVAIL_LLM_MODELS:
     if model.startswith('api2d-') and (model.replace('api2d-','') in model_info.keys()):
@@ -404,67 +312,25 @@ for model in AVAIL_LLM_MODELS:
         model_info.update({model: mi})
 
 # -=-=-=-=-=-=- 以下部分是新加入的模型，可能附带额外依赖 -=-=-=-=-=-=-
-# claude家族
+if "claude-1-100k" in AVAIL_LLM_MODELS or "claude-2" in AVAIL_LLM_MODELS:
-claude_models = ["claude-instant-1.2","claude-2.0","claude-2.1","claude-3-haiku-20240307","claude-3-sonnet-20240229","claude-3-opus-20240229"]
-if any(item in claude_models for item in AVAIL_LLM_MODELS):
     from .bridge_claude import predict_no_ui_long_connection as claude_noui
     from .bridge_claude import predict as claude_ui
     model_info.update({
-        "claude-instant-1.2": {
+        "claude-1-100k": {
             "fn_with_ui": claude_ui,
             "fn_without_ui": claude_noui,
-            "endpoint": claude_endpoint,
+            "endpoint": None,
-            "max_token": 100000,
+            "max_token": 8196,
             "tokenizer": tokenizer_gpt35,
             "token_cnt": get_token_num_gpt35,
         },
     })
     model_info.update({
-        "claude-2.0": {
+        "claude-2": {
             "fn_with_ui": claude_ui,
             "fn_without_ui": claude_noui,
-            "endpoint": claude_endpoint,
+            "endpoint": None,
-            "max_token": 100000,
+            "max_token": 8196,
-            "tokenizer": tokenizer_gpt35,
-            "token_cnt": get_token_num_gpt35,
-        },
-    })
-    model_info.update({
-        "claude-2.1": {
-            "fn_with_ui": claude_ui,
-            "fn_without_ui": claude_noui,
-            "endpoint": claude_endpoint,
-            "max_token": 200000,
-            "tokenizer": tokenizer_gpt35,
-            "token_cnt": get_token_num_gpt35,
-        },
-    })
-    model_info.update({
-        "claude-3-haiku-20240307": {
-            "fn_with_ui": claude_ui,
-            "fn_without_ui": claude_noui,
-            "endpoint": claude_endpoint,
-            "max_token": 200000,
-            "tokenizer": tokenizer_gpt35,
-            "token_cnt": get_token_num_gpt35,
-        },
-    })
-    model_info.update({
-        "claude-3-sonnet-20240229": {
-            "fn_with_ui": claude_ui,
-            "fn_without_ui": claude_noui,
-            "endpoint": claude_endpoint,
-            "max_token": 200000,
-            "tokenizer": tokenizer_gpt35,
-            "token_cnt": get_token_num_gpt35,
-        },
-    })
-    model_info.update({
-        "claude-3-opus-20240229": {
-            "fn_with_ui": claude_ui,
-            "fn_without_ui": claude_noui,
-            "endpoint": claude_endpoint,
-            "max_token": 200000,
             "tokenizer": tokenizer_gpt35,
             "token_cnt": get_token_num_gpt35,
         },
@@ -534,6 +400,22 @@ if "stack-claude" in AVAIL_LLM_MODELS:
             "token_cnt": get_token_num_gpt35,
         }
     })
+if "newbing-free" in AVAIL_LLM_MODELS:
+    try:
+        from .bridge_newbingfree import predict_no_ui_long_connection as newbingfree_noui
+        from .bridge_newbingfree import predict as newbingfree_ui
+        model_info.update({
+            "newbing-free": {
+                "fn_with_ui": newbingfree_ui,
+                "fn_without_ui": newbingfree_noui,
+                "endpoint": newbing_endpoint,
+                "max_token": 4096,
+                "tokenizer": tokenizer_gpt35,
+                "token_cnt": get_token_num_gpt35,
+            }
+        })
+    except:
+        print(trimmed_format_exc())
 if "newbing" in AVAIL_LLM_MODELS:   # same with newbing-free
     try:
         from .bridge_newbingfree import predict_no_ui_long_connection as newbingfree_noui
@@ -566,7 +448,6 @@ if "chatglmft" in AVAIL_LLM_MODELS:   # same with newbing-free
         })
     except:
         print(trimmed_format_exc())
-# -=-=-=-=-=-=- 上海AI-LAB书生大模型 -=-=-=-=-=-=-
 if "internlm" in AVAIL_LLM_MODELS:
     try:
         from .bridge_internlm import predict_no_ui_long_connection as internlm_noui
@@ -599,7 +480,6 @@ if "chatglm_onnx" in AVAIL_LLM_MODELS:
         })
     except:
         print(trimmed_format_exc())
-# -=-=-=-=-=-=- 通义-本地模型 -=-=-=-=-=-=-
 if "qwen-local" in AVAIL_LLM_MODELS:
     try:
         from .bridge_qwen_local import predict_no_ui_long_connection as qwen_local_noui
@@ -608,7 +488,6 @@ if "qwen-local" in AVAIL_LLM_MODELS:
             "qwen-local": {
                 "fn_with_ui": qwen_local_ui,
                 "fn_without_ui": qwen_local_noui,
-                "can_multi_thread": False,
                 "endpoint": None,
                 "max_token": 4096,
                 "tokenizer": tokenizer_gpt35,
@@ -617,7 +496,6 @@ if "qwen-local" in AVAIL_LLM_MODELS:
         })
     except:
         print(trimmed_format_exc())
-# -=-=-=-=-=-=- 通义-在线模型 -=-=-=-=-=-=-
 if "qwen-turbo" in AVAIL_LLM_MODELS or "qwen-plus" in AVAIL_LLM_MODELS or "qwen-max" in AVAIL_LLM_MODELS:   # zhipuai
     try:
         from .bridge_qwen import predict_no_ui_long_connection as qwen_noui
@@ -626,7 +504,6 @@ if "qwen-turbo" in AVAIL_LLM_MODELS or "qwen-plus" in AVAIL_LLM_MODELS or "qwen-
             "qwen-turbo": {
                 "fn_with_ui": qwen_ui,
                 "fn_without_ui": qwen_noui,
-                "can_multi_thread": True,
                 "endpoint": None,
                 "max_token": 6144,
                 "tokenizer": tokenizer_gpt35,
@@ -635,7 +512,6 @@ if "qwen-turbo" in AVAIL_LLM_MODELS or "qwen-plus" in AVAIL_LLM_MODELS or "qwen-
             "qwen-plus": {
                 "fn_with_ui": qwen_ui,
                 "fn_without_ui": qwen_noui,
-                "can_multi_thread": True,
                 "endpoint": None,
                 "max_token": 30720,
                 "tokenizer": tokenizer_gpt35,
@@ -644,7 +520,6 @@ if "qwen-turbo" in AVAIL_LLM_MODELS or "qwen-plus" in AVAIL_LLM_MODELS or "qwen-
             "qwen-max": {
                 "fn_with_ui": qwen_ui,
                 "fn_without_ui": qwen_noui,
-                "can_multi_thread": True,
                 "endpoint": None,
                 "max_token": 28672,
                 "tokenizer": tokenizer_gpt35,
@@ -653,35 +528,7 @@ if "qwen-turbo" in AVAIL_LLM_MODELS or "qwen-plus" in AVAIL_LLM_MODELS or "qwen-
         })
     except:
         print(trimmed_format_exc())
-# -=-=-=-=-=-=- 零一万物模型 -=-=-=-=-=-=-
+if "spark" in AVAIL_LLM_MODELS:   # 讯飞星火认知大模型
-if "yi-34b-chat-0205" in AVAIL_LLM_MODELS or "yi-34b-chat-200k" in AVAIL_LLM_MODELS:   # zhipuai
-    try:
-        from .bridge_yimodel import predict_no_ui_long_connection as yimodel_noui
-        from .bridge_yimodel import predict as yimodel_ui
-        model_info.update({
-            "yi-34b-chat-0205": {
-                "fn_with_ui": yimodel_ui,
-                "fn_without_ui": yimodel_noui,
-                "can_multi_thread": False,  # 目前来说，默认情况下并发量极低，因此禁用
-                "endpoint": yimodel_endpoint,
-                "max_token": 4000,
-                "tokenizer": tokenizer_gpt35,
-                "token_cnt": get_token_num_gpt35,
-            },
-            "yi-34b-chat-200k": {
-                "fn_with_ui": yimodel_ui,
-                "fn_without_ui": yimodel_noui,
-                "can_multi_thread": False,  # 目前来说，默认情况下并发量极低，因此禁用
-                "endpoint": yimodel_endpoint,
-                "max_token": 200000,
-                "tokenizer": tokenizer_gpt35,
-                "token_cnt": get_token_num_gpt35,
-            },
-        })
-    except:
-        print(trimmed_format_exc())
-# -=-=-=-=-=-=- 讯飞星火认知大模型 -=-=-=-=-=-=-
-if "spark" in AVAIL_LLM_MODELS:
     try:
         from .bridge_spark import predict_no_ui_long_connection as spark_noui
         from .bridge_spark import predict as spark_ui
@@ -689,7 +536,6 @@ if "spark" in AVAIL_LLM_MODELS:
             "spark": {
                 "fn_with_ui": spark_ui,
                 "fn_without_ui": spark_noui,
-                "can_multi_thread": True,
                 "endpoint": None,
                 "max_token": 4096,
                 "tokenizer": tokenizer_gpt35,
@@ -706,7 +552,6 @@ if "sparkv2" in AVAIL_LLM_MODELS:   # 讯飞星火认知大模型
             "sparkv2": {
                 "fn_with_ui": spark_ui,
                 "fn_without_ui": spark_noui,
-                "can_multi_thread": True,
                 "endpoint": None,
                 "max_token": 4096,
                 "tokenizer": tokenizer_gpt35,
@@ -723,7 +568,6 @@ if "sparkv3" in AVAIL_LLM_MODELS or "sparkv3.5" in AVAIL_LLM_MODELS:   # 讯飞
             "sparkv3": {
                 "fn_with_ui": spark_ui,
                 "fn_without_ui": spark_noui,
-                "can_multi_thread": True,
                 "endpoint": None,
                 "max_token": 4096,
                 "tokenizer": tokenizer_gpt35,
@@ -732,7 +576,6 @@ if "sparkv3" in AVAIL_LLM_MODELS or "sparkv3.5" in AVAIL_LLM_MODELS:   # 讯飞
             "sparkv3.5": {
                 "fn_with_ui": spark_ui,
                 "fn_without_ui": spark_noui,
-                "can_multi_thread": True,
                 "endpoint": None,
                 "max_token": 4096,
                 "tokenizer": tokenizer_gpt35,
@@ -757,7 +600,6 @@ if "llama2" in AVAIL_LLM_MODELS:   # llama2
         })
     except:
         print(trimmed_format_exc())
-# -=-=-=-=-=-=- 智谱 -=-=-=-=-=-=-
 if "zhipuai" in AVAIL_LLM_MODELS:   # zhipuai 是glm-4的别名，向后兼容配置
     try:
         model_info.update({
@@ -772,7 +614,6 @@ if "zhipuai" in AVAIL_LLM_MODELS:   # zhipuai 是glm-4的别名，向后兼容
         })
     except:
         print(trimmed_format_exc())
-# -=-=-=-=-=-=- 幻方-深度求索大模型 -=-=-=-=-=-=-
 if "deepseekcoder" in AVAIL_LLM_MODELS:   # deepseekcoder
     try:
         from .bridge_deepseekcoder import predict_no_ui_long_connection as deepseekcoder_noui
@@ -789,83 +630,26 @@ if "deepseekcoder" in AVAIL_LLM_MODELS:   # deepseekcoder
         })
     except:
         print(trimmed_format_exc())
+# if "skylark" in AVAIL_LLM_MODELS:
+#     try:
+#         from .bridge_skylark2 import predict_no_ui_long_connection as skylark_noui
+#         from .bridge_skylark2 import predict as skylark_ui
+#         model_info.update({
+#             "skylark": {
+#                 "fn_with_ui": skylark_ui,
+#                 "fn_without_ui": skylark_noui,
+#                 "endpoint": None,
+#                 "max_token": 4096,
+#                 "tokenizer": tokenizer_gpt35,
+#                 "token_cnt": get_token_num_gpt35,
+#             }
+#         })
+#     except:
+#         print(trimmed_format_exc())
 
 
-# -=-=-=-=-=-=- one-api 对齐支持 -=-=-=-=-=-=-
+# <-- 用于定义和切换多个azure模型 -->
-for model in [m for m in AVAIL_LLM_MODELS if m.startswith("one-api-")]:
+AZURE_CFG_ARRAY = get_conf("AZURE_CFG_ARRAY")
-    # 为了更灵活地接入one-api多模型管理界面，设计了此接口，例子：AVAIL_LLM_MODELS = ["one-api-mixtral-8x7b(max_token=6666)"]
-    # 其中
-    #   "one-api-"          是前缀（必要）
-    #   "mixtral-8x7b"      是模型名（必要）
-    #   "(max_token=6666)"  是配置（非必要）
-    try:
-        _, max_token_tmp = read_one_api_model_name(model)
-    except:
-        print(f"one-api模型 {model} 的 max_token 配置不是整数，请检查配置文件。")
-        continue
-    model_info.update({
-        model: {
-            "fn_with_ui": chatgpt_ui,
-            "fn_without_ui": chatgpt_noui,
-            "can_multi_thread": True,
-            "endpoint": openai_endpoint,
-            "max_token": max_token_tmp,
-            "tokenizer": tokenizer_gpt35,
-            "token_cnt": get_token_num_gpt35,
-        },
-    })
-# -=-=-=-=-=-=- vllm 对齐支持 -=-=-=-=-=-=-
-for model in [m for m in AVAIL_LLM_MODELS if m.startswith("vllm-")]:
-    # 为了更灵活地接入vllm多模型管理界面，设计了此接口，例子：AVAIL_LLM_MODELS = ["vllm-/home/hmp/llm/cache/Qwen1___5-32B-Chat(max_token=6666)"]
-    # 其中
-    #   "vllm-"             是前缀（必要）
-    #   "mixtral-8x7b"      是模型名（必要）
-    #   "(max_token=6666)"  是配置（非必要）
-    try:
-        _, max_token_tmp = read_one_api_model_name(model)
-    except:
-        print(f"vllm模型 {model} 的 max_token 配置不是整数，请检查配置文件。")
-        continue
-    model_info.update({
-        model: {
-            "fn_with_ui": chatgpt_ui,
-            "fn_without_ui": chatgpt_noui,
-            "can_multi_thread": True,
-            "endpoint": openai_endpoint,
-            "max_token": max_token_tmp,
-            "tokenizer": tokenizer_gpt35,
-            "token_cnt": get_token_num_gpt35,
-        },
-    })
-# -=-=-=-=-=-=- ollama 对齐支持 -=-=-=-=-=-=-
-for model in [m for m in AVAIL_LLM_MODELS if m.startswith("ollama-")]:
-    from .bridge_ollama import predict_no_ui_long_connection as ollama_noui
-    from .bridge_ollama import predict as ollama_ui
-    break
-for model in [m for m in AVAIL_LLM_MODELS if m.startswith("ollama-")]:
-    # 为了更灵活地接入ollama多模型管理界面，设计了此接口，例子：AVAIL_LLM_MODELS = ["ollama-phi3(max_token=6666)"]
-    # 其中
-    #   "ollama-"           是前缀（必要）
-    #   "phi3"            是模型名（必要）
-    #   "(max_token=6666)"  是配置（非必要）
-    try:
-        _, max_token_tmp = read_one_api_model_name(model)
-    except:
-        print(f"ollama模型 {model} 的 max_token 配置不是整数，请检查配置文件。")
-        continue
-    model_info.update({
-        model: {
-            "fn_with_ui": ollama_ui,
-            "fn_without_ui": ollama_noui,
-            "endpoint": ollama_endpoint,
-            "max_token": max_token_tmp,
-            "tokenizer": tokenizer_gpt35,
-            "token_cnt": get_token_num_gpt35,
-        },
-    })
-
-# -=-=-=-=-=-=- azure模型对齐支持 -=-=-=-=-=-=-
-AZURE_CFG_ARRAY = get_conf("AZURE_CFG_ARRAY") # <-- 用于定义和切换多个azure模型 -->
 if len(AZURE_CFG_ARRAY) > 0:
     for azure_model_name, azure_cfg_dict in AZURE_CFG_ARRAY.items():
         # 可能会覆盖之前的配置，但这是意料之中的
@@ -894,7 +678,7 @@ def LLM_CATCH_EXCEPTION(f):
     """
     装饰器函数，将错误显示出来
     """
-    def decorated(inputs:str, llm_kwargs:dict, history:list, sys_prompt:str, observe_window:list, console_slience:bool):
+    def decorated(inputs, llm_kwargs, history, sys_prompt, observe_window, console_slience):
         try:
             return f(inputs, llm_kwargs, history, sys_prompt, observe_window, console_slience)
         except Exception as e:
@@ -904,9 +688,9 @@ def LLM_CATCH_EXCEPTION(f):
     return decorated
 
 
-def predict_no_ui_long_connection(inputs:str, llm_kwargs:dict, history:list, sys_prompt:str, observe_window:list=[], console_slience:bool=False):
+def predict_no_ui_long_connection(inputs, llm_kwargs, history, sys_prompt, observe_window=[], console_slience=False):
     """
-    发送至LLM，等待回复，一次性完成，不显示中间过程。但内部（尽可能地）用stream的方法避免中途网线被掐。
+    发送至LLM，等待回复，一次性完成，不显示中间过程。但内部用stream的方法避免中途网线被掐。
     inputs：
         是本次问询的输入
     sys_prompt:
@@ -924,6 +708,7 @@ def predict_no_ui_long_connection(inputs:str, llm_kwargs:dict, history:list, sys
     model = llm_kwargs['llm_model']
     n_model = 1
     if '&' not in model:
+        assert not model.startswith("tgui"), "TGUI不支持函数插件的实现"
 
         # 如果只询问1个大语言模型：
         method = model_info[model]["fn_without_ui"]
@@ -958,8 +743,7 @@ def predict_no_ui_long_connection(inputs:str, llm_kwargs:dict, history:list, sys
                 # 观察窗（window）
                 chat_string = []
                 for i in range(n_model):
-                    color = colors[i%len(colors)]
+                    chat_string.append( f"【{str(models[i])} 说】: <font color=\"{colors[i]}\"> {window_mutex[i][0]} </font>" )
-                    chat_string.append( f"【{str(models[i])} 说】: <font color=\"{color}\"> {window_mutex[i][0]} </font>" )
                 res = '<br/><br/>\n\n---\n\n'.join(chat_string)
                 # # # # # # # # # # #
                 observe_window[0] = res
@@ -976,30 +760,22 @@ def predict_no_ui_long_connection(inputs:str, llm_kwargs:dict, history:list, sys
             time.sleep(1)
 
         for i, future in enumerate(futures):  # wait and get
-            color = colors[i%len(colors)]
+            return_string_collect.append( f"【{str(models[i])} 说】: <font color=\"{colors[i]}\"> {future.result()} </font>" )
-            return_string_collect.append( f"【{str(models[i])} 说】: <font color=\"{color}\"> {future.result()} </font>" )
 
         window_mutex[-1] = False # stop mutex thread
         res = '<br/><br/>\n\n---\n\n'.join(return_string_collect)
         return res
 
 
-def predict(inputs:str, llm_kwargs:dict, *args, **kwargs):
+def predict(inputs, llm_kwargs, *args, **kwargs):
     """
     发送至LLM，流式获取输出。
     用于基础的对话功能。
-
+    inputs 是本次问询的输入
-    完整参数列表：
+    top_p, temperature是LLM的内部调优参数
-        predict(
+    history 是之前的对话列表（注意无论是inputs还是history，内容太长了都会触发token数量溢出的错误）
-            inputs:str,                     # 是本次问询的输入
+    chatbot 为WebUI中显示的对话列表，修改它，然后yeild出去，可以直接修改对话界面内容
-            llm_kwargs:dict,                # 是LLM的内部调优参数
+    additional_fn代表点击的哪个按钮，按钮见functional.py
-            plugin_kwargs:dict,             # 是插件的内部参数
-            chatbot:ChatBotWithCookies,     # 原样传递，负责向用户前端展示对话，兼顾前端状态的功能
-            history:list=[],                # 是之前的对话列表
-            system_prompt:str='',           # 系统静默prompt
-            stream:bool=True,               # 是否流式输出（已弃用）
-            additional_fn:str=None          # 基础功能区按钮的附加功能
-        ):
     """
 
     inputs = apply_gpt_academic_string_mask(inputs, mode="show_llm")

request_llms/bridge_chatglm3.py

@@ -6,6 +6,7 @@ from toolbox import get_conf, ProxyNetworkActivate
 from .local_llm_class import LocalLLMHandle, get_local_llm_predict_fns
 
 
+
 # ------------------------------------------------------------------------------------------------------------------------
 # 🔌💻 Local Model
 # ------------------------------------------------------------------------------------------------------------------------
@@ -22,45 +23,20 @@ class GetGLM3Handle(LocalLLMHandle):
         import os, glob
         import os
         import platform
+        LOCAL_MODEL_QUANT, device = get_conf('LOCAL_MODEL_QUANT', 'LOCAL_MODEL_DEVICE')
 
-        LOCAL_MODEL_QUANT, device = get_conf("LOCAL_MODEL_QUANT", "LOCAL_MODEL_DEVICE")
+        if LOCAL_MODEL_QUANT == "INT4":         # INT4
-        _model_name_ = "THUDM/chatglm3-6b"
+            _model_name_ = "THUDM/chatglm3-6b-int4"
-        # if LOCAL_MODEL_QUANT == "INT4":  # INT4
+        elif LOCAL_MODEL_QUANT == "INT8":       # INT8
-        #     _model_name_ = "THUDM/chatglm3-6b-int4"
+            _model_name_ = "THUDM/chatglm3-6b-int8"
-        # elif LOCAL_MODEL_QUANT == "INT8":  # INT8
+        else:
-        #     _model_name_ = "THUDM/chatglm3-6b-int8"
+            _model_name_ = "THUDM/chatglm3-6b"  # FP16
-        # else:
+        with ProxyNetworkActivate('Download_LLM'):
-        #     _model_name_ = "THUDM/chatglm3-6b"  # FP16
+            chatglm_tokenizer = AutoTokenizer.from_pretrained(_model_name_, trust_remote_code=True)
-        with ProxyNetworkActivate("Download_LLM"):
+            if device=='cpu':
-            chatglm_tokenizer = AutoTokenizer.from_pretrained(
+                chatglm_model = AutoModel.from_pretrained(_model_name_, trust_remote_code=True, device='cpu').float()
-                _model_name_, trust_remote_code=True
-            )
-            if device == "cpu":
-                chatglm_model = AutoModel.from_pretrained(
-                    _model_name_,
-                    trust_remote_code=True,
-                    device="cpu",
-                ).float()
-            elif LOCAL_MODEL_QUANT == "INT4":  # INT4
-                chatglm_model = AutoModel.from_pretrained(
-                    pretrained_model_name_or_path=_model_name_,
-                    trust_remote_code=True,
-                    device="cuda",
-                    load_in_4bit=True,
-                )
-            elif LOCAL_MODEL_QUANT == "INT8":  # INT8
-                chatglm_model = AutoModel.from_pretrained(
-                    pretrained_model_name_or_path=_model_name_,
-                    trust_remote_code=True,
-                    device="cuda",
-                    load_in_8bit=True,
-                )
             else:
-                chatglm_model = AutoModel.from_pretrained(
+                chatglm_model = AutoModel.from_pretrained(_model_name_, trust_remote_code=True, device='cuda')
-                    pretrained_model_name_or_path=_model_name_,
-                    trust_remote_code=True,
-                    device="cuda",
-                )
             chatglm_model = chatglm_model.eval()
 
         self._model = chatglm_model
@@ -70,36 +46,32 @@ class GetGLM3Handle(LocalLLMHandle):
     def llm_stream_generator(self, **kwargs):
         # 🏃‍♂️🏃‍♂️🏃‍♂️ 子进程执行
         def adaptor(kwargs):
-            query = kwargs["query"]
+            query = kwargs['query']
-            max_length = kwargs["max_length"]
+            max_length = kwargs['max_length']
-            top_p = kwargs["top_p"]
+            top_p = kwargs['top_p']
-            temperature = kwargs["temperature"]
+            temperature = kwargs['temperature']
-            history = kwargs["history"]
+            history = kwargs['history']
             return query, max_length, top_p, temperature, history
 
         query, max_length, top_p, temperature, history = adaptor(kwargs)
 
-        for response, history in self._model.stream_chat(
+        for response, history in self._model.stream_chat(self._tokenizer, 
-            self._tokenizer,
+                                                         query, 
-            query,
+                                                         history, 
-            history,
+                                                         max_length=max_length,
-            max_length=max_length,
+                                                         top_p=top_p,
-            top_p=top_p,
+                                                         temperature=temperature,
-            temperature=temperature,
+                                                         ):
-        ):
             yield response
         
     def try_to_import_special_deps(self, **kwargs):
         # import something that will raise error if the user does not install requirement_*.txt
         # 🏃‍♂️🏃‍♂️🏃‍♂️ 主进程执行
         import importlib
-
         # importlib.import_module('modelscope')
 
 
 # ------------------------------------------------------------------------------------------------------------------------
 # 🔌💻 GPT-Academic Interface
 # ------------------------------------------------------------------------------------------------------------------------
-predict_no_ui_long_connection, predict = get_local_llm_predict_fns(
+predict_no_ui_long_connection, predict = get_local_llm_predict_fns(GetGLM3Handle, model_name, history_format='chatglm3')
-    GetGLM3Handle, model_name, history_format="chatglm3"
-)

request_llms/bridge_chatglmft.py

@@ -137,8 +137,7 @@ class GetGLMFTHandle(Process):
 global glmft_handle
 glmft_handle = None
 #################################################################################
-def predict_no_ui_long_connection(inputs:str, llm_kwargs:dict, history:list=[], sys_prompt:str="",
+def predict_no_ui_long_connection(inputs, llm_kwargs, history=[], sys_prompt="", observe_window=[], console_slience=False):
-                                  observe_window:list=[], console_slience:bool=False):
     """
         多线程方法
         函数的说明请见 request_llms/bridge_all.py

request_llms/bridge_chatgpt.py

@@ -21,9 +21,7 @@ import random
 
 # config_private.py放自己的秘密如API和代理网址
 # 读取时首先看是否存在私密的config_private配置文件（不受git管控），如果有，则覆盖原config文件
-from toolbox import get_conf, update_ui, is_any_api_key, select_api_key, what_keys, clip_history
+from toolbox import get_conf, update_ui, is_any_api_key, select_api_key, what_keys, clip_history, trimmed_format_exc, is_the_upload_folder
-from toolbox import trimmed_format_exc, is_the_upload_folder, read_one_api_model_name, log_chat
-from toolbox import ChatBotWithCookies
 proxies, TIMEOUT_SECONDS, MAX_RETRY, API_ORG, AZURE_CFG_ARRAY = \
     get_conf('proxies', 'TIMEOUT_SECONDS', 'MAX_RETRY', 'API_ORG', 'AZURE_CFG_ARRAY')
 
@@ -70,7 +68,7 @@ def verify_endpoint(endpoint):
         raise ValueError("Endpoint不正确, 请检查AZURE_ENDPOINT的配置! 当前的Endpoint为:" + endpoint)
     return endpoint
 
-def predict_no_ui_long_connection(inputs:str, llm_kwargs:dict, history:list=[], sys_prompt:str="", observe_window:list=None, console_slience:bool=False):
+def predict_no_ui_long_connection(inputs, llm_kwargs, history=[], sys_prompt="", observe_window=None, console_slience=False):
     """
     发送至chatGPT，等待回复，一次性完成，不显示中间过程。但内部用stream的方法避免中途网线被掐。
     inputs：
@@ -127,9 +125,8 @@ def predict_no_ui_long_connection(inputs:str, llm_kwargs:dict, history:list=[],
         json_data = chunkjson['choices'][0]
         delta = json_data["delta"]
         if len(delta) == 0: break
-        if (not has_content) and has_role: continue
+        if "role" in delta: continue
-        if (not has_content) and (not has_role): continue # raise RuntimeError("发现不标准的第三方接口："+delta)
+        if "content" in delta:
-        if has_content: # has_role = True/False
             result += delta["content"]
             if not console_slience: print(delta["content"], end='')
             if observe_window is not None: 
@@ -148,8 +145,7 @@ def predict_no_ui_long_connection(inputs:str, llm_kwargs:dict, history:list=[],
     return result
 
 
-def predict(inputs:str, llm_kwargs:dict, plugin_kwargs:dict, chatbot:ChatBotWithCookies,
+def predict(inputs, llm_kwargs, plugin_kwargs, chatbot, history=[], system_prompt='', stream = True, additional_fn=None):
-            history:list=[], system_prompt:str='', stream:bool=True, additional_fn:str=None):
     """
     发送至chatGPT，流式获取输出。
     用于基础的对话功能。
@@ -175,7 +171,7 @@ def predict(inputs:str, llm_kwargs:dict, plugin_kwargs:dict, chatbot:ChatBotWith
         inputs, history = handle_core_functionality(additional_fn, inputs, history, chatbot)
 
     raw_input = inputs
-    # logging.info(f'[raw_input] {raw_input}')
+    logging.info(f'[raw_input] {raw_input}')
     chatbot.append((inputs, ""))
     yield from update_ui(chatbot=chatbot, history=history, msg="等待响应") # 刷新界面
 
@@ -256,8 +252,7 @@ def predict(inputs:str, llm_kwargs:dict, plugin_kwargs:dict, chatbot:ChatBotWith
                     # 前者是API2D的结束条件，后者是OPENAI的结束条件
                     if ('data: [DONE]' in chunk_decoded) or (len(chunkjson['choices'][0]["delta"]) == 0):
                         # 判定为数据流的结束，gpt_replying_buffer也写完了
-                        # logging.info(f'[response] {gpt_replying_buffer}')
+                        logging.info(f'[response] {gpt_replying_buffer}')
-                        log_chat(llm_model=llm_kwargs["llm_model"], input_str=inputs, output_str=gpt_replying_buffer)
                         break
                     # 处理数据流的主体
                     status_text = f"finish_reason: {chunkjson['choices'][0].get('finish_reason', 'null')}"
@@ -269,8 +264,7 @@ def predict(inputs:str, llm_kwargs:dict, plugin_kwargs:dict, chatbot:ChatBotWith
                         # 一些第三方接口的出现这样的错误，兼容一下吧
                         continue
                     else:
-                        # 至此已经超出了正常接口应该进入的范围，一些垃圾第三方接口会出现这样的错误
+                        # 一些垃圾第三方接口的出现这样的错误
-                        if chunkjson['choices'][0]["delta"]["content"] is None: continue # 一些垃圾第三方接口出现这样的错误，兼容一下吧
                         gpt_replying_buffer = gpt_replying_buffer + chunkjson['choices'][0]["delta"]["content"]
 
                     history[-1] = gpt_replying_buffer
@@ -323,10 +317,7 @@ def generate_payload(inputs, llm_kwargs, history, system_prompt, stream):
     if not is_any_api_key(llm_kwargs['api_key']):
         raise AssertionError("你提供了错误的API_KEY。\n\n1. 临时解决方案：直接在输入区键入api_key，然后回车提交。\n\n2. 长效解决方案：在config.py中配置。")
 
-    if llm_kwargs['llm_model'].startswith('vllm-'):
+    api_key = select_api_key(llm_kwargs['api_key'], llm_kwargs['llm_model'])
-        api_key = 'no-api-key'
-    else:
-        api_key = select_api_key(llm_kwargs['api_key'], llm_kwargs['llm_model'])
 
     headers = {
         "Content-Type": "application/json",
@@ -365,12 +356,7 @@ def generate_payload(inputs, llm_kwargs, history, system_prompt, stream):
     model = llm_kwargs['llm_model']
     if llm_kwargs['llm_model'].startswith('api2d-'):
         model = llm_kwargs['llm_model'][len('api2d-'):]
-    if llm_kwargs['llm_model'].startswith('one-api-'):
+
-        model = llm_kwargs['llm_model'][len('one-api-'):]
-        model, _ = read_one_api_model_name(model)
-    if llm_kwargs['llm_model'].startswith('vllm-'):
-        model = llm_kwargs['llm_model'][len('vllm-'):]
-        model, _ = read_one_api_model_name(model)
     if model == "gpt-3.5-random": # 随机选择, 绕过openai访问频率限制
         model = random.choice([
             "gpt-3.5-turbo", 

request_llms/bridge_claude.py

@@ -9,15 +9,15 @@
     具备多线程调用能力的函数
     2. predict_no_ui_long_connection：支持多线程
 """
-import logging
+
 import os
-import time
-import traceback
 import json
+import time
+import gradio as gr
+import logging
+import traceback
 import requests
-from toolbox import get_conf, update_ui, trimmed_format_exc, encode_image, every_image_file_in_path, log_chat
+import importlib
-picture_system_prompt = "\n当回复图像时,必须说明正在回复哪张图像。所有图像仅在最后一个问题中提供,即使它们在历史记录中被提及。请使用'这是第X张图像:'的格式来指明您正在描述的是哪张图像。"
-Claude_3_Models = ["claude-3-haiku-20240307", "claude-3-sonnet-20240229", "claude-3-opus-20240229"]
 
 # config_private.py放自己的秘密如API和代理网址
 # 读取时首先看是否存在私密的config_private配置文件（不受git管控），如果有，则覆盖原config文件
@@ -39,34 +39,6 @@ def get_full_error(chunk, stream_response):
             break
     return chunk
 
-def decode_chunk(chunk):
-    # 提前读取一些信息（用于判断异常）
-    chunk_decoded = chunk.decode()
-    chunkjson = None
-    is_last_chunk = False
-    need_to_pass = False
-    if chunk_decoded.startswith('data:'):
-        try:
-            chunkjson = json.loads(chunk_decoded[6:])
-        except:
-            need_to_pass = True
-            pass
-    elif chunk_decoded.startswith('event:'):
-        try:
-            event_type = chunk_decoded.split(':')[1].strip()
-            if event_type == 'content_block_stop' or event_type == 'message_stop':
-                is_last_chunk = True
-            elif event_type == 'content_block_start' or event_type == 'message_start':
-                need_to_pass = True
-                pass
-        except:
-            need_to_pass = True
-            pass
-    else:
-        need_to_pass = True
-        pass
-    return need_to_pass, chunkjson, is_last_chunk
-
 
 def predict_no_ui_long_connection(inputs, llm_kwargs, history=[], sys_prompt="", observe_window=None, console_slience=False):
     """
@@ -82,67 +54,50 @@ def predict_no_ui_long_connection(inputs, llm_kwargs, history=[], sys_prompt="",
     observe_window = None：
         用于负责跨越线程传递已经输出的部分，大部分时候仅仅为了fancy的视觉效果，留空即可。observe_window[0]：观测窗。observe_window[1]：看门狗
     """
+    from anthropic import Anthropic
     watch_dog_patience = 5 # 看门狗的耐心, 设置5秒即可
+    prompt = generate_payload(inputs, llm_kwargs, history, system_prompt=sys_prompt, stream=True)
+    retry = 0
     if len(ANTHROPIC_API_KEY) == 0:
         raise RuntimeError("没有设置ANTHROPIC_API_KEY选项")
-    if inputs == "":     inputs = "空空如也的输入栏"
-    headers, message = generate_payload(inputs, llm_kwargs, history, sys_prompt, image_paths=None)
-    retry = 0
-
 
     while True:
         try:
             # make a POST request to the API endpoint, stream=False
             from .bridge_all import model_info
-            endpoint = model_info[llm_kwargs['llm_model']]['endpoint']
+            anthropic = Anthropic(api_key=ANTHROPIC_API_KEY)
-            response = requests.post(endpoint, headers=headers, json=message,
+            # endpoint = model_info[llm_kwargs['llm_model']]['endpoint']
-                                     proxies=proxies, stream=True, timeout=TIMEOUT_SECONDS);break
+            # with ProxyNetworkActivate()
-        except requests.exceptions.ReadTimeout as e:
+            stream = anthropic.completions.create(
+                prompt=prompt,
+                max_tokens_to_sample=4096,       # The maximum number of tokens to generate before stopping.
+                model=llm_kwargs['llm_model'],
+                stream=True,
+                temperature = llm_kwargs['temperature']
+            )
+            break
+        except Exception as e:
             retry += 1
             traceback.print_exc()
             if retry > MAX_RETRY: raise TimeoutError
             if MAX_RETRY!=0: print(f'请求超时，正在重试 ({retry}/{MAX_RETRY}) ……')
-    stream_response = response.iter_lines()
     result = ''
-    while True:
+    try: 
-        try: chunk = next(stream_response)
+        for completion in stream:
-        except StopIteration:
+            result += completion.completion
-            break
+            if not console_slience: print(completion.completion, end='')
-        except requests.exceptions.ConnectionError:
+            if observe_window is not None: 
-            chunk = next(stream_response) # 失败了，重试一次？再失败就没办法了。
+                # 观测窗，把已经获取的数据显示出去
-        need_to_pass, chunkjson, is_last_chunk = decode_chunk(chunk)
+                if len(observe_window) >= 1: observe_window[0] += completion.completion
-        if chunk:
+                # 看门狗，如果超过期限没有喂狗，则终止
-            try:
+                if len(observe_window) >= 2:  
-                if need_to_pass:
+                    if (time.time()-observe_window[1]) > watch_dog_patience:
-                    pass
+                        raise RuntimeError("用户取消了程序。")
-                elif is_last_chunk:
+    except Exception as e:
-                    # logging.info(f'[response] {result}')
+        traceback.print_exc()
-                    break
-                else:
-                    if chunkjson and chunkjson['type'] == 'content_block_delta':
-                        result += chunkjson['delta']['text']
-                        print(chunkjson['delta']['text'], end='')
-                        if observe_window is not None:
-                            # 观测窗，把已经获取的数据显示出去
-                            if len(observe_window) >= 1:
-                                observe_window[0] += chunkjson['delta']['text']
-                            # 看门狗，如果超过期限没有喂狗，则终止
-                            if len(observe_window) >= 2:
-                                if (time.time()-observe_window[1]) > watch_dog_patience:
-                                    raise RuntimeError("用户取消了程序。")
-            except Exception as e:
-                chunk = get_full_error(chunk, stream_response)
-                chunk_decoded = chunk.decode()
-                error_msg = chunk_decoded
-                print(error_msg)
-                raise RuntimeError("Json解析不合常规")
 
     return result
 
-def make_media_input(history,inputs,image_paths):
-    for image_path in image_paths:
-        inputs = inputs + f'<br/><br/><div align="center"><img src="file={os.path.abspath(image_path)}"></div>'
-    return inputs
 
 def predict(inputs, llm_kwargs, plugin_kwargs, chatbot, history=[], system_prompt='', stream = True, additional_fn=None):
     """
@@ -154,7 +109,7 @@ def predict(inputs, llm_kwargs, plugin_kwargs, chatbot, history=[], system_promp
     chatbot 为WebUI中显示的对话列表，修改它，然后yeild出去，可以直接修改对话界面内容
     additional_fn代表点击的哪个按钮，按钮见functional.py
     """
-    if inputs == "":     inputs = "空空如也的输入栏"
+    from anthropic import Anthropic
     if len(ANTHROPIC_API_KEY) == 0:
         chatbot.append((inputs, "没有设置ANTHROPIC_API_KEY"))
         yield from update_ui(chatbot=chatbot, history=history, msg="等待响应") # 刷新界面
@@ -164,23 +119,13 @@ def predict(inputs, llm_kwargs, plugin_kwargs, chatbot, history=[], system_promp
         from core_functional import handle_core_functionality
         inputs, history = handle_core_functionality(additional_fn, inputs, history, chatbot)
 
-    have_recent_file, image_paths = every_image_file_in_path(chatbot)
+    raw_input = inputs
-    if len(image_paths) > 20:
+    logging.info(f'[raw_input] {raw_input}')
-        chatbot.append((inputs, "图片数量超过api上限(20张)"))
+    chatbot.append((inputs, ""))
-        yield from update_ui(chatbot=chatbot, history=history, msg="等待响应")
+    yield from update_ui(chatbot=chatbot, history=history, msg="等待响应") # 刷新界面
-        return
-
-    if any([llm_kwargs['llm_model'] == model for model in Claude_3_Models]) and have_recent_file:
-        if inputs == "" or inputs == "空空如也的输入栏":     inputs = "请描述给出的图片"
-        system_prompt += picture_system_prompt  # 由于没有单独的参数保存包含图片的历史，所以只能通过提示词对第几张图片进行定位
-        chatbot.append((make_media_input(history,inputs, image_paths), ""))
-        yield from update_ui(chatbot=chatbot, history=history, msg="等待响应") # 刷新界面
-    else:
-        chatbot.append((inputs, ""))
-        yield from update_ui(chatbot=chatbot, history=history, msg="等待响应") # 刷新界面
 
     try:
-        headers, message = generate_payload(inputs, llm_kwargs, history, system_prompt, image_paths)
+        prompt = generate_payload(inputs, llm_kwargs, history, system_prompt, stream)
     except RuntimeError as e:
         chatbot[-1] = (inputs, f"您提供的api-key不满足要求，不包含任何可用于{llm_kwargs['llm_model']}的api-key。您可能选择了错误的模型或请求源。")
         yield from update_ui(chatbot=chatbot, history=history, msg="api-key不满足要求") # 刷新界面
@@ -193,117 +138,91 @@ def predict(inputs, llm_kwargs, plugin_kwargs, chatbot, history=[], system_promp
         try:
             # make a POST request to the API endpoint, stream=True
             from .bridge_all import model_info
-            endpoint = model_info[llm_kwargs['llm_model']]['endpoint']
+            anthropic = Anthropic(api_key=ANTHROPIC_API_KEY)
-            response = requests.post(endpoint, headers=headers, json=message,
+            # endpoint = model_info[llm_kwargs['llm_model']]['endpoint']
-                                     proxies=proxies, stream=True, timeout=TIMEOUT_SECONDS);break
+            # with ProxyNetworkActivate()
-        except requests.exceptions.ReadTimeout as e:
+            stream = anthropic.completions.create(
+                prompt=prompt,
+                max_tokens_to_sample=4096,       # The maximum number of tokens to generate before stopping.
+                model=llm_kwargs['llm_model'],
+                stream=True,
+                temperature = llm_kwargs['temperature']
+            )
+            
+            break
+        except:
             retry += 1
-            traceback.print_exc()
+            chatbot[-1] = ((chatbot[-1][0], timeout_bot_msg))
+            retry_msg = f"，正在重试 ({retry}/{MAX_RETRY}) ……" if MAX_RETRY > 0 else ""
+            yield from update_ui(chatbot=chatbot, history=history, msg="请求超时"+retry_msg) # 刷新界面
             if retry > MAX_RETRY: raise TimeoutError
-            if MAX_RETRY!=0: print(f'请求超时，正在重试 ({retry}/{MAX_RETRY}) ……')
+
-    stream_response = response.iter_lines()
     gpt_replying_buffer = ""
     
-    while True:
+    for completion in stream:
-        try: chunk = next(stream_response)
+        try:
-        except StopIteration:
+            gpt_replying_buffer = gpt_replying_buffer + completion.completion
-            break
+            history[-1] = gpt_replying_buffer
-        except requests.exceptions.ConnectionError:
+            chatbot[-1] = (history[-2], history[-1])
-            chunk = next(stream_response) # 失败了，重试一次？再失败就没办法了。
+            yield from update_ui(chatbot=chatbot, history=history, msg='正常') # 刷新界面
-        need_to_pass, chunkjson, is_last_chunk = decode_chunk(chunk)
-        if chunk:
-            try:
-                if need_to_pass:
-                    pass
-                elif is_last_chunk:
-                    log_chat(llm_model=llm_kwargs["llm_model"], input_str=inputs, output_str=gpt_replying_buffer)
-                    # logging.info(f'[response] {gpt_replying_buffer}')
-                    break
-                else:
-                    if chunkjson and chunkjson['type'] == 'content_block_delta':
-                        gpt_replying_buffer += chunkjson['delta']['text']
-                        history[-1] = gpt_replying_buffer
-                        chatbot[-1] = (history[-2], history[-1])
-                        yield from update_ui(chatbot=chatbot, history=history, msg='正常') # 刷新界面
 
-            except Exception as e:
+        except Exception as e:
-                chunk = get_full_error(chunk, stream_response)
+            from toolbox import regular_txt_to_markdown
-                chunk_decoded = chunk.decode()
+            tb_str = '```\n' + trimmed_format_exc() + '```'
-                error_msg = chunk_decoded
+            chatbot[-1] = (chatbot[-1][0], f"[Local Message] 异常 \n\n{tb_str}")
-                print(error_msg)
+            yield from update_ui(chatbot=chatbot, history=history, msg="Json异常" + tb_str) # 刷新界面
-                raise RuntimeError("Json解析不合常规")
+            return
         
-def multiple_picture_types(image_paths):
-    """
-    根据图片类型返回image/jpeg, image/png, image/gif, image/webp，无法判断则返回image/jpeg
-    """
-    for image_path in image_paths:
-        if image_path.endswith('.jpeg') or image_path.endswith('.jpg'):
-            return 'image/jpeg'
-        elif image_path.endswith('.png'):
-            return 'image/png'
-        elif image_path.endswith('.gif'):
-            return 'image/gif'
-        elif image_path.endswith('.webp'):
-            return 'image/webp'
-    return 'image/jpeg'
 
-def generate_payload(inputs, llm_kwargs, history, system_prompt, image_paths):
+
+
+# https://github.com/jtsang4/claude-to-chatgpt/blob/main/claude_to_chatgpt/adapter.py
+def convert_messages_to_prompt(messages):
+    prompt = ""
+    role_map = {
+        "system": "Human",
+        "user": "Human",
+        "assistant": "Assistant",
+    }
+    for message in messages:
+        role = message["role"]
+        content = message["content"]
+        transformed_role = role_map[role]
+        prompt += f"\n\n{transformed_role.capitalize()}: {content}"
+    prompt += "\n\nAssistant: "
+    return prompt
+
+def generate_payload(inputs, llm_kwargs, history, system_prompt, stream):
     """
     整合所有信息，选择LLM模型，生成http请求，为发送请求做准备
     """
+    from anthropic import Anthropic, HUMAN_PROMPT, AI_PROMPT
 
     conversation_cnt = len(history) // 2
 
-    messages = []
+    messages = [{"role": "system", "content": system_prompt}]
-
     if conversation_cnt:
         for index in range(0, 2*conversation_cnt, 2):
             what_i_have_asked = {}
             what_i_have_asked["role"] = "user"
-            what_i_have_asked["content"] = [{"type": "text", "text": history[index]}]
+            what_i_have_asked["content"] = history[index]
             what_gpt_answer = {}
             what_gpt_answer["role"] = "assistant"
-            what_gpt_answer["content"] = [{"type": "text", "text": history[index+1]}]
+            what_gpt_answer["content"] = history[index+1]
-            if what_i_have_asked["content"][0]["text"] != "":
+            if what_i_have_asked["content"] != "":
-                if what_i_have_asked["content"][0]["text"] == "": continue
+                if what_gpt_answer["content"] == "": continue
-                if what_i_have_asked["content"][0]["text"] == timeout_bot_msg: continue
+                if what_gpt_answer["content"] == timeout_bot_msg: continue
                 messages.append(what_i_have_asked)
                 messages.append(what_gpt_answer)
             else:
-                messages[-1]['content'][0]['text'] = what_gpt_answer['content'][0]['text']
+                messages[-1]['content'] = what_gpt_answer['content']
 
-    if any([llm_kwargs['llm_model'] == model for model in Claude_3_Models]) and image_paths:
+    what_i_ask_now = {}
-        what_i_ask_now = {}
+    what_i_ask_now["role"] = "user"
-        what_i_ask_now["role"] = "user"
+    what_i_ask_now["content"] = inputs
-        what_i_ask_now["content"] = []
-        for image_path in image_paths:
-            what_i_ask_now["content"].append({
-                "type": "image",
-                "source": {
-                    "type": "base64",
-                    "media_type": multiple_picture_types(image_paths),
-                    "data": encode_image(image_path),
-                }
-            })
-        what_i_ask_now["content"].append({"type": "text", "text": inputs})
-    else:
-        what_i_ask_now = {}
-        what_i_ask_now["role"] = "user"
-        what_i_ask_now["content"] = [{"type": "text", "text": inputs}]
     messages.append(what_i_ask_now)
-    # 开始整理headers与message
+    prompt = convert_messages_to_prompt(messages)
-    headers = {
+
-        'x-api-key': ANTHROPIC_API_KEY,
+    return prompt
-        'anthropic-version': '2023-06-01',
+
-        'content-type': 'application/json'
+
-    }
-    payload = {
-        'model': llm_kwargs['llm_model'],
-        'max_tokens': 4096,
-        'messages': messages,
-        'temperature': llm_kwargs['temperature'],
-        'stream': True,
-        'system': system_prompt
-    }
-    return headers, payload

request_llms/bridge_cohere.py

@@ -1,328 +0,0 @@
-# 借鉴了 https://github.com/GaiZhenbiao/ChuanhuChatGPT 项目
-
-"""
-    该文件中主要包含三个函数
-
-    不具备多线程能力的函数：
-    1. predict: 正常对话时使用，具备完备的交互功能，不可多线程
-
-    具备多线程调用能力的函数
-    2. predict_no_ui_long_connection：支持多线程
-"""
-
-import json
-import time
-import gradio as gr
-import logging
-import traceback
-import requests
-import importlib
-import random
-
-# config_private.py放自己的秘密如API和代理网址
-# 读取时首先看是否存在私密的config_private配置文件（不受git管控），如果有，则覆盖原config文件
-from toolbox import get_conf, update_ui, is_any_api_key, select_api_key, what_keys, clip_history
-from toolbox import trimmed_format_exc, is_the_upload_folder, read_one_api_model_name, log_chat
-from toolbox import ChatBotWithCookies
-proxies, TIMEOUT_SECONDS, MAX_RETRY, API_ORG, AZURE_CFG_ARRAY = \
-    get_conf('proxies', 'TIMEOUT_SECONDS', 'MAX_RETRY', 'API_ORG', 'AZURE_CFG_ARRAY')
-
-timeout_bot_msg = '[Local Message] Request timeout. Network error. Please check proxy settings in config.py.' + \
-                  '网络错误，检查代理服务器是否可用，以及代理设置的格式是否正确，格式须是[协议]://[地址]:[端口]，缺一不可。'
-
-def get_full_error(chunk, stream_response):
-    """
-        获取完整的从Cohere返回的报错
-    """
-    while True:
-        try:
-            chunk += next(stream_response)
-        except:
-            break
-    return chunk
-
-def decode_chunk(chunk):
-    # 提前读取一些信息 （用于判断异常）
-    chunk_decoded = chunk.decode()
-    chunkjson = None
-    has_choices = False
-    choice_valid = False
-    has_content = False
-    has_role = False
-    try:
-        chunkjson = json.loads(chunk_decoded)
-        has_choices = 'choices' in chunkjson
-        if has_choices: choice_valid = (len(chunkjson['choices']) > 0)
-        if has_choices and choice_valid: has_content = ("content" in chunkjson['choices'][0]["delta"])
-        if has_content: has_content = (chunkjson['choices'][0]["delta"]["content"] is not None)
-        if has_choices and choice_valid: has_role = "role" in chunkjson['choices'][0]["delta"]
-    except:
-        pass
-    return chunk_decoded, chunkjson, has_choices, choice_valid, has_content, has_role
-
-from functools import lru_cache
-@lru_cache(maxsize=32)
-def verify_endpoint(endpoint):
-    """
-        检查endpoint是否可用
-    """
-    if "你亲手写的api名称" in endpoint:
-        raise ValueError("Endpoint不正确, 请检查AZURE_ENDPOINT的配置! 当前的Endpoint为:" + endpoint)
-    return endpoint
-
-def predict_no_ui_long_connection(inputs:str, llm_kwargs:dict, history:list=[], sys_prompt:str="", observe_window:list=None, console_slience:bool=False):
-    """
-    发送，等待回复，一次性完成，不显示中间过程。但内部用stream的方法避免中途网线被掐。
-    inputs：
-        是本次问询的输入
-    sys_prompt:
-        系统静默prompt
-    llm_kwargs：
-        内部调优参数
-    history：
-        是之前的对话列表
-    observe_window = None：
-        用于负责跨越线程传递已经输出的部分，大部分时候仅仅为了fancy的视觉效果，留空即可。observe_window[0]：观测窗。observe_window[1]：看门狗
-    """
-    watch_dog_patience = 5 # 看门狗的耐心, 设置5秒即可
-    headers, payload = generate_payload(inputs, llm_kwargs, history, system_prompt=sys_prompt, stream=True)
-    retry = 0
-    while True:
-        try:
-            # make a POST request to the API endpoint, stream=False
-            from .bridge_all import model_info
-            endpoint = verify_endpoint(model_info[llm_kwargs['llm_model']]['endpoint'])
-            response = requests.post(endpoint, headers=headers, proxies=proxies,
-                                    json=payload, stream=True, timeout=TIMEOUT_SECONDS); break
-        except requests.exceptions.ReadTimeout as e:
-            retry += 1
-            traceback.print_exc()
-            if retry > MAX_RETRY: raise TimeoutError
-            if MAX_RETRY!=0: print(f'请求超时，正在重试 ({retry}/{MAX_RETRY}) ……')
-
-    stream_response = response.iter_lines()
-    result = ''
-    json_data = None
-    while True:
-        try: chunk = next(stream_response)
-        except StopIteration:
-            break
-        except requests.exceptions.ConnectionError:
-            chunk = next(stream_response) # 失败了，重试一次？再失败就没办法了。
-        chunk_decoded, chunkjson, has_choices, choice_valid, has_content, has_role = decode_chunk(chunk)
-        if chunkjson['event_type'] == 'stream-start': continue
-        if chunkjson['event_type'] == 'text-generation':
-            result += chunkjson["text"]
-            if not console_slience: print(chunkjson["text"], end='')
-            if observe_window is not None:
-                # 观测窗，把已经获取的数据显示出去
-                if len(observe_window) >= 1:
-                    observe_window[0] += chunkjson["text"]
-                # 看门狗，如果超过期限没有喂狗，则终止
-                if len(observe_window) >= 2:
-                    if (time.time()-observe_window[1]) > watch_dog_patience:
-                        raise RuntimeError("用户取消了程序。")
-        if chunkjson['event_type'] == 'stream-end': break
-    return result
-
-
-def predict(inputs:str, llm_kwargs:dict, plugin_kwargs:dict, chatbot:ChatBotWithCookies,
-            history:list=[], system_prompt:str='', stream:bool=True, additional_fn:str=None):
-    """
-    发送至chatGPT，流式获取输出。
-    用于基础的对话功能。
-    inputs 是本次问询的输入
-    top_p, temperature是chatGPT的内部调优参数
-    history 是之前的对话列表（注意无论是inputs还是history，内容太长了都会触发token数量溢出的错误）
-    chatbot 为WebUI中显示的对话列表，修改它，然后yeild出去，可以直接修改对话界面内容
-    additional_fn代表点击的哪个按钮，按钮见functional.py
-    """
-    # if is_any_api_key(inputs):
-    #     chatbot._cookies['api_key'] = inputs
-    #     chatbot.append(("输入已识别为Cohere的api_key", what_keys(inputs)))
-    #     yield from update_ui(chatbot=chatbot, history=history, msg="api_key已导入") # 刷新界面
-    #     return
-    # elif not is_any_api_key(chatbot._cookies['api_key']):
-    #     chatbot.append((inputs, "缺少api_key。\n\n1. 临时解决方案：直接在输入区键入api_key，然后回车提交。\n\n2. 长效解决方案：在config.py中配置。"))
-    #     yield from update_ui(chatbot=chatbot, history=history, msg="缺少api_key") # 刷新界面
-    #     return
-
-    user_input = inputs
-    if additional_fn is not None:
-        from core_functional import handle_core_functionality
-        inputs, history = handle_core_functionality(additional_fn, inputs, history, chatbot)
-
-    raw_input = inputs
-    # logging.info(f'[raw_input] {raw_input}')
-    chatbot.append((inputs, ""))
-    yield from update_ui(chatbot=chatbot, history=history, msg="等待响应") # 刷新界面
-
-    # check mis-behavior
-    if is_the_upload_folder(user_input):
-        chatbot[-1] = (inputs, f"[Local Message] 检测到操作错误！当您上传文档之后，需点击“**函数插件区**”按钮进行处理，请勿点击“提交”按钮或者“基础功能区”按钮。")
-        yield from update_ui(chatbot=chatbot, history=history, msg="正常") # 刷新界面
-        time.sleep(2)
-
-    try:
-        headers, payload = generate_payload(inputs, llm_kwargs, history, system_prompt, stream)
-    except RuntimeError as e:
-        chatbot[-1] = (inputs, f"您提供的api-key不满足要求，不包含任何可用于{llm_kwargs['llm_model']}的api-key。您可能选择了错误的模型或请求源。")
-        yield from update_ui(chatbot=chatbot, history=history, msg="api-key不满足要求") # 刷新界面
-        return
-
-    # 检查endpoint是否合法
-    try:
-        from .bridge_all import model_info
-        endpoint = verify_endpoint(model_info[llm_kwargs['llm_model']]['endpoint'])
-    except:
-        tb_str = '```\n' + trimmed_format_exc() + '```'
-        chatbot[-1] = (inputs, tb_str)
-        yield from update_ui(chatbot=chatbot, history=history, msg="Endpoint不满足要求") # 刷新界面
-        return
-
-    history.append(inputs); history.append("")
-
-    retry = 0
-    while True:
-        try:
-            # make a POST request to the API endpoint, stream=True
-            response = requests.post(endpoint, headers=headers, proxies=proxies,
-                                    json=payload, stream=True, timeout=TIMEOUT_SECONDS);break
-        except:
-            retry += 1
-            chatbot[-1] = ((chatbot[-1][0], timeout_bot_msg))
-            retry_msg = f"，正在重试 ({retry}/{MAX_RETRY}) ……" if MAX_RETRY > 0 else ""
-            yield from update_ui(chatbot=chatbot, history=history, msg="请求超时"+retry_msg) # 刷新界面
-            if retry > MAX_RETRY: raise TimeoutError
-
-    gpt_replying_buffer = ""
-
-    is_head_of_the_stream = True
-    if stream:
-        stream_response =  response.iter_lines()
-        while True:
-            try:
-                chunk = next(stream_response)
-            except StopIteration:
-                # 非Cohere官方接口的出现这样的报错，Cohere和API2D不会走这里
-                chunk_decoded = chunk.decode()
-                error_msg = chunk_decoded
-                # 其他情况，直接返回报错
-                chatbot, history = handle_error(inputs, llm_kwargs, chatbot, history, chunk_decoded, error_msg)
-                yield from update_ui(chatbot=chatbot, history=history, msg="非Cohere官方接口返回了错误:" + chunk.decode()) # 刷新界面
-                return
-
-            # 提前读取一些信息 （用于判断异常）
-            chunk_decoded, chunkjson, has_choices, choice_valid, has_content, has_role = decode_chunk(chunk)
-
-            if chunkjson:
-                try:
-                    if chunkjson['event_type'] == 'stream-start':
-                        continue
-                    if chunkjson['event_type'] == 'text-generation':
-                        gpt_replying_buffer = gpt_replying_buffer + chunkjson["text"]
-                        history[-1] = gpt_replying_buffer
-                        chatbot[-1] = (history[-2], history[-1])
-                        yield from update_ui(chatbot=chatbot, history=history, msg="正常") # 刷新界面
-                    if chunkjson['event_type'] == 'stream-end':
-                        log_chat(llm_model=llm_kwargs["llm_model"], input_str=inputs, output_str=gpt_replying_buffer)
-                        history[-1] = gpt_replying_buffer
-                        chatbot[-1] = (history[-2], history[-1])
-                        yield from update_ui(chatbot=chatbot, history=history, msg="正常") # 刷新界面
-                        break
-                except Exception as e:
-                    yield from update_ui(chatbot=chatbot, history=history, msg="Json解析不合常规") # 刷新界面
-                    chunk = get_full_error(chunk, stream_response)
-                    chunk_decoded = chunk.decode()
-                    error_msg = chunk_decoded
-                    chatbot, history = handle_error(inputs, llm_kwargs, chatbot, history, chunk_decoded, error_msg)
-                    yield from update_ui(chatbot=chatbot, history=history, msg="Json异常" + error_msg) # 刷新界面
-                    print(error_msg)
-                    return
-
-def handle_error(inputs, llm_kwargs, chatbot, history, chunk_decoded, error_msg):
-    from .bridge_all import model_info
-    Cohere_website = ' 请登录Cohere查看详情 https://platform.Cohere.com/signup'
-    if "reduce the length" in error_msg:
-        if len(history) >= 2: history[-1] = ""; history[-2] = "" # 清除当前溢出的输入：history[-2] 是本次输入, history[-1] 是本次输出
-        history = clip_history(inputs=inputs, history=history, tokenizer=model_info[llm_kwargs['llm_model']]['tokenizer'],
-                                               max_token_limit=(model_info[llm_kwargs['llm_model']]['max_token'])) # history至少释放二分之一
-        chatbot[-1] = (chatbot[-1][0], "[Local Message] Reduce the length. 本次输入过长, 或历史数据过长. 历史缓存数据已部分释放, 您可以请再次尝试. (若再次失败则更可能是因为输入过长.)")
-    elif "does not exist" in error_msg:
-        chatbot[-1] = (chatbot[-1][0], f"[Local Message] Model {llm_kwargs['llm_model']} does not exist. 模型不存在, 或者您没有获得体验资格.")
-    elif "Incorrect API key" in error_msg:
-        chatbot[-1] = (chatbot[-1][0], "[Local Message] Incorrect API key. Cohere以提供了不正确的API_KEY为由, 拒绝服务. " + Cohere_website)
-    elif "exceeded your current quota" in error_msg:
-        chatbot[-1] = (chatbot[-1][0], "[Local Message] You exceeded your current quota. Cohere以账户额度不足为由, 拒绝服务." + Cohere_website)
-    elif "account is not active" in error_msg:
-        chatbot[-1] = (chatbot[-1][0], "[Local Message] Your account is not active. Cohere以账户失效为由, 拒绝服务." + Cohere_website)
-    elif "associated with a deactivated account" in error_msg:
-        chatbot[-1] = (chatbot[-1][0], "[Local Message] You are associated with a deactivated account. Cohere以账户失效为由, 拒绝服务." + Cohere_website)
-    elif "API key has been deactivated" in error_msg:
-        chatbot[-1] = (chatbot[-1][0], "[Local Message] API key has been deactivated. Cohere以账户失效为由, 拒绝服务." + Cohere_website)
-    elif "bad forward key" in error_msg:
-        chatbot[-1] = (chatbot[-1][0], "[Local Message] Bad forward key. API2D账户额度不足.")
-    elif "Not enough point" in error_msg:
-        chatbot[-1] = (chatbot[-1][0], "[Local Message] Not enough point. API2D账户点数不足.")
-    else:
-        from toolbox import regular_txt_to_markdown
-        tb_str = '```\n' + trimmed_format_exc() + '```'
-        chatbot[-1] = (chatbot[-1][0], f"[Local Message] 异常 \n\n{tb_str} \n\n{regular_txt_to_markdown(chunk_decoded)}")
-    return chatbot, history
-
-def generate_payload(inputs, llm_kwargs, history, system_prompt, stream):
-    """
-    整合所有信息，选择LLM模型，生成http请求，为发送请求做准备
-    """
-    # if not is_any_api_key(llm_kwargs['api_key']):
-    #     raise AssertionError("你提供了错误的API_KEY。\n\n1. 临时解决方案：直接在输入区键入api_key，然后回车提交。\n\n2. 长效解决方案：在config.py中配置。")
-
-    api_key = select_api_key(llm_kwargs['api_key'], llm_kwargs['llm_model'])
-
-    headers = {
-        "Content-Type": "application/json",
-        "Authorization": f"Bearer {api_key}"
-    }
-    if API_ORG.startswith('org-'): headers.update({"Cohere-Organization": API_ORG})
-    if llm_kwargs['llm_model'].startswith('azure-'):
-        headers.update({"api-key": api_key})
-        if llm_kwargs['llm_model'] in AZURE_CFG_ARRAY.keys():
-            azure_api_key_unshared = AZURE_CFG_ARRAY[llm_kwargs['llm_model']]["AZURE_API_KEY"]
-            headers.update({"api-key": azure_api_key_unshared})
-
-    conversation_cnt = len(history) // 2
-
-    messages = [{"role": "SYSTEM", "message": system_prompt}]
-    if conversation_cnt:
-        for index in range(0, 2*conversation_cnt, 2):
-            what_i_have_asked = {}
-            what_i_have_asked["role"] = "USER"
-            what_i_have_asked["message"] = history[index]
-            what_gpt_answer = {}
-            what_gpt_answer["role"] = "CHATBOT"
-            what_gpt_answer["message"] = history[index+1]
-            if what_i_have_asked["message"] != "":
-                if what_gpt_answer["message"] == "": continue
-                if what_gpt_answer["message"] == timeout_bot_msg: continue
-                messages.append(what_i_have_asked)
-                messages.append(what_gpt_answer)
-            else:
-                messages[-1]['message'] = what_gpt_answer['message']
-
-    model = llm_kwargs['llm_model']
-    if model.startswith('cohere-'): model = model[len('cohere-'):]
-    payload = {
-        "model": model,
-        "message": inputs,
-        "chat_history": messages,
-        "temperature": llm_kwargs['temperature'],  # 1.0,
-        "top_p": llm_kwargs['top_p'],  # 1.0,
-        "n": 1,
-        "stream": stream,
-        "presence_penalty": 0,
-        "frequency_penalty": 0,
-    }
-
-    return headers,payload
-
-

request_llms/bridge_google_gemini.py

@@ -7,8 +7,7 @@ import re
 import os
 import time
 from request_llms.com_google import GoogleChatInit
-from toolbox import ChatBotWithCookies
+from toolbox import get_conf, update_ui, update_ui_lastest_msg, have_any_recent_upload_image_files, trimmed_format_exc
-from toolbox import get_conf, update_ui, update_ui_lastest_msg, have_any_recent_upload_image_files, trimmed_format_exc, log_chat
 
 proxies, TIMEOUT_SECONDS, MAX_RETRY = get_conf('proxies', 'TIMEOUT_SECONDS', 'MAX_RETRY')
 timeout_bot_msg = '[Local Message] Request timeout. Network error. Please check proxy settings in config.py.' + \
@@ -21,7 +20,7 @@ def predict_no_ui_long_connection(inputs, llm_kwargs, history=[], sys_prompt="",
     if get_conf("GEMINI_API_KEY") == "":
         raise ValueError(f"请配置 GEMINI_API_KEY。")
 
-    genai = GoogleChatInit(llm_kwargs)
+    genai = GoogleChatInit()
     watch_dog_patience = 5  # 看门狗的耐心, 设置5秒即可
     gpt_replying_buffer = ''
     stream_response = genai.generate_chat(inputs, llm_kwargs, history, sys_prompt)
@@ -45,8 +44,7 @@ def predict_no_ui_long_connection(inputs, llm_kwargs, history=[], sys_prompt="",
     return gpt_replying_buffer
 
 
-def predict(inputs:str, llm_kwargs:dict, plugin_kwargs:dict, chatbot:ChatBotWithCookies,
+def predict(inputs, llm_kwargs, plugin_kwargs, chatbot, history=[], system_prompt='', stream=True, additional_fn=None):
-            history:list=[], system_prompt:str='', stream:bool=True, additional_fn:str=None):
     # 检查API_KEY
     if get_conf("GEMINI_API_KEY") == "":
         yield from update_ui_lastest_msg(f"请配置 GEMINI_API_KEY。", chatbot=chatbot, history=history, delay=0)
@@ -72,7 +70,7 @@ def predict(inputs:str, llm_kwargs:dict, plugin_kwargs:dict, chatbot:ChatBotWith
 
     chatbot.append((inputs, ""))
     yield from update_ui(chatbot=chatbot, history=history)
-    genai = GoogleChatInit(llm_kwargs)
+    genai = GoogleChatInit()
     retry = 0
     while True:
         try:
@@ -99,7 +97,6 @@ def predict(inputs:str, llm_kwargs:dict, plugin_kwargs:dict, chatbot:ChatBotWith
             gpt_replying_buffer += paraphrase['text']    # 使用 json 解析库进行处理
             chatbot[-1] = (inputs, gpt_replying_buffer)
             history[-1] = gpt_replying_buffer
-            log_chat(llm_model=llm_kwargs["llm_model"], input_str=inputs, output_str=gpt_replying_buffer)
             yield from update_ui(chatbot=chatbot, history=history)
         if error_match:
             history = history[-2]  # 错误的不纳入对话

request_llms/bridge_jittorllms_llama.py

@@ -1,10 +1,10 @@
 
+from transformers import AutoModel, AutoTokenizer
 import time
 import threading
 import importlib
 from toolbox import update_ui, get_conf
 from multiprocessing import Process, Pipe
-from transformers import AutoModel, AutoTokenizer
 
 load_message = "jittorllms尚未加载，加载需要一段时间。注意，请避免混用多种jittor模型，否则可能导致显存溢出而造成卡顿，取决于`config.py`的配置，jittorllms消耗大量的内存（CPU）或显存（GPU），也许会导致低配计算机卡死 ……"
 
@@ -106,8 +106,7 @@ class GetGLMHandle(Process):
 global llama_glm_handle
 llama_glm_handle = None
 #################################################################################
-def predict_no_ui_long_connection(inputs:str, llm_kwargs:dict, history:list=[], sys_prompt:str="",
+def predict_no_ui_long_connection(inputs, llm_kwargs, history=[], sys_prompt="", observe_window=[], console_slience=False):
-                                  observe_window:list=[], console_slience:bool=False):
     """
         多线程方法
         函数的说明请见 request_llms/bridge_all.py

request_llms/bridge_jittorllms_pangualpha.py

@@ -1,10 +1,10 @@
 
+from transformers import AutoModel, AutoTokenizer
 import time
 import threading
 import importlib
 from toolbox import update_ui, get_conf
 from multiprocessing import Process, Pipe
-from transformers import AutoModel, AutoTokenizer
 
 load_message = "jittorllms尚未加载，加载需要一段时间。注意，请避免混用多种jittor模型，否则可能导致显存溢出而造成卡顿，取决于`config.py`的配置，jittorllms消耗大量的内存（CPU）或显存（GPU），也许会导致低配计算机卡死 ……"
 
@@ -106,8 +106,7 @@ class GetGLMHandle(Process):
 global pangu_glm_handle
 pangu_glm_handle = None
 #################################################################################
-def predict_no_ui_long_connection(inputs:str, llm_kwargs:dict, history:list=[], sys_prompt:str="",
+def predict_no_ui_long_connection(inputs, llm_kwargs, history=[], sys_prompt="", observe_window=[], console_slience=False):
-                                  observe_window:list=[], console_slience:bool=False):
     """
         多线程方法
         函数的说明请见 request_llms/bridge_all.py

request_llms/bridge_jittorllms_rwkv.py

@@ -106,8 +106,7 @@ class GetGLMHandle(Process):
 global rwkv_glm_handle
 rwkv_glm_handle = None
 #################################################################################
-def predict_no_ui_long_connection(inputs:str, llm_kwargs:dict, history:list=[], sys_prompt:str="",
+def predict_no_ui_long_connection(inputs, llm_kwargs, history=[], sys_prompt="", observe_window=[], console_slience=False):
-                                  observe_window:list=[], console_slience:bool=False):
     """
         多线程方法
         函数的说明请见 request_llms/bridge_all.py

request_llms/bridge_moonshot.py

@@ -1,197 +0,0 @@
-# encoding: utf-8
-# @Time   : 2024/3/3
-# @Author : Spike
-# @Descr   :
-import json
-import os
-import time
-import logging
-
-from toolbox import get_conf, update_ui, log_chat
-from toolbox import ChatBotWithCookies
-
-import requests
-
-
-class MoonShotInit:
-
-    def __init__(self):
-        self.llm_model = None
-        self.url = 'https://api.moonshot.cn/v1/chat/completions'
-        self.api_key = get_conf('MOONSHOT_API_KEY')
-
-    def __converter_file(self, user_input: str):
-        what_ask = []
-        for f in user_input.splitlines():
-            if os.path.exists(f):
-                files = []
-                if os.path.isdir(f):
-                    file_list = os.listdir(f)
-                    files.extend([os.path.join(f, file) for file in file_list])
-                else:
-                    files.append(f)
-                for file in files:
-                    if file.split('.')[-1] in ['pdf']:
-                        with open(file, 'r') as fp:
-                            from crazy_functions.crazy_utils import read_and_clean_pdf_text
-                            file_content, _ = read_and_clean_pdf_text(fp)
-                        what_ask.append({"role": "system", "content": file_content})
-        return what_ask
-
-    def __converter_user(self, user_input: str):
-        what_i_ask_now = {"role": "user", "content": user_input}
-        return what_i_ask_now
-
-    def __conversation_history(self, history):
-        conversation_cnt = len(history) // 2
-        messages = []
-        if conversation_cnt:
-            for index in range(0, 2 * conversation_cnt, 2):
-                what_i_have_asked = {
-                    "role": "user",
-                    "content": str(history[index])
-                }
-                what_gpt_answer = {
-                    "role": "assistant",
-                    "content": str(history[index + 1])
-                }
-                if what_i_have_asked["content"] != "":
-                    if what_gpt_answer["content"] == "": continue
-                    messages.append(what_i_have_asked)
-                    messages.append(what_gpt_answer)
-                else:
-                    messages[-1]['content'] = what_gpt_answer['content']
-        return messages
-
-    def _analysis_content(self, chuck):
-        chunk_decoded = chuck.decode("utf-8")
-        chunk_json = {}
-        content = ""
-        try:
-            chunk_json = json.loads(chunk_decoded[6:])
-            content = chunk_json['choices'][0]["delta"].get("content", "")
-        except:
-            pass
-        return chunk_decoded, chunk_json, content
-
-    def generate_payload(self, inputs, llm_kwargs, history, system_prompt, stream):
-        self.llm_model = llm_kwargs['llm_model']
-        llm_kwargs.update({'use-key': self.api_key})
-        messages = []
-        if system_prompt:
-            messages.append({"role": "system", "content": system_prompt})
-        messages.extend(self.__converter_file(inputs))
-        for i in history[0::2]:    # 历史文件继续上传
-            messages.extend(self.__converter_file(i))
-        messages.extend(self.__conversation_history(history))
-        messages.append(self.__converter_user(inputs))
-        header = {
-            "Content-Type": "application/json",
-            "Authorization": f"Bearer {self.api_key}",
-        }
-        payload = {
-            "model": self.llm_model,
-            "messages": messages,
-            "temperature": llm_kwargs.get('temperature', 0.3),  # 1.0,
-            "top_p": llm_kwargs.get('top_p', 1.0),  # 1.0,
-            "n": llm_kwargs.get('n_choices', 1),
-            "stream": stream
-        }
-        return payload, header
-
-    def generate_messages(self, inputs, llm_kwargs, history, system_prompt, stream):
-        payload, headers = self.generate_payload(inputs, llm_kwargs, history, system_prompt, stream)
-        response = requests.post(self.url, headers=headers, json=payload, stream=stream)
-
-        chunk_content = ""
-        gpt_bro_result = ""
-        for chuck in response.iter_lines():
-            chunk_decoded, check_json, content = self._analysis_content(chuck)
-            chunk_content += chunk_decoded
-            if content:
-                gpt_bro_result += content
-                yield content, gpt_bro_result, ''
-            else:
-                error_msg = msg_handle_error(llm_kwargs, chunk_decoded)
-                if error_msg:
-                    yield error_msg, gpt_bro_result, error_msg
-                    break
-
-
-def msg_handle_error(llm_kwargs, chunk_decoded):
-    use_ket = llm_kwargs.get('use-key', '')
-    api_key_encryption = use_ket[:8] + '****' + use_ket[-5:]
-    openai_website = f' 请登录OpenAI查看详情 https://platform.openai.com/signup  api-key: `{api_key_encryption}`'
-    error_msg = ''
-    if "does not exist" in chunk_decoded:
-        error_msg = f"[Local Message] Model {llm_kwargs['llm_model']} does not exist. 模型不存在, 或者您没有获得体验资格."
-    elif "Incorrect API key" in chunk_decoded:
-        error_msg = f"[Local Message] Incorrect API key. OpenAI以提供了不正确的API_KEY为由, 拒绝服务." + openai_website
-    elif "exceeded your current quota" in chunk_decoded:
-        error_msg = "[Local Message] You exceeded your current quota. OpenAI以账户额度不足为由, 拒绝服务." + openai_website
-    elif "account is not active" in chunk_decoded:
-        error_msg = "[Local Message] Your account is not active. OpenAI以账户失效为由, 拒绝服务." + openai_website
-    elif "associated with a deactivated account" in chunk_decoded:
-        error_msg = "[Local Message] You are associated with a deactivated account. OpenAI以账户失效为由, 拒绝服务." + openai_website
-    elif "API key has been deactivated" in chunk_decoded:
-        error_msg = "[Local Message] API key has been deactivated. OpenAI以账户失效为由, 拒绝服务." + openai_website
-    elif "bad forward key" in chunk_decoded:
-        error_msg = "[Local Message] Bad forward key. API2D账户额度不足."
-    elif "Not enough point" in chunk_decoded:
-        error_msg = "[Local Message] Not enough point. API2D账户点数不足."
-    elif 'error' in str(chunk_decoded).lower():
-        try:
-            error_msg = json.dumps(json.loads(chunk_decoded[:6]), indent=4, ensure_ascii=False)
-        except:
-            error_msg = chunk_decoded
-    return error_msg
-
-
-def predict(inputs:str, llm_kwargs:dict, plugin_kwargs:dict, chatbot:ChatBotWithCookies,
-            history:list=[], system_prompt:str='', stream:bool=True, additional_fn:str=None):
-    chatbot.append([inputs, ""])
-
-    if additional_fn is not None:
-        from core_functional import handle_core_functionality
-        inputs, history = handle_core_functionality(additional_fn, inputs, history, chatbot)
-    yield from update_ui(chatbot=chatbot, history=history, msg="等待响应")  # 刷新界面
-    gpt_bro_init = MoonShotInit()
-    history.extend([inputs, ''])
-    stream_response = gpt_bro_init.generate_messages(inputs, llm_kwargs, history, system_prompt, stream)
-    for content, gpt_bro_result, error_bro_meg in stream_response:
-        chatbot[-1] = [inputs, gpt_bro_result]
-        history[-1] = gpt_bro_result
-        yield from update_ui(chatbot=chatbot, history=history)  # 刷新界面
-        if error_bro_meg:
-            chatbot[-1] = [inputs, error_bro_meg]
-            history = history[:-2]
-            yield from update_ui(chatbot=chatbot, history=history)  # 刷新界面
-            break
-    log_chat(llm_model=llm_kwargs["llm_model"], input_str=inputs, output_str=gpt_bro_result)
-
-def predict_no_ui_long_connection(inputs, llm_kwargs, history=[], sys_prompt="", observe_window=None,
-                                  console_slience=False):
-    gpt_bro_init = MoonShotInit()
-    watch_dog_patience = 60  # 看门狗的耐心, 设置10秒即可
-    stream_response = gpt_bro_init.generate_messages(inputs, llm_kwargs, history, sys_prompt, True)
-    moonshot_bro_result = ''
-    for content, moonshot_bro_result, error_bro_meg in stream_response:
-        moonshot_bro_result = moonshot_bro_result
-        if error_bro_meg:
-            if len(observe_window) >= 3:
-                observe_window[2] = error_bro_meg
-            return f'{moonshot_bro_result} 对话错误'
-            # 观测窗
-        if len(observe_window) >= 1:
-            observe_window[0] = moonshot_bro_result
-        if len(observe_window) >= 2:
-            if (time.time() - observe_window[1]) > watch_dog_patience:
-                observe_window[2] = "请求超时，程序终止。"
-                raise RuntimeError(f"{moonshot_bro_result} 程序终止。")
-    return moonshot_bro_result
-
-if __name__ == '__main__':
-    moon_ai = MoonShotInit()
-    for g in moon_ai.generate_messages('hello', {'llm_model': 'moonshot-v1-8k'},
-                                       [], '', True):
-        print(g)

request_llms/bridge_moss.py

@@ -171,8 +171,7 @@ class GetGLMHandle(Process):
 global moss_handle
 moss_handle = None
 #################################################################################
-def predict_no_ui_long_connection(inputs:str, llm_kwargs:dict, history:list=[], sys_prompt:str="",
+def predict_no_ui_long_connection(inputs, llm_kwargs, history=[], sys_prompt="", observe_window=[], console_slience=False):
-                                  observe_window:list=[], console_slience:bool=False):
     """
         多线程方法
         函数的说明请见 request_llms/bridge_all.py

request_llms/bridge_ollama.py

@@ -1,272 +0,0 @@
-# 借鉴自同目录下的bridge_chatgpt.py
-
-"""
-    该文件中主要包含三个函数
-
-    不具备多线程能力的函数：
-    1. predict: 正常对话时使用，具备完备的交互功能，不可多线程
-
-    具备多线程调用能力的函数
-    2. predict_no_ui_long_connection：支持多线程
-"""
-
-import json
-import time
-import gradio as gr
-import logging
-import traceback
-import requests
-import importlib
-import random
-
-# config_private.py放自己的秘密如API和代理网址
-# 读取时首先看是否存在私密的config_private配置文件（不受git管控），如果有，则覆盖原config文件
-from toolbox import get_conf, update_ui, trimmed_format_exc, is_the_upload_folder, read_one_api_model_name
-proxies, TIMEOUT_SECONDS, MAX_RETRY = get_conf(
-    "proxies", "TIMEOUT_SECONDS", "MAX_RETRY"
-)
-
-timeout_bot_msg = '[Local Message] Request timeout. Network error. Please check proxy settings in config.py.' + \
-                  '网络错误，检查代理服务器是否可用，以及代理设置的格式是否正确，格式须是[协议]://[地址]:[端口]，缺一不可。'
-
-def get_full_error(chunk, stream_response):
-    """
-        获取完整的从Openai返回的报错
-    """
-    while True:
-        try:
-            chunk += next(stream_response)
-        except:
-            break
-    return chunk
-
-def decode_chunk(chunk):
-    # 提前读取一些信息（用于判断异常）
-    chunk_decoded = chunk.decode()
-    chunkjson = None
-    is_last_chunk = False
-    try:
-        chunkjson = json.loads(chunk_decoded)
-        is_last_chunk = chunkjson.get("done", False)
-    except:
-        pass
-    return chunk_decoded, chunkjson, is_last_chunk
-
-def predict_no_ui_long_connection(inputs, llm_kwargs, history=[], sys_prompt="", observe_window=None, console_slience=False):
-    """
-    发送至chatGPT，等待回复，一次性完成，不显示中间过程。但内部用stream的方法避免中途网线被掐。
-    inputs：
-        是本次问询的输入
-    sys_prompt:
-        系统静默prompt
-    llm_kwargs：
-        chatGPT的内部调优参数
-    history：
-        是之前的对话列表
-    observe_window = None：
-        用于负责跨越线程传递已经输出的部分，大部分时候仅仅为了fancy的视觉效果，留空即可。observe_window[0]：观测窗。observe_window[1]：看门狗
-    """
-    watch_dog_patience = 5 # 看门狗的耐心, 设置5秒即可
-    if inputs == "":     inputs = "空空如也的输入栏"
-    headers, payload = generate_payload(inputs, llm_kwargs, history, system_prompt=sys_prompt, stream=True)
-    retry = 0
-    while True:
-        try:
-            # make a POST request to the API endpoint, stream=False
-            from .bridge_all import model_info
-            endpoint = model_info[llm_kwargs['llm_model']]['endpoint']
-            response = requests.post(endpoint, headers=headers, proxies=proxies,
-                                    json=payload, stream=True, timeout=TIMEOUT_SECONDS); break
-        except requests.exceptions.ReadTimeout as e:
-            retry += 1
-            traceback.print_exc()
-            if retry > MAX_RETRY: raise TimeoutError
-            if MAX_RETRY!=0: print(f'请求超时，正在重试 ({retry}/{MAX_RETRY}) ……')
-
-    stream_response = response.iter_lines()
-    result = ''
-    while True:
-        try: chunk = next(stream_response)
-        except StopIteration:
-            break
-        except requests.exceptions.ConnectionError:
-            chunk = next(stream_response) # 失败了，重试一次？再失败就没办法了。
-        chunk_decoded, chunkjson, is_last_chunk = decode_chunk(chunk)
-        if chunk:
-            try:
-                if is_last_chunk:
-                    # 判定为数据流的结束，gpt_replying_buffer也写完了
-                    logging.info(f'[response] {result}')
-                    break
-                result += chunkjson['message']["content"]
-                if not console_slience: print(chunkjson['message']["content"], end='')
-                if observe_window is not None:
-                    # 观测窗，把已经获取的数据显示出去
-                    if len(observe_window) >= 1:
-                        observe_window[0] += chunkjson['message']["content"]
-                    # 看门狗，如果超过期限没有喂狗，则终止
-                    if len(observe_window) >= 2:
-                        if (time.time()-observe_window[1]) > watch_dog_patience:
-                            raise RuntimeError("用户取消了程序。")
-            except Exception as e:
-                chunk = get_full_error(chunk, stream_response)
-                chunk_decoded = chunk.decode()
-                error_msg = chunk_decoded
-                print(error_msg)
-                raise RuntimeError("Json解析不合常规")
-    return result
-
-
-def predict(inputs, llm_kwargs, plugin_kwargs, chatbot, history=[], system_prompt='', stream = True, additional_fn=None):
-    """
-    发送至chatGPT，流式获取输出。
-    用于基础的对话功能。
-    inputs 是本次问询的输入
-    top_p, temperature是chatGPT的内部调优参数
-    history 是之前的对话列表（注意无论是inputs还是history，内容太长了都会触发token数量溢出的错误）
-    chatbot 为WebUI中显示的对话列表，修改它，然后yeild出去，可以直接修改对话界面内容
-    additional_fn代表点击的哪个按钮，按钮见functional.py
-    """
-    if inputs == "":     inputs = "空空如也的输入栏"
-    user_input = inputs
-    if additional_fn is not None:
-        from core_functional import handle_core_functionality
-        inputs, history = handle_core_functionality(additional_fn, inputs, history, chatbot)
-
-    raw_input = inputs
-    logging.info(f'[raw_input] {raw_input}')
-    chatbot.append((inputs, ""))
-    yield from update_ui(chatbot=chatbot, history=history, msg="等待响应") # 刷新界面
-
-    # check mis-behavior
-    if is_the_upload_folder(user_input):
-        chatbot[-1] = (inputs, f"[Local Message] 检测到操作错误！当您上传文档之后，需点击“**函数插件区**”按钮进行处理，请勿点击“提交”按钮或者“基础功能区”按钮。")
-        yield from update_ui(chatbot=chatbot, history=history, msg="正常") # 刷新界面
-        time.sleep(2)
-
-    headers, payload = generate_payload(inputs, llm_kwargs, history, system_prompt, stream)
-
-    from .bridge_all import model_info
-    endpoint = model_info[llm_kwargs['llm_model']]['endpoint']
-
-    history.append(inputs); history.append("")
-
-    retry = 0
-    while True:
-        try:
-            # make a POST request to the API endpoint, stream=True
-            response = requests.post(endpoint, headers=headers, proxies=proxies,
-                                    json=payload, stream=True, timeout=TIMEOUT_SECONDS);break
-        except:
-            retry += 1
-            chatbot[-1] = ((chatbot[-1][0], timeout_bot_msg))
-            retry_msg = f"，正在重试 ({retry}/{MAX_RETRY}) ……" if MAX_RETRY > 0 else ""
-            yield from update_ui(chatbot=chatbot, history=history, msg="请求超时"+retry_msg) # 刷新界面
-            if retry > MAX_RETRY: raise TimeoutError
-
-    gpt_replying_buffer = ""
-
-    if stream:
-        stream_response =  response.iter_lines()
-        while True:
-            try:
-                chunk = next(stream_response)
-            except StopIteration:
-                break
-            except requests.exceptions.ConnectionError:
-                chunk = next(stream_response) # 失败了，重试一次？再失败就没办法了。
-
-            # 提前读取一些信息 （用于判断异常）
-            chunk_decoded, chunkjson, is_last_chunk = decode_chunk(chunk)
-
-            if chunk:
-                try:
-                    if is_last_chunk:
-                        # 判定为数据流的结束，gpt_replying_buffer也写完了
-                        logging.info(f'[response] {gpt_replying_buffer}')
-                        break
-                    # 处理数据流的主体
-                    try:
-                        status_text = f"finish_reason: {chunkjson['error'].get('message', 'null')}"
-                    except:
-                        status_text = "finish_reason: null"
-                    gpt_replying_buffer = gpt_replying_buffer + chunkjson['message']["content"]
-                    # 如果这里抛出异常，一般是文本过长，详情见get_full_error的输出
-                    history[-1] = gpt_replying_buffer
-                    chatbot[-1] = (history[-2], history[-1])
-                    yield from update_ui(chatbot=chatbot, history=history, msg=status_text) # 刷新界面
-                except Exception as e:
-                    yield from update_ui(chatbot=chatbot, history=history, msg="Json解析不合常规") # 刷新界面
-                    chunk = get_full_error(chunk, stream_response)
-                    chunk_decoded = chunk.decode()
-                    error_msg = chunk_decoded
-                    chatbot, history = handle_error(inputs, llm_kwargs, chatbot, history, chunk_decoded, error_msg)
-                    yield from update_ui(chatbot=chatbot, history=history, msg="Json异常" + error_msg) # 刷新界面
-                    print(error_msg)
-                    return
-
-def handle_error(inputs, llm_kwargs, chatbot, history, chunk_decoded, error_msg):
-    from .bridge_all import model_info
-    if "bad_request" in error_msg:
-        chatbot[-1] = (chatbot[-1][0], "[Local Message] 已经超过了模型的最大上下文或是模型格式错误,请尝试削减单次输入的文本量。")
-    elif "authentication_error" in error_msg:
-        chatbot[-1] = (chatbot[-1][0], "[Local Message] Incorrect API key. 请确保API key有效。")
-    elif "not_found" in error_msg:
-        chatbot[-1] = (chatbot[-1][0], f"[Local Message] {llm_kwargs['llm_model']} 无效，请确保使用小写的模型名称。")
-    elif "rate_limit" in error_msg:
-        chatbot[-1] = (chatbot[-1][0], "[Local Message] 遇到了控制请求速率限制，请一分钟后重试。")
-    elif "system_busy" in error_msg:
-        chatbot[-1] = (chatbot[-1][0], "[Local Message] 系统繁忙，请一分钟后重试。")
-    else:
-        from toolbox import regular_txt_to_markdown
-        tb_str = '```\n' + trimmed_format_exc() + '```'
-        chatbot[-1] = (chatbot[-1][0], f"[Local Message] 异常 \n\n{tb_str} \n\n{regular_txt_to_markdown(chunk_decoded)}")
-    return chatbot, history
-
-def generate_payload(inputs, llm_kwargs, history, system_prompt, stream):
-    """
-    整合所有信息，选择LLM模型，生成http请求，为发送请求做准备
-    """
-
-    headers = {
-        "Content-Type": "application/json",
-    }
-
-    conversation_cnt = len(history) // 2
-
-    messages = [{"role": "system", "content": system_prompt}]
-    if conversation_cnt:
-        for index in range(0, 2*conversation_cnt, 2):
-            what_i_have_asked = {}
-            what_i_have_asked["role"] = "user"
-            what_i_have_asked["content"] = history[index]
-            what_gpt_answer = {}
-            what_gpt_answer["role"] = "assistant"
-            what_gpt_answer["content"] = history[index+1]
-            if what_i_have_asked["content"] != "":
-                if what_gpt_answer["content"] == "": continue
-                if what_gpt_answer["content"] == timeout_bot_msg: continue
-                messages.append(what_i_have_asked)
-                messages.append(what_gpt_answer)
-            else:
-                messages[-1]['content'] = what_gpt_answer['content']
-
-    what_i_ask_now = {}
-    what_i_ask_now["role"] = "user"
-    what_i_ask_now["content"] = inputs
-    messages.append(what_i_ask_now)
-    model = llm_kwargs['llm_model']
-    if llm_kwargs['llm_model'].startswith('ollama-'):
-        model = llm_kwargs['llm_model'][len('ollama-'):]
-        model, _ = read_one_api_model_name(model)
-    options = {"temperature": llm_kwargs['temperature']}
-    payload = {
-        "model": model,
-        "messages": messages,
-        "options": options,
-    }
-    try:
-        print(f" {llm_kwargs['llm_model']} : {conversation_cnt} : {inputs[:100]} ..........")
-    except:
-        print('输入中可能存在乱码。')
-    return headers,payload

request_llms/bridge_qianfan.py

@@ -117,8 +117,7 @@ def generate_from_baidu_qianfan(inputs, llm_kwargs, history, system_prompt):
                 raise RuntimeError(dec['error_msg'])
 
 
-def predict_no_ui_long_connection(inputs:str, llm_kwargs:dict, history:list=[], sys_prompt:str="",
+def predict_no_ui_long_connection(inputs, llm_kwargs, history=[], sys_prompt="", observe_window=[], console_slience=False):
-                                  observe_window:list=[], console_slience:bool=False):
     """
         ⭐多线程方法
         函数的说明请见 request_llms/bridge_all.py
@@ -161,8 +160,3 @@ def predict(inputs, llm_kwargs, plugin_kwargs, chatbot, history=[], system_promp
         chatbot[-1] = (chatbot[-1][0], "[Local Message] Reduce the length. 本次输入过长, 或历史数据过长. 历史缓存数据已部分释放, 您可以请再次尝试. (若再次失败则更可能是因为输入过长.)")
         yield from update_ui(chatbot=chatbot, history=history, msg="异常") # 刷新界面
         return
-    except RuntimeError as e:
-        tb_str = '```\n' + trimmed_format_exc() + '```'
-        chatbot[-1] = (chatbot[-1][0], tb_str)
-        yield from update_ui(chatbot=chatbot, history=history, msg="异常") # 刷新界面
-        return

request_llms/bridge_qwen.py

@@ -5,8 +5,7 @@ from toolbox import check_packages, report_exception
 
 model_name = 'Qwen'
 
-def predict_no_ui_long_connection(inputs:str, llm_kwargs:dict, history:list=[], sys_prompt:str="",
+def predict_no_ui_long_connection(inputs, llm_kwargs, history=[], sys_prompt="", observe_window=[], console_slience=False):
-                                  observe_window:list=[], console_slience:bool=False):
     """
         ⭐多线程方法
         函数的说明请见 request_llms/bridge_all.py
@@ -48,8 +47,6 @@ def predict(inputs, llm_kwargs, plugin_kwargs, chatbot, history=[], system_promp
     if additional_fn is not None:
         from core_functional import handle_core_functionality
         inputs, history = handle_core_functionality(additional_fn, inputs, history, chatbot)
-        chatbot[-1] = (inputs, "")
-        yield from update_ui(chatbot=chatbot, history=history)
 
     # 开始接收回复
     from .com_qwenapi import QwenRequestInstance

request_llms/bridge_skylark2.py

@@ -9,8 +9,7 @@ def validate_key():
     if YUNQUE_SECRET_KEY == '': return False
     return True
 
-def predict_no_ui_long_connection(inputs:str, llm_kwargs:dict, history:list=[], sys_prompt:str="",
+def predict_no_ui_long_connection(inputs, llm_kwargs, history=[], sys_prompt="", observe_window=[], console_slience=False):
-                                  observe_window:list=[], console_slience:bool=False):
     """
         ⭐ 多线程方法
         函数的说明请见 request_llms/bridge_all.py

request_llms/bridge_spark.py

@@ -13,8 +13,7 @@ def validate_key():
         return False
     return True
 
-def predict_no_ui_long_connection(inputs:str, llm_kwargs:dict, history:list=[], sys_prompt:str="",
+def predict_no_ui_long_connection(inputs, llm_kwargs, history=[], sys_prompt="", observe_window=[], console_slience=False):
-                                  observe_window:list=[], console_slience:bool=False):
     """
         ⭐多线程方法
         函数的说明请见 request_llms/bridge_all.py

request_llms/bridge_yimodel.py

@@ -1,283 +0,0 @@
-# 借鉴自同目录下的bridge_chatgpt.py
-
-"""
-    该文件中主要包含三个函数
-
-    不具备多线程能力的函数：
-    1. predict: 正常对话时使用，具备完备的交互功能，不可多线程
-
-    具备多线程调用能力的函数
-    2. predict_no_ui_long_connection：支持多线程
-"""
-
-import json
-import time
-import gradio as gr
-import logging
-import traceback
-import requests
-import importlib
-import random
-
-# config_private.py放自己的秘密如API和代理网址
-# 读取时首先看是否存在私密的config_private配置文件（不受git管控），如果有，则覆盖原config文件
-from toolbox import get_conf, update_ui, trimmed_format_exc, is_the_upload_folder, read_one_api_model_name
-proxies, TIMEOUT_SECONDS, MAX_RETRY, YIMODEL_API_KEY = \
-    get_conf('proxies', 'TIMEOUT_SECONDS', 'MAX_RETRY', 'YIMODEL_API_KEY')
-
-timeout_bot_msg = '[Local Message] Request timeout. Network error. Please check proxy settings in config.py.' + \
-                  '网络错误，检查代理服务器是否可用，以及代理设置的格式是否正确，格式须是[协议]://[地址]:[端口]，缺一不可。'
-
-def get_full_error(chunk, stream_response):
-    """
-        获取完整的从Openai返回的报错
-    """
-    while True:
-        try:
-            chunk += next(stream_response)
-        except:
-            break
-    return chunk
-
-def decode_chunk(chunk):
-    # 提前读取一些信息（用于判断异常）
-    chunk_decoded = chunk.decode()
-    chunkjson = None
-    is_last_chunk = False
-    try:
-        chunkjson = json.loads(chunk_decoded[6:])
-        is_last_chunk = chunkjson.get("lastOne", False)
-    except:
-        pass
-    return chunk_decoded, chunkjson, is_last_chunk
-
-def predict_no_ui_long_connection(inputs, llm_kwargs, history=[], sys_prompt="", observe_window=None, console_slience=False):
-    """
-    发送至chatGPT，等待回复，一次性完成，不显示中间过程。但内部用stream的方法避免中途网线被掐。
-    inputs：
-        是本次问询的输入
-    sys_prompt:
-        系统静默prompt
-    llm_kwargs：
-        chatGPT的内部调优参数
-    history：
-        是之前的对话列表
-    observe_window = None：
-        用于负责跨越线程传递已经输出的部分，大部分时候仅仅为了fancy的视觉效果，留空即可。observe_window[0]：观测窗。observe_window[1]：看门狗
-    """
-    watch_dog_patience = 5 # 看门狗的耐心, 设置5秒即可
-    if inputs == "":     inputs = "空空如也的输入栏"
-    headers, payload = generate_payload(inputs, llm_kwargs, history, system_prompt=sys_prompt, stream=True)
-    retry = 0
-    while True:
-        try:
-            # make a POST request to the API endpoint, stream=False
-            from .bridge_all import model_info
-            endpoint = model_info[llm_kwargs['llm_model']]['endpoint']
-            response = requests.post(endpoint, headers=headers, proxies=proxies,
-                                    json=payload, stream=True, timeout=TIMEOUT_SECONDS); break
-        except requests.exceptions.ReadTimeout as e:
-            retry += 1
-            traceback.print_exc()
-            if retry > MAX_RETRY: raise TimeoutError
-            if MAX_RETRY!=0: print(f'请求超时，正在重试 ({retry}/{MAX_RETRY}) ……')
-
-    stream_response = response.iter_lines()
-    result = ''
-    is_head_of_the_stream = True
-    while True:
-        try: chunk = next(stream_response)
-        except StopIteration:
-            break
-        except requests.exceptions.ConnectionError:
-            chunk = next(stream_response) # 失败了，重试一次？再失败就没办法了。
-        chunk_decoded, chunkjson, is_last_chunk = decode_chunk(chunk)
-        if is_head_of_the_stream and (r'"object":"error"' not in chunk_decoded) and (r'"role":"assistant"' in chunk_decoded):
-            # 数据流的第一帧不携带content
-            is_head_of_the_stream = False; continue
-        if chunk:
-            try:
-                if is_last_chunk:
-                    # 判定为数据流的结束，gpt_replying_buffer也写完了
-                    logging.info(f'[response] {result}')
-                    break
-                result += chunkjson['choices'][0]["delta"]["content"]
-                if not console_slience: print(chunkjson['choices'][0]["delta"]["content"], end='')
-                if observe_window is not None:
-                    # 观测窗，把已经获取的数据显示出去
-                    if len(observe_window) >= 1:
-                        observe_window[0] += chunkjson['choices'][0]["delta"]["content"]
-                    # 看门狗，如果超过期限没有喂狗，则终止
-                    if len(observe_window) >= 2:
-                        if (time.time()-observe_window[1]) > watch_dog_patience:
-                            raise RuntimeError("用户取消了程序。")
-            except Exception as e:
-                chunk = get_full_error(chunk, stream_response)
-                chunk_decoded = chunk.decode()
-                error_msg = chunk_decoded
-                print(error_msg)
-                raise RuntimeError("Json解析不合常规")
-    return result
-
-
-def predict(inputs, llm_kwargs, plugin_kwargs, chatbot, history=[], system_prompt='', stream = True, additional_fn=None):
-    """
-    发送至chatGPT，流式获取输出。
-    用于基础的对话功能。
-    inputs 是本次问询的输入
-    top_p, temperature是chatGPT的内部调优参数
-    history 是之前的对话列表（注意无论是inputs还是history，内容太长了都会触发token数量溢出的错误）
-    chatbot 为WebUI中显示的对话列表，修改它，然后yeild出去，可以直接修改对话界面内容
-    additional_fn代表点击的哪个按钮，按钮见functional.py
-    """
-    if len(YIMODEL_API_KEY) == 0:
-        raise RuntimeError("没有设置YIMODEL_API_KEY选项")
-    if inputs == "":     inputs = "空空如也的输入栏"
-    user_input = inputs
-    if additional_fn is not None:
-        from core_functional import handle_core_functionality
-        inputs, history = handle_core_functionality(additional_fn, inputs, history, chatbot)
-
-    raw_input = inputs
-    logging.info(f'[raw_input] {raw_input}')
-    chatbot.append((inputs, ""))
-    yield from update_ui(chatbot=chatbot, history=history, msg="等待响应") # 刷新界面
-
-    # check mis-behavior
-    if is_the_upload_folder(user_input):
-        chatbot[-1] = (inputs, f"[Local Message] 检测到操作错误！当您上传文档之后，需点击“**函数插件区**”按钮进行处理，请勿点击“提交”按钮或者“基础功能区”按钮。")
-        yield from update_ui(chatbot=chatbot, history=history, msg="正常") # 刷新界面
-        time.sleep(2)
-
-    headers, payload = generate_payload(inputs, llm_kwargs, history, system_prompt, stream)
-
-    from .bridge_all import model_info
-    endpoint = model_info[llm_kwargs['llm_model']]['endpoint']
-
-    history.append(inputs); history.append("")
-
-    retry = 0
-    while True:
-        try:
-            # make a POST request to the API endpoint, stream=True
-            response = requests.post(endpoint, headers=headers, proxies=proxies,
-                                    json=payload, stream=True, timeout=TIMEOUT_SECONDS);break
-        except:
-            retry += 1
-            chatbot[-1] = ((chatbot[-1][0], timeout_bot_msg))
-            retry_msg = f"，正在重试 ({retry}/{MAX_RETRY}) ……" if MAX_RETRY > 0 else ""
-            yield from update_ui(chatbot=chatbot, history=history, msg="请求超时"+retry_msg) # 刷新界面
-            if retry > MAX_RETRY: raise TimeoutError
-
-    gpt_replying_buffer = ""
-
-    is_head_of_the_stream = True
-    if stream:
-        stream_response =  response.iter_lines()
-        while True:
-            try:
-                chunk = next(stream_response)
-            except StopIteration:
-                break
-            except requests.exceptions.ConnectionError:
-                chunk = next(stream_response) # 失败了，重试一次？再失败就没办法了。
-
-            # 提前读取一些信息 （用于判断异常）
-            chunk_decoded, chunkjson, is_last_chunk = decode_chunk(chunk)
-
-            if is_head_of_the_stream and (r'"object":"error"' not in chunk_decoded) and (r'"role":"assistant"' in chunk_decoded):
-                # 数据流的第一帧不携带content
-                is_head_of_the_stream = False; continue
-
-            if chunk:
-                try:
-                    if is_last_chunk:
-                        # 判定为数据流的结束，gpt_replying_buffer也写完了
-                        logging.info(f'[response] {gpt_replying_buffer}')
-                        break
-                    # 处理数据流的主体
-                    status_text = f"finish_reason: {chunkjson['choices'][0].get('finish_reason', 'null')}"
-                    gpt_replying_buffer = gpt_replying_buffer + chunkjson['choices'][0]["delta"]["content"]
-                    # 如果这里抛出异常，一般是文本过长，详情见get_full_error的输出
-                    history[-1] = gpt_replying_buffer
-                    chatbot[-1] = (history[-2], history[-1])
-                    yield from update_ui(chatbot=chatbot, history=history, msg=status_text) # 刷新界面
-                except Exception as e:
-                    yield from update_ui(chatbot=chatbot, history=history, msg="Json解析不合常规") # 刷新界面
-                    chunk = get_full_error(chunk, stream_response)
-                    chunk_decoded = chunk.decode()
-                    error_msg = chunk_decoded
-                    chatbot, history = handle_error(inputs, llm_kwargs, chatbot, history, chunk_decoded, error_msg)
-                    yield from update_ui(chatbot=chatbot, history=history, msg="Json异常" + error_msg) # 刷新界面
-                    print(error_msg)
-                    return
-
-def handle_error(inputs, llm_kwargs, chatbot, history, chunk_decoded, error_msg):
-    from .bridge_all import model_info
-    if "bad_request" in error_msg:
-        chatbot[-1] = (chatbot[-1][0], "[Local Message] 已经超过了模型的最大上下文或是模型格式错误,请尝试削减单次输入的文本量。")
-    elif "authentication_error" in error_msg:
-        chatbot[-1] = (chatbot[-1][0], "[Local Message] Incorrect API key. 请确保API key有效。")
-    elif "not_found" in error_msg:
-        chatbot[-1] = (chatbot[-1][0], f"[Local Message] {llm_kwargs['llm_model']} 无效，请确保使用小写的模型名称。")
-    elif "rate_limit" in error_msg:
-        chatbot[-1] = (chatbot[-1][0], "[Local Message] 遇到了控制请求速率限制，请一分钟后重试。")
-    elif "system_busy" in error_msg:
-        chatbot[-1] = (chatbot[-1][0], "[Local Message] 系统繁忙，请一分钟后重试。")
-    else:
-        from toolbox import regular_txt_to_markdown
-        tb_str = '```\n' + trimmed_format_exc() + '```'
-        chatbot[-1] = (chatbot[-1][0], f"[Local Message] 异常 \n\n{tb_str} \n\n{regular_txt_to_markdown(chunk_decoded)}")
-    return chatbot, history
-
-def generate_payload(inputs, llm_kwargs, history, system_prompt, stream):
-    """
-    整合所有信息，选择LLM模型，生成http请求，为发送请求做准备
-    """
-    api_key = f"Bearer {YIMODEL_API_KEY}"
-
-    headers = {
-        "Content-Type": "application/json",
-        "Authorization": api_key
-    }
-
-    conversation_cnt = len(history) // 2
-
-    messages = [{"role": "system", "content": system_prompt}]
-    if conversation_cnt:
-        for index in range(0, 2*conversation_cnt, 2):
-            what_i_have_asked = {}
-            what_i_have_asked["role"] = "user"
-            what_i_have_asked["content"] = history[index]
-            what_gpt_answer = {}
-            what_gpt_answer["role"] = "assistant"
-            what_gpt_answer["content"] = history[index+1]
-            if what_i_have_asked["content"] != "":
-                if what_gpt_answer["content"] == "": continue
-                if what_gpt_answer["content"] == timeout_bot_msg: continue
-                messages.append(what_i_have_asked)
-                messages.append(what_gpt_answer)
-            else:
-                messages[-1]['content'] = what_gpt_answer['content']
-
-    what_i_ask_now = {}
-    what_i_ask_now["role"] = "user"
-    what_i_ask_now["content"] = inputs
-    messages.append(what_i_ask_now)
-    model = llm_kwargs['llm_model']
-    if llm_kwargs['llm_model'].startswith('one-api-'):
-        model = llm_kwargs['llm_model'][len('one-api-'):]
-        model, _ = read_one_api_model_name(model)
-    tokens = 600 if llm_kwargs['llm_model'] == 'yi-34b-chat-0205' else 4096    #yi-34b-chat-0205只有4k上下文...
-    payload = {
-        "model": model,
-        "messages": messages,
-        "temperature": llm_kwargs['temperature'],  # 1.0,
-        "stream": stream,
-        "max_tokens": tokens
-    }
-    try:
-        print(f" {llm_kwargs['llm_model']} : {conversation_cnt} : {inputs[:100]} ..........")
-    except:
-        print('输入中可能存在乱码。')
-    return headers,payload

request_llms/bridge_zhipu.py

@@ -1,8 +1,7 @@
 import time
 import os
-from toolbox import update_ui, get_conf, update_ui_lastest_msg, log_chat
+from toolbox import update_ui, get_conf, update_ui_lastest_msg
 from toolbox import check_packages, report_exception, have_any_recent_upload_image_files
-from toolbox import ChatBotWithCookies
 
 model_name = '智谱AI大模型'
 zhipuai_default_model = 'glm-4'
@@ -17,8 +16,7 @@ def make_media_input(inputs, image_paths):
         inputs = inputs + f'<br/><br/><div align="center"><img src="file={os.path.abspath(image_path)}"></div>'
     return inputs
 
-def predict_no_ui_long_connection(inputs:str, llm_kwargs:dict, history:list=[], sys_prompt:str="",
+def predict_no_ui_long_connection(inputs, llm_kwargs, history=[], sys_prompt="", observe_window=[], console_slience=False):
-                                  observe_window:list=[], console_slience:bool=False):
     """
         ⭐多线程方法
         函数的说明请见 request_llms/bridge_all.py
@@ -44,8 +42,7 @@ def predict_no_ui_long_connection(inputs:str, llm_kwargs:dict, history:list=[],
     return response
 
 
-def predict(inputs:str, llm_kwargs:dict, plugin_kwargs:dict, chatbot:ChatBotWithCookies,
+def predict(inputs, llm_kwargs, plugin_kwargs, chatbot, history=[], system_prompt='', stream=True, additional_fn=None):
-            history:list=[], system_prompt:str='', stream:bool=True, additional_fn:str=None):
     """
         ⭐单线程方法
         函数的说明请见 request_llms/bridge_all.py
@@ -75,10 +72,6 @@ def predict(inputs:str, llm_kwargs:dict, plugin_kwargs:dict, chatbot:ChatBotWith
         llm_kwargs["llm_model"] = zhipuai_default_model
 
     if llm_kwargs["llm_model"] in ["glm-4v"]:
-        if (len(inputs) + sum(len(temp) for temp in history) + 1047) > 2000:
-            chatbot.append((inputs, "上下文长度超过glm-4v上限2000tokens，注意图片大约占用1,047个tokens"))
-            yield from update_ui(chatbot=chatbot, history=history)
-            return
         have_recent_file, image_paths = have_any_recent_upload_image_files(chatbot)
         if not have_recent_file:
             chatbot.append((inputs, "没有检测到任何近期上传的图像文件，请上传jpg格式的图片，此外，请注意拓展名需要小写"))
@@ -97,5 +90,4 @@ def predict(inputs:str, llm_kwargs:dict, plugin_kwargs:dict, chatbot:ChatBotWith
         chatbot[-1] = [inputs, response]
         yield from update_ui(chatbot=chatbot, history=history)
     history.extend([inputs, response])
-    log_chat(llm_model=llm_kwargs["llm_model"], input_str=inputs, output_str=response)
     yield from update_ui(chatbot=chatbot, history=history)

request_llms/com_google.py

@@ -114,10 +114,8 @@ def html_local_img(__file, layout="left", max_width=None, max_height=None, md=Tr
 
 
 class GoogleChatInit:
-    def __init__(self, llm_kwargs):
+    def __init__(self):
-        from .bridge_all import model_info
+        self.url_gemini = "https://generativelanguage.googleapis.com/v1beta/models/%m:streamGenerateContent?key=%k"
-        endpoint = model_info[llm_kwargs['llm_model']]['endpoint']
-        self.url_gemini = endpoint + "/%m:streamGenerateContent?key=%k"
 
     def generate_chat(self, inputs, llm_kwargs, history, system_prompt):
         headers, payload = self.generate_message_payload(

request_llms/com_qwenapi.py

@@ -48,10 +48,6 @@ class QwenRequestInstance():
         for response in responses:
             if response.status_code == HTTPStatus.OK:
                 if response.output.choices[0].finish_reason == 'stop':
-                    try:
-                        self.result_buf += response.output.choices[0].message.content
-                    except:
-                        pass
                     yield self.result_buf
                     break
                 elif response.output.choices[0].finish_reason == 'length':

request_llms/com_zhipuglm.py

@@ -8,7 +8,7 @@ from toolbox import get_conf, encode_image, get_pictures_list
 import logging, os
 
 
-def input_encode_handler(inputs:str, llm_kwargs:dict):
+def input_encode_handler(inputs, llm_kwargs):        
     if llm_kwargs["most_recent_uploaded"].get("path"):
         image_paths = get_pictures_list(llm_kwargs["most_recent_uploaded"]["path"])
     md_encode = []
@@ -28,7 +28,7 @@ class ZhipuChatInit:
         self.zhipu_bro = ZhipuAI(api_key=ZHIPUAI_API_KEY)
         self.model = ''
 
-    def __conversation_user(self, user_input: str, llm_kwargs:dict):
+    def __conversation_user(self, user_input: str, llm_kwargs):
         if self.model not in ["glm-4v"]:
             return {"role": "user", "content": user_input}
         else:
@@ -36,18 +36,12 @@ class ZhipuChatInit:
             what_i_have_asked = {"role": "user", "content": []}
             what_i_have_asked['content'].append({"type": 'text', "text": user_input})
             if encode_img:
-                if len(encode_img) > 1:
-                    logging.warning("glm-4v只支持一张图片,将只取第一张图片进行处理")
-                    print("glm-4v只支持一张图片,将只取第一张图片进行处理")
                 img_d = {"type": "image_url",
-                            "image_url": {
+                         "image_url": {'url': encode_img}}
-                                "url": encode_img[0]['data']
-                            }
-                        }
                 what_i_have_asked['content'].append(img_d)
             return what_i_have_asked
 
-    def __conversation_history(self, history:list, llm_kwargs:dict):
+    def __conversation_history(self, history, llm_kwargs):
         messages = []
         conversation_cnt = len(history) // 2
         if conversation_cnt:
@@ -61,67 +55,22 @@ class ZhipuChatInit:
                 messages.append(what_gpt_answer)
         return messages
 
-    @staticmethod
+    def __conversation_message_payload(self, inputs, llm_kwargs, history, system_prompt):
-    def preprocess_param(param, default=0.95, min_val=0.01, max_val=0.99):
-        """预处理参数，保证其在允许范围内，并处理精度问题"""
-        try:
-            param = float(param)
-        except ValueError:
-            return default
-
-        if param <= min_val:
-            return min_val
-        elif param >= max_val:
-            return max_val
-        else:
-            return round(param, 2)  # 可挑选精度，目前是两位小数
-
-    def __conversation_message_payload(self, inputs:str, llm_kwargs:dict, history:list, system_prompt:str):
         messages = []
         if system_prompt:
             messages.append({"role": "system", "content": system_prompt})
         self.model = llm_kwargs['llm_model']
         messages.extend(self.__conversation_history(history, llm_kwargs))  # 处理 history
-        if inputs.strip() == "": # 处理空输入导致报错的问题 https://github.com/binary-husky/gpt_academic/issues/1640 提示 {"error":{"code":"1214","message":"messages[1]:content和tool_calls 字段不能同时为空"}
-            inputs = "."    # 空格、换行、空字符串都会报错，所以用最没有意义的一个点代替
         messages.append(self.__conversation_user(inputs, llm_kwargs))  # 处理用户对话
-        """
-        采样温度，控制输出的随机性，必须为正数
-        取值范围是：(0.0, 1.0)，不能等于 0，默认值为 0.95，
-        值越大，会使输出更随机，更具创造性；
-        值越小，输出会更加稳定或确定
-        建议您根据应用场景调整 top_p 或 temperature 参数，但不要同时调整两个参数
-        """
-        temperature = self.preprocess_param(
-            param=llm_kwargs.get('temperature', 0.95),
-            default=0.95,
-            min_val=0.01,
-            max_val=0.99
-        )
-        """
-        用温度取样的另一种方法，称为核取样
-        取值范围是：(0.0, 1.0) 开区间，
-        不能等于 0 或 1，默认值为 0.7
-        模型考虑具有 top_p 概率质量 tokens 的结果
-        例如：0.1 意味着模型解码器只考虑从前 10% 的概率的候选集中取 tokens
-        建议您根据应用场景调整 top_p 或 temperature 参数，
-        但不要同时调整两个参数
-        """
-        top_p = self.preprocess_param(
-            param=llm_kwargs.get('top_p', 0.70),
-            default=0.70,
-            min_val=0.01,
-            max_val=0.99
-        )
         response = self.zhipu_bro.chat.completions.create(
             model=self.model, messages=messages, stream=True,
-            temperature=temperature,
+            temperature=llm_kwargs.get('temperature', 0.95) * 0.95,  # 只能传默认的 temperature 和 top_p
-            top_p=top_p,
+            top_p=llm_kwargs.get('top_p', 0.7) * 0.7,
-            max_tokens=llm_kwargs.get('max_tokens', 1024 * 4),
+            max_tokens=llm_kwargs.get('max_tokens', 1024 * 4),  # 最大输出模型的一半
         )
         return response
 
-    def generate_chat(self, inputs:str, llm_kwargs:dict, history:list, system_prompt:str):
+    def generate_chat(self, inputs, llm_kwargs, history, system_prompt):
         self.model = llm_kwargs['llm_model']
         response = self.__conversation_message_payload(inputs, llm_kwargs, history, system_prompt)
         bro_results = ''

request_llms/local_llm_class.py

@@ -1,7 +1,6 @@
 import time
 import threading
 from toolbox import update_ui, Singleton
-from toolbox import ChatBotWithCookies
 from multiprocessing import Process, Pipe
 from contextlib import redirect_stdout
 from request_llms.queued_pipe import create_queue_pipe
@@ -215,7 +214,7 @@ class LocalLLMHandle(Process):
 def get_local_llm_predict_fns(LLMSingletonClass, model_name, history_format='classic'):
     load_message = f"{model_name}尚未加载，加载需要一段时间。注意，取决于`config.py`的配置，{model_name}消耗大量的内存（CPU）或显存（GPU），也许会导致低配计算机卡死 ……"
 
-    def predict_no_ui_long_connection(inputs:str, llm_kwargs:dict, history:list=[], sys_prompt:str="", observe_window:list=[], console_slience:bool=False):
+    def predict_no_ui_long_connection(inputs, llm_kwargs, history=[], sys_prompt="", observe_window=[], console_slience=False):
         """
             refer to request_llms/bridge_all.py
         """
@@ -261,8 +260,7 @@ def get_local_llm_predict_fns(LLMSingletonClass, model_name, history_format='cla
                     raise RuntimeError("程序终止。")
         return response
 
-    def predict(inputs:str, llm_kwargs:dict, plugin_kwargs:dict, chatbot:ChatBotWithCookies,
+    def predict(inputs, llm_kwargs, plugin_kwargs, chatbot, history=[], system_prompt='', stream=True, additional_fn=None):
-                history:list=[], system_prompt:str='', stream:bool=True, additional_fn:str=None):
         """
             refer to request_llms/bridge_all.py
         """

requirements.txt

@@ -1,15 +1,13 @@
-https://public.agent-matrix.com/publish/gradio-3.32.9-py3-none-any.whl
+https://public.agent-matrix.com/publish/gradio-3.32.8-py3-none-any.whl
-fastapi==0.110
 gradio-client==0.8
 pypdf2==2.12.1
-zhipuai==2.0.1
+zhipuai>=2
 tiktoken>=0.3.3
 requests[socks]
 pydantic==2.5.2
 protobuf==3.18
 transformers>=4.27.1
 scipdf_parser>=0.52
-anthropic>=0.18.1
 python-markdown-math
 pymdown-extensions
 websocket-client
@@ -18,15 +16,13 @@ prompt_toolkit
 latex2mathml
 python-docx
 mdtex2html
-dashscope
+anthropic
 pyautogen
 colorama
 Markdown
 pygments
-edge-tts
 pymupdf
 openai
-rjsmin
 arxiv
 numpy
 rich

shared_utils/advanced_markdown_format.py

@@ -207,53 +207,6 @@ def fix_code_segment_indent(txt):
         return txt
 
 
-def markdown_convertion_for_file(txt):
-    """
-    将Markdown格式的文本转换为HTML格式。如果包含数学公式，则先将公式转换为HTML格式。
-    """
-    from themes.theme import advanced_css
-    pre = f"""
-    <!DOCTYPE html><head><meta charset="utf-8"><title>对话历史</title><style>{advanced_css}</style></head>
-    <body>
-    <div class="test_temp1" style="width:10%; height: 500px; float:left;"></div>
-    <div class="test_temp2" style="width:80%;padding: 40px;float:left;padding-left: 20px;padding-right: 20px;box-shadow: rgba(0, 0, 0, 0.2) 0px 0px 8px 8px;border-radius: 10px;">
-        <div class="markdown-body">
-    """
-    suf = """
-        </div>
-    </div>
-    <div class="test_temp3" style="width:10%; height: 500px; float:left;"></div>
-    </body>
-    """
-
-    if txt.startswith(pre) and txt.endswith(suf):
-        # print('警告，输入了已经经过转化的字符串，二次转化可能出问题')
-        return txt  # 已经被转化过，不需要再次转化
-
-    find_equation_pattern = r'<script type="math/tex(?:.*?)>(.*?)</script>'
-    txt = fix_markdown_indent(txt)
-    # convert everything to html format
-    split = markdown.markdown(text="---")
-    convert_stage_1 = markdown.markdown(
-        text=txt,
-        extensions=[
-            "sane_lists",
-            "tables",
-            "mdx_math",
-            "pymdownx.superfences",
-            "pymdownx.highlight",
-        ],
-        extension_configs={**markdown_extension_configs, **code_highlight_configs},
-    )
-    convert_stage_1 = markdown_bug_hunt(convert_stage_1)
-
-    # 2. convert to rendered equation
-    convert_stage_2_2, n = re.subn(
-        find_equation_pattern, replace_math_render, convert_stage_1, flags=re.DOTALL
-    )
-    # cat them together
-    return pre + convert_stage_2_2 + suf
-
 @lru_cache(maxsize=128)  # 使用 lru缓存 加快转换速度
 def markdown_convertion(txt):
     """

shared_utils/cookie_manager.py

@@ -1,88 +0,0 @@
-import json
-from typing import Callable
-
-def load_web_cookie_cache__fn_builder(customize_btns, cookies, predefined_btns)->Callable:
-    def load_web_cookie_cache(persistent_cookie_, cookies_):
-        import gradio as gr
-        from themes.theme import load_dynamic_theme, to_cookie_str, from_cookie_str, assign_user_uuid
-
-        ret = {}
-        for k in customize_btns:
-            ret.update({customize_btns[k]: gr.update(visible=False, value="")})
-
-        try: persistent_cookie_ = from_cookie_str(persistent_cookie_)    # persistent cookie to dict
-        except: return ret
-
-        customize_fn_overwrite_ = persistent_cookie_.get("custom_bnt", {})
-        cookies_['customize_fn_overwrite'] = customize_fn_overwrite_
-        ret.update({cookies: cookies_})
-
-        for k,v in persistent_cookie_["custom_bnt"].items():
-            if v['Title'] == "": continue
-            if k in customize_btns: ret.update({customize_btns[k]: gr.update(visible=True, value=v['Title'])})
-            else: ret.update({predefined_btns[k]: gr.update(visible=True, value=v['Title'])})
-        return ret
-    return load_web_cookie_cache
-
-def assign_btn__fn_builder(customize_btns, predefined_btns, cookies, web_cookie_cache)->Callable:
-    def assign_btn(persistent_cookie_, cookies_, basic_btn_dropdown_, basic_fn_title, basic_fn_prefix, basic_fn_suffix, clean_up=False):
-        import gradio as gr
-        from themes.theme import load_dynamic_theme, to_cookie_str, from_cookie_str, assign_user_uuid
-        ret = {}
-        # 读取之前的自定义按钮
-        customize_fn_overwrite_ = cookies_['customize_fn_overwrite']
-        # 更新新的自定义按钮
-        customize_fn_overwrite_.update({
-            basic_btn_dropdown_:
-                {
-                    "Title":basic_fn_title,
-                    "Prefix":basic_fn_prefix,
-                    "Suffix":basic_fn_suffix,
-                }
-            }
-        )
-        if clean_up:
-            customize_fn_overwrite_ = {}
-        cookies_.update(customize_fn_overwrite_)    # 更新cookie
-        visible = (not clean_up) and (basic_fn_title != "")
-        if basic_btn_dropdown_ in customize_btns:
-            # 是自定义按钮，不是预定义按钮
-            ret.update({customize_btns[basic_btn_dropdown_]: gr.update(visible=visible, value=basic_fn_title)})
-        else:
-            # 是预定义按钮
-            ret.update({predefined_btns[basic_btn_dropdown_]: gr.update(visible=visible, value=basic_fn_title)})
-        ret.update({cookies: cookies_})
-        try: persistent_cookie_ = from_cookie_str(persistent_cookie_)   # persistent cookie to dict
-        except: persistent_cookie_ = {}
-        persistent_cookie_["custom_bnt"] = customize_fn_overwrite_      # dict update new value
-        persistent_cookie_ = to_cookie_str(persistent_cookie_)          # persistent cookie to dict
-        ret.update({web_cookie_cache: persistent_cookie_})             # write persistent cookie
-        return ret
-    return assign_btn
-
-# cookies, web_cookie_cache = make_cookie_cache()
-def make_cookie_cache():
-    # 定义 后端state（cookies）、前端（web_cookie_cache）两兄弟
-    import gradio as gr
-    from toolbox import load_chat_cookies
-    # 定义cookies的后端state
-    cookies = gr.State(load_chat_cookies())
-    # 定义cookies的一个孪生的前端存储区（隐藏）
-    web_cookie_cache = gr.Textbox(visible=False, elem_id="web_cookie_cache")
-    return cookies, web_cookie_cache
-
-# history, history_cache, history_cache_update = make_history_cache()
-def make_history_cache():
-    # 定义 后端state（history）、前端（history_cache）、后端setter（history_cache_update）三兄弟
-    import gradio as gr
-    # 定义history的后端state
-    history = gr.State([])
-    # 定义history的一个孪生的前端存储区（隐藏）
-    history_cache = gr.Textbox(visible=False, elem_id="history_cache")
-    # 定义history_cache->history的更新方法（隐藏）。在触发这个按钮时，会先执行js代码更新history_cache，然后再执行python代码更新history
-    def process_history_cache(history_cache):
-        return json.loads(history_cache)
-    # 另一种更简单的setter方法
-    history_cache_update = gr.Button("", elem_id="elem_update_history", visible=False).click(
-        process_history_cache, inputs=[history_cache], outputs=[history])
-    return history, history_cache, history_cache_update

shared_utils/fastapi_server.py

@@ -1,252 +0,0 @@
-"""
-Tests:
-
-- custom_path false / no user auth:
-    -- upload file(yes)
-    -- download file(yes)
-    -- websocket(yes)
-    -- block __pycache__ access(yes)
-        -- rel (yes)
-        -- abs (yes)
-    -- block user access(fail) http://localhost:45013/file=gpt_log/admin/chat_secrets.log
-        -- fix(commit f6bf05048c08f5cd84593f7fdc01e64dec1f584a)-> block successful
-
-- custom_path yes("/cc/gptac") / no user auth:
-    -- upload file(yes)
-    -- download file(yes)
-    -- websocket(yes)
-    -- block __pycache__ access(yes)
-    -- block user access(yes)
-
-- custom_path yes("/cc/gptac/") / no user auth:
-    -- upload file(yes)
-    -- download file(yes)
-    -- websocket(yes)
-    -- block user access(yes)
-
-- custom_path yes("/cc/gptac/") / + user auth:
-    -- upload file(yes)
-    -- download file(yes)
-    -- websocket(yes)
-    -- block user access(yes)
-    -- block user-wise access (yes)
-
-- custom_path no + user auth:
-    -- upload file(yes)
-    -- download file(yes)
-    -- websocket(yes)
-    -- block user access(yes)
-    -- block user-wise access (yes)
-
-queue cocurrent effectiveness
-    -- upload file(yes)
-    -- download file(yes)
-    -- websocket(yes)
-"""
-
-import os, requests, threading, time
-import uvicorn
-
-def _authorize_user(path_or_url, request, gradio_app):
-    from toolbox import get_conf, default_user_name
-    PATH_PRIVATE_UPLOAD, PATH_LOGGING = get_conf('PATH_PRIVATE_UPLOAD', 'PATH_LOGGING')
-    sensitive_path = None
-    path_or_url = os.path.relpath(path_or_url)
-    if path_or_url.startswith(PATH_LOGGING):
-        sensitive_path = PATH_LOGGING
-    if path_or_url.startswith(PATH_PRIVATE_UPLOAD):
-        sensitive_path = PATH_PRIVATE_UPLOAD
-    if sensitive_path:
-        token = request.cookies.get("access-token") or request.cookies.get("access-token-unsecure")
-        user = gradio_app.tokens.get(token)  # get user
-        allowed_users = [user, 'autogen', default_user_name]  # three user path that can be accessed
-        for user_allowed in allowed_users:
-            # exact match
-            if f"{os.sep}".join(path_or_url.split(os.sep)[:2]) == os.path.join(sensitive_path, user_allowed):
-                return True
-        return False # "越权访问!"
-    return True
-
-
-class Server(uvicorn.Server):
-    # A server that runs in a separate thread
-    def install_signal_handlers(self):
-        pass
-
-    def run_in_thread(self):
-        self.thread = threading.Thread(target=self.run, daemon=True)
-        self.thread.start()
-        while not self.started:
-            time.sleep(1e-3)
-
-    def close(self):
-        self.should_exit = True
-        self.thread.join()
-
-
-def start_app(app_block, CONCURRENT_COUNT, AUTHENTICATION, PORT, SSL_KEYFILE, SSL_CERTFILE):
-    import uvicorn
-    import fastapi
-    import gradio as gr
-    from fastapi import FastAPI
-    from gradio.routes import App
-    from toolbox import get_conf
-    CUSTOM_PATH, PATH_LOGGING = get_conf('CUSTOM_PATH', 'PATH_LOGGING')
-
-    # --- --- configurate gradio app block --- ---
-    app_block:gr.Blocks
-    app_block.ssl_verify = False
-    app_block.auth_message = '请登录'
-    app_block.favicon_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), "docs/logo.png")
-    app_block.auth = AUTHENTICATION if len(AUTHENTICATION) != 0 else None
-    app_block.blocked_paths = ["config.py", "__pycache__", "config_private.py", "docker-compose.yml", "Dockerfile", f"{PATH_LOGGING}/admin"]
-    app_block.dev_mode = False
-    app_block.config = app_block.get_config_file()
-    app_block.enable_queue = True
-    app_block.queue(concurrency_count=CONCURRENT_COUNT)
-    app_block.validate_queue_settings()
-    app_block.show_api = False
-    app_block.config = app_block.get_config_file()
-    max_threads = 40
-    app_block.max_threads = max(
-        app_block._queue.max_thread_count if app_block.enable_queue else 0, max_threads
-    )
-    app_block.is_colab = False
-    app_block.is_kaggle = False
-    app_block.is_sagemaker = False
-
-    gradio_app = App.create_app(app_block)
-
-    # --- --- replace gradio endpoint to forbid access to sensitive files --- ---
-    if len(AUTHENTICATION) > 0:
-        dependencies = []
-        endpoint = None
-        for route in list(gradio_app.router.routes):
-            if route.path == "/file/{path:path}":
-                gradio_app.router.routes.remove(route)
-            if route.path == "/file={path_or_url:path}":
-                dependencies = route.dependencies
-                endpoint = route.endpoint
-                gradio_app.router.routes.remove(route)
-        @gradio_app.get("/file/{path:path}", dependencies=dependencies)
-        @gradio_app.head("/file={path_or_url:path}", dependencies=dependencies)
-        @gradio_app.get("/file={path_or_url:path}", dependencies=dependencies)
-        async def file(path_or_url: str, request: fastapi.Request):
-            if len(AUTHENTICATION) > 0:
-                if not _authorize_user(path_or_url, request, gradio_app):
-                    return "越权访问!"
-            return await endpoint(path_or_url, request)
-
-    TTS_TYPE = get_conf("TTS_TYPE")
-    if TTS_TYPE != "DISABLE":
-        # audio generation functionality
-        import httpx
-        from fastapi import FastAPI, Request, HTTPException
-        from starlette.responses import Response
-        async def forward_request(request: Request, method: str) -> Response:
-            async with httpx.AsyncClient() as client:
-                try:
-                    # Forward the request to the target service
-                    if TTS_TYPE == "EDGE_TTS":
-                        import tempfile
-                        import edge_tts
-                        import wave
-                        import uuid
-                        from pydub import AudioSegment
-                        json = await request.json()
-                        voice = get_conf("EDGE_TTS_VOICE")
-                        tts = edge_tts.Communicate(text=json['text'], voice=voice)
-                        temp_folder = tempfile.gettempdir()
-                        temp_file_name = str(uuid.uuid4().hex)
-                        temp_file = os.path.join(temp_folder, f'{temp_file_name}.mp3')
-                        await tts.save(temp_file)
-                        mp3_audio = AudioSegment.from_file(temp_file, format="mp3")
-                        mp3_audio.export(temp_file, format="wav")
-                        with open(temp_file, 'rb') as wav_file: t = wav_file.read()
-                        os.remove(temp_file)
-                        return Response(content=t)
-                    if TTS_TYPE == "LOCAL_SOVITS_API":
-                        # Forward the request to the target service
-                        TARGET_URL = get_conf("GPT_SOVITS_URL")
-                        body = await request.body()
-                        resp = await client.post(TARGET_URL, content=body, timeout=60)
-                        # Return the response from the target service
-                        return Response(content=resp.content, status_code=resp.status_code, headers=dict(resp.headers))
-                except httpx.RequestError as e:
-                    raise HTTPException(status_code=400, detail=f"Request to the target service failed: {str(e)}")
-        @gradio_app.post("/vits")
-        async def forward_post_request(request: Request):
-            return await forward_request(request, "POST")
-
-    # --- --- app_lifespan --- ---
-    from contextlib import asynccontextmanager
-    @asynccontextmanager
-    async def app_lifespan(app):
-        async def startup_gradio_app():
-            if gradio_app.get_blocks().enable_queue:
-                gradio_app.get_blocks().startup_events()
-        async def shutdown_gradio_app():
-            pass
-        await startup_gradio_app() # startup logic here
-        yield  # The application will serve requests after this point
-        await shutdown_gradio_app() # cleanup/shutdown logic here
-
-    # --- --- FastAPI --- ---
-    fastapi_app = FastAPI(lifespan=app_lifespan)
-    fastapi_app.mount(CUSTOM_PATH, gradio_app)
-
-    # --- --- favicon --- ---
-    if CUSTOM_PATH != '/':
-        from fastapi.responses import FileResponse
-        @fastapi_app.get("/favicon.ico")
-        async def favicon():
-            return FileResponse(app_block.favicon_path)
-
-    # --- --- uvicorn.Config --- ---
-    ssl_keyfile = None if SSL_KEYFILE == "" else SSL_KEYFILE
-    ssl_certfile = None if SSL_CERTFILE == "" else SSL_CERTFILE
-    server_name = "0.0.0.0"
-    config = uvicorn.Config(
-        fastapi_app,
-        host=server_name,
-        port=PORT,
-        reload=False,
-        log_level="warning",
-        ssl_keyfile=ssl_keyfile,
-        ssl_certfile=ssl_certfile,
-    )
-    server = Server(config)
-    url_host_name = "localhost" if server_name == "0.0.0.0" else server_name
-    if ssl_keyfile is not None:
-        if ssl_certfile is None:
-            raise ValueError(
-                "ssl_certfile must be provided if ssl_keyfile is provided."
-            )
-        path_to_local_server = f"https://{url_host_name}:{PORT}/"
-    else:
-        path_to_local_server = f"http://{url_host_name}:{PORT}/"
-    if CUSTOM_PATH != '/':
-        path_to_local_server += CUSTOM_PATH.lstrip('/').rstrip('/') + '/'
-    # --- --- begin  --- ---
-    server.run_in_thread()
-
-    # --- --- after server launch --- ---
-    app_block.server = server
-    app_block.server_name = server_name
-    app_block.local_url = path_to_local_server
-    app_block.protocol = (
-        "https"
-        if app_block.local_url.startswith("https") or app_block.is_colab
-        else "http"
-    )
-
-    if app_block.enable_queue:
-        app_block._queue.set_url(path_to_local_server)
-
-    forbid_proxies = {
-        "http": "",
-        "https": "",
-    }
-    requests.get(f"{app_block.local_url}startup-events", verify=app_block.ssl_verify, proxies=forbid_proxies)
-    app_block.is_running = True
-    app_block.block_thread()

shared_utils/handle_upload.py

@@ -104,14 +104,6 @@ def extract_archive(file_path, dest_dir):
 
     elif file_extension in [".tar", ".gz", ".bz2"]:
         with tarfile.open(file_path, "r:*") as tarobj:
-            # 清理提取路径，移除任何不安全的元素
-            for member in tarobj.getmembers():
-                member_path = os.path.normpath(member.name)
-                full_path = os.path.join(dest_dir, member_path)
-                full_path = os.path.abspath(full_path)
-                if not full_path.startswith(os.path.abspath(dest_dir) + os.sep):
-                    raise Exception(f"Attempted Path Traversal in {member.name}")
-
             tarobj.extractall(path=dest_dir)
             print("Successfully extracted tar archive to {}".format(dest_dir))
 

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}$|sk-proj-[a-zA-Z0-9]{48}$|sess-[a-zA-Z0-9]{40}$", key)
+        API_MATCH_ORIGINAL = re.match(r"sk-[a-zA-Z0-9]{48}$|sess-[a-zA-Z0-9]{40}$", key)
     return bool(API_MATCH_ORIGINAL)
 
 
@@ -28,11 +28,6 @@ def is_api2d_key(key):
     return bool(API_MATCH_API2D)
 
 
-def is_cohere_api_key(key):
-    API_MATCH_AZURE = re.match(r"[a-zA-Z0-9]{40}$", key)
-    return bool(API_MATCH_AZURE)
-
-
 def is_any_api_key(key):
     if ',' in key:
         keys = key.split(',')
@@ -40,7 +35,7 @@ def is_any_api_key(key):
             if is_any_api_key(k): return True
         return False
     else:
-        return is_openai_api_key(key) or is_api2d_key(key) or is_azure_api_key(key) or is_cohere_api_key(key)
+        return is_openai_api_key(key) or is_api2d_key(key) or is_azure_api_key(key)
 
 
 def what_keys(keys):
@@ -67,7 +62,7 @@ def select_api_key(keys, llm_model):
     avail_key_list = []
     key_list = keys.split(',')
 
-    if llm_model.startswith('gpt-') or llm_model.startswith('one-api-'):
+    if llm_model.startswith('gpt-'):
         for k in key_list:
             if is_openai_api_key(k): avail_key_list.append(k)
 
@@ -79,12 +74,8 @@ def select_api_key(keys, llm_model):
         for k in key_list:
             if is_azure_api_key(k): avail_key_list.append(k)
 
-    if llm_model.startswith('cohere-'):
-        for k in key_list:
-            if is_cohere_api_key(k): avail_key_list.append(k)
-
     if len(avail_key_list) == 0:
-        raise RuntimeError(f"您提供的api-key不满足要求，不包含任何可用于{llm_model}的api-key。您可能选择了错误的模型或请求源（左上角更换模型菜单中可切换openai,azure,claude,cohere等请求源）。")
+        raise RuntimeError(f"您提供的api-key不满足要求，不包含任何可用于{llm_model}的api-key。您可能选择了错误的模型或请求源（右下角更换模型菜单中可切换openai,azure,claude,api2d等请求源）。")
 
     api_key = random.choice(avail_key_list) # 随机负载均衡
     return api_key

shared_utils/map_names.py

@@ -1,34 +0,0 @@
-import re
-mapping_dic = {
-    # "qianfan": "qianfan（文心一言大模型）",
-    # "zhipuai": "zhipuai（智谱GLM4超级模型🔥）",
-    # "gpt-4-1106-preview": "gpt-4-1106-preview（新调优版本GPT-4🔥）",
-    # "gpt-4-vision-preview": "gpt-4-vision-preview（识图模型GPT-4V）",
-}
-
-rev_mapping_dic = {}
-for k, v in mapping_dic.items():
-    rev_mapping_dic[v] = k
-
-def map_model_to_friendly_names(m):
-    if m in mapping_dic:
-        return mapping_dic[m]
-    return m
-
-def map_friendly_names_to_model(m):
-    if m in rev_mapping_dic:
-        return rev_mapping_dic[m]
-    return m
-
-def read_one_api_model_name(model: str):
-    """return real model name and max_token.
-    """
-    max_token_pattern = r"\(max_token=(\d+)\)"
-    match = re.search(max_token_pattern, model)
-    if match:
-        max_token_tmp = match.group(1)  # 获取 max_token 的值
-        max_token_tmp = int(max_token_tmp)
-        model = re.sub(max_token_pattern, "", model)  # 从原字符串中删除 "(max_token=...)"
-    else:
-        max_token_tmp = 4096
-    return model, max_token_tmp

shared_utils/text_mask.py

@@ -26,8 +26,6 @@ def apply_gpt_academic_string_mask(string, mode="show_all"):
     当字符串中有掩码tag时（<gpt_academic_string_mask><show_...>），根据字符串要给谁看（大模型，还是web渲染），对字符串进行处理，返回处理后的字符串
     示意图：https://mermaid.live/edit#pako:eNqlkUtLw0AUhf9KuOta0iaTplkIPlpduFJwoZEwJGNbzItpita2O6tF8QGKogXFtwu7cSHiq3-mk_oznFR8IYLgrGbuOd9hDrcCpmcR0GDW9ubNPKaBMDauuwI_A9M6YN-3y0bODwxsYos4BdMoBrTg5gwHF-d0mBH6-vqFQe58ed5m9XPW2uteX3Tubrj0ljLYcwxxR3h1zB43WeMs3G19yEM9uapDMe_NG9i2dagKw1Fee4c1D9nGEbtc-5n6HbNtJ8IyHOs8tbs7V2HrlDX2w2Y7XD_5haHEtQiNsOwfMVa_7TzsvrWIuJGo02qTrdwLk9gukQylHv3Afv1ML270s-HZUndrmW1tdA-WfvbM_jMFYuAQ6uCCxVdciTJ1CPLEITpo_GphypeouzXuw6XAmyi7JmgBLZEYlHwLB2S4gHMUO-9DH7tTnvf1CVoFFkBLSOk4QmlRTqpIlaWUHINyNFXjaQWpCYRURUKiWovBYo8X4ymEJFlECQUpqaQkJmuvWygPpg
     """
-    if not string:
-        return string
     if "<gpt_academic_string_mask>" not in string: # No need to process
         return string
 

tests/test_llms.py

@@ -11,45 +11,28 @@ def validate_path():
 
 
 validate_path()  # validate path so you can run from base directory
+if __name__ == "__main__":
+    # from request_llms.bridge_newbingfree import predict_no_ui_long_connection
+    # from request_llms.bridge_moss import predict_no_ui_long_connection
+    # from request_llms.bridge_jittorllms_pangualpha import predict_no_ui_long_connection
+    # from request_llms.bridge_jittorllms_llama import predict_no_ui_long_connection
+    # from request_llms.bridge_claude import predict_no_ui_long_connection
+    # from request_llms.bridge_internlm import predict_no_ui_long_connection
+    # from request_llms.bridge_deepseekcoder import predict_no_ui_long_connection
+    # from request_llms.bridge_qwen_7B import predict_no_ui_long_connection
+    from request_llms.bridge_qwen_local import predict_no_ui_long_connection
 
-if "在线模型":
+    # from request_llms.bridge_spark import predict_no_ui_long_connection
-    if __name__ == "__main__":
+    # from request_llms.bridge_zhipu import predict_no_ui_long_connection
-        from request_llms.bridge_cohere import predict_no_ui_long_connection
+    # from request_llms.bridge_chatglm3 import predict_no_ui_long_connection
-        # from request_llms.bridge_spark import predict_no_ui_long_connection
-        # from request_llms.bridge_zhipu import predict_no_ui_long_connection
-        # from request_llms.bridge_chatglm3 import predict_no_ui_long_connection
-        llm_kwargs = {
-            "llm_model": "command-r-plus",
-            "max_length": 4096,
-            "top_p": 1,
-            "temperature": 1,
-        }
 
-        result = predict_no_ui_long_connection(
+    llm_kwargs = {
-            inputs="请问什么是质子？", llm_kwargs=llm_kwargs, history=["你好", "我好！"], sys_prompt="系统"
+        "max_length": 4096,
-        )
+        "top_p": 1,
-        print("final result:", result)
+        "temperature": 1,
-        print("final result:", result)
+    }
-
-
-if "本地模型":
-    if __name__ == "__main__":
-        # from request_llms.bridge_newbingfree import predict_no_ui_long_connection
-        # from request_llms.bridge_moss import predict_no_ui_long_connection
-        # from request_llms.bridge_jittorllms_pangualpha import predict_no_ui_long_connection
-        # from request_llms.bridge_jittorllms_llama import predict_no_ui_long_connection
-        # from request_llms.bridge_claude import predict_no_ui_long_connection
-        # from request_llms.bridge_internlm import predict_no_ui_long_connection
-        # from request_llms.bridge_deepseekcoder import predict_no_ui_long_connection
-        # from request_llms.bridge_qwen_7B import predict_no_ui_long_connection
-        # from request_llms.bridge_qwen_local import predict_no_ui_long_connection
-        llm_kwargs = {
-            "max_length": 4096,
-            "top_p": 1,
-            "temperature": 1,
-        }
-        result = predict_no_ui_long_connection(
-            inputs="请问什么是质子？", llm_kwargs=llm_kwargs, history=["你好", "我好！"], sys_prompt=""
-        )
-        print("final result:", result)
 
+    result = predict_no_ui_long_connection(
+        inputs="请问什么是质子？", llm_kwargs=llm_kwargs, history=["你好", "我好！"], sys_prompt=""
+    )
+    print("final result:", result)

tests/test_markdown.py

@@ -43,10 +43,8 @@ def validate_path():
 
 validate_path()  # validate path so you can run from base directory
 from toolbox import markdown_convertion
-from shared_utils.advanced_markdown_format import markdown_convertion_for_file
+
-with open("gpt_log/default_user/shared/2024-04-22-01-27-43.zip.extract/translated_markdown.md", "r", encoding="utf-8") as f:
+html = markdown_convertion(md)
-    md = f.read()
-html = markdown_convertion_for_file(md)
 # print(html)
 with open("test.html", "w", encoding="utf-8") as f:
     f.write(html)

tests/test_plugins.py

@@ -22,12 +22,10 @@ if __name__ == "__main__":
 
     # plugin_test(plugin='crazy_functions.Latex输出PDF->Latex翻译中文并重新编译PDF', main_input="2307.07522")
 
-    plugin_test(plugin='crazy_functions.PDF批量翻译->批量翻译PDF文档', main_input='build/pdf/t1.pdf')
+    plugin_test(
-
+        plugin="crazy_functions.Latex输出PDF->Latex翻译中文并重新编译PDF",
-    # plugin_test(
+        main_input="G:/SEAFILE_LOCAL/50503047/我的资料库/学位/paperlatex/aaai/Fu_8368_with_appendix",
-    #     plugin="crazy_functions.Latex输出PDF->Latex翻译中文并重新编译PDF",
+    )
-    #     main_input="G:/SEAFILE_LOCAL/50503047/我的资料库/学位/paperlatex/aaai/Fu_8368_with_appendix",
-    # )
 
     # plugin_test(plugin='crazy_functions.虚空终端->虚空终端', main_input='修改api-key为sk-jhoejriotherjep')
 
@@ -45,7 +43,7 @@ if __name__ == "__main__":
 
     # plugin_test(plugin='crazy_functions.批量Markdown翻译->Markdown中译英', main_input="README.md")
 
-    # plugin_test(plugin='crazy_functions.PDF批量翻译->批量翻译PDF文档', main_input='crazy_functions/test_project/pdf_and_word/aaai.pdf')
+    # plugin_test(plugin='crazy_functions.批量翻译PDF文档_多线程->批量翻译PDF文档', main_input='crazy_functions/test_project/pdf_and_word/aaai.pdf')
 
     # plugin_test(plugin='crazy_functions.谷歌检索小助手->谷歌检索小助手', main_input="https://scholar.google.com/scholar?hl=en&as_sdt=0%2C5&q=auto+reinforcement+learning&btnG=")
 

themes/common.css

@@ -38,7 +38,6 @@
     left: calc(100% + 3px);
     top: 0;
     display: flex;
-    flex-direction: column;
     justify-content: space-between;
 }
 /* .message-btn-row-leading, .message-btn-row-trailing {

themes/common.py

@@ -1,34 +1,10 @@
 from toolbox import get_conf
 CODE_HIGHLIGHT, ADD_WAIFU, LAYOUT = get_conf("CODE_HIGHLIGHT", "ADD_WAIFU", "LAYOUT")
 
-def minimize_js(common_js_path):
-    try:
-        import rjsmin, hashlib, glob, os
-        # clean up old minimized js files, matching `common_js_path + '.min.*'`
-        for old_min_js in glob.glob(common_js_path + '.min.*.js'):
-            os.remove(old_min_js)
-        # use rjsmin to minimize `common_js_path`
-        c_jsmin = rjsmin.jsmin
-        with open(common_js_path, "r") as f:
-            js_content = f.read()
-        minimized_js_content = c_jsmin(js_content)
-        # compute sha256 hash of minimized js content
-        sha_hash = hashlib.sha256(minimized_js_content.encode()).hexdigest()[:8]
-        minimized_js_path = common_js_path + '.min.' + sha_hash + '.js'
-        # save to minimized js file
-        with open(minimized_js_path, "w") as f:
-            f.write(minimized_js_content)
-        # return minimized js file path
-        return minimized_js_path
-    except:
-        return common_js_path
-
 def get_common_html_javascript_code():
     js = "\n"
-    common_js_path = "themes/common.js"
-    minimized_js_path = minimize_js(common_js_path)
     for jsf in [
-        f"file={minimized_js_path}",
+        "file=themes/common.js",
     ]:
         js += f"""<script src="{jsf}"></script>\n"""
 
@@ -39,6 +15,4 @@ def get_common_html_javascript_code():
             "file=themes/waifu_plugin/jquery-ui.min.js",
         ]:
             js += f"""<script src="{jsf}"></script>\n"""
-    else:
-        js += """<script>window.loadLive2D = function(){};</script>\n"""
     return js

themes/gradios.py

@@ -1,3 +1,4 @@
+import logging
 import os
 import gradio as gr
 from toolbox import get_conf, ProxyNetworkActivate
@@ -9,15 +10,12 @@ theme_dir = os.path.dirname(__file__)
 def dynamic_set_theme(THEME):
     set_theme = gr.themes.ThemeClass()
     with ProxyNetworkActivate("Download_Gradio_Theme"):
-        print("正在下载Gradio主题，请稍等。")
+        logging.info("正在下载Gradio主题，请稍等。")
-        try:
+        if THEME.startswith("Huggingface-"):
-            if THEME.startswith("Huggingface-"):
+            THEME = THEME.lstrip("Huggingface-")
-                THEME = THEME.lstrip("Huggingface-")
+        if THEME.startswith("huggingface-"):
-            if THEME.startswith("huggingface-"):
+            THEME = THEME.lstrip("huggingface-")
-                THEME = THEME.lstrip("huggingface-")
+        set_theme = set_theme.from_hub(THEME.lower())
-            set_theme = set_theme.from_hub(THEME.lower())
-        except:
-            print("下载Gradio主题时出现异常。")
     return set_theme
 
 
@@ -25,16 +23,13 @@ def adjust_theme():
     try:
         set_theme = gr.themes.ThemeClass()
         with ProxyNetworkActivate("Download_Gradio_Theme"):
-            print("正在下载Gradio主题，请稍等。")
+            logging.info("正在下载Gradio主题，请稍等。")
-            try:
+            THEME = get_conf("THEME")
-                THEME = get_conf("THEME")
+            if THEME.startswith("Huggingface-"):
-                if THEME.startswith("Huggingface-"):
+                THEME = THEME.lstrip("Huggingface-")
-                    THEME = THEME.lstrip("Huggingface-")
+            if THEME.startswith("huggingface-"):
-                if THEME.startswith("huggingface-"):
+                THEME = THEME.lstrip("huggingface-")
-                    THEME = THEME.lstrip("huggingface-")
+            set_theme = set_theme.from_hub(THEME.lower())
-                set_theme = set_theme.from_hub(THEME.lower())
-            except:
-                print("下载Gradio主题时出现异常。")
 
         from themes.common import get_common_html_javascript_code
         js = get_common_html_javascript_code()
@@ -54,7 +49,9 @@ def adjust_theme():
         )
     except Exception:
         set_theme = None
-        print("gradio版本较旧, 不能自定义字体和颜色。")
+        from toolbox import trimmed_format_exc
+
+        logging.error("gradio版本较旧, 不能自定义字体和颜色:", trimmed_format_exc())
     return set_theme
 
 

themes/theme.py

@@ -1,10 +1,7 @@
 import pickle
 import base64
 import uuid
-import json
 from toolbox import get_conf
-import json
-
 
 """
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
@@ -48,24 +45,24 @@ adjust_theme, advanced_css, theme_declaration, _ = load_dynamic_theme(get_conf("
 cookie相关工具函数
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 """
-def assign_user_uuid(cookies):
+
+def init_cookie(cookies):
     # 为每一位访问的用户赋予一个独一无二的uuid编码
     cookies.update({"uuid": uuid.uuid4()})
     return cookies
 
 
 def to_cookie_str(d):
-    # serialize the dictionary and encode it as a string
+    # Pickle the dictionary and encode it as a string
-    serialized_dict = json.dumps(d)
+    pickled_dict = pickle.dumps(d)
-    cookie_value = base64.b64encode(serialized_dict.encode('utf8')).decode("utf-8")
+    cookie_value = base64.b64encode(pickled_dict).decode("utf-8")
     return cookie_value
 
 
 def from_cookie_str(c):
-    # Decode the base64-encoded string and unserialize it into a dictionary
+    # Decode the base64-encoded string and unpickle it into a dictionary
-    serialized_dict = base64.b64decode(c.encode("utf-8"))
+    pickled_dict = base64.b64decode(c.encode("utf-8"))
-    serialized_dict.decode("utf-8")
+    return pickle.loads(pickled_dict)
-    return json.loads(serialized_dict)
 
 
 """
@@ -106,15 +103,15 @@ js_code_for_toggle_darkmode = """() => {
 }"""
 
 
-js_code_for_persistent_cookie_init = """(web_cookie_cache, cookie) => {
+js_code_for_persistent_cookie_init = """(py_pickle_cookie, cookie) => {
-    return [getCookie("web_cookie_cache"), cookie];
+    return [getCookie("py_pickle_cookie"), cookie];
 }
 """
 
-# 详见 themes/common.js
+
 js_code_reset = """
 (a,b,c)=>{
-    return reset_conversation(a,b);
+    return [[], [], "已重置"];
 }
 """
 
@@ -178,8 +175,11 @@ setTimeout(() => {
 js_code_show_or_hide_group2 = """
 (display_panel_arr)=>{
 setTimeout(() => {
+    // console.log("display_panel_arr");
+    // get conf
     display_panel_arr = get_checkbox_selected_items("cbsc");
 
+    ////////////////////// 添加Live2D形象 ///////////////////////////
     let searchString = "添加Live2D形象";
     let ele = "none";
     if (display_panel_arr.includes(searchString)) {
@@ -190,6 +190,7 @@ setTimeout(() => {
         $('.waifu').hide();
     }
 
+
 }, 50);
 }
 """

toolbox.py

@@ -7,8 +7,6 @@ import base64
 import gradio
 import shutil
 import glob
-import logging
-import uuid
 from functools import wraps
 from shared_utils.config_loader import get_conf
 from shared_utils.config_loader import set_conf
@@ -27,14 +25,11 @@ from shared_utils.text_mask import apply_gpt_academic_string_mask
 from shared_utils.text_mask import build_gpt_academic_masked_string
 from shared_utils.text_mask import apply_gpt_academic_string_mask_langbased
 from shared_utils.text_mask import build_gpt_academic_masked_string_langbased
-from shared_utils.map_names import map_friendly_names_to_model
-from shared_utils.map_names import map_model_to_friendly_names
-from shared_utils.map_names import read_one_api_model_name
 from shared_utils.handle_upload import html_local_file
 from shared_utils.handle_upload import html_local_img
 from shared_utils.handle_upload import file_manifest_filter_type
 from shared_utils.handle_upload import extract_archive
-from typing import List
+
 pj = os.path.join
 default_user_name = "default_user"
 
@@ -79,8 +74,6 @@ class ChatBotWithCookies(list):
     def get_cookies(self):
         return self._cookies
 
-    def get_user(self):
-        return self._cookies.get("user_name", default_user_name)
 
 def ArgsGeneralWrapper(f):
     """
@@ -88,9 +81,7 @@ def ArgsGeneralWrapper(f):
     该装饰器是大多数功能调用的入口。
     函数示意图：https://mermaid.live/edit#pako:eNqNVFtPGkEY_StkntoEDQtLoTw0sWqapjQxVWPabmOm7AiEZZcsQ9QiiW012qixqdeqqIn10geBh6ZR8PJnmAWe-hc6l3VhrWnLEzNzzvnO953ZyYOYoSIQAWOaMR5LQBN7hvoU3UN_g5iu7imAXEyT4wUF3Pd0dT3y9KGYYUJsmK8V0GPGs0-QjkyojZgwk0Fm82C2dVghX08U8EaoOHjOfoEMU0XmADRhOksVWnNLjdpM82qFzB6S5Q_WWsUhuqCc3JtAsVR_OoMnhyZwXgHWwbS1d4gnsLVZJp-P6mfVxveqAgqC70Jz_pQCOGDKM5xFdNNPDdilF6uSU_hOYqu4a3MHYDZLDzq5fodrC3PWcEaFGPUaRiqJWK_W9g9rvRITa4dhy_0nw67SiePMp3oSR6PPn41DGgllkvkizYwsrmtaejTFd8V4yekGmT1zqrt4XGlAy8WTuiPULF01LksZvukSajfQQRAxmYi5S0D81sDcyzapVdn6sYFHkjhhGyel3frVQnvsnbR23lEjlhIlaOJiFPWzU5G4tfNJo8ejwp47-TbvJkKKZvmxA6SKo16oaazJysfG6klr9T0pbTW2ZqzlL_XaT8fYbQLXe4mSmvoCZXMaa7FePW6s7jVqK9bujvse3WFjY5_Z4KfsA4oiPY4T7Drvn1tLJTbG1to1qR79ulgk89-oJbvZzbIwJty6u20LOReWa9BvwserUd9s9MIKc3x5TUWEoAhUyJK5y85w_yG-dFu_R9waoU7K581y8W_qLle35-rG9Nxcrz8QHRsc0K-r9NViYRT36KsFvCCNzDRMqvSVyzOKAnACpZECIvSvCs2UAhS9QHEwh43BST0GItjMIS_I8e-sLwnj9A262cxA_ZVh0OUY1LJiDSJ5MAEiUijYLUtBORR6KElyQPaCSRDpksNSd8AfluSgHPaFC17wjrOlbgbzyyFf4IFPDvoD_sJvnkdK-g
     """
-    def decorated(request: gradio.Request, cookies:dict, max_length:int, llm_model:str,
+    def decorated(request: gradio.Request, cookies, max_length, llm_model, txt, txt2, top_p, temperature, chatbot, history, system_prompt, plugin_advanced_arg, *args):
-                  txt:str, txt2:str, top_p:float, temperature:float, chatbot:list,
-                  history:list, system_prompt:str, plugin_advanced_arg:str, *args):
         txt_passon = txt
         if txt == "" and txt2 != "": txt_passon = txt2
         # 引入一个有cookie的chatbot
@@ -142,7 +133,7 @@ def ArgsGeneralWrapper(f):
     return decorated
 
 
-def update_ui(chatbot:ChatBotWithCookies, history, msg="正常", **kwargs):  # 刷新界面
+def update_ui(chatbot, history, msg="正常", **kwargs):  # 刷新界面
     """
     刷新用户界面
     """
@@ -172,7 +163,7 @@ def update_ui(chatbot:ChatBotWithCookies, history, msg="正常", **kwargs):  #
     yield cookies, chatbot_gr, history, msg
 
 
-def update_ui_lastest_msg(lastmsg:str, chatbot:ChatBotWithCookies, history:list, delay=1):  # 刷新界面
+def update_ui_lastest_msg(lastmsg, chatbot, history, delay=1):  # 刷新界面
     """
     刷新用户界面
     """
@@ -192,8 +183,6 @@ def trimmed_format_exc():
     replace_path = "."
     return str.replace(current_path, replace_path)
 
-def trimmed_format_exc_markdown():
-    return '\n\n```\n' + trimmed_format_exc() + '```'
 
 def CatchException(f):
     """
@@ -201,12 +190,13 @@ def CatchException(f):
     """
 
     @wraps(f)
-    def decorated(main_input:str, llm_kwargs:dict, plugin_kwargs:dict,
+    def decorated(main_input, llm_kwargs, plugin_kwargs, chatbot_with_cookie, history, *args, **kwargs):
-                  chatbot_with_cookie:ChatBotWithCookies, history:list, *args, **kwargs):
         try:
             yield from f(main_input, llm_kwargs, plugin_kwargs, chatbot_with_cookie, history, *args, **kwargs)
         except Exception as e:
+            from check_proxy import check_proxy
             from toolbox import get_conf
+            proxies = get_conf('proxies')
             tb_str = '```\n' + trimmed_format_exc() + '```'
             if len(chatbot_with_cookie) == 0:
                 chatbot_with_cookie.clear()
@@ -259,7 +249,7 @@ def HotReload(f):
 """
 
 
-def get_reduce_token_percent(text:str):
+def get_reduce_token_percent(text):
     """
     * 此函数未来将被弃用
     """
@@ -278,7 +268,7 @@ def get_reduce_token_percent(text:str):
 
 
 def write_history_to_file(
-    history:list, file_basename:str=None, file_fullname:str=None, auto_caption:bool=True
+    history, file_basename=None, file_fullname=None, auto_caption=True
 ):
     """
     将对话记录history以Markdown格式写入文件中。如果没有指定文件名，则使用当前时间生成文件名。
@@ -312,7 +302,7 @@ def write_history_to_file(
     return res
 
 
-def regular_txt_to_markdown(text:str):
+def regular_txt_to_markdown(text):
     """
     将普通文本转换为Markdown格式的文本。
     """
@@ -322,7 +312,7 @@ def regular_txt_to_markdown(text:str):
     return text
 
 
-def report_exception(chatbot:ChatBotWithCookies, history:list, a:str, b:str):
+def report_exception(chatbot, history, a, b):
     """
     向chatbot中添加错误信息
     """
@@ -330,7 +320,7 @@ def report_exception(chatbot:ChatBotWithCookies, history:list, a:str, b:str):
     history.extend([a, b])
 
 
-def find_free_port()->int:
+def find_free_port():
     """
     返回当前系统中可用的未使用端口。
     """
@@ -343,9 +333,10 @@ def find_free_port()->int:
         return s.getsockname()[1]
 
 
-def find_recent_files(directory:str)->List[str]:
+def find_recent_files(directory):
     """
-    Find files that is created with in one minutes under a directory with python, write a function
+    me: find files that is created with in one minutes under a directory with python, write a function
+    gpt: here it is!
     """
     import os
     import time
@@ -368,7 +359,7 @@ def find_recent_files(directory:str)->List[str]:
     return recent_files
 
 
-def file_already_in_downloadzone(file:str, user_path:str):
+def file_already_in_downloadzone(file, user_path):
     try:
         parent_path = os.path.abspath(user_path)
         child_path = os.path.abspath(file)
@@ -380,7 +371,7 @@ def file_already_in_downloadzone(file:str, user_path:str):
         return False
 
 
-def promote_file_to_downloadzone(file:str, rename_file:str=None, chatbot:ChatBotWithCookies=None):
+def promote_file_to_downloadzone(file, rename_file=None, chatbot=None):
     # 将文件复制一份到下载区
     import shutil
 
@@ -415,12 +406,12 @@ def promote_file_to_downloadzone(file:str, rename_file:str=None, chatbot:ChatBot
     return new_path
 
 
-def disable_auto_promotion(chatbot:ChatBotWithCookies):
+def disable_auto_promotion(chatbot):
     chatbot._cookies.update({"files_to_promote": []})
     return
 
 
-def del_outdated_uploads(outdate_time_seconds:float, target_path_base:str=None):
+def del_outdated_uploads(outdate_time_seconds, target_path_base=None):
     if target_path_base is None:
         user_upload_dir = get_conf("PATH_PRIVATE_UPLOAD")
     else:
@@ -473,8 +464,7 @@ def to_markdown_tabs(head: list, tabs: list, alignment=":---:", column=False, om
 
 
 def on_file_uploaded(
-    request: gradio.Request, files:List[str], chatbot:ChatBotWithCookies,
+    request: gradio.Request, files, chatbot, txt, txt2, checkboxes, cookies
-    txt:str, txt2:str, checkboxes:List[str], cookies:dict
 ):
     """
     当文件被上传时的回调函数
@@ -538,25 +528,18 @@ def on_file_uploaded(
     return chatbot, txt, txt2, cookies
 
 
-def generate_file_link(report_files:List[str]):
+def on_report_generated(cookies, files, chatbot):
-    file_links = ""
+    # from toolbox import find_recent_files
-    for f in report_files:
+    # PATH_LOGGING = get_conf('PATH_LOGGING')
-        file_links += (
-            f'<br/><a href="file={os.path.abspath(f)}" target="_blank">{f}</a>'
-        )
-    return file_links
-
-
-
-
-def on_report_generated(cookies:dict, files:List[str], chatbot:ChatBotWithCookies):
     if "files_to_promote" in cookies:
         report_files = cookies["files_to_promote"]
         cookies.pop("files_to_promote")
     else:
         report_files = []
+    #     report_files = find_recent_files(PATH_LOGGING)
     if len(report_files) == 0:
         return cookies, None, chatbot
+    # files.extend(report_files)
     file_links = ""
     for f in report_files:
         file_links += (
@@ -836,7 +819,7 @@ def is_the_upload_folder(string):
         return False
 
 
-def get_user(chatbotwithcookies:ChatBotWithCookies):
+def get_user(chatbotwithcookies):
     return chatbotwithcookies._cookies.get("user_name", default_user_name)
 
 
@@ -881,6 +864,23 @@ class ProxyNetworkActivate:
         return
 
 
+def objdump(obj, file="objdump.tmp"):
+    import pickle
+
+    with open(file, "wb+") as f:
+        pickle.dump(obj, f)
+    return
+
+
+def objload(file="objdump.tmp"):
+    import pickle, os
+
+    if not os.path.exists(file):
+        return
+    with open(file, "rb") as f:
+        return pickle.load(f)
+
+
 def Singleton(cls):
     """
     一个单实例装饰器
@@ -902,7 +902,7 @@ def get_pictures_list(path):
     return file_manifest
 
 
-def have_any_recent_upload_image_files(chatbot:ChatBotWithCookies):
+def have_any_recent_upload_image_files(chatbot):
     _5min = 5 * 60
     if chatbot is None:
         return False, None  # chatbot is None
@@ -919,18 +919,6 @@ def have_any_recent_upload_image_files(chatbot:ChatBotWithCookies):
     else:
         return False, None  # most_recent_uploaded is too old
 
-# Claude3 model supports graphic context dialogue, reads all images
-def every_image_file_in_path(chatbot:ChatBotWithCookies):
-    if chatbot is None:
-        return False, []  # chatbot is None
-    most_recent_uploaded = chatbot._cookies.get("most_recent_uploaded", None)
-    if not most_recent_uploaded:
-        return False, []  # most_recent_uploaded is None
-    path = most_recent_uploaded["path"]
-    file_manifest = get_pictures_list(path)
-    if len(file_manifest) == 0:
-        return False, []
-    return True, file_manifest
 
 # Function to encode the image
 def encode_image(image_path):
@@ -951,65 +939,3 @@ def check_packages(packages=[]):
         spam_spec = importlib.util.find_spec(p)
         if spam_spec is None:
             raise ModuleNotFoundError
-
-
-def map_file_to_sha256(file_path):
-    import hashlib
-
-    with open(file_path, 'rb') as file:
-        content = file.read()
-
-    # Calculate the SHA-256 hash of the file contents
-    sha_hash = hashlib.sha256(content).hexdigest()
-
-    return sha_hash
-
-
-def check_repeat_upload(new_pdf_path, pdf_hash):
-    '''
-    检查历史上传的文件是否与新上传的文件相同，如果相同则返回(True, 重复文件路径)，否则返回(False，None)
-    '''
-    from toolbox import get_conf
-    import PyPDF2
-
-    user_upload_dir = os.path.dirname(os.path.dirname(new_pdf_path))
-    file_name = os.path.basename(new_pdf_path)
-
-    file_manifest = [f for f in glob.glob(f'{user_upload_dir}/**/{file_name}', recursive=True)]
-
-    for saved_file in file_manifest:
-        with open(new_pdf_path, 'rb') as file1, open(saved_file, 'rb') as file2:
-            reader1 = PyPDF2.PdfFileReader(file1)
-            reader2 = PyPDF2.PdfFileReader(file2)
-
-            # 比较页数是否相同
-            if reader1.getNumPages() != reader2.getNumPages():
-                continue
-
-            # 比较每一页的内容是否相同
-            for page_num in range(reader1.getNumPages()):
-                page1 = reader1.getPage(page_num).extractText()
-                page2 = reader2.getPage(page_num).extractText()
-                if page1 != page2:
-                    continue
-
-        maybe_project_dir = glob.glob('{}/**/{}'.format(get_log_folder(), pdf_hash + ".tag"), recursive=True)
-
-
-        if len(maybe_project_dir) > 0:
-            return True, os.path.dirname(maybe_project_dir[0])
-
-    # 如果所有页的内容都相同，返回 True
-    return False, None
-
-def log_chat(llm_model: str, input_str: str, output_str: str):
-    try:
-        if output_str and input_str and llm_model:
-            uid = str(uuid.uuid4().hex)
-            logging.info(f"[Model({uid})] {llm_model}")
-            input_str = input_str.rstrip('\n')
-            logging.info(f"[Query({uid})]\n{input_str}")
-            output_str = output_str.rstrip('\n')
-            logging.info(f"[Response({uid})]\n{output_str}\n\n")
-    except:
-        print(trimmed_format_exc())

version

@@ -1,5 +1,5 @@
 {
-  "version": 3.75,
+  "version": 3.72,
   "show_feature": true,
-  "new_feature": "添加TTS语音输出（EdgeTTS和SoVits语音克隆） <-> Doc2x PDF翻译 <-> 添加回溯对话按钮"
+  "new_feature": "支持切换多个智谱ai模型 <-> 用绘图功能增强部分插件 <-> 基础功能区支持自动切换中英提示词 <-> 支持Mermaid绘图库（让大模型绘制脑图） <-> 支持Gemini-pro <-> 支持直接拖拽文件到上传区 <-> 支持将图片粘贴到输入区"
 }