bugfix: 第一次启动时报错

ChuanhuChatbot.py

@@ -76,7 +76,7 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
                             historySelectList = gr.Radio(
                                 label=i18n("从列表中加载对话"),
                                 choices=get_history_names(),
-                                value=get_history_names()[0],
+                                value=get_first_history_name(),
                                 # multiselect=False,
                                 container=False,
                                 elem_id="history-select-dropdown"

modules/models/base_model.py

@@ -208,7 +208,7 @@ class BaseLLMModel:
         self.api_key = None
         self.need_api_key = False
         self.single_turn = False
-        self.history_file_path = get_history_names(user)[0]
+        self.history_file_path = get_first_history_name(user)
 
         self.temperature = temperature
         self.top_p = top_p
@@ -625,8 +625,7 @@ class BaseLLMModel:
         self.history = []
         self.all_token_counts = []
         self.interrupted = False
-        self.history_file_path = new_auto_history_filename(
-            os.path.join(HISTORY_DIR, self.user_identifier))
+        self.history_file_path = new_auto_history_filename(self.user_identifier)
         history_name = self.history_file_path[:-5]
         choices = [history_name] + get_history_names(self.user_identifier)
         return [], self.token_message([0]), gr.Radio.update(choices=choices, value=history_name)
@@ -671,7 +670,7 @@ class BaseLLMModel:
         self.history_file_path = filename
         save_file(filename, self.system_prompt, self.history, chatbot, user_name)
         return init_history_list(user_name)
-    
+
     def auto_name_chat_history(self, user_question, chatbot, user_name):
         if chatbot == []:
             filename = user_question[:12] + ".json"
@@ -753,7 +752,12 @@ class BaseLLMModel:
             return i18n("对话历史")+filename+i18n("已经被删除啦"), get_history_list(user_name), []
 
     def auto_load(self):
-        self.history_file_path = get_history_filepath(self.user_identifier)
+        filepath = get_history_filepath(self.user_identifier)
+        if not filepath:
+            self.history_file_path = new_auto_history_filename(
+                self.user_identifier)
+        else:
+            self.history_file_path = filepath
         filename, system_prompt, chatbot = self.load_chat_history()
         filename = filename[:-5]
         return filename, system_prompt, chatbot

modules/utils.py

@@ -339,6 +339,8 @@ def save_file(filename, system, history, chatbot, user_name):
         filename = filename[:-3]
     if not filename.endswith(".json") and not filename.endswith(".md"):
         filename += ".json"
+    if filename == ".json":
+        raise Exception("文件名不能为空")
 
     json_s = {"system": system, "history": history, "chatbot": chatbot}
     if "/" in filename or "\\" in filename:
@@ -367,11 +369,8 @@ def sorted_by_last_modified_time(list, dir):
 def get_file_names_by_type(dir, filetypes=[".json"]):
     logging.debug(f"获取文件名列表，目录为{dir}，文件类型为{filetypes}")
     files = []
-    try:
-        for type in filetypes:
-            files += [f for f in os.listdir(dir) if f.endswith(type)]
-    except FileNotFoundError:
-        files = [""]
+    for type in filetypes:
+        files += [f for f in os.listdir(dir) if f.endswith(type)]
     logging.debug(f"files are:{files}")
     return files
 
@@ -397,12 +396,16 @@ def get_file_names_by_last_modified_time(dir, filetypes=[".json"]):
 def get_history_names(user_name=""):
     logging.debug(f"从用户 {user_name} 中获取历史记录文件名列表")
     if user_name == "" and hide_history_when_not_logged_in:
-        return [""]
+        return []
     else:
         history_files = get_file_names_by_last_modified_time(os.path.join(HISTORY_DIR, user_name))
         history_files = [f[:f.rfind(".")] for f in history_files]
         return history_files
 
+def get_first_history_name(user_name=""):
+    history_names = get_history_names(user_name)
+    return history_names[0] if history_names else None
+
 def get_history_list(user_name=""):
     history_names = get_history_names(user_name)
     return gr.Radio.update(choices=history_names)
@@ -657,10 +660,10 @@ def toggle_like_btn_visibility(selected_model_name):
     else:
         return gr.update(visible=False)
 
-def new_auto_history_filename(dirname):
-    latest_file = get_file_names_by_last_modified_time(dirname)[0]
+def new_auto_history_filename(username):
+    latest_file = get_first_history_name(username)
     if latest_file:
-        with open(os.path.join(dirname, latest_file), 'r', encoding="utf-8") as f:
+        with open(os.path.join(HISTORY_DIR, username, latest_file + ".json"), 'r', encoding="utf-8") as f:
             if len(f.read()) == 0:
                 return latest_file
     now = datetime.datetime.now().strftime('%Y-%m-%d_%H-%M-%S')
@@ -669,9 +672,9 @@ def new_auto_history_filename(dirname):
 def get_history_filepath(username):
     dirname = os.path.join(HISTORY_DIR, username)
     os.makedirs(dirname, exist_ok=True)
-    latest_file = get_file_names_by_last_modified_time(dirname)[0]
+    latest_file = get_first_history_name(username)
     if not latest_file:
-        latest_file = new_auto_history_filename(dirname)
+        latest_file = new_auto_history_filename(username)
 
     latest_file = os.path.join(dirname, latest_file)
     return latest_file