update to the latest version

CITATION.cff

@@ -1,5 +1,5 @@
 cff-version: 1.2.0
-title: ChuanhuChatGPT
+title: Chuanhu Chat
 message: >-
   If you use this software, please cite it using these
   metadata.
@@ -13,8 +13,8 @@ authors:
     orcid: https://orcid.org/0009-0005-0357-272X
 repository-code: 'https://github.com/GaiZhenbiao/ChuanhuChatGPT'
 url: 'https://github.com/GaiZhenbiao/ChuanhuChatGPT'
-abstract: Provided a light and easy to use interface for ChatGPT API
+abstract: This software provides a light and easy-to-use interface for ChatGPT API and many LLMs.
 license: GPL-3.0
-commit: bd0034c37e5af6a90bd9c2f7dd073f6cd27c61af
-version: '20230405'
-date-released: '2023-04-05'
+commit: c6c08bc62ef80e37c8be52f65f9b6051a7eea1fa
+version: '20230709'
+date-released: '2023-07-09'

ChuanhuChatbot.py

@@ -38,17 +38,26 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
         status_display = gr.Markdown(get_geoip(), elem_id="status_display")
     with gr.Row(elem_id="float_display"):
         user_info = gr.Markdown(value="getting user info...", elem_id="user_info")
-
-    with gr.Row().style(equal_height=True):
+        update_info = gr.HTML(get_html("update.html").format(
+            current_version=repo_html(),
+            version_time=version_time(),
+            cancel_btn=i18n("取消"),
+            update_btn=i18n("更新"),
+            seenew_btn=i18n("详情"),
+            ok_btn=i18n("好"),
+            ), visible=check_update)
+
+    with gr.Row(equal_height=True):
         with gr.Column(scale=5):
             with gr.Row():
-                chatbot = gr.Chatbot(label="Chuanhu Chat", elem_id="chuanhu_chatbot").style(height="100%")
+                chatbot = gr.Chatbot(label="Chuanhu Chat", elem_id="chuanhu_chatbot", latex_delimiters=latex_delimiters_set, height=700)
             with gr.Row():
                 with gr.Column(min_width=225, scale=12):
                     user_input = gr.Textbox(
                         elem_id="user_input_tb",
-                        show_label=False, placeholder=i18n("在这里输入")
-                    ).style(container=False)
+                        show_label=False, placeholder=i18n("在这里输入"),
+                        container=False
+                    )
                 with gr.Column(min_width=42, scale=1):
                     submitBtn = gr.Button(value="", variant="primary", elem_id="submit_btn")
                     cancelBtn = gr.Button(value="", variant="secondary", visible=False, elem_id="cancel_btn")
@@ -77,9 +86,9 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
                         label="API-Key",
                     )
                     if multi_api_key:
-                        usageTxt = gr.Markdown(i18n("多账号模式已开启，无需输入key，可直接开始对话"), elem_id="usage_display", elem_classes="insert_block")
+                        usageTxt = gr.Markdown(i18n("多账号模式已开启，无需输入key，可直接开始对话"), elem_id="usage_display", elem_classes="insert_block", visible=show_api_billing)
                     else:
-                        usageTxt = gr.Markdown(i18n("**发送消息** 或 **提交key** 以显示额度"), elem_id="usage_display", elem_classes="insert_block")
+                        usageTxt = gr.Markdown(i18n("**发送消息** 或 **提交key** 以显示额度"), elem_id="usage_display", elem_classes="insert_block", visible=show_api_billing)
                     model_select_dropdown = gr.Dropdown(
                         label=i18n("选择模型"), choices=MODELS, multiselect=False, value=MODELS[DEFAULT_MODEL], interactive=True
                     )
@@ -87,8 +96,8 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
                         label=i18n("选择LoRA模型"), choices=[], multiselect=False, interactive=True, visible=False
                     )
                     with gr.Row():
-                        single_turn_checkbox = gr.Checkbox(label=i18n("单轮对话"), value=False)
-                        use_websearch_checkbox = gr.Checkbox(label=i18n("使用在线搜索"), value=False)
+                        single_turn_checkbox = gr.Checkbox(label=i18n("单轮对话"), value=False, elem_classes="switch_checkbox")
+                        use_websearch_checkbox = gr.Checkbox(label=i18n("使用在线搜索"), value=False, elem_classes="switch_checkbox")
                     language_select_dropdown = gr.Dropdown(
                         label=i18n("选择回复语言（针对搜索&索引功能）"),
                         choices=REPLY_LANGUAGES,
@@ -107,8 +116,8 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
                         placeholder=i18n("在这里输入System Prompt..."),
                         label="System prompt",
                         value=INITIAL_SYSTEM_PROMPT,
-                        lines=10,
-                    ).style(container=False)
+                        lines=10
+                    )
                     with gr.Accordion(label=i18n("加载Prompt模板"), open=True):
                         with gr.Column():
                             with gr.Row():
@@ -118,7 +127,8 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
                                         choices=get_template_names(plain=True),
                                         multiselect=False,
                                         value=get_template_names(plain=True)[0],
-                                    ).style(container=False)
+                                        container=False,
+                                    )
                                 with gr.Column(scale=1):
                                     templateRefreshBtn = gr.Button(i18n("🔄 刷新"))
                             with gr.Row():
@@ -129,7 +139,8 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
                                             get_template_names(plain=True)[0], mode=1
                                         ),
                                         multiselect=False,
-                                    ).style(container=False)
+                                        container=False,
+                                    )
 
                 with gr.Tab(label=i18n("保存/加载")):
                     with gr.Accordion(label=i18n("保存/加载对话历史记录"), open=True):
@@ -139,10 +150,14 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
                                     historyFileSelectDropdown = gr.Dropdown(
                                         label=i18n("从列表中加载对话"),
                                         choices=get_history_names(plain=True),
-                                        multiselect=False
+                                        multiselect=False,
+                                        container=False,
                                     )
-                                with gr.Column(scale=1):
-                                    historyRefreshBtn = gr.Button(i18n("🔄 刷新"))
+                                with gr.Row():
+                                    with gr.Column(min_width=42, scale=1):
+                                        historyRefreshBtn = gr.Button(i18n("🔄 刷新"))
+                                    with gr.Column(min_width=42, scale=1):
+                                        historyDeleteBtn = gr.Button(i18n("🗑️ 删除"))
                             with gr.Row():
                                 with gr.Column(scale=6):
                                     saveFileName = gr.Textbox(
@@ -150,7 +165,8 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
                                         placeholder=i18n("设置文件名: 默认为.json，可选为.md"),
                                         label=i18n("设置保存文件名"),
                                         value=i18n("对话历史记录"),
-                                    ).style(container=True)
+                                        container=False,
+                                    )
                                 with gr.Column(scale=1):
                                     saveHistoryBtn = gr.Button(i18n("💾 保存对话"))
                                     exportMarkdownBtn = gr.Button(i18n("📝 导出为Markdown"))
@@ -160,11 +176,12 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
                                     downloadFile = gr.File(interactive=True)
 
                 with gr.Tab(label=i18n("高级")):
-                    gr.Markdown(i18n("# ⚠️ 务必谨慎更改 ⚠️\n\n如果无法使用请恢复默认设置"))
                     gr.HTML(get_html("appearance_switcher.html").format(label=i18n("切换亮暗色主题")), elem_classes="insert_block")
                     use_streaming_checkbox = gr.Checkbox(
-                            label=i18n("实时传输回答"), value=True, visible=ENABLE_STREAMING_OPTION
+                            label=i18n("实时传输回答"), value=True, visible=ENABLE_STREAMING_OPTION, elem_classes="switch_checkbox"
                         )
+                    checkUpdateBtn = gr.Button(i18n("🔄 检查更新..."), visible=check_update)
+                    gr.Markdown(i18n("# ⚠️ 务必谨慎更改 ⚠️"), elem_id="advanced_warning")
                     with gr.Accordion(i18n("参数"), open=False):
                         temperature_slider = gr.Slider(
                             minimum=-0,
@@ -192,7 +209,7 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
                         )
                         stop_sequence_txt = gr.Textbox(
                             show_label=True,
-                            placeholder=i18n("在这里输入停止符，用英文逗号隔开..."),
+                            placeholder=i18n("停止符，用英文逗号隔开..."),
                             label="stop",
                             value="",
                             lines=1,
@@ -244,7 +261,7 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
                             lines=1,
                         )
 
-                    with gr.Accordion(i18n("网络设置"), open=False, visible=False):
+                    with gr.Accordion(i18n("网络设置"), open=False):
                         # 优先展示自定义的api_host
                         apihostTxt = gr.Textbox(
                             show_label=True,
@@ -252,6 +269,7 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
                             label="API-Host",
                             value=config.api_host or shared.API_HOST,
                             lines=1,
+                            container=False,
                         )
                         changeAPIURLBtn = gr.Button(i18n("🔄 切换API地址"))
                         proxyTxt = gr.Textbox(
@@ -260,6 +278,7 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
                             label=i18n("代理地址（示例：http://127.0.0.1:10809）"),
                             value="",
                             lines=2,
+                            container=False,
                         )
                         changeProxyBtn = gr.Button(i18n("🔄 设置代理地址"))
                         default_btn = gr.Button(i18n("🔙 恢复默认设置"))
@@ -323,6 +342,10 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
         outputs=[saveFileName, systemPromptTxt, chatbot]
     )
 
+    refresh_history_args = dict(
+        fn=get_history_names, inputs=[gr.State(False), user_name], outputs=[historyFileSelectDropdown]
+    )
+
 
     # Chatbot
     cancelBtn.click(interrupt, [current_model], [])
@@ -341,6 +364,7 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
         inputs=[current_model],
         outputs=[chatbot, status_display],
         show_progress=True,
+        _js='()=>{clearHistoryHtml();}',
     )
 
     retryBtn.click(**start_outputing_args).then(
@@ -391,7 +415,7 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
     keyTxt.change(set_key, [current_model, keyTxt], [user_api_key, status_display], api_name="set_key").then(**get_usage_args)
     keyTxt.submit(**get_usage_args)
     single_turn_checkbox.change(set_single_turn, [current_model, single_turn_checkbox], None)
-    model_select_dropdown.change(get_model, [model_select_dropdown, lora_select_dropdown, user_api_key, temperature_slider, top_p_slider, systemPromptTxt, user_name], [current_model, status_display, chatbot, lora_select_dropdown], show_progress=True, api_name="get_model")
+    model_select_dropdown.change(get_model, [model_select_dropdown, lora_select_dropdown, user_api_key, temperature_slider, top_p_slider, systemPromptTxt, user_name], [current_model, status_display, chatbot, lora_select_dropdown, user_api_key, keyTxt], show_progress=True, api_name="get_model")
     model_select_dropdown.change(toggle_like_btn_visibility, [model_select_dropdown], [like_dislike_area], show_progress=False)
     lora_select_dropdown.change(get_model, [model_select_dropdown, lora_select_dropdown, user_api_key, temperature_slider, top_p_slider, systemPromptTxt, user_name], [current_model, status_display, chatbot], show_progress=True)
 
@@ -425,7 +449,8 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
         downloadFile,
         show_progress=True,
     )
-    historyRefreshBtn.click(get_history_names, [gr.State(False), user_name], [historyFileSelectDropdown])
+    historyRefreshBtn.click(**refresh_history_args)
+    historyDeleteBtn.click(delete_chat_history, [current_model, historyFileSelectDropdown, user_name], [status_display, historyFileSelectDropdown, chatbot], _js='(a,b,c)=>{return showConfirmationDialog(a, b, c);}')
     historyFileSelectDropdown.change(**load_history_from_file_args)
     downloadFile.change(upload_chat_history, [current_model, downloadFile, user_name], [saveFileName, systemPromptTxt, chatbot])
 
@@ -456,6 +481,7 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
         [status_display],
         show_progress=True,
     )
