解决登录后上传对话历史记录无效的问题

ChuanhuChatbot.py

@@ -426,7 +426,7 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
     )
     historyRefreshBtn.click(get_history_names, [gr.State(False), user_name], [historyFileSelectDropdown])
     historyFileSelectDropdown.change(**load_history_from_file_args)
-    downloadFile.change(**load_history_from_file_args)
+    downloadFile.change(upload_chat_history, [current_model, downloadFile, user_name], [saveFileName, systemPromptTxt, chatbot])
 
     # Advanced
     max_context_length_slider.change(set_token_upper_limit, [current_model, max_context_length_slider], None)

modules/models/base_model.py

@@ -538,6 +538,7 @@ class BaseLLMModel:
 
     def load_chat_history(self, filename, user_name):
         logging.debug(f"{user_name} 加载对话历史中……")
+        logging.info(f"filename: {filename}")
         if type(filename) != str:
             filename = filename.name
         try:
@@ -562,11 +563,11 @@ class BaseLLMModel:
                 pass
             logging.debug(f"{user_name} 加载对话历史完毕")
             self.history = json_s["history"]
-            return filename, json_s["system"], json_s["chatbot"]
+            return os.path.basename(filename), json_s["system"], json_s["chatbot"]
         except:
             # 没有对话历史或者对话历史解析失败
             logging.info(f"没有找到对话历史记录 {history_file_path}")
-            return filename, self.system_prompt, gr.update()
+            return os.path.basename(filename), self.system_prompt, gr.update()
 
     def auto_load(self):
         if self.user_identifier == "":

modules/utils.py

@@ -77,6 +77,10 @@ def export_markdown(current_model, *args):
 def load_chat_history(current_model, *args):
     return current_model.load_chat_history(*args)
 
+def upload_chat_history(current_model, file_src, username):
+    filename = file_src.name
+    return current_model.load_chat_history(filename, username)
+
 def set_token_upper_limit(current_model, *args):
     return current_model.set_token_upper_limit(*args)