chore: 历史记录管理代码逻辑改进

ChuanhuChatbot.py

@@ -549,7 +549,7 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
 
     load_history_from_file_args = dict(
         fn=load_chat_history,
-        inputs=[current_model, historySelectList, user_name],
+        inputs=[current_model, historySelectList],
         outputs=[saveFileName, systemPromptTxt, chatbot]
     )
 
@@ -559,7 +559,7 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
 
     auto_name_chat_history_args = dict(
         fn=auto_name_chat_history,
-        inputs=[current_model, name_chat_method, user_question, chatbot, user_name, single_turn_checkbox],
+        inputs=[current_model, name_chat_method, user_question, chatbot, single_turn_checkbox],
         outputs=[historySelectList],
         show_progress=False,
     )
@@ -679,12 +679,12 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
     )
     exportMarkdownBtn.click(
         export_markdown,
-        [current_model, saveFileName, chatbot, user_name],
+        [current_model, saveFileName, chatbot],
         [],
         show_progress=True,
     )
     historyRefreshBtn.click(**refresh_history_args)
-    historyDeleteBtn.click(delete_chat_history, [current_model, historySelectList, user_name], [status_display, historySelectList, chatbot], _js='(a,b,c)=>{return showConfirmationDialog(a, b, c);}').then(
+    historyDeleteBtn.click(delete_chat_history, [current_model, historySelectList], [status_display, historySelectList, chatbot], _js='(a,b,c)=>{return showConfirmationDialog(a, b, c);}').then(
         reset,
         inputs=[current_model, retain_system_prompt_checkbox],
         outputs=[chatbot, status_display, historySelectList, systemPromptTxt],
@@ -692,7 +692,7 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
         _js='(a,b)=>{return clearChatbot(a,b);}',
     )
     historySelectList.input(**load_history_from_file_args)
-    uploadFileBtn.upload(upload_chat_history, [current_model, uploadFileBtn, user_name], [
+    uploadFileBtn.upload(upload_chat_history, [current_model, uploadFileBtn], [
                         saveFileName, systemPromptTxt, chatbot]).then(**refresh_history_args)
     historyDownloadBtn.click(None, [
                              user_name, historySelectList], None, _js='(a,b)=>{return downloadHistory(a,b,".json");}')

modules/models/OpenAI.py

@@ -252,7 +252,7 @@ class OpenAIClient(BaseLLMModel):
         return response
 
 
-    def auto_name_chat_history(self, name_chat_method, user_question, chatbot, user_name, single_turn_checkbox):
+    def auto_name_chat_history(self, name_chat_method, user_question, chatbot, single_turn_checkbox):
         if len(self.history) == 2 and not single_turn_checkbox and not hide_history_when_not_logged_in:
             user_question = self.history[0]["content"]
             if name_chat_method == i18n("模型自动总结（消耗tokens）"):
@@ -269,10 +269,10 @@ class OpenAIClient(BaseLLMModel):
                 except Exception as e:
                     logging.info(f"自动命名失败。{e}")
                     filename = replace_special_symbols(user_question)[:16] + ".json"
-                return self.rename_chat_history(filename, chatbot, user_name)
+                return self.rename_chat_history(filename, chatbot)
             elif name_chat_method == i18n("第一条提问"):
                 filename = replace_special_symbols(user_question)[:16] + ".json"
-                return self.rename_chat_history(filename, chatbot, user_name)
+                return self.rename_chat_history(filename, chatbot)
             else:
                 return gr.update()
         else:

modules/models/base_model.py

@@ -721,31 +721,31 @@ class BaseLLMModel:
             token_sum += sum(token_lst[: i + 1])
         return i18n("Token 计数: ") + f"{sum(token_lst)}" + i18n("，本次对话累计消耗了 ") + f"{token_sum} tokens"
 
-    def rename_chat_history(self, filename, chatbot, user_name):
+    def rename_chat_history(self, filename, chatbot):
         if filename == "":
             return gr.update()
         if not filename.endswith(".json"):
             filename += ".json"
-        self.delete_chat_history(self.history_file_path, user_name)
+        self.delete_chat_history(self.history_file_path)
         # 命名重复检测
         repeat_file_index = 2
-        full_path = os.path.join(HISTORY_DIR, user_name, filename)
+        full_path = os.path.join(HISTORY_DIR, self.user_identifier, filename)
         while os.path.exists(full_path):
-            full_path = os.path.join(HISTORY_DIR, user_name, f"{repeat_file_index}_{filename}")
+            full_path = os.path.join(HISTORY_DIR, self.user_identifier, f"{repeat_file_index}_{filename}")
             repeat_file_index += 1
         filename = os.path.basename(full_path)
 
         self.history_file_path = filename
-        save_file(filename, self.system_prompt, self.history, chatbot, user_name)
-        return init_history_list(user_name)
+        save_file(filename, self.system_prompt, self.history, chatbot, self.user_identifier)
+        return init_history_list(self.user_identifier)
 
-    def auto_name_chat_history(self, name_chat_method, user_question, chatbot, user_name, single_turn_checkbox):
+    def auto_name_chat_history(self, name_chat_method, user_question, chatbot, single_turn_checkbox):
         if len(self.history) == 2 and not single_turn_checkbox:
             user_question = self.history[0]["content"]
             if type(user_question) == list:
                 user_question = user_question[0]["text"]
             filename = replace_special_symbols(user_question)[:16] + ".json"
-            return self.rename_chat_history(filename, chatbot, user_name)
+            return self.rename_chat_history(filename, chatbot, self.user_identifier)
         else:
             return gr.update()
 
@@ -753,14 +753,14 @@ class BaseLLMModel:
         save_file(self.history_file_path, self.system_prompt,
                   self.history, chatbot, self.user_identifier)
 
-    def export_markdown(self, filename, chatbot, user_name):
+    def export_markdown(self, filename, chatbot):
         if filename == "":
             return
         if not filename.endswith(".md"):
             filename += ".md"
-        save_file(filename, self.system_prompt, self.history, chatbot, user_name)
+        save_file(filename, self.system_prompt, self.history, chatbot, self.user_identifier)
 
-    def load_chat_history(self, new_history_file_path=None, username=None):
+    def load_chat_history(self, new_history_file_path=None):
         logging.debug(f"{self.user_identifier} 加载对话历史中……")
         if new_history_file_path is not None:
             if type(new_history_file_path) != str:
@@ -806,7 +806,7 @@ class BaseLLMModel:
             logging.info(f"没有找到对话历史记录 {self.history_file_path}")
             return self.history_file_path, "", []
 
-    def delete_chat_history(self, filename, user_name):
+    def delete_chat_history(self, filename):
         if filename == "CANCELED":
             return gr.update(), gr.update(), gr.update()
         if filename == "":
@@ -814,17 +814,17 @@ class BaseLLMModel:
         if not filename.endswith(".json"):
             filename += ".json"
         if filename == os.path.basename(filename):
-            history_file_path = os.path.join(HISTORY_DIR, user_name, filename)
+            history_file_path = os.path.join(HISTORY_DIR, self.user_identifier, filename)
         else:
             history_file_path = filename
         md_history_file_path = history_file_path[:-5] + ".md"
         try:
             os.remove(history_file_path)
             os.remove(md_history_file_path)
-            return i18n("删除对话历史成功"), get_history_list(user_name), []
+            return i18n("删除对话历史成功"), get_history_list(self.user_identifier), []
         except:
             logging.info(f"删除对话历史失败 {history_file_path}")
-            return i18n("对话历史")+filename+i18n("已经被删除啦"), get_history_list(user_name), []
+            return i18n("对话历史")+filename+i18n("已经被删除啦"), get_history_list(self.user_identifier), []
 
     def auto_load(self):
         filepath = get_history_filepath(self.user_identifier)