bugfix: 修复自动保存参数时的若干问题

ChuanhuChatbot.py

@@ -329,7 +329,7 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
                             user_identifier_txt = gr.Textbox(
                                 show_label=True,
                                 placeholder=i18n("用于定位滥用行为"),
-                                label=i18n("用户名"),
+                                label=i18n("用户标识符"),
                                 value=user_name.value,
                                 lines=1,
                             )
@@ -496,8 +496,7 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
             user_info, user_name = gr.Markdown.update(
                 value=f"", visible=False), ""
         current_model = get_model(
-            model_name=MODELS[DEFAULT_MODEL], access_key=my_api_key)[0]
-        current_model.set_user_identifier(user_name)
+            model_name=MODELS[DEFAULT_MODEL], access_key=my_api_key, user_name=user_name)[0]
         if not hide_history_when_not_logged_in or user_name:
             loaded_stuff = current_model.auto_load()
         else:
@@ -639,7 +638,7 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
                   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)
+        set_single_turn, [current_model, single_turn_checkbox], None, show_progress=False)
     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], [
                                  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], [
@@ -650,7 +649,7 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
                                 top_p_slider, systemPromptTxt, user_name, current_model], [current_model, status_display, chatbot], show_progress=True)
 
     # Template
-    systemPromptTxt.change(set_system_prompt, [
+    systemPromptTxt.input(set_system_prompt, [
                            current_model, systemPromptTxt], None)
     templateRefreshBtn.click(get_template_dropdown, None, [
                              templateFileSelectDropdown])
@@ -723,25 +722,25 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
         cancel_all_jobs, [], [openai_train_status], show_progress=True)
 
     # Advanced
-    max_context_length_slider.input(
-        set_token_upper_limit, [current_model, max_context_length_slider], None)
     temperature_slider.input(
-        set_temperature, [current_model, temperature_slider], None)
-    top_p_slider.input(set_top_p, [current_model, top_p_slider], None)
+        set_temperature, [current_model, temperature_slider], None, show_progress=False)
+    top_p_slider.input(set_top_p, [current_model, top_p_slider], None, show_progress=False)
     n_choices_slider.input(
-        set_n_choices, [current_model, n_choices_slider], None)
+        set_n_choices, [current_model, n_choices_slider], None, show_progress=False)
     stop_sequence_txt.input(
-        set_stop_sequence, [current_model, stop_sequence_txt], None)
+        set_stop_sequence, [current_model, stop_sequence_txt], None, show_progress=False)
+    max_context_length_slider.input(
+        set_token_upper_limit, [current_model, max_context_length_slider], None, show_progress=False)
     max_generation_slider.input(
-        set_max_tokens, [current_model, max_generation_slider], None)
+        set_max_tokens, [current_model, max_generation_slider], None, show_progress=False)
     presence_penalty_slider.input(
-        set_presence_penalty, [current_model, presence_penalty_slider], None)
+        set_presence_penalty, [current_model, presence_penalty_slider], None, show_progress=False)
     frequency_penalty_slider.input(
-        set_frequency_penalty, [current_model, frequency_penalty_slider], None)
+        set_frequency_penalty, [current_model, frequency_penalty_slider], None, show_progress=False)
     logit_bias_txt.input(
-        set_logit_bias, [current_model, logit_bias_txt], None)
+        set_logit_bias, [current_model, logit_bias_txt], None, show_progress=False)
     user_identifier_txt.input(set_user_identifier, [
-                               current_model, user_identifier_txt], None)
+                               current_model, user_identifier_txt], None, show_progress=False)
 
     default_btn.click(
         reset_default, [], [apihostTxt, proxyTxt, status_display], show_progress=True

locale/en_US.json

@@ -93,7 +93,7 @@
     "状态": "Status",
     "生成内容总结中……": "Generating content summary...",
     "用于定位滥用行为": "Used to locate abuse",
-    "用户名": "Username",
+    "用户标识符": "User identifier",
     "由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)",
     "知识库": "Knowledge base",
     "知识库文件": "Knowledge base files",

locale/ja_JP.json

@@ -93,7 +93,7 @@
     "状态": "ステータス",
     "生成内容总结中……": "コンテンツ概要を生成しています...",
     "用于定位滥用行为": "不正行為を特定するために使用されます",
-    "用户名": "ユーザー名",
+    "用户标识符": "ユーザー識別子",
     "由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)",
     "知识库": "ナレッジベース",
     "知识库文件": "ナレッジベースファイル",

locale/ko_KR.json

@@ -93,7 +93,7 @@
     "状态": "상태",
     "生成内容总结中……": "콘텐츠 요약 생성중...",
     "用于定位滥用行为": "악용 사례 파악에 활용됨",
-    "用户名": "사용자 이름",
+    "用户标识符": "사용자 식별자",
     "由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)",
     "知识库": "지식 라이브러리",
     "知识库文件": "지식 라이브러리 파일",

locale/ru_RU.json

@@ -93,7 +93,7 @@
     "状态": "Статус",
     "生成内容总结中……": "Создание сводки контента...",
     "用于定位滥用行为": "Используется для выявления злоупотреблений",
-    "用户名": "Имя пользователя",
+    "用户标识符": "Идентификатор пользователя",
     "由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) 下载最新版脚本": "Разработано [土川虎虎虎](https://space.bilibili.com/29125536), [明昭MZhao](https://space.bilibili.com/24807452) и [Keldos](https://github.com/Keldos-Li).<br />посетите [GitHub Project](https://github.com/GaiZhenbiao/ChuanhuChatGPT) чата Chuanhu, чтобы загрузить последнюю версию скрипта",
     "知识库": "База знаний",
     "知识库文件": "Файл базы знаний",

locale/sv_SE.json

@@ -93,7 +93,7 @@
     "状态": "Status",
     "生成内容总结中……": "Genererar innehållssammanfattning...",
     "用于定位滥用行为": "Används för att lokalisera missbruk",
-    "用户名": "Användarnamn",
+    "用户标识符": "Användar-ID",
     "由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)",
     "知识库": "kunskapsbank",
     "知识库文件": "kunskapsbankfil",

locale/vi_VN.json

@@ -93,7 +93,7 @@
     "状态": "Tình trạng",
     "生成内容总结中……": "Đang tạo tóm tắt nội dung...",
     "用于定位滥用行为": "Sử dụng để xác định hành vi lạm dụng",
-    "用户名": "Tên người dùng",
+    "用户标识符": "Định danh người dùng",
     "由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) 下载最新版脚本": "Phát triển bởi Bilibili [土川虎虎虎](https://space.bilibili.com/29125536), [明昭MZhao](https://space.bilibili.com/24807452) và [Keldos](https://github.com/Keldos-Li)\n\nTải mã nguồn mới nhất từ [GitHub](https://github.com/GaiZhenbiao/ChuanhuChatGPT)",
     "知识库": "Cơ sở kiến thức",
     "知识库文件": "Tệp cơ sở kiến thức",

modules/models/OpenAI.py

@@ -105,9 +105,6 @@ class OpenAIClient(BaseLLMModel):
             logging.error(i18n("获取API使用情况失败:") + str(e))
             return STANDARD_ERROR_MSG + ERROR_RETRIEVE_MSG
 
-    def set_token_upper_limit(self, new_upper_limit):
-        pass
-
     @shared.state.switching_api_key  # 在不开启多账号模式的时候，这个装饰器不会起作用
     def _get_response(self, stream=False):
         openai_api_key = self.api_key
@@ -139,7 +136,7 @@ class OpenAIClient(BaseLLMModel):
         if self.stop_sequence is not None:
             payload["stop"] = self.stop_sequence
         if self.logit_bias is not None:
-            payload["logit_bias"] = self.logit_bias
+            payload["logit_bias"] = self.encoded_logit_bias()
         if self.user_identifier:
             payload["user"] = self.user_identifier
 

modules/models/OpenAIVision.py

@@ -174,9 +174,6 @@ class OpenAIVisionClient(BaseLLMModel):
             logging.error(i18n("获取API使用情况失败:") + str(e))
             return STANDARD_ERROR_MSG + ERROR_RETRIEVE_MSG
 
-    def set_token_upper_limit(self, new_upper_limit):
-        pass
-
     @shared.state.switching_api_key  # 在不开启多账号模式的时候，这个装饰器不会起作用
     def _get_response(self, stream=False):
         openai_api_key = self.api_key
@@ -214,7 +211,7 @@ class OpenAIVisionClient(BaseLLMModel):
         if self.stop_sequence is not None:
             payload["stop"] = self.stop_sequence
         if self.logit_bias is not None:
-            payload["logit_bias"] = self.logit_bias
+            payload["logit_bias"] = self.encoded_logit_bias()
         if self.user_identifier:
             payload["user"] = self.user_identifier
 

modules/models/base_model.py

@@ -208,7 +208,7 @@ class BaseLLMModel:
         temperature=1.0,
         top_p=1.0,
         n_choices=1,
-        stop=None,
+        stop="",
         max_generation_token=None,
         presence_penalty=0,
         frequency_penalty=0,
@@ -233,6 +233,7 @@ class BaseLLMModel:
         self.need_api_key = False
         self.history_file_path = get_first_history_name(user)
         self.user_name = user
+        self.chatbot = []
 
         self.default_single_turn = single_turn
         self.default_temperature = temperature
@@ -637,6 +638,7 @@ class BaseLLMModel:
             status_text = f"为了防止token超限，模型忘记了早期的 {count} 轮对话"
             yield chatbot, status_text
 
+        self.chatbot = chatbot
         self.auto_save(chatbot)
 
     def retry(
@@ -702,32 +704,45 @@ class BaseLLMModel:
 
     def set_token_upper_limit(self, new_upper_limit):
         self.token_upper_limit = new_upper_limit
-        print(f"token上限设置为{new_upper_limit}")
+        self.auto_save()
 
     def set_temperature(self, new_temperature):
         self.temperature = new_temperature
+        self.auto_save()
 
     def set_top_p(self, new_top_p):
         self.top_p = new_top_p
+        self.auto_save()
 
     def set_n_choices(self, new_n_choices):
         self.n_choices = new_n_choices
+        self.auto_save()
 
     def set_stop_sequence(self, new_stop_sequence: str):
         new_stop_sequence = new_stop_sequence.split(",")
         self.stop_sequence = new_stop_sequence
+        self.auto_save()
 
     def set_max_tokens(self, new_max_tokens):
         self.max_generation_token = new_max_tokens
+        self.auto_save()
 
     def set_presence_penalty(self, new_presence_penalty):
         self.presence_penalty = new_presence_penalty
+        self.auto_save()
 
     def set_frequency_penalty(self, new_frequency_penalty):
         self.frequency_penalty = new_frequency_penalty
+        self.auto_save()
 
     def set_logit_bias(self, logit_bias):
-        logit_bias = logit_bias.split()
+        self.logit_bias = logit_bias
+        self.auto_save()
+
+    def encoded_logit_bias(self):
+        if self.logit_bias is None:
+            return {}
+        logit_bias = self.logit_bias.split()
         bias_map = {}
         encoding = tiktoken.get_encoding("cl100k_base")
         for line in logit_bias:
@@ -735,13 +750,15 @@ class BaseLLMModel:
             if word:
                 for token in encoding.encode(word):
                     bias_map[token] = float(bias_amount)
-        self.logit_bias = bias_map
+        return bias_map
 
     def set_user_identifier(self, new_user_identifier):
         self.user_identifier = new_user_identifier
+        self.auto_save()
 
     def set_system_prompt(self, new_system_prompt):
         self.system_prompt = new_system_prompt
+        self.auto_save()
 
     def set_key(self, new_access_key):
         if "*" not in new_access_key:
@@ -754,6 +771,7 @@ class BaseLLMModel:
 
     def set_single_turn(self, new_single_turn):
         self.single_turn = new_single_turn
+        self.auto_save()
 
     def reset(self, remain_system_prompt=False):
         self.history = []
@@ -813,6 +831,7 @@ class BaseLLMModel:
             msg = "删除了一组对话的token计数记录"
             self.all_token_counts.pop()
         msg = "删除了一组对话"
+        self.chatbot = chatbot
         self.auto_save(chatbot)
         return chatbot, msg
 
@@ -861,7 +880,9 @@ class BaseLLMModel:
         else:
             return gr.update()
 
-    def auto_save(self, chatbot):
+    def auto_save(self, chatbot=None):
+        if chatbot is None:
+            chatbot = self.chatbot
         save_file(self.history_file_path, self, chatbot)
 
     def export_markdown(self, filename, chatbot):
@@ -924,7 +945,7 @@ class BaseLLMModel:
             self.temperature = saved_json.get("temperature", self.temperature)
             self.top_p = saved_json.get("top_p", self.top_p)
             self.n_choices = saved_json.get("n_choices", self.n_choices)
-            self.stop_sequence = saved_json.get("stop_sequence", self.stop_sequence)
+            self.stop_sequence = list(saved_json.get("stop_sequence", self.stop_sequence))
             self.token_upper_limit = saved_json.get(
                 "token_upper_limit", self.token_upper_limit
             )
@@ -940,6 +961,7 @@ class BaseLLMModel:
             self.logit_bias = saved_json.get("logit_bias", self.logit_bias)
             self.user_identifier = saved_json.get("user_identifier", self.user_name)
             self.metadata = saved_json.get("metadata", self.metadata)
+            self.chatbot = saved_json["chatbot"]
             return (
                 os.path.basename(self.history_file_path)[:-5],
                 saved_json["system"],
@@ -948,7 +970,7 @@ class BaseLLMModel:
                 self.temperature,
                 self.top_p,
                 self.n_choices,
-                self.stop_sequence,
+                ",".join(self.stop_sequence),
                 self.token_upper_limit,
                 self.max_generation_token,
                 self.presence_penalty,
@@ -959,6 +981,7 @@ class BaseLLMModel:
         except:
             # 没有对话历史或者对话历史解析失败
             logging.info(f"没有找到对话历史记录 {self.history_file_path}")
+            self.reset()
             return (
                 os.path.basename(self.history_file_path),
                 "",
@@ -967,7 +990,7 @@ class BaseLLMModel:
                 self.temperature,
                 self.top_p,
                 self.n_choices,
-                self.stop_sequence,
+                ",".join(self.stop_sequence),
                 self.token_upper_limit,
                 self.max_generation_token,
                 self.presence_penalty,