Upload 114 files

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

@@ -1,8 +1,11 @@
 # -*- coding:utf-8 -*-
-import os
 import logging
-import sys
+logging.basicConfig(
+    level=logging.INFO,
+    format="%(asctime)s [%(levelname)s] [%(filename)s:%(lineno)d] %(message)s",
+)
 
+import colorama
 import gradio as gr
 
 from modules import config
@@ -12,6 +15,7 @@ from modules.presets import *
 from modules.overwrites import *
 from modules.webui import *
 from modules.repo import *
+from modules.train_func import *
 from modules.models.models import get_model
 
 logging.getLogger("httpx").setLevel(logging.WARNING)
@@ -40,6 +44,7 @@ with gr.Blocks(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")
+        config_info = gr.HTML(get_html("config_info.html").format(bot_avatar=config.bot_avatar, user_avatar=config.user_avatar), visible=False, elem_id="config-info")
         update_info = gr.HTML(get_html("update.html").format(
             current_version=repo_tag_html(),
             version_time=version_time(),
@@ -63,13 +68,17 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
                 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")
-            with gr.Row():
-                emptyBtn = gr.Button(
-                    i18n("🧹 新的对话"), elem_id="empty-btn"
-                )
-                retryBtn = gr.Button(i18n("🔄 重新生成"))
-                delFirstBtn = gr.Button(i18n("🗑️ 删除最旧对话"))
-                delLastBtn = gr.Button(i18n("🗑️ 删除最新对话"))
+            with gr.Row(elem_id="chatbot-buttons"):
+                with gr.Column(min_width=120, scale=1):
+                    emptyBtn = gr.Button(
+                        i18n("🧹 新的对话"), elem_id="empty-btn"
+                    )
+                with gr.Column(min_width=120, scale=1):
+                    retryBtn = gr.Button(i18n("🔄 重新生成"))
+                with gr.Column(min_width=120, scale=1):
+                    delFirstBtn = gr.Button(i18n("🗑️ 删除最旧对话"))
+                with gr.Column(min_width=120, scale=1):
+                    delLastBtn = gr.Button(i18n("🗑️ 删除最新对话"))
                 with gr.Row(visible=False) as like_dislike_area:
                     with gr.Column(min_width=20, scale=1):
                         likeBtn = gr.Button(i18n("👍"))
@@ -178,6 +187,25 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
                                 with gr.Column():
                                     downloadFile = gr.File(interactive=True)
 
+                with gr.Tab(label=i18n("微调")):
+                    openai_train_status = gr.Markdown(label=i18n("训练状态"), value=i18n("在这里[查看使用介绍](https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/%E4%BD%BF%E7%94%A8%E6%95%99%E7%A8%8B#%E5%BE%AE%E8%B0%83-gpt-35)"))
+
+                    with gr.Tab(label=i18n("准备数据集")):
+                        dataset_preview_json = gr.JSON(label=i18n("数据集预览"), readonly=True)
+                        dataset_selection = gr.Files(label = i18n("选择数据集"), file_types=[".xlsx", ".jsonl"], file_count="single")
+                        upload_to_openai_btn = gr.Button(i18n("上传到OpenAI"), variant="primary", interactive=False)
+
+                    with gr.Tab(label=i18n("训练")):
+                        openai_ft_file_id = gr.Textbox(label=i18n("文件ID"), value="", lines=1, placeholder=i18n("上传到 OpenAI 后自动填充"))
+                        openai_ft_suffix = gr.Textbox(label=i18n("模型名称后缀"), value="", lines=1, placeholder=i18n("可选，用于区分不同的模型"))
+                        openai_train_epoch_slider = gr.Slider(label=i18n("训练轮数（Epochs）"), minimum=1, maximum=100, value=3, step=1, interactive=True)
+                        openai_start_train_btn = gr.Button(i18n("开始训练"), variant="primary", interactive=False)
+
+                    with gr.Tab(label=i18n("状态")):
+                        openai_status_refresh_btn = gr.Button(i18n("刷新状态"))
+                        openai_cancel_all_jobs_btn = gr.Button(i18n("取消所有任务"))
+                        add_to_models_btn = gr.Button(i18n("添加训练好的模型到模型列表"), interactive=False)
+
                 with gr.Tab(label=i18n("高级")):
                     gr.HTML(get_html("appearance_switcher.html").format(label=i18n("切换亮暗色主题")), elem_classes="insert-block")
                     use_streaming_checkbox = gr.Checkbox(
@@ -292,9 +320,9 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
                             elem_classes="view-only-textbox no-container",
                         )
                         # changeAPIURLBtn = gr.Button(i18n("🔄 切换API地址"))
-                        
                         updateChuanhuBtn = gr.Button(visible=False, elem_classes="invisible-btn", elem_id="update-chuanhu-btn")
 
+
     gr.Markdown(CHUANHU_DESCRIPTION, elem_id="description")
     gr.HTML(get_html("footer.html").format(versions=versions_html()), elem_id="footer")
 
@@ -376,7 +404,7 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
         inputs=[current_model],
         outputs=[chatbot, status_display],
         show_progress=True,
-        _js='clearHistoryHtml',
+        _js='clearChatbot',
     )
 
     retryBtn.click(**start_outputing_args).then(
@@ -466,6 +494,18 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
     historyFileSelectDropdown.change(**load_history_from_file_args)
     downloadFile.change(upload_chat_history, [current_model, downloadFile, user_name], [saveFileName, systemPromptTxt, chatbot])
 
+    # Train
+    dataset_selection.upload(handle_dataset_selection, dataset_selection, [dataset_preview_json, upload_to_openai_btn, openai_train_status])
+    dataset_selection.clear(handle_dataset_clear, [], [dataset_preview_json, upload_to_openai_btn])
+    upload_to_openai_btn.click(upload_to_openai, [dataset_selection], [openai_ft_file_id, openai_train_status], show_progress=True)
+
+    openai_ft_file_id.change(lambda x: gr.update(interactive=True) if len(x) > 0 else gr.update(interactive=False), [openai_ft_file_id], [openai_start_train_btn])
+    openai_start_train_btn.click(start_training, [openai_ft_file_id, openai_ft_suffix, openai_train_epoch_slider], [openai_train_status])
+
+    openai_status_refresh_btn.click(get_training_status, [], [openai_train_status, add_to_models_btn])
+    add_to_models_btn.click(add_to_models, [], [model_select_dropdown, openai_train_status], show_progress=True)
+    openai_cancel_all_jobs_btn.click(cancel_all_jobs, [], [openai_train_status], show_progress=True)
+
     # Advanced
     max_context_length_slider.change(set_token_upper_limit, [current_model, max_context_length_slider], None)
     temperature_slider.change(set_temperature, [current_model, temperature_slider], None)
@@ -513,4 +553,7 @@ demo.title = i18n("川虎Chat 🚀")
 
 if __name__ == "__main__":
     reload_javascript()
-    demo.queue(concurrency_count=CONCURRENT_COUNT).launch()
+    demo.queue(concurrency_count=CONCURRENT_COUNT).launch(
+        blocked_paths=["config.json"],
+        favicon_path="./web_assets/favicon.ico",
+    )

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"]

config_example.json

@@ -7,6 +7,11 @@
     "xmchat_api_key": "", // 你的 xmchat API Key，用于 XMChat 对话模型
     "minimax_api_key": "", // 你的 MiniMax API Key，用于 MiniMax 对话模型
     "minimax_group_id": "", // 你的 MiniMax Group ID，用于 MiniMax 对话模型
+    "midjourney_proxy_api_base": "https://xxx/mj", // 你的 https://github.com/novicezk/midjourney-proxy 代理地址
+    "midjourney_proxy_api_secret": "", // 你的 MidJourney Proxy API Secret，用于鉴权访问 api，可选
+    "midjourney_discord_proxy_url": "", // 你的 MidJourney Discord Proxy URL，用于对生成对图进行反代，可选
+    "midjourney_temp_folder": "./tmp", // 你的 MidJourney 临时文件夹，用于存放生成的图片，填空则关闭自动下载切图（直接显示MJ的四宫格图）
+
 
     //== Azure ==
     "openai_api_type": "openai", // 可选项：azure, openai
@@ -24,6 +29,8 @@
     "hide_history_when_not_logged_in": false, //未登录情况下是否不展示对话历史
     "check_update": true, //是否启用检查更新
     "default_model": "gpt-3.5-turbo", // 默认模型
+    "bot_avatar": "default", // 机器人头像，可填写图片链接、Data URL (base64)，或者"none"（不显示头像）
+    "user_avatar": "default", // 用户头像，可填写图片链接、Data URL (base64)，或者"none"（不显示头像）
 
     //== API 用量 ==
     "show_api_billing": false, //是否显示OpenAI API用量（启用需要填写sensitive_id）

locale/en_US.json

@@ -32,24 +32,33 @@
     "📝 导出为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）",
+    "未设置代理...": "No proxy...",
+    "代理地址": "Proxy address",
     "🔄 设置代理地址": "🔄 Set Proxy Address",
-    "🔙 恢复默认设置": "🔙 Restore Default Settings",
+    "🔙 恢复默认网络设置": "🔙 Reset Network Settings",
+    "🔄 检查更新...": "🔄 Check for Update...",
+    "取消": "Cancel",
+    "更新": "Update",
+    "详情": "Details",
+    "好": "OK",
+    "更新成功，请重启本程序": "Updated successfully, please restart this program",
+    "更新失败，请尝试[手动更新](https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/使用教程#手动更新)": "Update failed, please try [manually updating](https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/使用教程#手动更新)",
     "川虎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 +73,15 @@
     "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",
+    "---\n⚠️ 为保证API-Key安全，请在配置文件`config.json`中修改网络设置": "---\n⚠️ To ensure the security of API-Key, please modify the network settings in the configuration file `config.json`.",
+    "网络参数": "Network parameter"
 }

locale/ja_JP.json

@@ -32,24 +32,33 @@
     "📝 导出为Markdown": "📝 Markdownでエクスポート",
     "默认保存于history文件夹": "デフォルトでhistoryフォルダに保存されます",
     "高级": "Advanced",
-    "# ⚠️ 务必谨慎更改 ⚠️\n\n如果无法使用请恢复默认设置": "# ⚠️ 変更には慎重に ⚠️\n\nもし動作しない場合は、デフォルト設定に戻してください。",
+    "# ⚠️ 务必谨慎更改 ⚠️": "# ⚠️ 変更には慎重に ⚠️",
     "参数": "パラメータ",
-    "在这里输入停止符，用英文逗号隔开...": "ここにストップ文字を英語のカンマで区切って入力してください...",
+    "停止符，用英文逗号隔开...": "ここにストップ文字を英語のカンマで区切って入力してください...",
     "用于定位滥用行为": "不正行為を特定するために使用されます",
     "用户名": "ユーザー名",
-    "网络设置": "ネットワーク設定",
     "在这里输入API-Host...": "API-Hostを入力してください...",
     "🔄 切换API地址": "🔄 APIアドレスを切り替え",
-    "在这里输入代理地址...": "プロキシアドレスを入力してください...",
-    "代理地址（示例：http://127.0.0.1:10809）": "プロキシアドレス（例：http://127.0.0.1:10809）",
+    "未设置代理...": "代理が設定されていません...",
+    "代理地址": "プロキシアドレス",
     "🔄 设置代理地址": "🔄 プロキシアドレスを設定",
-    "🔙 恢复默认设置": "🔙 デフォルト設定に戻す",
+    "🔙 恢复默认网络设置": "🔙 ネットワーク設定のリセット",
+    "🔄 检查更新...": "🔄 アップデートをチェック...",
+    "取消": "キャンセル",
+    "更新": "アップデート",
+    "详情": "詳細",
+    "好": "はい",
+    "更新成功，请重启本程序": "更新が成功しました、このプログラムを再起動してください",
+    "更新失败，请尝试[手动更新](https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/使用教程#手动更新)": "更新に失敗しました、[手動での更新](https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/使用教程#手动更新)をお試しください。",
     "川虎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 +73,15 @@
     "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",
+    "---\n⚠️ 为保证API-Key安全，请在配置文件`config.json`中修改网络设置": "---\n⚠️ APIキーの安全性を確保するために、`config.json`ファイルでネットワーク設定を変更してください。",
+    "网络参数": "ネットワークパラメータ"
+}

locale/ko_KR.json

@@ -0,0 +1,89 @@
+{
+    "未命名对话历史记录": "이름없는 대화 기록",
+    "在这里输入": "여기에 입력하세요",
+    "🧹 新的对话": "🧹 새로운 대화",
+    "🔄 重新生成": "🔄 재생성",
+    "🗑️ 删除最旧对话": "🗑️ 가장 오래된 대화 삭제",
+    "🗑️ 删除最新对话": "🗑️ 최신 대화 삭제",
+    "🗑️ 删除": "🗑️ 삭제",
+    "模型": "LLM 모델",
+    "多账号模式已开启，无需输入key，可直接开始对话": "다중 계정 모드가 활성화되어 있으므로 키를 입력할 필요가 없이 바로 대화를 시작할 수 있습니다",
+    "**发送消息** 或 **提交key** 以显示额度": "**메세지를 전송** 하거나 **Key를 입력**하여 크레딧 표시",
+    "选择模型": "모델 선택",
+    "选择LoRA模型": "LoRA 모델 선택",
+    "实时传输回答": "실시간 전송",
+    "单轮对话": "단일 대화",
+    "使用在线搜索": "온라인 검색 사용",
+    "选择回复语言（针对搜索&索引功能）": "답장 언어 선택 (검색 & 인덱스용)",
+    "上传索引文件": "업로드",
+    "双栏pdf": "2-column pdf",
+    "识别公式": "formula OCR",
+    "在这里输入System Prompt...": "여기에 시스템 프롬프트를 입력하세요...",
+    "加载Prompt模板": "프롬프트 템플릿 불러오기",
+    "选择Prompt模板集合文件": "프롬프트 콜렉션 파일 선택",
+    "🔄 刷新": "🔄 새로고침",
+    "从Prompt模板中加载": "프롬프트 템플릿에서 불러오기",
+    "保存/加载": "저장/불러오기",
+    "保存/加载对话历史记录": "대화 기록 저장/불러오기",
+    "从列表中加载对话": "리스트에서 대화 불러오기",
+    "设置文件名: 默认为.json，可选为.md": "파일 이름 설정: 기본값: .json, 선택: .md",
+    "设置保存文件名": "저장 파일명 설정",
+    "对话历史记录": "대화 기록",
+    "💾 保存对话": "💾 대화 저장",
+    "📝 导出为Markdown": "📝 마크다운으로 내보내기",
+    "默认保存于history文件夹": "히스토리 폴더에 기본 저장",
+    "高级": "고급",
+    "# ⚠️ 务必谨慎更改 ⚠️": "# ⚠️ 주의: 변경시 주의하세요. ⚠️",
+    "参数": "파라미터들",
+    "停止符，用英文逗号隔开...": "여기에 정지 토큰 입력, ','로 구분됨...",
+    "用于定位滥用行为": "악용 사례 파악에 활용됨",
+    "用户名": "사용자 이름",
+    "在这里输入API-Host...": "여기에 API host를 입력하세요...",
+    "🔄 切换API地址": "🔄 API 주소 변경",
+    "未设置代理...": "대리인이 설정되지 않았습니다...",
+    "代理地址": "프록시 주소",
+    "🔄 设置代理地址": "🔄 프록시 주소 설정",
+    "🔙 恢复默认网络设置": "🔙 네트워크 설정 초기화",
+    "🔄 检查更新...": "🔄 업데이트 확인...",
+    "取消": "취소",
+    "更新": "업데이트",
+    "详情": "상세",
+    "好": "예",
+    "更新成功，请重启本程序": "업데이트 성공, 이 프로그램을 재시작 해주세요",
+    "更新失败，请尝试[手动更新](https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/使用教程#手动更新)": "업데이트 실패, [수동 업데이트](https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/使用教程#手动更新)를 시도하십시오",
+    "川虎Chat 🚀": "Chuanhu Chat 🚀",
+    "开始实时传输回答……": "실시간 응답 출력 시작...",
+    "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 파싱 에러, 응답: ",
+    "模型设置为了：": "설정된 모델: ",
+    "☹️发生了错误：": "☹️에러: ",
+    "获取对话时发生错误，请查看后台日志": "대화를 가져오는 중 에러가 발생했습니다. 백그라운드 로그를 확인하세요",
+    "请检查网络连接，或者API-Key是否有效。": "네트워크 연결 또는 API키가 유효한지 확인하세요",
+    "连接超时，无法获取对话。": "연결 시간 초과, 대화를 가져올 수 없습니다.",
+    "读取超时，无法获取对话。": "읽기 시간 초과, 대화를 가져올 수 없습니다.",
+    "代理错误，无法获取对话。": "프록시 에러, 대화를 가져올 수 없습니다.",
+    "SSL错误，无法获取对话。": "SSL 에러, 대화를 가져올 수 없습니다.",
+    "API key为空，请检查是否输入正确。": "API 키가 비어 있습니다. 올바르게 입력되었는지 확인하십세요.",
+    "请输入对话内容。": "대화 내용을 입력하세요.",
+    "账单信息不适用": "청구 정보를 가져올 수 없습니다",
+    "由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최신 코드 다운로드: [GitHub](https://github.com/GaiZhenbiao/ChuanhuChatGPT)",
+    "切换亮暗色主题": "라이트/다크 테마 전환",
+    "您的IP区域：未知。": "IP 지역: 알 수 없음.",
+    "获取IP地理位置失败。原因：": "다음과 같은 이유로 IP 위치를 가져올 수 없습니다. 이유: ",
+    "。你仍然可以使用聊天功能。": ". 채팅 기능을 계속 사용할 수 있습니다.",
+    "您的IP区域：": "당신의 IP 지역: ",
+    "总结": "요약",
+    "生成内容总结中……": "콘텐츠 요약 생성중...",
+    "上传": "업로드",
+    "由于下面的原因，Google 拒绝返回 PaLM 的回答：\n\n": "구글은 다음과 같은 이유로 인해 PaLM의 응답을 거부합니다: \n\n",
+    "---\n⚠️ 为保证API-Key安全，请在配置文件`config.json`中修改网络设置": "---\n⚠️ API-Key의 안전을 보장하기 위해 네트워크 설정을 `config.json` 구성 파일에서 수정해주세요.",
+    "网络参数": "네트워크 매개변수"
+}

locale/sv-SE.json

@@ -0,0 +1,87 @@
+{  
+    "未命名对话历史记录": "Onämnd Dialoghistorik",  
+    "在这里输入": "Skriv in här",  
+    "🧹 新的对话": "🧹 Ny Dialog",  
+    "🔄 重新生成": "🔄 Regenerera",  
+    "🗑️ 删除最旧对话": "🗑️ Ta bort äldsta dialogen",  
+    "🗑️ 删除最新对话": "🗑️ Ta bort senaste dialogen",  
+    "模型": "Modell",  
+    "多账号模式已开启，无需输入key，可直接开始对话": "Flerkontoläge är aktiverat, ingen nyckel behövs, du kan starta dialogen direkt",  
+    "**发送消息** 或 **提交key** 以显示额度": "**Skicka meddelande** eller **Skicka in nyckel** för att visa kredit",  
+    "选择模型": "Välj Modell",  
+    "选择LoRA模型": "Välj LoRA Modell",  
+    "实时传输回答": "Strömmande utdata",  
+    "单轮对话": "Enkel dialog",  
+    "使用在线搜索": "Använd online-sökning",  
+    "选择回复语言（针对搜索&索引功能）": "Välj svarspråk (för sök- och indexfunktion)",  
+    "上传索引文件": "Ladda upp",  
+    "双栏pdf": "Två-kolumns pdf",  
+    "识别公式": "Formel OCR",  
+    "在这里输入System Prompt...": "Skriv in System Prompt här...",  
+    "加载Prompt模板": "Ladda Prompt-mall",  
+    "选择Prompt模板集合文件": "Välj Prompt-mall Samlingsfil",  
+    "🔄 刷新": "🔄 Uppdatera",  
+    "从Prompt模板中加载": "Ladda från Prompt-mall",  
+    "保存/加载": "Spara/Ladda",  
+    "保存/加载对话历史记录": "Spara/Ladda Dialoghistorik",  
+    "从列表中加载对话": "Ladda dialog från lista",  
+    "设置文件名: 默认为.json，可选为.md": "Ställ in filnamn: standard är .json, valfritt är .md",  
+    "设置保存文件名": "Ställ in sparfilnamn",  
+    "对话历史记录": "Dialoghistorik",  
+    "💾 保存对话": "💾 Spara Dialog",  
+    "📝 导出为Markdown": "📝 Exportera som Markdown",  
+    "默认保存于history文件夹": "Sparas som standard i mappen history",  
+    "高级": "Avancerat",  
+    "# ⚠️ 务必谨慎更改 ⚠️": "# ⚠️ Var försiktig med ändringar. ⚠️",  
+    "参数": "Parametrar",  
+    "停止符，用英文逗号隔开...": "Skriv in stopptecken här, separerade med kommatecken...",  
+    "用于定位滥用行为": "Används för att lokalisera missbruk",  
+    "用户名": "Användarnamn",  
+    "在这里输入API-Host...": "Skriv in API-Host här...",  
+    "🔄 切换API地址": "🔄 Byt API-adress",  
+    "未设置代理...": "Inte inställd proxy...",  
+    "代理地址": "Proxyadress",  
+    "🔄 设置代理地址": "🔄 Ställ in Proxyadress",  
+    "🔙 恢复网络默认设置": "🔙 Återställ Nätverksinställningar",  
+    "🔄 检查更新...": "🔄 Sök efter uppdateringar...",  
+    "取消": "Avbryt",  
+    "更新": "Uppdatera",  
+    "详情": "Detaljer",  
+    "好": "OK",  
+    "更新成功，请重启本程序": "Uppdaterat framgångsrikt, starta om programmet",
+    "更新失败，请尝试[手动更新](https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/使用教程#手动更新)": "Uppdateringen misslyckades, prova att [uppdatera manuellt](https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/使用教程#手动更新)",
+    "川虎Chat 🚀": "Chuanhu Chat 🚀",  
+    "开始实时传输回答……": "Börjar strömma utdata...",  
+    "Token 计数: ": "Tokenräkning: ",  
+    "，本次对话累计消耗了 ": ", Total kostnad för denna dialog är ",  
+    "**获取API使用情况失败**": "**Misslyckades med att hämta API-användning**",  
+    "**获取API使用情况失败**，需在填写`config.json`中正确填写sensitive_id": "**Misslyckades med att hämta API-användning**, korrekt sensitive_id behövs i `config.json`",  
+    "**获取API使用情况失败**，sensitive_id错误或已过期": "**Misslyckades med att hämta API-användning**, felaktig eller utgången sensitive_id",  
+    "**本月使用金额** ": "**Månadens användning** ",  
+    "本月使用金额": "Månadens användning",  
+    "获取API使用情况失败:": "Misslyckades med att hämta API-användning:",  
+    "API密钥更改为了": "API-nyckeln har ändrats till",  
+    "JSON解析错误,收到的内容: ": "JSON-tolkningsfel, mottaget innehåll: ",  
+    "模型设置为了：": "Modellen är inställd på: ",  
+    "☹️发生了错误：": "☹️Fel: ",  
+    "获取对话时发生错误，请查看后台日志": "Ett fel uppstod när dialogen hämtades, kontrollera bakgrundsloggen",  
+    "请检查网络连接，或者API-Key是否有效。": "Kontrollera nätverksanslutningen eller om API-nyckeln är giltig.",  
+    "连接超时，无法获取对话。": "Anslutningen tog för lång tid, kunde inte hämta dialogen.",  
+    "读取超时，无法获取对话。": "Läsningen tog för lång tid, kunde inte hämta dialogen.",  
+    "代理错误，无法获取对话。": "Proxyfel, kunde inte hämta dialogen.",  
+    "SSL错误，无法获取对话。": "SSL-fel, kunde inte hämta dialogen.",  
+    "API key为空，请检查是否输入正确。": "API-nyckeln är tom, kontrollera om den är korrekt inmatad.",  
+    "请输入对话内容。": "Ange dialoginnehåll.",  
+    "账单信息不适用": "Faktureringsinformation är inte tillämplig",  
+    "由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) 下载最新版脚本": "Utvecklad av Bilibili [土川虎虎虎](https://space.bilibili.com/29125536), [明昭MZhao](https://space.bilibili.com/24807452) och [Keldos](https://github.com/Keldos-Li)\n\nLadda ner senaste koden från [GitHub](https://github.com/GaiZhenbiao/ChuanhuChatGPT)",  
+    "切换亮暗色主题": "Byt ljus/mörk tema",  
+    "您的IP区域：未知。": "Din IP-region: Okänd.",  
+    "获取IP地理位置失败。原因：": "Misslyckades med att hämta IP-plats. Orsak: ",  
+    "。你仍然可以使用聊天功能。": ". Du kan fortfarande använda chattfunktionen.",  
+    "您的IP区域：": "Din IP-region: ",  
+    "总结": "Sammanfatta",  
+    "生成内容总结中……": "Genererar innehållssammanfattning...",  
+    "由于下面的原因，Google 拒绝返回 PaLM 的回答：\n\n": "På grund av följande skäl vägrar Google att ge ett svar till PaLM: \n\n",
+    "---\n⚠️ 为保证API-Key安全，请在配置文件`config.json`中修改网络设置": "---\n⚠️ För att säkerställa säkerheten för API-nyckeln, vänligen ändra nätverksinställningarna i konfigurationsfilen `config.json`.",
+    "网络参数": "nätverksparametrar"
+}  

modules/config.py

@@ -16,7 +16,6 @@ __all__ = [
     "auth_list",
     "dockerflag",
     "retrieve_proxy",
-    "log_level",
     "advance_docs",
     "update_doc_config",
     "usage_limit",
@@ -92,10 +91,15 @@ 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 = my_api_key
+else:
     sensitive_id = config.get("sensitive_id", "")
     sensitive_id = os.environ.get("SENSITIVE_ID", sensitive_id)
-else:
-    sensitive_id = my_api_key
+
+# 模型配置
+if "extra_models" in  config:
+    presets.MODELS.extend(config["extra_models"])
+    logging.info(f"已添加额外的模型：{config['extra_models']}")
 
 google_palm_api_key = config.get("google_palm_api_key", "")
 google_palm_api_key = os.environ.get(
@@ -110,6 +114,15 @@ os.environ["MINIMAX_API_KEY"] = minimax_api_key
 minimax_group_id = config.get("minimax_group_id", "")
 os.environ["MINIMAX_GROUP_ID"] = minimax_group_id
 
+midjourney_proxy_api_base = config.get("midjourney_proxy_api_base", "")
+os.environ["MIDJOURNEY_PROXY_API_BASE"] = midjourney_proxy_api_base
+midjourney_proxy_api_secret = config.get("midjourney_proxy_api_secret", "")
+os.environ["MIDJOURNEY_PROXY_API_SECRET"] = midjourney_proxy_api_secret
+midjourney_discord_proxy_url = config.get("midjourney_discord_proxy_url", "")
+os.environ["MIDJOURNEY_DISCORD_PROXY_URL"] = midjourney_discord_proxy_url
+midjourney_temp_folder = config.get("midjourney_temp_folder", "")
+os.environ["MIDJOURNEY_TEMP_FOLDER"] = midjourney_temp_folder
+
 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"])
 
@@ -155,12 +168,6 @@ def retrieve_openai_api(api_key=None):
     os.environ["OPENAI_API_KEY"] = old_api_key
 
 
-# 处理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 = os.environ.get("HTTP_PROXY", "")
@@ -267,3 +274,7 @@ except ValueError:
     pass
 
 share = config.get("share", False)
+
+# avatar
+bot_avatar = config.get("bot_avatar", "default")
+user_avatar = config.get("user_avatar", "default")

modules/index_func.py

@@ -1,7 +1,7 @@
 import os
 import logging
 
-import colorama
+import hashlib
 import PyPDF2
 from tqdm import tqdm
 
@@ -10,19 +10,6 @@ from modules.utils import *
 from modules.config import local_embedding
 
 
-def get_index_name(file_src):
-    file_paths = [x.name for x in file_src]
-    file_paths.sort(key=lambda x: os.path.basename(x))
-
-    md5_hash = hashlib.md5()
-    for file_path in file_paths:
-        with open(file_path, "rb") as f:
-            while chunk := f.read(8192):
-                md5_hash.update(chunk)
-
-    return md5_hash.hexdigest()
-
-
 def get_documents(file_src):
     from langchain.schema import Document
     from langchain.text_splitter import TokenTextSplitter
@@ -113,7 +100,7 @@ def construct_index(
     embedding_limit = None if embedding_limit == 0 else embedding_limit
     separator = " " if separator == "" else separator
 
-    index_name = get_index_name(file_src)
+    index_name = get_file_hash(file_src)
     index_path = f"./index/{index_name}"
     if local_embedding:
         from langchain.embeddings.huggingface import HuggingFaceEmbeddings

modules/models/base_model.py

@@ -141,6 +141,7 @@ class ModelType(Enum):
     ChuanhuAgent = 8
     GooglePaLM = 9
     LangchainChat = 10
+    Midjourney = 11
 
     @classmethod
     def get_type(cls, model_name: str):
@@ -166,7 +167,9 @@ class ModelType(Enum):
             model_type = ModelType.ChuanhuAgent
         elif "palm" in model_name_lower:
             model_type = ModelType.GooglePaLM
-        elif "azure" or "api" in model_name_lower:
+        elif "midjourney" in model_name_lower:
+            model_type = ModelType.Midjourney
+        elif "azure" in model_name_lower or "api" in model_name_lower:
             model_type = ModelType.LangchainChat
         else:
             model_type = ModelType.Unknown

modules/models/midjourney.py

@@ -0,0 +1,385 @@
+import base64
+import io
+import json
+import logging
+import pathlib
+import time
+import tempfile
+import os
+
+from datetime import datetime
+
+import requests
+import tiktoken
+from PIL import Image
+
+from modules.config import retrieve_proxy
+from modules.models.models import XMChat
+
+mj_proxy_api_base = os.getenv("MIDJOURNEY_PROXY_API_BASE")
+mj_discord_proxy_url = os.getenv("MIDJOURNEY_DISCORD_PROXY_URL")
+mj_temp_folder = os.getenv("MIDJOURNEY_TEMP_FOLDER")
+
+
+class Midjourney_Client(XMChat):
+
+    class FetchDataPack:
+        """
+        A class to store data for current fetching data from Midjourney API
+        """
+
+        action: str  # current action, e.g. "IMAGINE", "UPSCALE", "VARIATION"
+        prefix_content: str  # prefix content, task description and process hint
+        task_id: str  # task id
+        start_time: float  # task start timestamp
+        timeout: int  # task timeout in seconds
+        finished: bool  # whether the task is finished
+        prompt: str  # prompt for the task
+
+        def __init__(self, action, prefix_content, task_id, timeout=900):
+            self.action = action
+            self.prefix_content = prefix_content
+            self.task_id = task_id
+            self.start_time = time.time()
+            self.timeout = timeout
+            self.finished = False
+
+    def __init__(self, model_name, api_key, user_name=""):
+        super().__init__(api_key, user_name)
+        self.model_name = model_name
+        self.history = []
+        self.api_key = api_key
+        self.headers = {
+            "Content-Type": "application/json",
+            "mj-api-secret": f"{api_key}"
+        }
+        self.proxy_url = mj_proxy_api_base
+        self.command_splitter = "::"
+
+        if mj_temp_folder:
+            temp = "./tmp"
+            if user_name:
+                temp = os.path.join(temp, user_name)
+            if not os.path.exists(temp):
+                os.makedirs(temp)
+            self.temp_path = tempfile.mkdtemp(dir=temp)
+            logging.info("mj temp folder: " + self.temp_path)
+        else:
+            self.temp_path = None
+
+    def use_mj_self_proxy_url(self, img_url):
+        """
+        replace discord cdn url with mj self proxy url
+        """
+        return img_url.replace(
+            "https://cdn.discordapp.com/",
+            mj_discord_proxy_url and mj_discord_proxy_url or "https://cdn.discordapp.com/"
+        )
+
+    def split_image(self, image_url):
+        """
+        when enabling temp dir, split image into 4 parts
+        """
+        with retrieve_proxy():
+            image_bytes = requests.get(image_url).content
+        img = Image.open(io.BytesIO(image_bytes))
+        width, height = img.size
+        # calculate half width and height
+        half_width = width // 2
+        half_height = height // 2
+        # create coordinates (top-left x, top-left y, bottom-right x, bottom-right y)
+        coordinates = [(0, 0, half_width, half_height),
+                       (half_width, 0, width, half_height),
+                       (0, half_height, half_width, height),
+                       (half_width, half_height, width, height)]
+
+        images = [img.crop(c) for c in coordinates]
+        return images
+
+    def auth_mj(self):
+        """
+        auth midjourney api
+        """
+        # TODO: check if secret is valid
+        return {'status': 'ok'}
+
+    def request_mj(self, path: str, action: str, data: str, retries=3):
+        """
+        request midjourney api
+        """
+        mj_proxy_url = self.proxy_url
+        if mj_proxy_url is None or not (mj_proxy_url.startswith("http://") or mj_proxy_url.startswith("https://")):
+            raise Exception('please set MIDJOURNEY_PROXY_API_BASE in ENV or in config.json')
+
+        auth_ = self.auth_mj()
+        if auth_.get('error'):
+            raise Exception('auth not set')
+
+        fetch_url = f"{mj_proxy_url}/{path}"
+        # logging.info(f"[MJ Proxy] {action} {fetch_url} params: {data}")
+
+        for _ in range(retries):
+            try:
+                with retrieve_proxy():
+                    res = requests.request(method=action, url=fetch_url, headers=self.headers, data=data)
+                break
+            except Exception as e:
+                print(e)
+
+        if res.status_code != 200:
+            raise Exception(f'{res.status_code} - {res.content}')
+
+        return res
+
+    def fetch_status(self, fetch_data: FetchDataPack):
+        """
+        fetch status of current task
+        """
+        if fetch_data.start_time + fetch_data.timeout < time.time():
+            fetch_data.finished = True
+            return "任务超时，请检查 dc 输出。描述：" + fetch_data.prompt
+
+        time.sleep(3)
+        status_res = self.request_mj(f"task/{fetch_data.task_id}/fetch", "GET", '')
+        status_res_json = status_res.json()
+        if not (200 <= status_res.status_code < 300):
+            raise Exception("任务状态获取失败：" + status_res_json.get(
+                'error') or status_res_json.get('description') or '未知错误')
+        else:
+            fetch_data.finished = False
+            if status_res_json['status'] == "SUCCESS":
+                content = status_res_json['imageUrl']
+                fetch_data.finished = True
+            elif status_res_json['status'] == "FAILED":
+                content = status_res_json['failReason'] or '未知原因'
+                fetch_data.finished = True
+            elif status_res_json['status'] == "NOT_START":
+                content = f'任务未开始，已等待 {time.time() - fetch_data.start_time:.2f} 秒'
+            elif status_res_json['status'] == "IN_PROGRESS":
+                content = '任务正在运行'
+                if status_res_json.get('progress'):
+                    content += f"，进度：{status_res_json['progress']}"
+            elif status_res_json['status'] == "SUBMITTED":
+                content = '任务已提交处理'
+            elif status_res_json['status'] == "FAILURE":
+                fetch_data.finished = True
+                return "任务处理失败，原因：" + status_res_json['failReason'] or '未知原因'
+            else:
+                content = status_res_json['status']
+            if fetch_data.finished:
+                img_url = self.use_mj_self_proxy_url(status_res_json['imageUrl'])
+                if fetch_data.action == "DESCRIBE":
+                    return f"\n{status_res_json['prompt']}"
+                time_cost_str = f"\n\n{fetch_data.action} 花费时间：{time.time() - fetch_data.start_time:.2f} 秒"
+                upscale_str = ""
+                variation_str = ""
+                if fetch_data.action in ["IMAGINE", "UPSCALE", "VARIATION"]:
+                    upscale = [f'/mj UPSCALE{self.command_splitter}{i+1}{self.command_splitter}{fetch_data.task_id}'
+                               for i in range(4)]
+                    upscale_str = '\n放大图片：\n\n' + '\n\n'.join(upscale)
+                    variation = [f'/mj VARIATION{self.command_splitter}{i+1}{self.command_splitter}{fetch_data.task_id}'
+                                 for i in range(4)]
+                    variation_str = '\n图片变体：\n\n' + '\n\n'.join(variation)
+                if self.temp_path and fetch_data.action in ["IMAGINE", "VARIATION"]:
+                    try:
+                        images = self.split_image(img_url)
+                        # save images to temp path
+                        for i in range(4):
+                            images[i].save(pathlib.Path(self.temp_path) / f"{fetch_data.task_id}_{i}.png")
+                        img_str = '\n'.join(
+                            [f"![{fetch_data.task_id}](/file={self.temp_path}/{fetch_data.task_id}_{i}.png)"
+                             for i in range(4)])
+                        return fetch_data.prefix_content + f"{time_cost_str}\n\n{img_str}{upscale_str}{variation_str}"
+                    except Exception as e:
+                        logging.error(e)
+                return fetch_data.prefix_content + \
+                    f"{time_cost_str}[![{fetch_data.task_id}]({img_url})]({img_url}){upscale_str}{variation_str}"
+            else:
+                content = f"**任务状态:** [{(datetime.now()).strftime('%Y-%m-%d %H:%M:%S')}] - {content}"
+                content += f"\n\n花费时间：{time.time() - fetch_data.start_time:.2f} 秒"
+                if status_res_json['status'] == 'IN_PROGRESS' and status_res_json.get('imageUrl'):
+                    img_url = status_res_json.get('imageUrl')
+                    return f"{content}\n[![{fetch_data.task_id}]({img_url})]({img_url})"
+                return content
+        return None
+
+    def handle_file_upload(self, files, chatbot, language):
+        """
+        handle file upload
+        """
+        if files:
+            for file in files:
+                if file.name:
+                    logging.info(f"尝试读取图像: {file.name}")
+                    self.try_read_image(file.name)
+            if self.image_path is not None:
+                chatbot = chatbot + [((self.image_path,), None)]
+            if self.image_bytes is not None:
+                logging.info("使用图片作为输入")
+        return None, chatbot, None
+
+    def reset(self):
+        self.image_bytes = None
+        self.image_path = None
+        return [], "已重置"
+
+    def get_answer_at_once(self):
+        content = self.history[-1]['content']
+        answer = self.get_help()
+
+        if not content.lower().startswith("/mj"):
+            return answer, len(content)
+
+        prompt = content[3:].strip()
+        action = "IMAGINE"
+        first_split_index = prompt.find(self.command_splitter)
+        if first_split_index > 0:
+            action = prompt[:first_split_index]
+        if action not in ["IMAGINE", "DESCRIBE", "UPSCALE",
+                          # "VARIATION", "BLEND", "REROLL"
+                          ]:
+            raise Exception("任务提交失败：未知的任务类型")
+        else:
+            action_index = None
+            action_use_task_id = None
+            if action in ["VARIATION", "UPSCALE", "REROLL"]:
+                action_index = int(prompt[first_split_index + 2:first_split_index + 3])
+                action_use_task_id = prompt[first_split_index + 5:]
+
+            try:
+                res = None
+                if action == "IMAGINE":
+                    data = {
+                        "prompt": prompt
+                    }
+                    if self.image_bytes is not None:
+                        data["base64"] = 'data:image/png;base64,' + self.image_bytes
+                    res = self.request_mj("submit/imagine", "POST",
+                                          json.dumps(data))
+                elif action == "DESCRIBE":
+                    res = self.request_mj("submit/describe", "POST",
+                                          json.dumps({"base64": 'data:image/png;base64,' + self.image_bytes}))
+                elif action == "BLEND":
+                    res = self.request_mj("submit/blend", "POST", json.dumps(
+                        {"base64Array": [self.image_bytes, self.image_bytes]}))
+                elif action in ["UPSCALE", "VARIATION", "REROLL"]:
+                    res = self.request_mj(
+                        "submit/change", "POST",
+                        json.dumps({"action": action, "index": action_index, "taskId": action_use_task_id}))
+                res_json = res.json()
+                if not (200 <= res.status_code < 300) or (res_json['code'] not in [1, 22]):
+                    answer = "任务提交失败：" + res_json.get('error', res_json.get('description', '未知错误'))
+                else:
+                    task_id = res_json['result']
+                    prefix_content = f"**画面描述:** {prompt}\n**任务ID:** {task_id}\n"
+
+                    fetch_data = Midjourney_Client.FetchDataPack(
+                        action=action,
+                        prefix_content=prefix_content,
+                        task_id=task_id,
+                    )
+                    fetch_data.prompt = prompt
+                    while not fetch_data.finished:
+                        answer = self.fetch_status(fetch_data)
+            except Exception as e:
+                logging.error("submit failed", e)
+                answer = "任务提交错误：" + str(e.args[0]) if e.args else '未知错误'
+
+        return answer, tiktoken.get_encoding("cl100k_base").encode(content)
+
+    def get_answer_stream_iter(self):
+        content = self.history[-1]['content']
+        answer = self.get_help()
+
+        if not content.lower().startswith("/mj"):
+            yield answer
+            return
+
+        prompt = content[3:].strip()
+        action = "IMAGINE"
+        first_split_index = prompt.find(self.command_splitter)
+        if first_split_index > 0:
+            action = prompt[:first_split_index]
+        if action not in ["IMAGINE", "DESCRIBE", "UPSCALE",
+                          "VARIATION", "BLEND", "REROLL"
+                          ]:
+            yield "任务提交失败：未知的任务类型"
+            return
+
+        action_index = None
+        action_use_task_id = None
+        if action in ["VARIATION", "UPSCALE", "REROLL"]:
+            action_index = int(prompt[first_split_index + 2:first_split_index + 3])
+            action_use_task_id = prompt[first_split_index + 5:]
+
+        try:
+            res = None
+            if action == "IMAGINE":
+                data = {
+                    "prompt": prompt
+                }
+                if self.image_bytes is not None:
+                    data["base64"] = 'data:image/png;base64,' + self.image_bytes
+                res = self.request_mj("submit/imagine", "POST",
+                                      json.dumps(data))
+            elif action == "DESCRIBE":
+                res = self.request_mj("submit/describe", "POST", json.dumps(
+                    {"base64": 'data:image/png;base64,' + self.image_bytes}))
+            elif action == "BLEND":
+                res = self.request_mj("submit/blend", "POST", json.dumps(
+                    {"base64Array": [self.image_bytes, self.image_bytes]}))
+            elif action in ["UPSCALE", "VARIATION", "REROLL"]:
+                res = self.request_mj(
+                    "submit/change", "POST",
+                    json.dumps({"action": action, "index": action_index, "taskId": action_use_task_id}))
+            res_json = res.json()
+            if not (200 <= res.status_code < 300) or (res_json['code'] not in [1, 22]):
+                yield "任务提交失败：" + res_json.get('error', res_json.get('description', '未知错误'))
+            else:
+                task_id = res_json['result']
+                prefix_content = f"**画面描述:** {prompt}\n**任务ID:** {task_id}\n"
+                content = f"[{(datetime.now()).strftime('%Y-%m-%d %H:%M:%S')}] - 任务提交成功：" + \
+                    res_json.get('description') or '请稍等片刻'
+                yield content
+
+                fetch_data = Midjourney_Client.FetchDataPack(
+                    action=action,
+                    prefix_content=prefix_content,
+                    task_id=task_id,
+                )
+                while not fetch_data.finished:
+                    yield self.fetch_status(fetch_data)
+        except Exception as e:
+            logging.error('submit failed', e)
+            yield "任务提交错误：" + str(e.args[0]) if e.args else '未知错误'
+
+    def get_help(self):
+        return """```
+【绘图帮助】
+所有命令都需要以 /mj 开头，如：/mj a dog
+IMAGINE - 绘图，可以省略该命令，后面跟上绘图内容
+    /mj a dog
+    /mj IMAGINE::a cat
+DESCRIBE - 描述图片，需要在右下角上传需要描述的图片内容
+    /mj DESCRIBE::
+UPSCALE - 确认后放大图片，第一个数值为需要放大的图片（1~4），第二参数为任务ID
+    /mj UPSCALE::1::123456789
+    请使用SD进行UPSCALE
+VARIATION - 图片变体，第一个数值为需要放大的图片（1~4），第二参数为任务ID
+    /mj VARIATION::1::123456789
+    
+【绘图参数】
+所有命令默认会带上参数--v 5.2
+其他参数参照 https://docs.midjourney.com/docs/parameter-list
+长宽比 --aspect/--ar
+    --ar 1:2
+    --ar 16:9
+负面tag --no
+    --no plants
+    --no hands
+随机种子 --seed
+    --seed 1
+生成动漫风格（NijiJourney） --niji
+    --niji
+```
+"""

modules/models/models.py

@@ -96,6 +96,7 @@ class OpenAIClient(BaseLLMModel):
             # 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)
+            from ..webui import get_html
             # return i18n("**本月使用金额** ") + f"\u3000 ${rounded_usage}"
             return get_html("billing_info.html").format(
                     label = i18n("本月使用金额"),
@@ -162,7 +163,7 @@ class OpenAIClient(BaseLLMModel):
 
         # 如果有自定义的api-host，使用自定义host发送请求，否则使用默认设置发送请求
         if shared.state.completion_url != COMPLETION_URL:
-            logging.info(f"使用自定义API URL: {shared.state.completion_url}")
+            logging.debug(f"使用自定义API URL: {shared.state.completion_url}")
 
         with retrieve_proxy():
             try:
@@ -208,7 +209,7 @@ class OpenAIClient(BaseLLMModel):
                 chunk_length = len(chunk)
                 try:
                     chunk = json.loads(chunk[6:])
-                except json.JSONDecodeError:
+                except:
                     print(i18n("JSON解析错误,收到的内容: ") + f"{chunk}")
                     error_msg += chunk
                     continue
@@ -620,6 +621,10 @@ def get_model(
         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.Midjourney:
+            from .midjourney import Midjourney_Client
+            mj_proxy_api_secret = os.getenv("MIDJOURNEY_PROXY_API_SECRET")
+            model = Midjourney_Client(model_name, mj_proxy_api_secret, user_name=user_name)
         elif model_type == ModelType.Unknown:
             raise ValueError(f"未知模型: {model_name}")
         logging.info(msg)

modules/presets.py

@@ -69,6 +69,7 @@ ONLINE_MODELS = [
     "yuanai-1.0-rhythm_poems",
     "minimax-abab4-chat",
     "minimax-abab5-chat",
+    "midjourney"
 ]
 
 LOCAL_MODELS = [

modules/repo.py

@@ -51,14 +51,14 @@ def run(command, desc=None, errdesc=None, custom_env=None, live: bool = default_
     return (result.stdout or "")
 
 
-def run_pip(command, desc=None, live=default_command_live):
+def run_pip(command, desc=None, pref=None, live=default_command_live):
     # if args.skip_install:
     #     return
 
     index_url_line = f' --index-url {index_url}' if index_url != '' else ''
     return run(
         f'"{python}" -m pip {command} --prefer-binary{index_url_line}', 
-        desc=f"Installing {desc}...", 
+        desc=f"{pref} Installing {desc}...", 
         errdesc=f"Couldn't install {desc}", 
         live=live
     )
@@ -158,6 +158,12 @@ def get_tag_commit_hash(tag):
         commit_hash = "<none>"
     return commit_hash
 
+def repo_need_stash():
+    try:
+        return subprocess.check_output([git, "diff-index", "--quiet", "HEAD", "--"], shell=False, encoding='utf8').strip() != ""
+    except Exception:
+        return True
+
 def background_update():
     # {git} fetch --all && ({git} pull https://github.com/GaiZhenbiao/ChuanhuChatGPT.git main -f || ({git} stash && {git} pull https://github.com/GaiZhenbiao/ChuanhuChatGPT.git main -f && {git} stash pop)) && {pip} install -r requirements.txt")
     try:
@@ -165,47 +171,65 @@ def background_update():
         latest_release_tag = latest_release["tag"]
         latest_release_hash = get_tag_commit_hash(latest_release_tag)
         need_pip = latest_release["need_pip"]
+        need_stash = repo_need_stash()
 
+        timestamp = datetime.datetime.now().strftime("%Y%m%d%H%M%S")
         current_branch = get_current_branch()
-        updater_branch = f'tmp_{datetime.datetime.now().strftime("%Y%m%d%H%M%S")}'
+        updater_branch = f'tmp_{timestamp}'
+        backup_branch = f'backup_{timestamp}'
         track_repo = "https://github.com/GaiZhenbiao/ChuanhuChatGPT.git"
         try:
             try:
-                run(f"{git} fetch {track_repo}", desc="Fetching from github...", live=False)
+                run(f"{git} fetch {track_repo}", desc="[Updater] Fetching from github...", live=False)
             except Exception:
-                logging.error(f"Update failed in fetching")
+                logging.error(f"Update failed in fetching, check your network connection")
                 return "failed"
             
-            run(f'{git} stash save -a "updater-tmp"')
-
+            run(f'{git} stash push --include-untracked -m "updater-{timestamp}"', 
+                desc=f'[Updater] Restoring you local changes on stash updater-{timestamp}', live=False) if need_stash else None
+            
+            run(f"{git} checkout -b {backup_branch}", live=False)
             run(f"{git} checkout -b {updater_branch}", live=False)
             run(f"{git} reset --hard FETCH_HEAD", live=False)
-            run(f"{git} reset --hard {latest_release_hash}", desc=f'Checking out {latest_release_tag}...')
+            run(f"{git} reset --hard {latest_release_hash}", desc=f'[Updater] Checking out {latest_release_tag}...', live=False)
             run(f"{git} checkout {current_branch}", live=False)
             
             try:
-                run(f"{git} merge {updater_branch} -q", desc="Trying to apply latest update...")
+                run(f"{git} merge --no-edit {updater_branch} -q", desc=f"[Updater] Trying to apply latest update on version {latest_release_tag}...")
             except Exception:
                 logging.error(f"Update failed in merging")
                 try:
-                    run(f"{git} merge --abort", desc="Canceling update...")
-                    run(f"{git} reset --hard {current_branch}", live=False)
-                    run(f"{git} stash pop", live=False)
+                    run(f"{git} merge --abort", desc="[Updater] Conflict detected, canceling update...")
+                    run(f"{git} reset --hard {backup_branch}", live=False)
                     run(f"{git} branch -D -f {updater_branch}", live=False)
+                    run(f"{git} branch -D -f {backup_branch}", live=False)
+                    run(f"{git} stash pop", live=False) if need_stash else None
                     logging.error(f"Update failed, but your file was safely reset to the state before the update.")
                     return "failed"
                 except Exception as e:
-                    logging.error(f"!!!Update failed in resetting, try to reset your files manually.")
+                    logging.error(f"!!!Update failed in resetting, try to reset your files manually. {e}")
                     return "failed"
-                
-            run(f"{git} stash pop", live=False)
+
+            if need_stash:
+                try:
+                    run(f"{git} stash apply", desc="[Updater] Trying to restore your local modifications...", live=False)
+                except Exception:
+                    run(f"{git} reset --hard {backup_branch}", desc="[Updater] Conflict detected, canceling update...", live=False)
+                    run(f"{git} branch -D -f {updater_branch}", live=False)
+                    run(f"{git} branch -D -f {backup_branch}", live=False)
+                    run(f"{git} stash pop", live=False)
+                    logging.error(f"Update failed in applying your local changes, but your file was safely reset to the state before the update.")
+                    return "failed"
+                run(f"{git} stash drop", live=False)
+
             run(f"{git} branch -D -f {updater_branch}", live=False)
+            run(f"{git} branch -D -f {backup_branch}", live=False)
         except Exception as e:
             logging.error(f"Update failed: {e}")
             return "failed"
         if need_pip:
             try: 
-                run_pip(f"install -r requirements.txt", "requirements") 
+                run_pip(f"install -r requirements.txt", pref="[Updater]", desc="requirements", live=False) 
             except Exception:
                 logging.error(f"Update failed in pip install")
                 return "failed"

modules/train_func.py

@@ -0,0 +1,161 @@
+import os
+import logging
+import traceback
+
+import openai
+import gradio as gr
+import ujson as json
+import commentjson
+import openpyxl
+
+import modules.presets as presets
+from modules.utils import get_file_hash, count_token
+from modules.presets import i18n
+
+def excel_to_jsonl(filepath, preview=False):
+    # 打开Excel文件
+    workbook = openpyxl.load_workbook(filepath)
+
+    # 获取第一个工作表
+    sheet = workbook.active
+
+    # 获取所有行数据
+    data = []
+    for row in sheet.iter_rows(values_only=True):
+        data.append(row)
+
+    # 构建字典列表
+    headers = data[0]
+    jsonl = []
+    for row in data[1:]:
+        row_data = dict(zip(headers, row))
+        if any(row_data.values()):
+            jsonl.append(row_data)
+    formatted_jsonl = []
+    for i in jsonl:
+            if "提问" in i and "答案" in i:
+                if "系统" in i :
+                    formatted_jsonl.append({
+                        "messages":[
+                            {"role": "system", "content": i["系统"]},
+                            {"role": "user", "content": i["提问"]},
+                            {"role": "assistant", "content": i["答案"]}
+                        ]
+                    })
+                else:
+                    formatted_jsonl.append({
+                        "messages":[
+                            {"role": "user", "content": i["提问"]},
+                            {"role": "assistant", "content": i["答案"]}
+                        ]
+                    })
+            else:
+                logging.warning(f"跳过一行数据，因为没有找到提问和答案: {i}")
+    return formatted_jsonl
+
+def jsonl_save_to_disk(jsonl, filepath):
+    file_hash = get_file_hash(file_paths = [filepath])
+    os.makedirs("files", exist_ok=True)
+    save_path = f"files/{file_hash}.jsonl"
+    with open(save_path, "w") as f:
+        f.write("\n".join([json.dumps(i, ensure_ascii=False) for i in jsonl]))
+    return save_path
+
+def estimate_cost(ds):
+    dialogues = []
+    for l in ds:
+        for m in l["messages"]:
+            dialogues.append(m["content"])
+    dialogues = "\n".join(dialogues)
+    tokens = count_token(dialogues)
+    return f"Token 数约为 {tokens}，预估每轮（epoch）费用约为 {tokens / 1000 * 0.008} 美元。"
+
+
+def handle_dataset_selection(file_src):
+    logging.info(f"Loading dataset {file_src.name}...")
+    preview = ""
+    if file_src.name.endswith(".jsonl"):
+        with open(file_src.name, "r") as f:
+            ds = [json.loads(l) for l in f.readlines()]
+    else:
+        ds = excel_to_jsonl(file_src.name)
+    preview = ds[0]
+
+    return preview, gr.update(interactive=True), estimate_cost(ds)
+
+def upload_to_openai(file_src):
+    openai.api_key = os.getenv("OPENAI_API_KEY")
+    dspath = file_src.name
+    msg = ""
+    logging.info(f"Uploading dataset {dspath}...")
+    if dspath.endswith(".xlsx"):
+        jsonl = excel_to_jsonl(dspath)
+        dspath = jsonl_save_to_disk(jsonl, dspath)
+    try:
+        uploaded = openai.File.create(
+            file=open(dspath, "rb"),
+            purpose='fine-tune'
+            )
+        return uploaded.id, f"上传成功"
+    except Exception as e:
+        traceback.print_exc()
+        return "", f"上传失败，原因：{ e }"
+
+def build_event_description(id, status, trained_tokens, name=i18n("暂时未知")):
+    # convert to markdown
+    return f"""
+    #### 训练任务 {id}
+
+    模型名称：{name}
+
+    状态：{status}
+
+    已经训练了 {trained_tokens} 个token
+    """
+
+def start_training(file_id, suffix, epochs):
+    openai.api_key = os.getenv("OPENAI_API_KEY")
+    try:
+        job = openai.FineTuningJob.create(training_file=file_id, model="gpt-3.5-turbo", suffix=suffix, hyperparameters={"n_epochs": epochs})
+        return build_event_description(job.id, job.status, job.trained_tokens)
+    except Exception as e:
+        traceback.print_exc()
+        if "is not ready" in str(e):
+            return "训练出错，因为文件还没准备好。OpenAI 需要一点时间准备文件，过几分钟再来试试。"
+        return f"训练失败，原因：{ e }"
+
+def get_training_status():
+    openai.api_key = os.getenv("OPENAI_API_KEY")
+    active_jobs = [build_event_description(job["id"], job["status"], job["trained_tokens"], job["fine_tuned_model"]) for job in openai.FineTuningJob.list(limit=10)["data"] if job["status"] != "cancelled"]
+    return "\n\n".join(active_jobs), gr.update(interactive=True) if len(active_jobs) > 0 else gr.update(interactive=False)
+
+def handle_dataset_clear():
+    return gr.update(value=None), gr.update(interactive=False)
+
+def add_to_models():
+    openai.api_key = os.getenv("OPENAI_API_KEY")
+    succeeded_jobs = [job for job in openai.FineTuningJob.list()["data"] if job["status"] == "succeeded"]
+    extra_models = [job["fine_tuned_model"] for job in succeeded_jobs]
+    for i in extra_models:
+        if i not in presets.MODELS:
+            presets.MODELS.append(i)
+
+    with open('config.json', 'r') as f:
+        data = commentjson.load(f)
+    if 'extra_models' in data:
+        for i in extra_models:
+            if i not in data['extra_models']:
+                data['extra_models'].append(i)
+    else:
+        data['extra_models'] = extra_models
+    with open('config.json', 'w') as f:
+        commentjson.dump(data, f, indent=4)
+
+    return gr.update(choices=presets.MODELS), f"成功添加了 {len(succeeded_jobs)} 个模型。"
+
+def cancel_all_jobs():
+    openai.api_key = os.getenv("OPENAI_API_KEY")
+    jobs = [job for job in openai.FineTuningJob.list()["data"] if job["status"] not in ["cancelled", "succeeded"]]
+    for job in jobs:
+        openai.FineTuningJob.cancel(job["id"])
+    return f"成功取消了 {len(jobs)} 个训练任务。"

modules/utils.py

@@ -2,17 +2,14 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING, Any, Callable, Dict, List, Tuple, Type
 import logging
-import json
+import commentjson as json
 import os
 import datetime
-from datetime import timezone
-import hashlib
 import csv
 import requests
 import re
 import html
-import sys
-import subprocess
+import hashlib
 
 import gradio as gr
 from pypinyin import lazy_pinyin
@@ -129,9 +126,10 @@ def dislike(current_model, *args):
     return current_model.dislike(*args)
 
 
-def count_token(message):
+def count_token(input_str):
     encoding = tiktoken.get_encoding("cl100k_base")
-    input_str = f"role: {message['role']}, content: {message['content']}"
+    if type(input_str) == dict:
+        input_str = f"role: {input_str['role']}, content: {input_str['content']}"
     length = len(encoding.encode(input_str))
     return length
 
@@ -241,7 +239,7 @@ def convert_bot_before_marked(chat_message):
         code_block_pattern = re.compile(r"```(.*?)(?:```|$)", re.DOTALL)
         code_blocks = code_block_pattern.findall(chat_message)
         non_code_parts = code_block_pattern.split(chat_message)[::2]
-        result = []  
+        result = []
         for non_code, code in zip(non_code_parts, code_blocks + [""]):
             if non_code.strip():
                 result.append(non_code)
@@ -542,10 +540,10 @@ def transfer_input(inputs):
 def update_chuanhu():
     from .repo import background_update
 
-    print("Trying to update...")
+    print("[Updater] Trying to update...")
     update_status = background_update()
     if update_status == "success":
-        print("Successfully updated, restart needed")
+        logging.info("Successfully updated, restart needed")
         status = '<span id="update-status" class="hideK">success</span>'
         return gr.Markdown.update(value=i18n("更新成功，请重启本程序")+status)
     else:
@@ -658,3 +656,28 @@ def beautify_err_msg(err_msg):
     if "Resource not found" in err_msg:
         return i18n("请查看 config_example.json，配置 Azure OpenAI")
     return err_msg
+
+def auth_from_conf(username, password):
+    try:
+        with open("config.json", encoding="utf-8") as f:
+            conf = json.load(f)
+        usernames, passwords = [i[0] for i in conf["users"]], [i[1] for i in conf["users"]]
+        if username in usernames:
+            if passwords[usernames.index(username)] == password:
+                return True
+        return False
+    except:
+        return False
+
+def get_file_hash(file_src=None, file_paths=None):
+    if file_src:
+        file_paths = [x.name for x in file_src]
+    file_paths.sort(key=lambda x: os.path.basename(x))
+
+    md5_hash = hashlib.md5()
+    for file_path in file_paths:
+        with open(file_path, "rb") as f:
+            while chunk := f.read(8192):
+                md5_hash.update(chunk)
+
+    return md5_hash.hexdigest()

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

@@ -7,7 +7,7 @@ tqdm
 colorama
 googlesearch-python
 Pygments
-langchain==0.0.173
+langchain==0.0.276
 markdown
 PyPDF2
 pdfplumber
@@ -21,7 +21,8 @@ duckduckgo-search
 arxiv
 wikipedia
 google.generativeai
-openai
+openai>=0.27.9
 unstructured
 google-api-python-client
 tabulate
+ujson