bugfix: 修复继续对话时会创建新文件的问题

ChuanhuChatbot.py

@@ -35,7 +35,7 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
     user_question = gr.State("")
     assert type(my_api_key)==str
     user_api_key = gr.State(my_api_key)
-    current_model = gr.State(create_new_model)
+    current_model = gr.State()
 
     topic = gr.State(i18n("未命名对话历史记录"))
 
@@ -65,6 +65,7 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
                                 historyFileSelectDropdown = gr.Radio(
                                     label=i18n("从列表中加载对话"),
                                     choices=get_history_names(),
+                                    value=get_history_names()[0],
                                     # multiselect=False,
                                     container=False,
                                     elem_id="history-select-dropdown"
@@ -430,8 +431,8 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
         current_model = get_model(model_name = MODELS[DEFAULT_MODEL], access_key = my_api_key)[0]
         current_model.set_user_identifier(user_name)
         chatbot = gr.Chatbot.update(label=MODELS[DEFAULT_MODEL])
-        return user_info, user_name, current_model, toggle_like_btn_visibility(DEFAULT_MODEL), *current_model.auto_load(), chatbot
-    demo.load(create_greeting, inputs=None, outputs=[user_info, user_name, current_model, like_dislike_area, systemPromptTxt, chatbot, chatbot], api_name="load")
+        return user_info, user_name, current_model, toggle_like_btn_visibility(DEFAULT_MODEL), *current_model.auto_load(), chatbot, init_history_list(user_name)
+    demo.load(create_greeting, inputs=None, outputs=[user_info, user_name, current_model, like_dislike_area, systemPromptTxt, chatbot, chatbot, historyFileSelectDropdown], api_name="load")
     chatgpt_predict_args = dict(
         fn=predict,
         inputs=[
@@ -652,9 +653,9 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
     )
     historySelectBtn.click( # This is an experimental feature... Not actually used.
         fn=load_chat_history,
-        inputs=[current_model, historyFileSelectDropdown, user_name],
+        inputs=[current_model, historyFileSelectDropdown],
         outputs=[saveFileName, systemPromptTxt, chatbot],
-        _js='(a,b,c)=>{return bgSelectHistory(a,b,c);}'
+        _js='(a,b)=>{return bgSelectHistory(a,b);}'
     )
 
 

modules/models/base_model.py

@@ -207,6 +207,7 @@ class BaseLLMModel:
         self.api_key = None
         self.need_api_key = False
         self.single_turn = False
+        self.history_file_path = None
 
         self.temperature = temperature
         self.top_p = top_p
@@ -623,8 +624,8 @@ class BaseLLMModel:
         self.history = []
         self.all_token_counts = []
         self.interrupted = False
-        pathlib.Path(os.path.join(HISTORY_DIR, self.user_identifier, new_auto_history_filename(
-            os.path.join(HISTORY_DIR, self.user_identifier)))).touch()
+        self.history_file_path = new_auto_history_filename(
+            os.path.join(HISTORY_DIR, self.user_identifier))
         return [], self.token_message([0])
 
     def delete_first_conversation(self):
@@ -666,8 +667,7 @@ class BaseLLMModel:
         return save_file(filename, self.system_prompt, self.history, chatbot, user_name)
 
     def auto_save(self, chatbot):
-        history_file_path = get_history_filepath(self.user_identifier)
-        save_file(history_file_path, self.system_prompt,
+        save_file(self.history_file_path, self.system_prompt,
                   self.history, chatbot, self.user_identifier)
 
     def export_markdown(self, filename, chatbot, user_name):
@@ -677,18 +677,21 @@ class BaseLLMModel:
             filename += ".md"
         return save_file(filename, self.system_prompt, self.history, chatbot, user_name)
 
-    def load_chat_history(self, filename, user_name):
-        logging.debug(f"{user_name} 加载对话历史中……")
-        logging.info(f"filename: {filename}")
-        if type(filename) != str and filename is not None:
-            filename = filename.name
+    def load_chat_history(self, new_history_file_path=None, username=None):
+        logging.debug(f"{self.user_identifier} 加载对话历史中……")
+        logging.info(f"filename: {self.history_file_path}")
+        if new_history_file_path is not None:
+            if type(new_history_file_path) != str:
+                self.history_file_path = new_history_file_path.name
+            else:
+                self.history_file_path = new_history_file_path
         try:
-            if "/" not in filename:
+            if "/" not in self.history_file_path:
                 history_file_path = os.path.join(
-                    HISTORY_DIR, user_name, filename)
+                    HISTORY_DIR, self.user_identifier, self.history_file_path)
             else:
-                history_file_path = filename
-            if not filename.endswith(".json"):
+                history_file_path = self.history_file_path
+            if not self.history_file_path.endswith(".json"):
                 history_file_path += ".json"
             with open(history_file_path, "r", encoding="utf-8") as f:
                 json_s = json.load(f)
@@ -705,12 +708,12 @@ class BaseLLMModel:
                     logging.info(new_history)
             except:
                 pass
-            logging.debug(f"{user_name} 加载对话历史完毕")
+            logging.debug(f"{self.user_identifier} 加载对话历史完毕")
             self.history = json_s["history"]
-            return os.path.basename(filename), json_s["system"], json_s["chatbot"]
+            return os.path.basename(self.history_file_path), json_s["system"], json_s["chatbot"]
         except:
             # 没有对话历史或者对话历史解析失败
-            logging.info(f"没有找到对话历史记录 {filename}")
+            logging.info(f"没有找到对话历史记录 {self.history_file_path}")
             return gr.update(), self.system_prompt, gr.update()
 
     def delete_chat_history(self, filename, user_name):
@@ -735,9 +738,8 @@ class BaseLLMModel:
         if self.user_identifier == "":
             self.reset()
             return self.system_prompt, gr.update()
-        history_file_path = get_history_filepath(self.user_identifier)
-        filename, system_prompt, chatbot = self.load_chat_history(
-            history_file_path, self.user_identifier)
+        self.history_file_path = get_history_filepath(self.user_identifier)
+        filename, system_prompt, chatbot = self.load_chat_history()
         return system_prompt, chatbot
 
     def like(self):

modules/utils.py

@@ -331,14 +331,16 @@ def construct_assistant(text):
 
 
 def save_file(filename, system, history, chatbot, user_name):
-    logging.debug(f"{user_name} 保存对话历史中……")
     os.makedirs(os.path.join(HISTORY_DIR, user_name), exist_ok=True)
+    if not filename.endswith(".json") and not filename.endswith(".md"):
+        filename += ".json"
     if filename.endswith(".json"):
         json_s = {"system": system, "history": history, "chatbot": chatbot}
         if "/" in filename or "\\" in filename:
             history_file_path = filename
         else:
             history_file_path = os.path.join(HISTORY_DIR, user_name, filename)
+        logging.info(f"保存文件，文件名为{filename}，用户为{user_name}, 文件路径为{history_file_path}")
         with open(history_file_path, "w", encoding='utf-8') as f:
             json.dump(json_s, f, ensure_ascii=False)
     elif filename.endswith(".md"):
@@ -347,7 +349,6 @@ def save_file(filename, system, history, chatbot, user_name):
             md_s += f"\n{data['role']}: \n- {data['content']} \n"
         with open(os.path.join(HISTORY_DIR, user_name, filename), "w", encoding="utf8") as f:
             f.write(md_s)
-    logging.debug(f"{user_name} 保存对话历史完毕")
     return os.path.join(HISTORY_DIR, user_name, filename)
 
 
@@ -400,6 +401,9 @@ def get_history_list(user_name=""):
     history_names = get_history_names(user_name)
     return gr.Radio.update(choices=history_names)
 
+def init_history_list(user_name=""):
+    history_names = get_history_names(user_name)
+    return gr.Radio.update(choices=history_names, value=history_names[0] if history_names else "")
 
 def load_template(filename, mode=0):
     logging.debug(f"加载模板文件{filename}，模式为{mode}（0为返回字典和下拉菜单，1为返回下拉菜单，2为返回字典）")
@@ -640,7 +644,7 @@ def toggle_like_btn_visibility(selected_model_name):
         return gr.update(visible=False)
 
 def new_auto_history_filename(dirname):
-    latest_file = get_latest_filepath(dirname)
+    latest_file = get_file_names_by_last_modified_time(dirname)[0]
     if latest_file:
         with open(os.path.join(dirname, latest_file), 'r', encoding="utf-8") as f:
             if len(f.read()) == 0:
@@ -648,25 +652,10 @@ def new_auto_history_filename(dirname):
     now = datetime.datetime.now().strftime('%Y-%m-%d_%H-%M-%S')
     return f'{now}.json'
 
-def get_latest_filepath(dirname):
-    pattern = re.compile(r'\d{4}-\d{2}-\d{2}_\d{2}-\d{2}-\d{2}')
-    latest_time = None
-    latest_file = None
-    for filename in os.listdir(dirname):
-        if os.path.isfile(os.path.join(dirname, filename)):
-            match = pattern.search(filename)
-            if match and match.group(0) == filename[:19]:
-                time_str = filename[:19]
-                filetime = datetime.datetime.strptime(time_str, '%Y-%m-%d_%H-%M-%S')
-                if not latest_time or filetime > latest_time:
-                    latest_time = filetime
-                    latest_file = filename
-    return latest_file
-
 def get_history_filepath(username):
     dirname = os.path.join(HISTORY_DIR, username)
     os.makedirs(dirname, exist_ok=True)
-    latest_file = get_latest_filepath(dirname)
+    latest_file = get_file_names_by_last_modified_time(dirname)[0]
     if not latest_file:
         latest_file = new_auto_history_filename(dirname)
 

web_assets/javascript/fake-gradio.js

@@ -45,7 +45,7 @@ function transUpload() {
 
     // let uploaderEvents = ["click", "drag", "dragend", "dragenter", "dragleave", "dragover", "dragstart", "drop"];
     // transEventListeners(chatbotUploader, grUploader, uploaderEvents);
-    
+
     chatbotUploader.addEventListener('click', handleClick);
 }
 
@@ -101,8 +101,8 @@ function transEventListeners(target, source, events) {
     /* 事实上，我发现这样写的大多数gradio组件并不适用。。所以。。。生气 */
 }
 
-function bgSelectHistory(a,b,c){
+function bgSelectHistory(a,b){
     const historySelectorInput = gradioApp().querySelector('#history-select-dropdown input');
     let file = historySelectorInput.value;
-    return [a,file,c]
+    return [a,file]
 }