+    checkUpdateBtn.click(fn=None, _js='()=>{manualCheckUpdate();}')
 
 logging.info(
     colorama.Back.GREEN
@@ -469,5 +495,10 @@ if __name__ == "__main__":
     reload_javascript()
     demo.queue(concurrency_count=CONCURRENT_COUNT).launch(
         blocked_paths=["config.json"],
-        favicon_path="./assets/favicon.ico"
+        server_name=server_name,
+        server_port=server_port,
+        share=share,
+        auth=auth_list if authflag else None,
+        favicon_path="./assets/favicon.ico",
+        inbrowser=not dockerflag, # 禁止在docker下开启inbrowser
     )

Dockerfile

@@ -1,15 +1,18 @@
-FROM python:3.9 as builder
-RUN apt-get update && apt-get install -y build-essential
+FROM python:3.9-slim-buster as builder
+RUN apt-get update \
+    && apt-get install -y build-essential \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 COPY requirements.txt .
 COPY requirements_advanced.txt .
-RUN pip install --user -r requirements.txt
-# RUN pip install --user -r requirements_advanced.txt
+RUN pip install --user --no-cache-dir -r requirements.txt
+# RUN pip install --user --no-cache-dir -r requirements_advanced.txt
 
-FROM python:3.9
-MAINTAINER iskoldt
+FROM python:3.9-slim-buster
+LABEL maintainer="iskoldt"
 COPY --from=builder /root/.local /root/.local
 ENV PATH=/root/.local/bin:$PATH
 COPY . /app
 WORKDIR /app
-ENV dockerrun yes
-CMD ["python3", "-u", "ChuanhuChatbot.py", "2>&1", "|", "tee", "/var/log/application.log"]
+ENV dockerrun=yes
+CMD ["python3", "-u", "ChuanhuChatbot.py","2>&1", "|", "tee", "/var/log/application.log"]

README.md

@@ -1,14 +1,142 @@
----
-title: ChuanhuChatGPT
-emoji: 🐯
-colorFrom: green
-colorTo: red
-sdk: gradio
-sdk_version: 3.33.1
-app_file: ChuanhuChatbot.py
-pinned: false
-license: gpl-3.0
-duplicated_from: JohnSmith9982/ChuanhuChatGPT
----
-
-Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference
+<div align="right">
+  <!-- 语言: -->
+  简体中文 | <a title="English" href="./readme/README_en.md">English</a> | <a title="Japanese" href="./readme/README_ja.md">日本語</a>
+</div>
+
+<h1 align="center">川虎 Chat 🐯 Chuanhu Chat</h1>
+<div align="center">
+  <a href="https://github.com/GaiZhenBiao/ChuanhuChatGPT">
+    <img src="https://github.com/GaiZhenbiao/ChuanhuChatGPT/assets/70903329/aca3a7ec-4f1d-4667-890c-a6f47bf08f63" alt="Logo" height="156">
+  </a>
+
+<p align="center">
+    <h3>为ChatGPT等多种LLM提供了一个轻快好用的Web图形界面和众多附加功能</h3>
+    <p align="center">
+      <a href="https://github.com/GaiZhenbiao/ChuanhuChatGPT/blob/main/LICENSE">
+        <img alt="Tests Passing" src="https://img.shields.io/github/license/GaiZhenbiao/ChuanhuChatGPT" />
+      </a>
+      <a href="https://gradio.app/">
+        <img alt="GitHub Contributors" src="https://img.shields.io/badge/Base-Gradio-fb7d1a?style=flat" />
+      </a>
+      <a href="https://t.me/tkdifferent">
+        <img alt="GitHub pull requests" src="https://img.shields.io/badge/Telegram-Group-blue.svg?logo=telegram" />
+      </a>
+      <p>
+        流式传输 / 无限对话 / 保存对话 / 预设Prompt集 / 联网搜索 / 根据文件回答 <br />
+        渲染LaTeX / 渲染表格 / 代码高亮 / 自动亮暗色切换 / 自适应界面 / “小而美”的体验 <br />
+        自定义api-Host / 多参数可调 / 多API Key均衡负载 / 多用户显示 / 适配GPT-4 / 支持本地部署LLM
+      </p>
+      <a href="https://www.bilibili.com/video/BV1mo4y1r7eE"><strong>视频教程</strong></a>
+        ·
+      <a href="https://www.bilibili.com/video/BV1184y1w7aP"><strong>2.0介绍视频</strong></a>
+	||
+      <a href="https://huggingface.co/spaces/JohnSmith9982/ChuanhuChatGPT"><strong>在线体验</strong></a>
+      	·
+      <a href="https://huggingface.co/login?next=%2Fspaces%2FJohnSmith9982%2FChuanhuChatGPT%3Fduplicate%3Dtrue"><strong>一键部署</strong></a>
+    </p>
+    <p align="center">
+      <img alt="Animation Demo" src="https://user-images.githubusercontent.com/51039745/226255695-6b17ff1f-ea8d-464f-b69b-a7b6b68fffe8.gif" />
+    </p>
+  </p>
+</div>
+
+## 目录
+
+| [支持模型](#支持模型) | [使用技巧](#使用技巧) | [安装方式](https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/使用教程) | [常见问题](https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/常见问题) | [给作者买可乐🥤](#捐款) |
+| ------------------ | ------------------ | -------------------------------------------------------------------- | -------------------------------------------------------------------- | -------------------- |
+
+## 支持模型
+
+**通过API调用的语言模型**：
+
+- [ChatGPT](https://chat.openai.com) ([GPT-4](https://openai.com/product/gpt-4))
+- [Google PaLM](https://developers.generativeai.google/products/palm)
+- [Inspur Yuan 1.0](https://air.inspur.com/home)
+- [MiniMax](https://api.minimax.chat/)
+- [XMChat](https://github.com/MILVLG/xmchat)
+
+**本地部署语言模型**：
+
+- [ChatGLM](https://github.com/THUDM/ChatGLM-6B) ([ChatGLM2](https://github.com/THUDM/ChatGLM2-6B))
+- [LLaMA](https://github.com/facebookresearch/llama)
+- [StableLM](https://github.com/Stability-AI/StableLM)
+- [MOSS](https://github.com/OpenLMLab/MOSS)
+
+## 使用技巧
+
+- 使用System Prompt可以很有效地设定前提条件。
+- 使用Prompt模板功能时，选择Prompt模板集合文件，然后从下拉菜单中选择想要的prompt。
+- 如果回答不满意，可以使用 `重新生成`按钮再试一次
+- 输入框支持换行，按 `shift enter`即可。
+- 可以在输入框按上下箭头在输入历史之间切换
+- 部署到服务器：在 `config.json` 中设置 `"server_name": "0.0.0.0", "server_port": <你的端口号>,`。
+- 获取公共链接：在 `config.json` 中设置 `"share": true,`。注意程序必须在运行，才能通过公共链接访问。
+- 在Hugging Face上使用：建议在右上角 **复制Space** 再使用，这样App反应可能会快一点。
+
+## 快速上手
+
+```shell
+git clone https://github.com/GaiZhenbiao/ChuanhuChatGPT.git
+cd ChuanhuChatGPT
+pip install -r requirements.txt
+```
+
+然后，在项目文件夹中复制一份 `config_example.json`，并将其重命名为 `config.json`，在其中填入 `API-Key` 等设置。
+
+```shell
+python ChuanhuChatbot.py
+```
+
+一个浏览器窗口将会自动打开，此时您将可以使用 **川虎Chat** 与ChatGPT或其他模型进行对话。
+
+> **Note**
+>
+> 具体详尽的安装教程和使用教程请查看[本项目的wiki页面](https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/使用教程)。
+
+## 疑难杂症解决
+
+在遇到各种问题查阅相关信息前，您可以先尝试手动拉取本项目的最新更改并更新依赖库，然后重试。步骤为：
+
+1. 点击网页上的 `Download ZIP` 下载最新代码，或
+   ```shell
+   git pull https://github.com/GaiZhenbiao/ChuanhuChatGPT.git main -f
+   ```
+2. 尝试再次安装依赖（可能本项目引入了新的依赖）
+   ```
+   pip install -r requirements.txt
+   ```
+
+很多时候，这样就可以解决问题。
+
+如果问题仍然存在，请查阅该页面：[常见问题](https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/常见问题)
+
+该页面列出了**几乎所有**您可能遇到的各种问题，包括如何配置代理，以及遇到问题后您该采取的措施，**请务必认真阅读**。
+
+## 了解更多
+
+若需了解更多信息，请查看我们的 [wiki](https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki)：
+
+- [想要做出贡献？](https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/贡献指南)
+- [项目更新情况？](https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/更新日志)
+- [二次开发许可？](https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/使用许可)
+- [如何引用项目？](https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/使用许可#如何引用该项目)
+
+## Starchart
+
+[![Star History Chart](https://api.star-history.com/svg?repos=GaiZhenbiao/ChuanhuChatGPT&type=Date)](https://star-history.com/#GaiZhenbiao/ChuanhuChatGPT&Date)
+
+## Contributors
+
+<a href="https://github.com/GaiZhenbiao/ChuanhuChatGPT/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=GaiZhenbiao/ChuanhuChatGPT" />
+</a>
+
+## 捐款
+
+🐯如果觉得这个软件对你有所帮助，欢迎请作者喝可乐、喝咖啡～
+
+联系作者：请去[我的bilibili账号](https://space.bilibili.com/29125536)私信我。
+
+<a href="https://www.buymeacoffee.com/ChuanhuChat" ><img src="https://img.buymeacoffee.com/button-api/?text=Buy me a coffee&emoji=&slug=ChuanhuChat&button_colour=219d53&font_colour=ffffff&font_family=Poppins&outline_colour=ffffff&coffee_colour=FFDD00" alt="Buy Me A Coffee" width="250"></a>
+
+<img width="250" alt="image" src="https://user-images.githubusercontent.com/51039745/226920291-e8ec0b0a-400f-4c20-ac13-dafac0c3aeeb.JPG">

assets/custom.css

@@ -7,8 +7,11 @@
     --message-user-background-color-dark: #26B561;
     --message-bot-background-color-light: #FFFFFF;
     --message-bot-background-color-dark: #2C2C2C;
+    --switch-checkbox-color-light: #e5e7eb;
+    --switch-checkbox-color-dark: #515151;
 }
 
+
 #app_title {
     font-weight: var(--prose-header-text-weight);
     font-size: var(--text-xxl);
@@ -22,6 +25,19 @@
     margin: 32px 0 4px 0;
 }
 
+/* 解决container=False时的错误填充 */
+div.form {
+    background: none !important;
+}
+
+/* 高级页面 */
+#advanced_warning {
+    display: flex;
+    flex-wrap: wrap;
+    flex-direction: column;
+    align-content: center;
+}
+
 /* gradio的页脚信息 */
 footer {
     /* display: none !important; */
@@ -43,21 +59,74 @@ footer {
     position: absolute;
     max-height: 30px;
 }
+#toast-update {
+    position: absolute;
+    display: flex;
+    top: -500px;
+    width: 100%;
+    justify-content: center;
+    z-index: var(--layer-top);
+    transition: top 0.3s ease-out;
+}
+#check-chuanhu-update {
+    position: absolute;
+    align-items: center;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    margin: var(--size-6) var(--size-4);
+    box-shadow: var(--shadow-drop-lg);
+    border: 1px solid var(--block-label-border-color);
+    border-radius: var(--container-radius);
+    background: var(--background-fill-primary);
+    padding: var(--size-4) var(--size-6);
+    min-width: 360px;
+    max-width: 480px;
+    overflow: hidden;
+    pointer-events: auto;
+}
+#version-info-title {
+    font-size: 1.2em;
+    font-weight: bold;
+    text-align: start;
+    width: 100%;
+}
+#release-note-wrap {
+    width: 100%;
+    max-width: 400px;
+    height: 120px;
+    border: solid 1px var(--border-color-primary);
+    overflow: auto;
+    padding: 0 8px;
+}
+#release-note-wrap.hideK {
+    display: none;
+}
+.btn-update-group {
+    display: flex;
+    justify-content: space-evenly;
+    align-items: center;
+    width: 100%;
+    padding-top: 10px;
+}
+.btn-update-group.hideK {
+    display: none;
+}
 /* user_info */
-#user_info {
+#user_info.block {
     white-space: nowrap;
-    position: absolute; left: 8em; top: .2em;
+    position: absolute; left: 8em; top: .8em;
     z-index: var(--layer-2);
     box-shadow: var(--block-shadow);
-    border: none; border-radius: var(--block-label-radius);
+    border: none!important; border-radius: var(--block-label-radius);
     background: var(--color-accent);
     padding: var(--block-label-padding);
     font-size: var(--block-label-text-size); line-height: var(--line-sm);
-    width: auto; min-height: 30px!important;
+    width: auto; max-height: 30px!important;
     opacity: 1;
     transition: opacity 0.3s ease-in-out;
 }
-#user_info .wrap {
+#user_info.block .wrap {
     opacity: 0;
 }
 #user_info p {
@@ -94,7 +163,7 @@ footer {
 .insert_block {
     position: relative;
     margin: 0;
-    padding: .5em 1em;
+    padding: 8px 12px;
     box-shadow: var(--block-shadow);
     border-width: var(--block-border-width);
     border-color: var(--block-border-color);
@@ -132,13 +201,42 @@ footer {
     line-height: 20px;
 }
 
-.apSwitch {
+/* 亮暗色模式切换 */
+#apSwitch input[type="checkbox"] {
+    margin: 0 !important;
+}
+#apSwitch label.apSwitch {
+    display: flex;
+    align-items: center;
+    cursor: pointer;
+    color: var(--body-text-color);
+    font-weight: var(--checkbox-label-text-weight);
+    font-size: var(--checkbox-label-text-size);
+    line-height: var(--line-md);
+    margin: 2px 0 !important;
+}
+input[type="checkbox"]#apSwitch_checkbox::before {
+    background: none !important;
+    content: '🌞';
+    border: none !important;
+    box-shadow: none !important;
+    font-size: 22px;
+    top: -4.4px;
+    left: -1px;
+}
+input:checked[type="checkbox"]#apSwitch_checkbox::before {
+    content: '🌚';
+    left: 16px;
+}
+
+/* .apSwitch {
     top: 2px;
     display: inline-block;
-    height: 24px;
+    height: 22px;
     position: relative;
-    width: 48px;
-    border-radius: 12px;
+    width: 40px;
+    border-radius: 11px;
+    box-shadow: inset 0 0 1px 0 rgba(0,0,0,0.05), inset 0 0 2px 0 rgba(0,0,0,0.08) !important;
 }
 .apSwitch input {
     display: none !important;
@@ -152,12 +250,11 @@ footer {
     right: 0;
     top: 0;
     transition: .4s;
-    font-size: 18px;
-    border-radius: 12px;
+    font-size: 22px;
+    border-radius: 11px;
 }
 .apSlider::before {
-    bottom: -1.5px;
-    left: 1px;
+    transform: scale(0.9);
     position: absolute;
     transition: .4s;
     content: "🌞";
@@ -166,8 +263,63 @@ input:checked + .apSlider {
     background-color: var(--primary-600);
 }
 input:checked + .apSlider::before {
-    transform: translateX(23px);
+    transform: translateX(18px);
     content:"🌚";
+} */
+
+.switch_checkbox label {
+    flex-direction: row-reverse;
+    justify-content: space-between;
+}
+.switch_checkbox input[type="checkbox"] + span {
+    margin-left: 0 !important;
+}
+
+.switch_checkbox input[type="checkbox"] {
+    -moz-appearance: none;
+    appearance: none;
+    -webkit-appearance: none;
+    outline: none;
+}
+
+.switch_checkbox input[type="checkbox"] {
+    display: inline-block !important;
+    position: relative !important;
+    border: none !important;
+    outline: none;
+    width: 40px !important;
+    height: 22px !important;
+    border-radius: 11px !important;
+    background-image: none !important;
+    box-shadow: inset 0 0 1px 0 rgba(0,0,0,0.05), inset 0 0 2px 0 rgba(0,0,0,0.08) !important;
+    background-image: none !important;
+    background-color: var(--switch-checkbox-color-light) !important;
+    transition: .2s ease background-color;
+}
+.dark .switch_checkbox input[type="checkbox"] {
+    background-color: var(--switch-checkbox-color-dark) !important;
+}
+.switch_checkbox input[type="checkbox"]::before {
+    content: "";
+    position: absolute;
+    width: 22px;
+    height: 22px;
+    top: 0;
+    left: 0;
+    background: #FFFFFF;
+    border: 0.5px solid rgba(0,0,0,0.02);
+    box-shadow: 0 0 0 0 rgba(0,0,0,0.15), 0 1px 0 0 rgba(0,0,0,0.05);
+    transform: scale(0.9);
+    border-radius: 11px !important;
+    transition: .4s ease all;
+    box-shadow: var(--input-shadow);
+}
+.switch_checkbox input:checked[type="checkbox"] {
+    background-color: var(--primary-600) !important;
+}
+.switch_checkbox input:checked[type="checkbox"]::before {
+    background-color: #fff;
+    left: 18px;
 }
 
 /* Override Slider Styles (for webkit browsers like Safari and Chrome)
@@ -204,6 +356,45 @@ input[type=range]::-webkit-slider-runnable-track {
     background: transparent;
 }
 
+hr.append-display {
+    margin: 8px 0;
+    border: none;
+    height: 1px;
+    border-top-width: 0;
+    background-image: linear-gradient(to right, rgba(50,50,50, 0.1), rgba(150, 150, 150, 0.8), rgba(50,50,50, 0.1));
+}
+.source-a {
+    font-size: 0.8em;
+    max-width: 100%;
+    margin: 0;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    align-items: center;
+    /* background-color: #dddddd88; */
+    border-radius: 1.5rem;
+    padding: 0.2em;
+}
+.source-a a {
+    display: inline-block;
+    background-color: #aaaaaa50;
+    border-radius: 1rem;
+    padding: 0.5em;
+    text-align: center;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    min-width: 20%;
+    white-space: nowrap;
+    margin: 0.2rem 0.1rem;
+    text-decoration: none !important;
+    flex: 1;
+    transition: flex 0.5s;
+}
+.source-a a:hover {
+    background-color: #aaaaaa20;
+    flex: 2;
+}
+
 #submit_btn, #cancel_btn {
     height: 42px !important;
 }
@@ -249,7 +440,7 @@ ol:not(.options), ul:not(.options) {
     #chuanhu_chatbot {
         height: calc(100vh - 200px);
     }
-    #chuanhu_chatbot .wrap {
+    #chuanhu_chatbot>.wrapper>.wrap {
         max-height: calc(100vh - 200px - var(--line-sm)*1rem - 2*var(--block-label-margin) );
     }
 }
@@ -258,7 +449,7 @@ ol:not(.options), ul:not(.options) {
     #chuanhu_chatbot {
         height: calc(100vh - 140px);
     }
-    #chuanhu_chatbot .wrap {
+    #chuanhu_chatbot>.wrapper>.wrap {
         max-height: calc(100vh - 140px - var(--line-sm)*1rem - 2*var(--block-label-margin) );
     }
     [data-testid = "bot"] {
@@ -268,7 +459,7 @@ ol:not(.options), ul:not(.options) {
         letter-spacing: -1px; font-size: 22px;
     }
 }
-#chuanhu_chatbot .wrap {
+#chuanhu_chatbot>.wrapper>.wrap {
     overflow-x: hidden;
 }
 /* 对话气泡 */
@@ -364,7 +555,7 @@ ol:not(.options), ul:not(.options) {
 }
 
 /* history message */
-.wrap>.history-message {
+.wrapper>.wrap>.history-message {
     padding: 10px !important;
 }
 .history-message {
@@ -383,7 +574,7 @@ ol:not(.options), ul:not(.options) {
 .history-message>.message {
     margin-bottom: 16px;
 }
-.wrap>.history-message::after {
+.wrapper>.wrap>.history-message::after {
     content: "";
     display: block;
     height: 2px;
@@ -392,7 +583,7 @@ ol:not(.options), ul:not(.options) {
     margin-top: -10px;
     clear: both;
 }
-.wrap>.history-message>:last-child::after {
+.wrapper>.wrap>.history-message>:last-child::after {
     content: "仅供查看";
     display: block;
     text-align: center;

assets/custom.js

@@ -15,26 +15,60 @@ var appTitleDiv = null;
 var chatbot = null;
 var chatbotWrap = null;
 var apSwitch = null;
-var empty_botton = null;
 var messageBotDivs = null;
 var loginUserForm = null;
 var logginUser = null;
+var updateToast = null;
+var sendBtn = null;
+var cancelBtn = null;
+var sliders = null;
 
 var userLogged = false;
 var usernameGotten = false;
 var historyLoaded = false;
+var updateInfoGotten = false;
+var isLatestVersion = localStorage.getItem('isLatestVersion') || false;
 
 var ga = document.getElementsByTagName("gradio-app");
 var targetNode = ga[0];
 var isInIframe = (window.self !== window.top);
 var language = navigator.language.slice(0,2);
+var currentTime = new Date().getTime();
 
+// i18n
 var forView_i18n = {
     'zh': "仅供查看",
     'en': "For viewing only",
     'ja': "閲覧専用",
+    'ko': "읽기 전용",
     'fr': "Pour consultation seulement",
     'es': "Solo para visualización",
+    'sv': "Endast för visning",
+};
+
+var deleteConfirm_i18n_pref = {
+    'zh': "你真的要删除 ",
+    'en': "Are you sure you want to delete ",
+    'ja': "本当に ",
+    'ko': "정말로 ",
+    'sv': "Är du säker på att du vill ta bort "
+};
+var deleteConfirm_i18n_suff = {
+    'zh': " 吗？",
+    'en': " ?",
+    'ja': " を削除してもよろしいですか？",
+    'ko': " 을(를) 삭제하시겠습니까?",
+    'sv': " ?"
+};
+var deleteConfirm_msg_pref = "Are you sure you want to delete ";
+var deleteConfirm_msg_suff = " ?";
+
+var usingLatest_i18n = {
+    'zh': "您使用的就是最新版！",
+    'en': "You are using the latest version!",
+    'ja': "最新バージョンを使用しています！",
+    'ko': "최신 버전을 사용하고 있습니다!",
+    'sv': "Du använder den senaste versionen!"
 };
 
 // gradio 页面加载好了么??? 我能动你的元素了么??
@@ -47,9 +81,12 @@ function gradioLoaded(mutations) {
             userInfoDiv = document.getElementById("user_info");
             appTitleDiv = document.getElementById("app_title");
             chatbot = document.querySelector('#chuanhu_chatbot');
-            chatbotWrap = document.querySelector('#chuanhu_chatbot > .wrap');
+            chatbotWrap = document.querySelector('#chuanhu_chatbot > .wrapper > .wrap');
             apSwitch = document.querySelector('.apSwitch input[type="checkbox"]');
-            empty_botton = document.getElementById("empty_btn")
+            updateToast = document.querySelector("#toast-update");
+            sendBtn = document.getElementById("submit_btn");
+            cancelBtn = document.getElementById("cancel_btn");
+            sliders = document.querySelectorAll('input[type="range"]');
 
             if (loginUserForm) {
                 localStorage.setItem("userLogged", true);
@@ -76,29 +113,54 @@ function gradioLoaded(mutations) {
                     loadHistoryHtml();
                 }
                 setChatbotScroll();
+                mObserver.observe(chatbotWrap, { attributes: true, childList: true, subtree: true, characterData: true});
+            }
+            if (sliders) {
+                setSlider();
             }
-            if (empty_botton) {
-                emptyHistory();
+            if (updateToast) {
+                const lastCheckTime = localStorage.getItem('lastCheckTime') || 0;
+                const longTimeNoCheck = currentTime - lastCheckTime > 3 * 24 * 60 * 60 * 1000;
+                if (longTimeNoCheck && !updateInfoGotten && !isLatestVersion || isLatestVersion && !updateInfoGotten) {
+                    updateLatestVersion();
+                }
+            }
+            if (cancelBtn) {
+                submitObserver.observe(cancelBtn, { attributes: true, characterData: true});
             }
         }
     }
 }
 
 function webLocale() {
-    console.log("webLocale", language);
+    // console.log("webLocale", language);
     if (forView_i18n.hasOwnProperty(language)) {
         var forView = forView_i18n[language];
         var forViewStyle = document.createElement('style');
-        forViewStyle.innerHTML = '.wrap>.history-message>:last-child::after { content: "' + forView + '"!important; }';
+        forViewStyle.innerHTML = '.wrapper>.wrap>.history-message>:last-child::after { content: "' + forView + '"!important; }';
         document.head.appendChild(forViewStyle);
-        // console.log("added forViewStyle", forView);
+    }
+    if (deleteConfirm_i18n_pref.hasOwnProperty(language)) {
+        deleteConfirm_msg_pref = deleteConfirm_i18n_pref[language];
+        deleteConfirm_msg_suff = deleteConfirm_i18n_suff[language];
     }
 }
 
+function showConfirmationDialog(a, file, c) {
+    if (file != "") {
+        var result = confirm(deleteConfirm_msg_pref + file + deleteConfirm_msg_suff);
+        if (result) {
+            return [a, file, c];
+        }
+    }
+    return [a, "CANCELED", c];
+}
+
 function selectHistory() {
     user_input_ta = user_input_tb.querySelector("textarea");
     if (user_input_ta) {
         observer.disconnect(); // 停止监听
+        disableSendBtn();
         // 在 textarea 上监听 keydown 事件
         user_input_ta.addEventListener("keydown", function (event) {
             var value = user_input_ta.value.trim();
@@ -143,6 +205,13 @@ function selectHistory() {
     }
 }
 
+function disableSendBtn() {
+    sendBtn.disabled = user_input_ta.value.trim() === '';
+    user_input_ta.addEventListener('input', () => {
+        sendBtn.disabled = user_input_ta.value.trim() === '';
+    });
+}
+
 var username = null;
 function getUserInfo() {
     if (usernameGotten) {
@@ -181,8 +250,6 @@ function toggleUserInfoVisibility(shouldHide) {
     }
 }
 function showOrHideUserInfo() {
-    var sendBtn = document.getElementById("submit_btn");
-
     // Bind mouse/touch events to show/hide user info
     appTitleDiv.addEventListener("mouseenter", function () {
         toggleUserInfoVisibility(false);
@@ -266,22 +333,21 @@ function setChatbotHeight() {
     const screenWidth = window.innerWidth;
     const statusDisplay = document.querySelector('#status_display');
     const statusDisplayHeight = statusDisplay ? statusDisplay.offsetHeight : 0;
-    const wrap = chatbot.querySelector('.wrap');
     const vh = window.innerHeight * 0.01;
     document.documentElement.style.setProperty('--vh', `${vh}px`);
     if (isInIframe) {
         chatbot.style.height = `700px`;
-        wrap.style.maxHeight = `calc(700px - var(--line-sm) * 1rem - 2 * var(--block-label-margin))`
+        chatbotWrap.style.maxHeight = `calc(700px - var(--line-sm) * 1rem - 2 * var(--block-label-margin))`
     } else {
         if (screenWidth <= 320) {
             chatbot.style.height = `calc(var(--vh, 1vh) * 100 - ${statusDisplayHeight + 150}px)`;
-            wrap.style.maxHeight = `calc(var(--vh, 1vh) * 100 - ${statusDisplayHeight + 150}px - var(--line-sm) * 1rem - 2 * var(--block-label-margin))`;
+            chatbotWrap.style.maxHeight = `calc(var(--vh, 1vh) * 100 - ${statusDisplayHeight + 150}px - var(--line-sm) * 1rem - 2 * var(--block-label-margin))`;
         } else if (screenWidth <= 499) {
             chatbot.style.height = `calc(var(--vh, 1vh) * 100 - ${statusDisplayHeight + 100}px)`;
-            wrap.style.maxHeight = `calc(var(--vh, 1vh) * 100 - ${statusDisplayHeight + 100}px - var(--line-sm) * 1rem - 2 * var(--block-label-margin))`;
+            chatbotWrap.style.maxHeight = `calc(var(--vh, 1vh) * 100 - ${statusDisplayHeight + 100}px - var(--line-sm) * 1rem - 2 * var(--block-label-margin))`;
         } else {
             chatbot.style.height = `calc(var(--vh, 1vh) * 100 - ${statusDisplayHeight + 160}px)`;
-            wrap.style.maxHeight = `calc(var(--vh, 1vh) * 100 - ${statusDisplayHeight + 160}px - var(--line-sm) * 1rem - 2 * var(--block-label-margin))`;
+            chatbotWrap.style.maxHeight = `calc(var(--vh, 1vh) * 100 - ${statusDisplayHeight + 160}px - var(--line-sm) * 1rem - 2 * var(--block-label-margin))`;
         }
     }
 }
@@ -321,12 +387,12 @@ function addChuanhuButton(botElement) {
         }
         return;
     }
-    var copyButton = null;
-    var toggleButton = null;
-    copyButton = botElement.querySelector('button.copy-bot-btn');
-    toggleButton = botElement.querySelector('button.toggle-md-btn');
-    if (copyButton) copyButton.remove();
-    if (toggleButton) toggleButton.remove();
+    var oldCopyButton = null;
+    var oldToggleButton = null;
+    oldCopyButton = botElement.querySelector('button.copy-bot-btn');
+    oldToggleButton = botElement.querySelector('button.toggle-md-btn');
+    if (oldCopyButton) oldCopyButton.remove();
+    if (oldToggleButton) oldToggleButton.remove();
 
     // Copy bot button
     var copyButton = document.createElement('button');
@@ -334,19 +400,34 @@ function addChuanhuButton(botElement) {
     copyButton.classList.add('copy-bot-btn');
     copyButton.setAttribute('aria-label', 'Copy');
     copyButton.innerHTML = copyIcon;
-    copyButton.addEventListener('click', () => {
+    copyButton.addEventListener('click', async () => {
         const textToCopy = rawMessage.innerText;
-        navigator.clipboard
-            .writeText(textToCopy)
-            .then(() => {
+        try {
+            if ("clipboard" in navigator) {
+                await navigator.clipboard.writeText(textToCopy);
                 copyButton.innerHTML = copiedIcon;
                 setTimeout(() => {
                     copyButton.innerHTML = copyIcon;
                 }, 1500);
-            })
-            .catch(() => {
-                console.error("copy failed");
-            });
+            } else {
+                const textArea = document.createElement("textarea");
+                textArea.value = textToCopy;
+                document.body.appendChild(textArea);
+                textArea.select();
+                try {
+                    document.execCommand('copy');
+                    copyButton.innerHTML = copiedIcon;
+                    setTimeout(() => {
+                        copyButton.innerHTML = copyIcon;
+                    }, 1500);
+                } catch (error) {
+                    console.error("Copy failed: ", error);
+                }
+                document.body.removeChild(textArea);
+            }
+        } catch (error) {
+            console.error("Copy failed: ", error);
+        }
     });
     botElement.appendChild(copyButton);
 
@@ -386,44 +467,48 @@ function removeMarkdownText(message) {
 let timeoutId;
 let isThrottled = false;
 var mmutation
-// 监听所有元素中 bot message 的变化，为 bot 消息添加复制按钮。
+// 监听chatWrap元素的变化，为 bot 消息添加复制按钮。
 var mObserver = new MutationObserver(function (mutationsList) {
     for (mmutation of mutationsList) {
         if (mmutation.type === 'childList') {
             for (var node of mmutation.addedNodes) {
-                if (node.nodeType === 1 && node.classList.contains('message') && node.getAttribute('data-testid') === 'bot') {
+                if (node.nodeType === 1 && node.classList.contains('message')) {
                     saveHistoryHtml();
-                    document.querySelectorAll('#chuanhu_chatbot>.wrap>.message-wrap .message.bot').forEach(addChuanhuButton);
-                }
-                if (node.tagName === 'INPUT' && node.getAttribute('type') === 'range') {
-                    setSlider();
+                    disableSendBtn();
+                    document.querySelectorAll('#chuanhu_chatbot .message-wrap .message.bot').forEach(addChuanhuButton);
                 }
             }
             for (var node of mmutation.removedNodes) {
-                if (node.nodeType === 1 && node.classList.contains('message') && node.getAttribute('data-testid') === 'bot') {
+                if (node.nodeType === 1 && node.classList.contains('message')) {
                     saveHistoryHtml();
-                    document.querySelectorAll('#chuanhu_chatbot>.wrap>.message-wrap .message.bot').forEach(addChuanhuButton);
+                    disableSendBtn();
+                    document.querySelectorAll('#chuanhu_chatbot .message-wrap .message.bot').forEach(addChuanhuButton);
                 }
             }
         } else if (mmutation.type === 'attributes') {
-            if (mmutation.target.nodeType === 1 && mmutation.target.classList.contains('message') && mmutation.target.getAttribute('data-testid') === 'bot') {
-                if (isThrottled) break; // 为了防止重复不断疯狂渲染，加上等待_(:з」∠)_
-                isThrottled = true;
-                clearTimeout(timeoutId);
-                timeoutId = setTimeout(() => {
-                    isThrottled = false;
-                    document.querySelectorAll('#chuanhu_chatbot>.wrap>.message-wrap .message.bot').forEach(addChuanhuButton);
-                    saveHistoryHtml();
-                }, 500);
-            }
+            if (isThrottled) break; // 为了防止重复不断疯狂渲染，加上等待_(:з」∠)_
+            isThrottled = true;
+            clearTimeout(timeoutId);
+            timeoutId = setTimeout(() => {
+                isThrottled = false;
+                document.querySelectorAll('#chuanhu_chatbot .message-wrap .message.bot').forEach(addChuanhuButton);
+                saveHistoryHtml();
+                disableSendBtn();
+            }, 1500);
         }
     }
 });
-mObserver.observe(document.documentElement, { attributes: true, childList: true, subtree: true });
+// mObserver.observe(targetNode, { attributes: true, childList: true, subtree: true, characterData: true});
+
+var submitObserver = new MutationObserver(function (mutationsList) {
+    document.querySelectorAll('#chuanhu_chatbot .message-wrap .message.bot').forEach(addChuanhuButton);
+    saveHistoryHtml();
+});
 
 var loadhistorytime = 0; // for debugging
 function saveHistoryHtml() {
-    var historyHtml = document.querySelector('#chuanhu_chatbot > .wrap');
+    var historyHtml = document.querySelector('#chuanhu_chatbot>.wrapper>.wrap');
+    if (!historyHtml) return;   // no history, do nothing
     localStorage.setItem('chatHistory', historyHtml.innerHTML);
     // console.log("History Saved")
     historyLoaded = false;
@@ -474,12 +559,98 @@ function clearHistoryHtml() {
         console.log("History Cleared");
     }
 }
-function emptyHistory() {
-    empty_botton.addEventListener("click", function () {
-        clearHistoryHtml();
-    });
+
+var showingUpdateInfo = false;
+async function getLatestRelease() {
+    try {
+        const response = await fetch('https://api.github.com/repos/gaizhenbiao/chuanhuchatgpt/releases/latest');
+        if (!response.ok) {
+            console.log(`Error: ${response.status} - ${response.statusText}`);
+            updateInfoGotten = true;
+            return null;
+          }
+        const data = await response.json();
+        updateInfoGotten = true;
+        return data;
+    } catch (error) {
+        console.log(`Error: ${error}`);
+        updateInfoGotten = true;
+        return null;
+    }
+}
+async function updateLatestVersion() {
+    const currentVersionElement = document.getElementById('current-version');
+    const latestVersionElement = document.getElementById('latest-version-title');
+    const releaseNoteElement = document.getElementById('release-note-content');
+    const currentVersion = currentVersionElement.textContent;
+    const versionTime = document.getElementById('version-time').innerText;
+    const localVersionTime = versionTime !== "unknown" ? (new Date(versionTime)).getTime() : 0;
+    updateInfoGotten = true; //无论成功与否都只执行一次，否则容易api超限...
+    try {
+        const data = await getLatestRelease();
+        const releaseNote = data.body;
+        if (releaseNote) {
+            releaseNoteElement.innerHTML = marked.parse(releaseNote, {mangle: false, headerIds: false});
+        }
+        const latestVersion = data.tag_name;
+        const latestVersionTime = (new Date(data.created_at)).getTime();
+        if (latestVersionTime) {
+            if (localVersionTime < latestVersionTime) {
+                latestVersionElement.textContent = latestVersion;
+                console.log(`New version ${latestVersion} found!`);
+                if (!isInIframe) {openUpdateToast();}      
+            } else {
+                noUpdate();
+            }
+            currentTime = new Date().getTime();
+            localStorage.setItem('lastCheckTime', currentTime);
+        }
+    } catch (error) {
+        console.error(error);
+    }
+}
+function getUpdate() {
+    window.open('https://github.com/gaizhenbiao/chuanhuchatgpt/releases/latest', '_blank');
+    closeUpdateToast();
+}
+function cancelUpdate() {
+    closeUpdateToast();
+}
+function openUpdateToast() {
+    showingUpdateInfo = true;
+    setUpdateWindowHeight();
+}
+function closeUpdateToast() {
+    updateToast.style.setProperty('top', '-500px');
+    showingUpdateInfo = false;
+}
+function manualCheckUpdate() {
+    openUpdateToast();
+    updateLatestVersion();
+    currentTime = new Date().getTime();
+    localStorage.setItem('lastCheckTime', currentTime);
 }
+function noUpdate() {
+    localStorage.setItem('isLatestVersion', 'true');
+    isLatestVersion = true;
+    const versionInfoElement = document.getElementById('version-info-title');
+    const releaseNoteWrap = document.getElementById('release-note-wrap');
+    const gotoUpdateBtn = document.getElementById('goto-update-btn');
+    const closeUpdateBtn = document.getElementById('close-update-btn');
 
+    versionInfoElement.textContent = usingLatest_i18n.hasOwnProperty(language) ? usingLatest_i18n[language] : usingLatest_i18n['en'];
+    releaseNoteWrap.style.setProperty('display', 'none');
+    gotoUpdateBtn.classList.add('hideK');
+    closeUpdateBtn.classList.remove('hideK');
+}
+function setUpdateWindowHeight() {
+    if (!showingUpdateInfo) {return;}
+    const scrollPosition = window.scrollY;
+    // const originalTop = updateToast.style.getPropertyValue('top');
+    const resultTop = scrollPosition - 20 + 'px';
+    updateToast.style.setProperty('top', resultTop);
+}
+    
 // 监视页面内部 DOM 变动
 var observer = new MutationObserver(function (mutations) {
     gradioLoaded(mutations);
@@ -492,9 +663,43 @@ window.addEventListener("DOMContentLoaded", function () {
     historyLoaded = false;
 });
 window.addEventListener('resize', setChatbotHeight);
-window.addEventListener('scroll', setChatbotHeight);
+window.addEventListener('scroll', function(){setChatbotHeight();setUpdateWindowHeight();});
 window.matchMedia("(prefers-color-scheme: dark)").addEventListener("change", adjustDarkMode);
 
+// console suprise
+var styleTitle1 = `
+font-size: 16px;
+font-family: ui-monospace, monospace;
+color: #06AE56;
+`
+var styleDesc1 = `
+font-size: 12px;
+font-family: ui-monospace, monospace;
+`
+function makeML(str) {
+    let l = new String(str)
+    l = l.substring(l.indexOf("/*") + 3, l.lastIndexOf("*/"))
+    return l
+}
+let ChuanhuInfo = function () {
+    /* 
+   ________                      __             ________          __ 
+  / ____/ /_  __  ______ _____  / /_  __  __   / ____/ /_  ____ _/ /_
+ / /   / __ \/ / / / __ `/ __ \/ __ \/ / / /  / /   / __ \/ __ `/ __/
+/ /___/ / / / /_/ / /_/ / / / / / / / /_/ /  / /___/ / / / /_/ / /_  
+\____/_/ /_/\__,_/\__,_/_/ /_/_/ /_/\__,_/   \____/_/ /_/\__,_/\__/  
+                                                                     
+   川虎Chat (Chuanhu Chat) - GUI for ChatGPT API and many LLMs
+ */
+}
+let description = `
+© 2023 Chuanhu, MZhao, Keldos
+GitHub repository: [https://github.com/GaiZhenbiao/ChuanhuChatGPT]\n
+Enjoy our project!\n
+`
+console.log(`%c${makeML(ChuanhuInfo)}`,styleTitle1)
+console.log(`%c${description}`, styleDesc1)
+
 // button svg code
 const copyIcon   = '<span><svg stroke="currentColor" fill="none" stroke-width="2" viewBox="0 0 24 24" stroke-linecap="round" stroke-linejoin="round" height=".8em" width=".8em" xmlns="http://www.w3.org/2000/svg"><rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path></svg></span>';
 const copiedIcon = '<span><svg stroke="currentColor" fill="none" stroke-width="2" viewBox="0 0 24 24" stroke-linecap="round" stroke-linejoin="round" height=".8em" width=".8em" xmlns="http://www.w3.org/2000/svg"><polyline points="20 6 9 17 4 12"></polyline></svg></span>';

assets/html/appearance_switcher.html

@@ -1,11 +1,6 @@
-<div style="display: flex; justify-content: space-between;">
-    <span style="margin-top: 4px !important;">
-        {label}
-    </span>
-    <span>
-        <label class="apSwitch" for="checkbox">
-            <input type="checkbox" id="checkbox">
-            <div class="apSlider"></div>
-        </label>
-    </span>
+<div class="switch_checkbox" id="apSwitch">
+    <label class="apSwitch">
+        <input type="checkbox" id="apSwitch_checkbox" data-testid="checkbox" />
+        <span class="apSwitch_span">{label}</span>
+    </label>
 </div>

config_example.json

@@ -1,24 +1,53 @@
 {
-    // 你的OpenAI API Key，一般必填，
-    // 若缺省填为 "openai_api_key": "" 则必须再在图形界面中填入API Key
-    "openai_api_key": "",
-    // 你的xmchat API Key，与OpenAI API Key不同
-    "xmchat_api_key": "",
-    "language": "auto",
-    // 如果使用代理，请取消注释下面的两行，并替换代理URL
-    // "https_proxy": "http://127.0.0.1:1079",
-    // "http_proxy": "http://127.0.0.1:1079",
+    // 各配置具体说明，见 [https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/使用教程#配置-configjson]
+
+    //== API 配置 ==
+    "openai_api_key": "", // 你的 OpenAI API Key，一般必填，若空缺则需在图形界面中填入API Key
+    "google_palm_api_key": "", // 你的 Google PaLM API Key，用于 Google PaLM 对话模型
+    "xmchat_api_key": "", // 你的 xmchat API Key，用于 XMChat 对话模型
+    "minimax_api_key": "", // 你的 MiniMax API Key，用于 MiniMax 对话模型
+    "minimax_group_id": "", // 你的 MiniMax Group ID，用于 MiniMax 对话模型
+
+    //== Azure ==
+    "openai_api_type": "openai", // 可选项：azure, openai
+    "azure_openai_api_key": "", // 你的 Azure OpenAI API Key，用于 Azure OpenAI 对话模型
+    "azure_openai_api_base_url": "", // 你的 Azure Base URL
+    "azure_openai_api_version": "2023-05-15", // 你的 Azure OpenAI API 版本
+    "azure_deployment_name": "", // 你的 Azure OpenAI Chat 模型 Deployment 名称
+    "azure_embedding_deployment_name": "", // 你的 Azure OpenAI Embedding 模型 Deployment 名称
+    "azure_embedding_model_name": "text-embedding-ada-002", // 你的 Azure OpenAI Embedding 模型名称
+
+    //== 基础配置 ==
+    "language": "auto", // 界面语言，可选"auto", "zh-CN", "en-US", "ja-JP", "ko-KR", "sv-SE"
     "users": [], // 用户列表，[[用户名1, 密码1], [用户名2, 密码2], ...]
     "local_embedding": false, //是否在本地编制索引
+    "hide_history_when_not_logged_in": false, //未登录情况下是否不展示对话历史
+    "check_update": true, //是否启用检查更新
     "default_model": "gpt-3.5-turbo", // 默认模型
+
+    //== API 用量 ==
+    "show_api_billing": false, //是否显示OpenAI API用量（启用需要填写sensitive_id）
+    "sensitive_id": "", // 你 OpenAI 账户的 Sensitive ID，用于查询 API 用量
+    "usage_limit": 120, // 该 OpenAI API Key 的当月限额，单位：美元，用于计算百分比和显示上限
+    "legacy_api_usage": false, // 是否使用旧版 API 用量查询接口（OpenAI现已关闭该接口，但是如果你在使用第三方 API，第三方可能仍然支持此接口）
+
+    //== 川虎助理设置 ==
+    "default_chuanhu_assistant_model": "gpt-4", //川虎助理使用的模型，可选gpt-3.5-turbo或者gpt-4等
+    "GOOGLE_CSE_ID": "", //谷歌搜索引擎ID，用于川虎助理Pro模式，获取方式请看 https://stackoverflow.com/questions/37083058/programmatically-searching-google-in-python-using-custom-search
+    "GOOGLE_API_KEY": "", //谷歌API Key，用于川虎助理Pro模式
+    "WOLFRAM_ALPHA_APPID": "", //Wolfram Alpha API Key，用于川虎助理Pro模式，获取方式请看 https://products.wolframalpha.com/api/
+    "SERPAPI_API_KEY": "", //SerpAPI API Key，用于川虎助理Pro模式，获取方式请看 https://serpapi.com/
+
+    //== 文档处理与显示 ==
+    "latex_option": "default", // LaTeX 公式渲染策略，可选"default", "strict", "all"或者"disabled"
     "advance_docs": {
         "pdf": {
-            // 是否认为PDF是双栏的
-            "two_column": false,
-            // 是否使用OCR识别PDF中的公式
-            "formula_ocr": true
+            "two_column": false, // 是否认为PDF是双栏的
+            "formula_ocr": true // 是否使用OCR识别PDF中的公式
         }
     },
+
+    //== 高级配置 ==
     // 是否多个API Key轮换使用
     "multi_api_key": false,
     "api_key_list": [
@@ -26,7 +55,12 @@
         "sk-xxxxxxxxxxxxxxxxxxxxxxxx2",
         "sk-xxxxxxxxxxxxxxxxxxxxxxxx3"
     ],
-    // 如果使用自定义端口、自定义ip，请取消注释并替换对应内容
+    // 自定义OpenAI API Base
+    // "openai_api_base": "https://api.openai.com",
+    // 自定义使用代理（请替换代理URL）
+    // "https_proxy": "http://127.0.0.1:1079",
+    // "http_proxy": "http://127.0.0.1:1079",
+    // 自定义端口、自定义ip（请替换对应内容）
     // "server_name": "0.0.0.0",
     // "server_port": 7860,
     // 如果要share到gradio，设置为true

locale/en_US.json

@@ -32,24 +32,32 @@
     "📝 导出为Markdown": "📝 Export as Markdown",
     "默认保存于history文件夹": "Default save in history folder",
     "高级": "Advanced",
-    "# ⚠️ 务必谨慎更改 ⚠️\n\n如果无法使用请恢复默认设置": "# ⚠️ Caution: Changes require care. ⚠️\n\nIf unable to use, restore default settings.",
+    "# ⚠️ 务必谨慎更改 ⚠️": "# ⚠️ Caution: Changes require care. ⚠️",
     "参数": "Parameters",
-    "在这里输入停止符，用英文逗号隔开...": "Type in stop token here, separated by comma...",
+    "停止符，用英文逗号隔开...": "Type in stop token here, separated by comma...",
     "用于定位滥用行为": "Used to locate abuse",
     "用户名": "Username",
     "网络设置": "Network Settings",
     "在这里输入API-Host...": "Type in API-Host here...",
     "🔄 切换API地址": "🔄 Switch API Address",
     "在这里输入代理地址...": "Type in proxy address here...",
-    "代理地址（示例：http://127.0.0.1:10809）": "Proxy address (example: http://127.0.0.1:10809）",
+    "代理地址（示例：http://127.0.0.1:10809）": "Proxy address (example: http://127.0.0.1:10809)",
     "🔄 设置代理地址": "🔄 Set Proxy Address",
-    "🔙 恢复默认设置": "🔙 Restore Default Settings",
+    "🔙 恢复网络默认设置": "🔙 Reset Network Settings",
+    "🔄 检查更新...": "🔄 Check for Update...",
+    "取消": "Cancel",
+    "更新": "Update",
+    "详情": "Details",
+    "好": "OK",
     "川虎Chat 🚀": "Chuanhu Chat 🚀",
     "开始实时传输回答……": "Start streaming output...",
     "Token 计数: ": "Token Count: ",
-    "，本次对话累计消耗了 ": "，Total cost for this dialogue is ",
+    "，本次对话累计消耗了 ": ", Total cost for this dialogue is ",
     "**获取API使用情况失败**": "**Failed to get API usage**",
+    "**获取API使用情况失败**，需在填写`config.json`中正确填写sensitive_id": "**Failed to get API usage**, correct sensitive_id needed in `config.json`",
+    "**获取API使用情况失败**，sensitive_id错误或已过期": "**Failed to get API usage**, wrong or expired sensitive_id",
     "**本月使用金额** ": "**Monthly usage** ",
+    "本月使用金额": "Monthly usage",
     "获取API使用情况失败:": "Failed to get API usage:",
     "API密钥更改为了": "The API key is changed to",
     "JSON解析错误,收到的内容: ": "JSON parsing error, received content: ",
@@ -64,10 +72,13 @@
     "API key为空，请检查是否输入正确。": "API key is empty, check whether it is entered correctly.",
     "请输入对话内容。": "Enter the content of the conversation.",
     "账单信息不适用": "Billing information is not applicable",
-    "由Bilibili [土川虎虎虎](https://space.bilibili.com/29125536) 和 [明昭MZhao](https://space.bilibili.com/24807452)开发<br />访问川虎Chat的 [GitHub项目](https://github.com/GaiZhenbiao/ChuanhuChatGPT) 下载最新版脚本": "developor: Bilibili [土川虎虎虎](https://space.bilibili.com/29125536) and [明昭MZhao](https://space.bilibili.com/24807452)\n\nDownload latest code from [GitHub](https://github.com/GaiZhenbiao/ChuanhuChatGPT)",
+    "由Bilibili [土川虎虎虎](https://space.bilibili.com/29125536)、[明昭MZhao](https://space.bilibili.com/24807452) 和 [Keldos](https://github.com/Keldos-Li) 开发<br />访问川虎Chat的 [GitHub项目](https://github.com/GaiZhenbiao/ChuanhuChatGPT) 下载最新版脚本": "Developed by Bilibili [土川虎虎虎](https://space.bilibili.com/29125536), [明昭MZhao](https://space.bilibili.com/24807452) and [Keldos](https://github.com/Keldos-Li)\n\nDownload latest code from [GitHub](https://github.com/GaiZhenbiao/ChuanhuChatGPT)",
     "切换亮暗色主题": "Switch light/dark theme",
     "您的IP区域：未知。": "Your IP region: Unknown.",
     "获取IP地理位置失败。原因：": "Failed to get IP location. Reason: ",
     "。你仍然可以使用聊天功能。": ". You can still use the chat function.",
-    "您的IP区域：": "Your IP region: "
+    "您的IP区域：": "Your IP region: ",
+    "总结": "Summarize",
+    "生成内容总结中……": "Generating content summary...",
+    "由于下面的原因，Google 拒绝返回 PaLM 的回答：\n\n": "Due to the following reasons, Google refuses to provide an answer to PaLM: \n\n"
 }

locale/ja_JP.json

@@ -32,9 +32,9 @@
     "📝 导出为Markdown": "📝 Markdownでエクスポート",
     "默认保存于history文件夹": "デフォルトでhistoryフォルダに保存されます",
     "高级": "Advanced",
-    "# ⚠️ 务必谨慎更改 ⚠️\n\n如果无法使用请恢复默认设置": "# ⚠️ 変更には慎重に ⚠️\n\nもし動作しない場合は、デフォルト設定に戻してください。",
+    "# ⚠️ 务必谨慎更改 ⚠️": "# ⚠️ 変更には慎重に ⚠️",
     "参数": "パラメータ",
-    "在这里输入停止符，用英文逗号隔开...": "ここにストップ文字を英語のカンマで区切って入力してください...",
+    "停止符，用英文逗号隔开...": "ここにストップ文字を英語のカンマで区切って入力してください...",
     "用于定位滥用行为": "不正行為を特定するために使用されます",
     "用户名": "ユーザー名",
     "网络设置": "ネットワーク設定",
@@ -43,13 +43,21 @@
     "在这里输入代理地址...": "プロキシアドレスを入力してください...",
     "代理地址（示例：http://127.0.0.1:10809）": "プロキシアドレス（例：http://127.0.0.1:10809）",
     "🔄 设置代理地址": "🔄 プロキシアドレスを設定",
-    "🔙 恢复默认设置": "🔙 デフォルト設定に戻す",
+    "🔙 恢复默认网络设置": "🔙 ネットワーク設定のリセット",
+    "🔄 检查更新...": "🔄 アップデートをチェック...",
+    "取消": "キャンセル",
+    "更新": "アップデート",
+    "详情": "詳細",
+    "好": "はい",
     "川虎Chat 🚀": "川虎Chat 🚀",
     "开始实时传输回答……": "ストリーム出力開始……",
     "Token 计数: ": "Token数: ",
     "，本次对话累计消耗了 ": ", 今の会話で消費合計 ",
     "**获取API使用情况失败**": "**API使用状況の取得に失敗しました**",
+    "**获取API使用情况失败**，需在填写`config.json`中正确填写sensitive_id": "**API使用状況の取得に失敗しました**、`config.json`に正しい`sensitive_id`を入力する必要があります",
+    "**获取API使用情况失败**，sensitive_id错误或已过期": "**API使用状況の取得に失敗しました**、sensitive_idが間違っているか、期限切れです",
     "**本月使用金额** ": "**今月の使用料金** ",
+    "本月使用金额": "今月の使用料金",
     "获取API使用情况失败:": "API使用状況の取得に失敗しました:",
     "API密钥更改为了": "APIキーが変更されました",
     "JSON解析错误,收到的内容: ": "JSON解析エラー、受信内容: ",
@@ -64,10 +72,13 @@
     "API key为空，请检查是否输入正确。": "APIキーが入力されていません。正しく入力されているか確認してください。",
     "请输入对话内容。": "会話内容を入力してください。",
     "账单信息不适用": "課金情報は対象外です",
-    "由Bilibili [土川虎虎虎](https://space.bilibili.com/29125536) 和 [明昭MZhao](https://space.bilibili.com/24807452)开发<br />访问川虎Chat的 [GitHub项目](https://github.com/GaiZhenbiao/ChuanhuChatGPT) 下载最新版脚本": "開発：Bilibili [土川虎虎虎](https://space.bilibili.com/29125536) と [明昭MZhao](https://space.bilibili.com/24807452)\n\n最新コードは川虎Chatのサイトへ [GitHubプロジェクト](https://github.com/GaiZhenbiao/ChuanhuChatGPT)",
+    "由Bilibili [土川虎虎虎](https://space.bilibili.com/29125536)、[明昭MZhao](https://space.bilibili.com/24807452) 和 [Keldos](https://github.com/Keldos-Li) 开发<br />访问川虎Chat的 [GitHub项目](https://github.com/GaiZhenbiao/ChuanhuChatGPT) 下载最新版脚本": "開発：Bilibili [土川虎虎虎](https://space.bilibili.com/29125536) と [明昭MZhao](https://space.bilibili.com/24807452) と [Keldos](https://github.com/Keldos-Li)\n\n最新コードは川虎Chatのサイトへ [GitHubプロジェクト](https://github.com/GaiZhenbiao/ChuanhuChatGPT)",
     "切换亮暗色主题": "テーマの明暗切替",
     "您的IP区域：未知。": "あなたのIPアドレス地域：不明",
     "获取IP地理位置失败。原因：": "IPアドレス地域の取得に失敗しました。理由：",
     "。你仍然可以使用聊天功能。": "。あなたはまだチャット機能を使用できます。",
-    "您的IP区域：": "あなたのIPアドレス地域："
-}
+    "您的IP区域：": "あなたのIPアドレス地域：",
+    "总结": "要約する",
+    "生成内容总结中……": "コンテンツ概要を生成しています...",
+    "由于下面的原因，Google 拒绝返回 PaLM 的回答：\n\n": "Googleは以下の理由から、PaLMの回答を返すことを拒否しています:\n\n"
+}

modules/config.py

@@ -11,6 +11,7 @@ from . import presets
 
 __all__ = [
     "my_api_key",
+    "sensitive_id",
     "authflag",
     "auth_list",
     "dockerflag",
@@ -23,8 +24,11 @@ __all__ = [
     "server_name",
     "server_port",
     "share",
+    "check_update",
+    "latex_delimiters_set",
     "hide_history_when_not_logged_in",
-    "default_chuanhu_assistant_model"
+    "default_chuanhu_assistant_model",
+    "show_api_billing"
 ]
 
 # 添加一个统一的config文件，避免文件过多造成的疑惑（优先级最低）
@@ -35,10 +39,22 @@ if os.path.exists("config.json"):
 else:
     config = {}
 
+
+def load_config_to_environ(key_list):
+    global config
+    for key in key_list:
+        if key in config:
+            os.environ[key.upper()] = os.environ.get(key.upper(), config[key])
+
+
 lang_config = config.get("language", "auto")
 language = os.environ.get("LANGUAGE", lang_config)
 
-hide_history_when_not_logged_in = config.get("hide_history_when_not_logged_in", False)
+hide_history_when_not_logged_in = config.get(
+    "hide_history_when_not_logged_in", False)
+check_update = config.get("check_update", True)
+show_api_billing = config.get("show_api_billing", False)
+show_api_billing = bool(os.environ.get("SHOW_API_BILLING", show_api_billing))
 
 if os.path.exists("api_key.txt"):
     logging.info("检测到api_key.txt文件，正在进行迁移...")
@@ -52,26 +68,39 @@ if os.path.exists("auth.json"):
     logging.info("检测到auth.json文件，正在进行迁移...")
     auth_list = []
     with open("auth.json", "r", encoding='utf-8') as f:
-            auth = json.load(f)
-            for _ in auth:
-                if auth[_]["username"] and auth[_]["password"]:
-                    auth_list.append((auth[_]["username"], auth[_]["password"]))
-                else:
-                    logging.error("请检查auth.json文件中的用户名和密码！")
-                    sys.exit(1)
+        auth = json.load(f)
+        for _ in auth:
+            if auth[_]["username"] and auth[_]["password"]:
+                auth_list.append((auth[_]["username"], auth[_]["password"]))
+            else:
+                logging.error("请检查auth.json文件中的用户名和密码！")
+                sys.exit(1)
     config["users"] = auth_list
     os.rename("auth.json", "auth(deprecated).json")
     with open("config.json", "w", encoding='utf-8') as f:
         json.dump(config, f, indent=4, ensure_ascii=False)
 
-## 处理docker if we are running in Docker
+# 处理docker if we are running in Docker
 dockerflag = config.get("dockerflag", False)
 if os.environ.get("dockerrun") == "yes":
     dockerflag = True
 
-## 处理 api-key 以及 允许的用户列表
+# 处理 api-key 以及 允许的用户列表
 my_api_key = config.get("openai_api_key", "")
 my_api_key = os.environ.get("OPENAI_API_KEY", my_api_key)
+os.environ["OPENAI_API_KEY"] = my_api_key
+os.environ["OPENAI_EMBEDDING_API_KEY"] = my_api_key
+
+if config.get("legacy_api_usage", False):
+    sensitive_id = config.get("sensitive_id", "")
+    sensitive_id = os.environ.get("SENSITIVE_ID", sensitive_id)
+else:
+    sensitive_id = my_api_key
+
+google_palm_api_key = config.get("google_palm_api_key", "")
+google_palm_api_key = os.environ.get(
+    "GOOGLE_PALM_API_KEY", google_palm_api_key)
+os.environ["GOOGLE_PALM_API_KEY"] = google_palm_api_key
 
 xmchat_api_key = config.get("xmchat_api_key", "")
 os.environ["XMCHAT_API_KEY"] = xmchat_api_key
@@ -81,11 +110,14 @@ os.environ["MINIMAX_API_KEY"] = minimax_api_key
 minimax_group_id = config.get("minimax_group_id", "")
 os.environ["MINIMAX_GROUP_ID"] = minimax_group_id
 
+load_config_to_environ(["openai_api_type", "azure_openai_api_key", "azure_openai_api_base_url",
+                       "azure_openai_api_version", "azure_deployment_name", "azure_embedding_deployment_name", "azure_embedding_model_name"])
+
 
 usage_limit = os.environ.get("USAGE_LIMIT", config.get("usage_limit", 120))
 
-## 多账户机制
-multi_api_key = config.get("multi_api_key", False) # 是否开启多账户机制
+# 多账户机制
+multi_api_key = config.get("multi_api_key", False)  # 是否开启多账户机制
 if multi_api_key:
     api_key_list = config.get("api_key_list", [])
     if len(api_key_list) == 0:
@@ -93,21 +125,26 @@ if multi_api_key:
         sys.exit(1)
     shared.state.set_api_key_queue(api_key_list)
 
-auth_list = config.get("users", []) # 实际上是使用者的列表
+auth_list = config.get("users", [])  # 实际上是使用者的列表
 authflag = len(auth_list) > 0  # 是否开启认证的状态值，改为判断auth_list长度
 
 # 处理自定义的api_host，优先读环境变量的配置，如果存在则自动装配
-api_host = os.environ.get("OPENAI_API_BASE", config.get("openai_api_base", None))
+api_host = os.environ.get(
+    "OPENAI_API_BASE", config.get("openai_api_base", None))
 if api_host is not None:
     shared.state.set_api_host(api_host)
+    os.environ["OPENAI_API_BASE"] = f"{api_host}/v1"
+    logging.info(f"OpenAI API Base set to: {os.environ['OPENAI_API_BASE']}")
 
-default_chuanhu_assistant_model = config.get("default_chuanhu_assistant_model", "gpt-3.5-turbo")
+default_chuanhu_assistant_model = config.get(
+    "default_chuanhu_assistant_model", "gpt-3.5-turbo")
 for x in ["GOOGLE_CSE_ID", "GOOGLE_API_KEY", "WOLFRAM_ALPHA_APPID", "SERPAPI_API_KEY"]:
     if config.get(x, None) is not None:
         os.environ[x] = config[x]
 
+
 @contextmanager
-def retrieve_openai_api(api_key = None):
+def retrieve_openai_api(api_key=None):
     old_api_key = os.environ.get("OPENAI_API_KEY", "")
     if api_key is None:
         os.environ["OPENAI_API_KEY"] = my_api_key
@@ -117,24 +154,26 @@ def retrieve_openai_api(api_key = None):
         yield api_key
     os.environ["OPENAI_API_KEY"] = old_api_key
 
-## 处理log
+
+# 处理log
 log_level = config.get("log_level", "INFO")
 logging.basicConfig(
     level=log_level,
     format="%(asctime)s [%(levelname)s] [%(filename)s:%(lineno)d] %(message)s",
 )
 
-## 处理代理：
-http_proxy = config.get("http_proxy", "")
-https_proxy = config.get("https_proxy", "")
-http_proxy = os.environ.get("HTTP_PROXY", http_proxy)
-https_proxy = os.environ.get("HTTPS_PROXY", https_proxy)
+# 处理代理：
+http_proxy = os.environ.get("HTTP_PROXY", "")
+https_proxy = os.environ.get("HTTPS_PROXY", "")
+http_proxy = config.get("http_proxy", http_proxy)
+https_proxy = config.get("https_proxy", https_proxy)
 
 # 重置系统变量，在不需要设置的时候不设置环境变量，以免引起全局代理报错
 os.environ["HTTP_PROXY"] = ""
 os.environ["HTTPS_PROXY"] = ""
 
-local_embedding = config.get("local_embedding", False) # 是否使用本地embedding
+local_embedding = config.get("local_embedding", False)  # 是否使用本地embedding
+
 
 @contextmanager
 def retrieve_proxy(proxy=None):
@@ -151,22 +190,62 @@ def retrieve_proxy(proxy=None):
         old_var = os.environ["HTTP_PROXY"], os.environ["HTTPS_PROXY"]
         os.environ["HTTP_PROXY"] = http_proxy
         os.environ["HTTPS_PROXY"] = https_proxy
-        yield http_proxy, https_proxy # return new proxy
+        yield http_proxy, https_proxy  # return new proxy
 
         # return old proxy
         os.environ["HTTP_PROXY"], os.environ["HTTPS_PROXY"] = old_var
 
 
-## 处理advance docs
+# 处理latex options
+user_latex_option = config.get("latex_option", "default")
+if user_latex_option == "default":
+    latex_delimiters_set = [
+        {"left": "$$", "right": "$$", "display": True},
+        {"left": "$", "right": "$", "display": False},
+        {"left": "\\(", "right": "\\)", "display": False},
+        {"left": "\\[", "right": "\\]", "display": True},
+    ]
+elif user_latex_option == "strict":
+    latex_delimiters_set = [
+        {"left": "$$", "right": "$$", "display": True},
+        {"left": "\\(", "right": "\\)", "display": False},
+        {"left": "\\[", "right": "\\]", "display": True},
+    ]
+elif user_latex_option == "all":
+    latex_delimiters_set = [
+        {"left": "$$", "right": "$$", "display": True},
+        {"left": "$", "right": "$", "display": False},
+        {"left": "\\(", "right": "\\)", "display": False},
+        {"left": "\\[", "right": "\\]", "display": True},
+        {"left": "\\begin{equation}", "right": "\\end{equation}", "display": True},
+        {"left": "\\begin{align}", "right": "\\end{align}", "display": True},
+        {"left": "\\begin{alignat}", "right": "\\end{alignat}", "display": True},
+        {"left": "\\begin{gather}", "right": "\\end{gather}", "display": True},
+        {"left": "\\begin{CD}", "right": "\\end{CD}", "display": True},
+    ]
+elif user_latex_option == "disabled":
+    latex_delimiters_set = []
+else:
+    latex_delimiters_set = [
+        {"left": "$$", "right": "$$", "display": True},
+        {"left": "$", "right": "$", "display": False},
+        {"left": "\\(", "right": "\\)", "display": False},
+        {"left": "\\[", "right": "\\]", "display": True},
+    ]
+
+# 处理advance docs
 advance_docs = defaultdict(lambda: defaultdict(dict))
 advance_docs.update(config.get("advance_docs", {}))
+
+
 def update_doc_config(two_column_pdf):
     global advance_docs
     advance_docs["pdf"]["two_column"] = two_column_pdf
 
     logging.info(f"更新后的文件参数为：{advance_docs}")
 
-## 处理gradio.launch参数
+
+# 处理gradio.launch参数
 server_name = config.get("server_name", None)
 server_port = config.get("server_port", None)
 if server_name is None:

modules/index_func.py

@@ -47,11 +47,12 @@ def get_documents(file_src):
                     pdftext = parse_pdf(filepath, two_column).text
                 except:
                     pdftext = ""
-                    with open(filepath, "rb", encoding="utf-8") as pdfFileObj:
+                    with open(filepath, "rb") as pdfFileObj:
                         pdfReader = PyPDF2.PdfReader(pdfFileObj)
                         for page in tqdm(pdfReader.pages):
                             pdftext += page.extract_text()
-                texts = [Document(page_content=pdftext, metadata={"source": filepath})]
+                texts = [Document(page_content=pdftext,
+                                  metadata={"source": filepath})]
             elif file_type == ".docx":
                 logging.debug("Loading Word...")
                 from langchain.document_loaders import UnstructuredWordDocumentLoader
@@ -72,7 +73,8 @@ def get_documents(file_src):
                 text_list = excel_to_string(filepath)
                 texts = []
                 for elem in text_list:
-                    texts.append(Document(page_content=elem, metadata={"source": filepath}))
+                    texts.append(Document(page_content=elem,
+                                 metadata={"source": filepath}))
             else:
                 logging.debug("Loading text file...")
                 from langchain.document_loaders import TextLoader
@@ -115,10 +117,16 @@ def construct_index(
     index_path = f"./index/{index_name}"
     if local_embedding:
         from langchain.embeddings.huggingface import HuggingFaceEmbeddings
-        embeddings = HuggingFaceEmbeddings(model_name = "sentence-transformers/distiluse-base-multilingual-cased-v2")
+        embeddings = HuggingFaceEmbeddings(
+            model_name="sentence-transformers/distiluse-base-multilingual-cased-v2")
     else:
         from langchain.embeddings import OpenAIEmbeddings
-        embeddings = OpenAIEmbeddings(openai_api_base=os.environ.get("OPENAI_API_BASE", None), openai_api_key=os.environ.get("OPENAI_EMBEDDING_API_KEY", api_key))
+        if os.environ.get("OPENAI_API_TYPE", "openai") == "openai":
+            embeddings = OpenAIEmbeddings(openai_api_base=os.environ.get(
+                "OPENAI_API_BASE", None), openai_api_key=os.environ.get("OPENAI_EMBEDDING_API_KEY", api_key))
+        else:
+            embeddings = OpenAIEmbeddings(deployment=os.environ["AZURE_EMBEDDING_DEPLOYMENT_NAME"], openai_api_key=os.environ["AZURE_OPENAI_API_KEY"],
+                                          model=os.environ["AZURE_EMBEDDING_MODEL_NAME"], openai_api_base=os.environ["AZURE_OPENAI_API_BASE_URL"], openai_api_type="azure")
     if os.path.exists(index_path):
         logging.info("找到了缓存的索引文件，加载中……")
         return FAISS.load_local(index_path, embeddings)

modules/models/base_model.py

@@ -29,6 +29,8 @@ from langchain.input import print_text
 from langchain.schema import AgentAction, AgentFinish, LLMResult
 from threading import Thread, Condition
 from collections import deque
+from langchain.chat_models.base import BaseChatModel
+from langchain.schema import HumanMessage, AIMessage, SystemMessage, BaseMessage
 
 from ..presets import *
 from ..index_func import *
@@ -36,6 +38,7 @@ from ..utils import *
 from .. import shared
 from ..config import retrieve_proxy
 
+
 class CallbackToIterator:
     def __init__(self):
         self.queue = deque()
@@ -52,7 +55,8 @@ class CallbackToIterator:
 
     def __next__(self):
         with self.cond:
-            while not self.queue and not self.finished:  # Wait for a value to be added to the queue.
+            # Wait for a value to be added to the queue.
+            while not self.queue and not self.finished:
                 self.cond.wait()
             if not self.queue:
                 raise StopIteration()
@@ -63,6 +67,7 @@ class CallbackToIterator:
             self.finished = True
             self.cond.notify()  # Wake up the generator if it's waiting.
 
+
 def get_action_description(text):
     match = re.search('```(.*?)```', text, re.S)
     json_text = match.group(1)
@@ -76,6 +81,7 @@ def get_action_description(text):
     else:
         return ""
 
+
 class ChuanhuCallbackHandler(BaseCallbackHandler):
 
     def __init__(self, callback) -> None:
@@ -117,6 +123,10 @@ class ChuanhuCallbackHandler(BaseCallbackHandler):
         """Run on new LLM token. Only available when streaming is enabled."""
         self.callback(token)
 
+    def on_chat_model_start(self, serialized: Dict[str, Any], messages: List[List[BaseMessage]],  **kwargs: Any) -> Any:
+        """Run when a chat model starts running."""
+        pass
+
 
 class ModelType(Enum):
     Unknown = -1
@@ -129,6 +139,8 @@ class ModelType(Enum):
     YuanAI = 6
     Minimax = 7
     ChuanhuAgent = 8
+    GooglePaLM = 9
+    LangchainChat = 10
 
     @classmethod
     def get_type(cls, model_name: str):
@@ -152,6 +164,10 @@ class ModelType(Enum):
             model_type = ModelType.Minimax
         elif "川虎助理" in model_name_lower:
             model_type = ModelType.ChuanhuAgent
+        elif "palm" in model_name_lower:
+            model_type = ModelType.GooglePaLM
+        elif "azure" or "api" in model_name_lower:
+            model_type = ModelType.LangchainChat
         else:
             model_type = ModelType.Unknown
         return model_type
@@ -161,7 +177,7 @@ class BaseLLMModel:
     def __init__(
         self,
         model_name,
-        system_prompt="",
+        system_prompt=INITIAL_SYSTEM_PROMPT,
         temperature=1.0,
         top_p=1.0,
         n_choices=1,
@@ -201,7 +217,8 @@ class BaseLLMModel:
         conversations are stored in self.history, with the most recent question, in OpenAI format
         should return a generator, each time give the next word (str) in the answer
         """
-        logging.warning("stream predict not implemented, using at once predict instead")
+        logging.warning(
+            "stream predict not implemented, using at once predict instead")
         response, _ = self.get_answer_at_once()
         yield response
 
@@ -212,7 +229,8 @@ class BaseLLMModel:
         the answer (str)
         total token count (int)
         """
-        logging.warning("at once predict not implemented, using stream predict instead")
+        logging.warning(
+            "at once predict not implemented, using stream predict instead")
         response_iter = self.get_answer_stream_iter()
         count = 0
         for response in response_iter:
@@ -246,7 +264,7 @@ class BaseLLMModel:
         stream_iter = self.get_answer_stream_iter()
 
         if display_append:
-            display_append = "<hr>" +display_append
+            display_append = '\n\n<hr class="append-display no-in-raw" />' + display_append
         for partial_text in stream_iter:
             chatbot[-1] = (chatbot[-1][0], partial_text + display_append)
             self.all_token_counts[-1] += 1
@@ -273,9 +291,11 @@ class BaseLLMModel:
             self.history[-2] = construct_user(fake_input)
         chatbot[-1] = (chatbot[-1][0], ai_reply + display_append)
         if fake_input is not None:
-            self.all_token_counts[-1] += count_token(construct_assistant(ai_reply))
+            self.all_token_counts[-1] += count_token(
+                construct_assistant(ai_reply))
         else:
-            self.all_token_counts[-1] = total_token_count - sum(self.all_token_counts)
+            self.all_token_counts[-1] = total_token_count - \
+                sum(self.all_token_counts)
         status_text = self.token_message()
         return chatbot, status_text
 
@@ -299,10 +319,13 @@ class BaseLLMModel:
             from langchain.chat_models import ChatOpenAI
             from langchain.callbacks import StdOutCallbackHandler
             prompt_template = "Write a concise summary of the following:\n\n{text}\n\nCONCISE SUMMARY IN " + language + ":"
-            PROMPT = PromptTemplate(template=prompt_template, input_variables=["text"])
+            PROMPT = PromptTemplate(
+                template=prompt_template, input_variables=["text"])
             llm = ChatOpenAI()
-            chain = load_summarize_chain(llm, chain_type="map_reduce", return_intermediate_steps=True, map_prompt=PROMPT, combine_prompt=PROMPT)
-            summary = chain({"input_documents": list(index.docstore.__dict__["_dict"].values())}, return_only_outputs=True)["output_text"]
+            chain = load_summarize_chain(
+                llm, chain_type="map_reduce", return_intermediate_steps=True, map_prompt=PROMPT, combine_prompt=PROMPT)
+            summary = chain({"input_documents": list(index.docstore.__dict__[
+                            "_dict"].values())}, return_only_outputs=True)["output_text"]
             print(i18n("总结") + f": {summary}")
             chatbot.append([i18n("上传了")+str(len(files))+"个文件", summary])
         return chatbot, status
@@ -323,9 +346,12 @@ class BaseLLMModel:
             msg = "索引获取成功，生成回答中……"
             logging.info(msg)
             with retrieve_proxy():
-                retriever = VectorStoreRetriever(vectorstore=index, search_type="similarity_score_threshold",search_kwargs={"k":6, "score_threshold": 0.5})
-                relevant_documents = retriever.get_relevant_documents(real_inputs)
-            reference_results = [[d.page_content.strip("�"), os.path.basename(d.metadata["source"])] for d in relevant_documents]
+                retriever = VectorStoreRetriever(vectorstore=index, search_type="similarity_score_threshold", search_kwargs={
+                                                 "k": 6, "score_threshold": 0.5})
+                relevant_documents = retriever.get_relevant_documents(
+                    real_inputs)
+            reference_results = [[d.page_content.strip("�"), os.path.basename(
+                d.metadata["source"])] for d in relevant_documents]
             reference_results = add_source_numbers(reference_results)
             display_append = add_details(reference_results)
             display_append = "\n\n" + "".join(display_append)
@@ -348,10 +374,12 @@ class BaseLLMModel:
                 reference_results.append([result['body'], result['href']])
                 display_append.append(
                     # f"{idx+1}. [{domain_name}]({result['href']})\n"
-                    f"<li><a href=\"{result['href']}\" target=\"_blank\">{result['title']}</a></li>\n"
+                    f"<a href=\"{result['href']}\" target=\"_blank\">{idx+1}.&nbsp;{result['title']}</a>"
                 )
             reference_results = add_source_numbers(reference_results)
-            display_append = "<ol>\n\n" + "".join(display_append) + "</ol>"
+            # display_append = "<ol>\n\n" + "".join(display_append) + "</ol>"
+            display_append = '<div class = "source-a">' + \
+                "".join(display_append) + '</div>'
             real_inputs = (
                 replace_today(WEBSEARCH_PTOMPT_TEMPLATE)
                 .replace("{query}", real_inputs)
@@ -375,14 +403,16 @@ class BaseLLMModel:
 
         status_text = "开始生成回答……"
         logging.info(
-             "用户" + f"{self.user_identifier}" + "的输入为：" + colorama.Fore.BLUE + f"{inputs}" + colorama.Style.RESET_ALL
+            "用户" + f"{self.user_identifier}" + "的输入为：" +
+            colorama.Fore.BLUE + f"{inputs}" + colorama.Style.RESET_ALL
         )
         if should_check_token_count:
             yield chatbot + [(inputs, "")], status_text
         if reply_language == "跟随问题语言（不稳定）":
             reply_language = "the same language as the question, such as English, 中文, 日本語, Español, Français, or Deutsch."
 
-        limited_context, fake_inputs, display_append, inputs, chatbot = self.prepare_inputs(real_inputs=inputs, use_websearch=use_websearch, files=files, reply_language=reply_language, chatbot=chatbot)
+        limited_context, fake_inputs, display_append, inputs, chatbot = self.prepare_inputs(
+            real_inputs=inputs, use_websearch=use_websearch, files=files, reply_language=reply_language, chatbot=chatbot)
         yield chatbot + [(fake_inputs, "")], status_text
 
         if (
@@ -568,10 +598,13 @@ class BaseLLMModel:
         self.system_prompt = new_system_prompt
 
     def set_key(self, new_access_key):
-        self.api_key = new_access_key.strip()
-        msg = i18n("API密钥更改为了") + hide_middle_chars(self.api_key)
-        logging.info(msg)
-        return self.api_key, msg
+        if "*" not in new_access_key:
+            self.api_key = new_access_key.strip()
+            msg = i18n("API密钥更改为了") + hide_middle_chars(self.api_key)
+            logging.info(msg)
+            return self.api_key, msg
+        else:
+            return gr.update(), gr.update()
 
     def set_single_turn(self, new_single_turn):
         self.single_turn = new_single_turn
@@ -580,7 +613,8 @@ class BaseLLMModel:
         self.history = []
         self.all_token_counts = []
         self.interrupted = False
-        pathlib.Path(os.path.join(HISTORY_DIR, self.user_identifier, new_auto_history_filename(os.path.join(HISTORY_DIR, self.user_identifier)))).touch()
+        pathlib.Path(os.path.join(HISTORY_DIR, self.user_identifier, new_auto_history_filename(
+            os.path.join(HISTORY_DIR, self.user_identifier)))).touch()
         return [], self.token_message([0])
 
     def delete_first_conversation(self):
@@ -623,7 +657,8 @@ class BaseLLMModel:
 
     def auto_save(self, chatbot):
         history_file_path = get_history_filepath(self.user_identifier)
-        save_file(history_file_path, self.system_prompt, self.history, chatbot, self.user_identifier)
+        save_file(history_file_path, self.system_prompt,
+                  self.history, chatbot, self.user_identifier)
 
     def export_markdown(self, filename, chatbot, user_name):
         if filename == "":
@@ -639,7 +674,8 @@ class BaseLLMModel:
             filename = filename.name
         try:
             if "/" not in filename:
-                history_file_path = os.path.join(HISTORY_DIR, user_name, filename)
+                history_file_path = os.path.join(
+                    HISTORY_DIR, user_name, filename)
             else:
                 history_file_path = filename
             with open(history_file_path, "r", encoding="utf-8") as f:
@@ -665,15 +701,33 @@ class BaseLLMModel:
             logging.info(f"没有找到对话历史记录 {filename}")
             return gr.update(), self.system_prompt, gr.update()
 
+    def delete_chat_history(self, filename, user_name):
+        if filename == "CANCELED":
+            return gr.update(), gr.update(), gr.update()
+        if filename == "":
+            return i18n("你没有选择任何对话历史"), gr.update(), gr.update()
+        if not filename.endswith(".json"):
+            filename += ".json"
+        if "/" not in filename:
+            history_file_path = os.path.join(HISTORY_DIR, user_name, filename)
+        else:
+            history_file_path = filename
+        try:
+            os.remove(history_file_path)
+            return i18n("删除对话历史成功"), get_history_names(False, user_name), []
+        except:
+            logging.info(f"删除对话历史失败 {history_file_path}")
+            return i18n("对话历史")+filename+i18n("已经被删除啦"), gr.update(), gr.update()
+
     def auto_load(self):
         if self.user_identifier == "":
             self.reset()
             return self.system_prompt, gr.update()
         history_file_path = get_history_filepath(self.user_identifier)
-        filename, system_prompt, chatbot = self.load_chat_history(history_file_path, self.user_identifier)
+        filename, system_prompt, chatbot = self.load_chat_history(
+            history_file_path, self.user_identifier)
         return system_prompt, chatbot
 
-
     def like(self):
         """like the last response, implement if needed
         """
@@ -683,3 +737,47 @@ class BaseLLMModel:
         """dislike the last response, implement if needed
         """
         return gr.update()
+
+
+class Base_Chat_Langchain_Client(BaseLLMModel):
+    def __init__(self, model_name, user_name=""):
+        super().__init__(model_name, user=user_name)
+        self.need_api_key = False
+        self.model = self.setup_model()
+
+    def setup_model(self):
+        # inplement this to setup the model then return it
+        pass
+
+    def _get_langchain_style_history(self):
+        history = [SystemMessage(content=self.system_prompt)]
+        for i in self.history:
+            if i["role"] == "user":
+                history.append(HumanMessage(content=i["content"]))
+            elif i["role"] == "assistant":
+                history.append(AIMessage(content=i["content"]))
+        return history
+
+    def get_answer_at_once(self):
+        assert isinstance(
+            self.model, BaseChatModel), "model is not instance of LangChain BaseChatModel"
+        history = self._get_langchain_style_history()
+        response = self.model.generate(history)
+        return response.content, sum(response.content)
+
+    def get_answer_stream_iter(self):
+        it = CallbackToIterator()
+        assert isinstance(
+            self.model, BaseChatModel), "model is not instance of LangChain BaseChatModel"
+        history = self._get_langchain_style_history()
+
+        def thread_func():
+            self.model(messages=history, callbacks=[
+                ChuanhuCallbackHandler(it.callback)])
+            it.finish()
+        t = Thread(target=thread_func)
+        t.start()
+        partial_text = ""
+        for value in it:
+            partial_text += value
+            yield partial_text

modules/models/models.py

@@ -24,7 +24,7 @@ from ..presets import *
 from ..index_func import *
 from ..utils import *
 from .. import shared
-from ..config import retrieve_proxy, usage_limit
+from ..config import retrieve_proxy, usage_limit, sensitive_id
 from modules import config
 from .base_model import BaseLLMModel, ModelType
 
@@ -87,21 +87,22 @@ class OpenAIClient(BaseLLMModel):
             try:
                 usage_data = self._get_billing_data(usage_url)
             except Exception as e:
-                logging.error(f"获取API使用情况失败:" + str(e))
+                # logging.error(f"获取API使用情况失败: " + str(e))
+                if "Invalid authorization header" in str(e):
+                    return i18n("**获取API使用情况失败**，需在填写`config.json`中正确填写sensitive_id")
+                elif "Incorrect API key provided: sess" in str(e):
+                    return i18n("**获取API使用情况失败**，sensitive_id错误或已过期")
                 return i18n("**获取API使用情况失败**")
             # rounded_usage = "{:.5f}".format(usage_data["total_usage"] / 100)
             rounded_usage = round(usage_data["total_usage"] / 100, 5)
             usage_percent = round(usage_data["total_usage"] / usage_limit, 2)
             # return i18n("**本月使用金额** ") + f"\u3000 ${rounded_usage}"
-            return """\
-                <b>""" + i18n("本月使用金额") + f"""</b>
-                <div class="progress-bar">
-                    <div class="progress" style="width: {usage_percent}%;">
-                        <span class="progress-text">{usage_percent}%</span>
-                    </div>
-                </div>
-                <div style="display: flex; justify-content: space-between;"><span>${rounded_usage}</span><span>${usage_limit}</span></div>
-                """
+            return get_html("billing_info.html").format(
+                    label = i18n("本月使用金额"),
+                    usage_percent = usage_percent,
+                    rounded_usage = rounded_usage,
+                    usage_limit = usage_limit
+                )
         except requests.exceptions.ConnectTimeout:
             status_text = (
                 STANDARD_ERROR_MSG + CONNECTION_TIMEOUT_MSG + ERROR_RETRIEVE_MSG
@@ -179,9 +180,10 @@ class OpenAIClient(BaseLLMModel):
     def _refresh_header(self):
         self.headers = {
             "Content-Type": "application/json",
-            "Authorization": f"Bearer {self.api_key}",
+            "Authorization": f"Bearer {sensitive_id}",
         }
 
+
     def _get_billing_data(self, billing_url):
         with retrieve_proxy():
             response = requests.get(
@@ -560,6 +562,7 @@ def get_model(
     try:
         if model_type == ModelType.OpenAI:
             logging.info(f"正在加载OpenAI模型: {model_name}")
+            access_key = os.environ.get("OPENAI_API_KEY", access_key)
             model = OpenAIClient(
                 model_name=model_name,
                 api_key=access_key,
@@ -610,16 +613,25 @@ def get_model(
         elif model_type == ModelType.ChuanhuAgent:
             from .ChuanhuAgent import ChuanhuAgent_Client
             model = ChuanhuAgent_Client(model_name, access_key, user_name=user_name)
+        elif model_type == ModelType.GooglePaLM:
+            from .Google_PaLM import Google_PaLM_Client
+            access_key = os.environ.get("GOOGLE_PALM_API_KEY", access_key)
+            model = Google_PaLM_Client(model_name, access_key, user_name=user_name)
+        elif model_type == ModelType.LangchainChat:
+            from .azure import Azure_OpenAI_Client
+            model = Azure_OpenAI_Client(model_name, user_name=user_name)
         elif model_type == ModelType.Unknown:
             raise ValueError(f"未知模型: {model_name}")
         logging.info(msg)
     except Exception as e:
-        logging.error(e)
+        import traceback
+        traceback.print_exc()
         msg = f"{STANDARD_ERROR_MSG}: {e}"
+    presudo_key = hide_middle_chars(access_key)
     if dont_change_lora_selector:
-        return model, msg, chatbot
+        return model, msg, chatbot, gr.update(), access_key, presudo_key
     else:
-        return model, msg, chatbot, gr.Dropdown.update(choices=lora_choices, visible=lora_selector_visibility)
+        return model, msg, chatbot, gr.Dropdown.update(choices=lora_choices, visible=lora_selector_visibility), access_key, presudo_key
 
 
 if __name__ == "__main__":

modules/overwrites.py

@@ -80,8 +80,7 @@ with open("./assets/custom.js", "r", encoding="utf-8") as f, \
 def reload_javascript():
     print("Reloading javascript...")
     js = f'<script>{customJS}</script><script async>{externalScripts}</script>'
-    # if render_latex:
-    #     js += """\"""
+    js += '<script async src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>'
     def template_response(*args, **kwargs):
         res = GradioTemplateResponseOriginal(*args, **kwargs)
         res.body = res.body.replace(b'</html>', f'{js}</html>'.encode("utf8"))

modules/presets.py

@@ -60,7 +60,9 @@ ONLINE_MODELS = [
     "gpt-4-32k-0613",
     "川虎助理",
     "川虎助理 Pro",
+    "GooglePaLM",
     "xmchat",
+    "Azure OpenAI",
     "yuanai-1.0-base_10B",
     "yuanai-1.0-translate",
     "yuanai-1.0-dialog",
@@ -72,7 +74,9 @@ ONLINE_MODELS = [
 LOCAL_MODELS = [
     "chatglm-6b",
     "chatglm-6b-int4",
-    "chatglm-6b-int4-qe",
+    "chatglm-6b-int4-ge",
+    "chatglm2-6b",
+    "chatglm2-6b-int4",
     "StableLM",
     "MOSS",
     "llama-7b-hf",
@@ -121,6 +125,7 @@ REPLY_LANGUAGES = [
     "Español",
     "Français",
     "Deutsch",
+    "한국어",
     "跟随问题语言（不稳定）"
 ]
 
@@ -222,7 +227,7 @@ small_and_beautiful_theme = gr.themes.Soft(
         # button_primary_background_fill_hover="*primary_400",
         # button_primary_border_color="*primary_500",
         button_primary_border_color_dark="*primary_600",
-        button_primary_text_color="wihte",
+        button_primary_text_color="white",
         button_primary_text_color_dark="white",
         button_secondary_background_fill="*neutral_100",
         button_secondary_background_fill_hover="*neutral_50",

modules/utils.py

@@ -5,6 +5,7 @@ import logging
 import json
 import os
 import datetime
+from datetime import timezone 
 import hashlib
 import csv
 import requests
@@ -47,6 +48,9 @@ def set_key(current_model, *args):
 def load_chat_history(current_model, *args):
     return current_model.load_chat_history(*args)
 
+def delete_chat_history(current_model, *args):
+    return current_model.delete_chat_history(*args)
+
 def interrupt(current_model, *args):
     return current_model.interrupt(*args)
 
@@ -214,7 +218,10 @@ def convert_bot_before_marked(chat_message):
         non_code_parts = code_block_pattern.split(chat_message)[::2]
         result = []
 
-        raw = f'<div class="raw-message hideM">{escape_markdown(chat_message)}</div>'
+        hr_pattern = r'\n\n<hr class="append-display no-in-raw" />(.*?)'
+        hr_match = re.search(hr_pattern, chat_message, re.DOTALL)
+        clip_hr = chat_message[:hr_match.start()] if hr_match else chat_message
+        raw = f'<div class="raw-message hideM">{escape_markdown(clip_hr)}</div>'
         for non_code, code in zip(non_code_parts, code_blocks + [""]):
             if non_code.strip():
                 result.append(non_code)
@@ -236,7 +243,7 @@ def escape_markdown(text):
     Escape Markdown special characters to HTML-safe equivalents.
     """
     escape_chars = {
-        ' ': '&nbsp;',
+        # ' ': '&nbsp;',
         '_': '&#95;',
         '*': '&#42;',
         '[': '&#91;',
@@ -253,8 +260,11 @@ def escape_markdown(text):
         '`': '&#96;',
         '>': '&#62;',
         '<': '&#60;',
-        '|': '&#124;'
+        '|': '&#124;',
+        '$': '&#36;',
+        ':': '&#58;',
     }
+    text = text.replace('    ', '&nbsp;&nbsp;&nbsp;&nbsp;')
     return ''.join(escape_chars.get(c, c) for c in text)
 
 
@@ -531,26 +541,55 @@ def run(command, desc=None, errdesc=None, custom_env=None, live=False):
         raise RuntimeError(message)
     return result.stdout.decode(encoding="utf8", errors="ignore")
 
-def versions_html():
+def commit_html():
     git = os.environ.get('GIT', "git")
-    python_version = ".".join([str(x) for x in sys.version_info[0:3]])
     try:
         commit_hash = run(f"{git} rev-parse HEAD").strip()
     except Exception:
         commit_hash = "<none>"
     if commit_hash != "<none>":
         short_commit = commit_hash[0:7]
-        commit_info = f"<a style=\"text-decoration:none;color:inherit\" href=\"https://github.com/GaiZhenbiao/ChuanhuChatGPT/commit/{short_commit}\">{short_commit}</a>"
+        commit_info = f'<a style="text-decoration:none;color:inherit" href="https://github.com/GaiZhenbiao/ChuanhuChatGPT/commit/{short_commit}">{short_commit}</a>'
     else:
         commit_info = "unknown \U0001F615"
+    return commit_info
+
+def tag_html():
+    git = os.environ.get('GIT', "git")
+    try:
+        tag = run(f"{git} describe --tags --exact-match").strip()
+    except Exception:
+        tag = "<none>"
+    if tag != "<none>":
+        tag_info = f'<a style="text-decoration:none;color:inherit" href="https://github.com/GaiZhenbiao/ChuanhuChatGPT/releases/tag/{tag}">{tag}</a>'
+    else:
+        tag_info = "unknown \U0001F615"
+    return tag_info
+
+def repo_html():
+    commit_version = commit_html()
+    tag_version = tag_html()
+    return tag_version if tag_version != "unknown \U0001F615" else commit_version
+
+def versions_html():
+    python_version = ".".join([str(x) for x in sys.version_info[0:3]])
+    repo_version = repo_html()
     return f"""
         Python: <span title="{sys.version}">{python_version}</span>
          • 
         Gradio: {gr.__version__}
          • 
-        <a style="text-decoration:none;color:inherit" href="https://github.com/GaiZhenbiao/ChuanhuChatGPT">ChuanhuChat</a>: {commit_info}
+        <a style="text-decoration:none;color:inherit" href="https://github.com/GaiZhenbiao/ChuanhuChatGPT">ChuanhuChat</a>: {repo_version}
         """
 
+def version_time():
+    git = os.environ.get('GIT', "git")
+    try:
+        commit_time = run(f"TZ=UTC {git} log -1 --format=%cd --date='format-local:%Y-%m-%dT%H:%M:%SZ'").strip()
+    except Exception:
+        commit_time = "unknown"
+    return commit_time
+
 def get_html(filename):
     path = os.path.join(shared.chuanhu_path, "assets", "html", filename)
     if os.path.exists(path):

readme/README_en.md

@@ -6,7 +6,7 @@
 <h1 align="center">川虎 Chat 🐯 Chuanhu Chat</h1>
 <div align="center">
   <a href="https://github.com/GaiZhenBiao/ChuanhuChatGPT">
-    <img src="https://user-images.githubusercontent.com/70903329/227087087-93b37d64-7dc3-4738-a518-c1cf05591c8a.png" alt="Logo" height="156">
+    <img src="https://github.com/GaiZhenbiao/ChuanhuChatGPT/assets/70903329/aca3a7ec-4f1d-4667-890c-a6f47bf08f63" alt="Logo" height="156">
   </a>
 
 <p align="center">
@@ -44,6 +44,23 @@
   </p>
 </div>
 
+## Supported LLM Models
+
+**LLM models via API**:
+
+- [ChatGPT](https://chat.openai.com) ([GPT-4](https://openai.com/product/gpt-4))
+- [Google PaLM](https://developers.generativeai.google/products/palm)
+- [Inspur Yuan 1.0](https://air.inspur.com/home)
+- [MiniMax](https://api.minimax.chat/)
+- [XMChat](https://github.com/MILVLG/xmchat)
+
+**LLM models via local deployment**:
+
+- [ChatGLM](https://github.com/THUDM/ChatGLM-6B) ([ChatGLM2](https://github.com/THUDM/ChatGLM2-6B))
+- [LLaMA](https://github.com/facebookresearch/llama)
+- [StableLM](https://github.com/Stability-AI/StableLM)
+- [MOSS](https://github.com/OpenLMLab/MOSS)
+
 ## Usage Tips
 
 - To better control the ChatGPT, use System Prompt.
@@ -51,11 +68,11 @@
 - To try again if the response is unsatisfactory, use `🔄 Regenerate` button.
 - To start a new line in the input box, press <kbd>Shift</kbd> + <kbd>Enter</kbd> keys.
 - To quickly switch between input history, press <kbd>↑</kbd> and <kbd>↓</kbd> key in the input box.
-- To deploy the program onto a server, change the last line of the program to `demo.launch(server_name="0.0.0.0", server_port=<your port number>)`.
-- To get a public shared link, change the last line of the program to `demo.launch(share=True)`. Please be noted that the program must be running in order to be accessed via a public link.
+- To deploy the program onto a server, set `"server_name": "0.0.0.0", "server_port" <your port number>,` in `config.json`.
+- To get a public shared link, set `"share": true,` in `config.json`. Please be noted that the program must be running in order to be accessed via a public link.
 - To use it in Hugging Face Spaces: It is recommended to **Duplicate Space** and run the program in your own Space for a faster and more secure experience.
 
-## Installation
+## Quickstart
 
 ```shell
 git clone https://github.com/GaiZhenbiao/ChuanhuChatGPT.git
@@ -87,10 +104,6 @@ When you encounter problems, you should try manually pulling the latest changes
    ```
    pip install -r requirements.txt
    ```
-3. Update Gradio
-   ```
-   pip install gradio --upgrade --force-reinstall
-   ```
 
 Generally, you can solve most problems by following these steps.
 

readme/README_ja.md

@@ -6,7 +6,7 @@
 <h1 align="center">川虎 Chat 🐯 Chuanhu Chat</h1>
 <div align="center">
   <a href="https://github.com/GaiZhenBiao/ChuanhuChatGPT">
-    <img src="https://user-images.githubusercontent.com/70903329/227087087-93b37d64-7dc3-4738-a518-c1cf05591c8a.png" alt="Logo" height="156">
+    <img src="https://github.com/GaiZhenbiao/ChuanhuChatGPT/assets/70903329/aca3a7ec-4f1d-4667-890c-a6f47bf08f63" alt="Logo" height="156">
   </a>
 
 <p align="center">
@@ -44,17 +44,34 @@
   </p>
 </div>
 
+## サポートされている大規模言語モデル
+
+**APIを通じてアクセス可能な大規模言語モデル**：
+
+- [ChatGPT](https://chat.openai.com) ([GPT-4](https://openai.com/product/gpt-4))
+- [Google PaLM](https://developers.generativeai.google/products/palm)
+- [Inspur Yuan 1.0](https://air.inspur.com/home)
+- [MiniMax](https://api.minimax.chat/)
+- [XMChat](https://github.com/MILVLG/xmchat)
+
+**ローカルに展開された大規模言語モデル**：
+
+- [ChatGLM](https://github.com/THUDM/ChatGLM-6B) ([ChatGLM2](https://github.com/THUDM/ChatGLM2-6B))
+- [LLaMA](https://github.com/facebookresearch/llama)
+- [StableLM](https://github.com/Stability-AI/StableLM)
+- [MOSS](https://github.com/OpenLMLab/MOSS)
+
 ## 使う上でのTips
 
 - ChatGPTをより適切に制御するために、システムプロンプトを使用できます。
 - プロンプトテンプレートを使用するには、プロンプトテンプレートコレクションを選択し、ドロップダウンメニューから特定のプロンプトを選択。回答が不十分な場合は、`🔄再生成`ボタンを使って再試行します。
 - 入力ボックスで改行するには、<kbd>Shift</kbd> + <kbd>Enter</kbd>キーを押してください。
 - 入力履歴を素早く切り替えるには、入力ボックスで <kbd>↑</kbd>と<kbd>↓</kbd>キーを押す。
-- プログラムをサーバにデプロイするには、プログラムの最終行を `demo.launch(server_name="0.0.0.0", server_port=<your port number>)`に変更します。
-- 共有リンクを取得するには、プログラムの最後の行を `demo.launch(share=True)` に変更してください。なお、公開リンクでアクセスするためには、プログラムが実行されている必要があることに注意してください。
+- プログラムをサーバーに展開するには、`config.json` 内の `"server_name": "0.0.0.0", "server_port": <ポート番号>`を設定してください。
+- 共有リンクを取得するには、 `config.json` 内の `"share": true` を設定してください。なお、公開リンクでアクセスするためには、プログラムが実行されている必要があることに注意してください。
 - Hugging Face Spacesで使用する場合： より速く、より安全に利用するために、**Duplicate Space**を使用し、自分のスペースでプログラムを実行することをお勧めします。
 
-## インストール
+## クイックスタート
 
 ```shell
 git clone https://github.com/GaiZhenbiao/ChuanhuChatGPT.git
@@ -86,10 +103,6 @@ python ChuanhuChatbot.py
    ```
    pip install -r requirements.txt
    ```
-3. Gradioを更新
-   ```
-   pip install gradio --upgrade --force-reinstall
-   ```
 
 一般的に、以下の手順でほとんどの問題を解決することができます。
 

requirements.txt

@@ -1,5 +1,5 @@
-gradio==3.33.1
-gradio_client==0.2.5
+gradio==3.36.1
+gradio_client==0.2.7
 pypinyin
 tiktoken
 socksio
@@ -16,10 +16,12 @@ commentjson
 openpyxl
 pandoc
 wolframalpha
-faiss-cpu
+faiss-cpu==1.7.4
 duckduckgo-search
 arxiv
 wikipedia
 google.generativeai
 openai
 unstructured
+google-api-python-client
+tabulate

run_Windows.bat

@@ -1,5 +1,24 @@
 @echo off
 echo Opening ChuanhuChatGPT...
 
-REM Open powershell via bat
-start powershell.exe -NoExit -Command "python ./ChuanhuChatbot.py"
+if not exist "%~dp0\ChuanhuChat\Scripts" (
+    echo Creating venv...
+    python -m venv ChuanhuChat
+    
+    cd /d "%~dp0\ChuanhuChat\Scripts"
+    call activate.bat
+    
+    cd /d "%~dp0"
+    pip install -r requirements.txt
+)
+
+goto :activate_venv
+
+:launch
+%PYTHON% ChuanhuChatbot.py %*
+pause
+
+:activate_venv
+set PYTHON="%~dp0\ChuanhuChat\Scripts\Python.exe"
+echo venv %PYTHON%
+goto :launch