加强代码健壮性

ChuanhuChatbot.py

@@ -69,26 +69,26 @@ with gr.Blocks(css=customCSS) as demo:
         with gr.Column():
             with gr.Row():
                 with gr.Column(scale=6):
-                    templateFileSelectDropdown = gr.Dropdown(label="选择Prompt模板集合文件（.csv）", choices=get_template_names(plain=True), multiselect=False)
+                    templateFileSelectDropdown = gr.Dropdown(label="选择Prompt模板集合文件（.csv）", choices=get_template_names(plain=True), multiselect=False, value=get_template_names(plain=True)[0])
                 with gr.Column(scale=1):
                     templateRefreshBtn = gr.Button("🔄 刷新")
                     templaeFileReadBtn = gr.Button("📂 读入模板")
             with gr.Row():
                 with gr.Column(scale=6):
-                    templateSelectDropdown = gr.Dropdown(label="从Prompt模板中加载", choices=load_template(get_template_names(plain=True)[0], mode=1), multiselect=False)
+                    templateSelectDropdown = gr.Dropdown(label="从Prompt模板中加载", choices=load_template(get_template_names(plain=True)[0], mode=1), multiselect=False, value=load_template(get_template_names(plain=True)[0], mode=1)[0])
                 with gr.Column(scale=1):
                     templateApplyBtn = gr.Button("⬇️ 应用")
-    with gr.Accordion(label="保存/加载对话历史记录(在文本框中输入文件名，点击“保存对话”按钮，历史记录文件会被存储到Python文件旁边)", open=False):
+    with gr.Accordion(label="保存/加载对话历史记录", open=False):
         with gr.Column():
             with gr.Row():
                 with gr.Column(scale=6):
                     saveFileName = gr.Textbox(
                         show_label=True, placeholder=f"在这里输入保存的文件名...", label="设置保存文件名", value="对话历史记录").style(container=True)
                 with gr.Column(scale=1):
-                    saveBtn = gr.Button("💾 保存对话")
+                    saveHistoryBtn = gr.Button("💾 保存对话")
             with gr.Row():
                 with gr.Column(scale=6):
-                    historyFileSelectDropdown = gr.Dropdown(label="从列表中加载对话", choices=get_history_names(plain=True), multiselect=False)
+                    historyFileSelectDropdown = gr.Dropdown(label="从列表中加载对话", choices=get_history_names(plain=True), multiselect=False, value=get_history_names(plain=True)[0])
                 with gr.Column(scale=1):
                     historyRefreshBtn = gr.Button("🔄 刷新")
                     historyReadBtn = gr.Button("📂 读入对话")
@@ -116,14 +116,14 @@ with gr.Blocks(css=customCSS) as demo:
                      chatbot, history], show_progress=True)
     reduceTokenBtn.click(predict, [txt, top_p, temperature, keyTxt, chatbot, history,
                          systemPromptTxt, FALSECONSTANT, TRUECOMSTANT], [chatbot, history, statusDisplay], show_progress=True)
-    saveBtn.click(save_chat_history, [
+    saveHistoryBtn.click(save_chat_history, [
                   saveFileName, systemPromptTxt, history, chatbot], None, show_progress=True)
-    saveBtn.click(get_history_names, None, [historyFileSelectDropdown])
+    saveHistoryBtn.click(get_history_names, None, [historyFileSelectDropdown])
     historyRefreshBtn.click(get_history_names, None, [historyFileSelectDropdown])
-    historyReadBtn.click(load_chat_history, [historyFileSelectDropdown],  [saveFileName, systemPromptTxt, history, chatbot], show_progress=True)
+    historyReadBtn.click(load_chat_history, [historyFileSelectDropdown, systemPromptTxt, history, chatbot],  [saveFileName, systemPromptTxt, history, chatbot], show_progress=True)
     templateRefreshBtn.click(get_template_names, None, [templateFileSelectDropdown])
     templaeFileReadBtn.click(load_template, [templateFileSelectDropdown],  [promptTemplates, templateSelectDropdown], show_progress=True)
-    templateApplyBtn.click(lambda x, y: x[y], [promptTemplates, templateSelectDropdown],  [systemPromptTxt], show_progress=True)
+    templateApplyBtn.click(get_template_content, [promptTemplates, templateSelectDropdown, systemPromptTxt],  [systemPromptTxt], show_progress=True)
 
 print("川虎的温馨提示：访问 http://localhost:7860 查看界面")
 # 默认开启本地服务器，默认可以直接从IP访问，默认不创建公开分享链接

utils.py

@@ -210,15 +210,18 @@ def predict(inputs, top_p, temperature, openai_api_key, chatbot=[], history=[],
 
 
 def delete_last_conversation(chatbot, history):
-    if "☹️发生了错误" in chatbot[-1][1]:
-        chatbot.pop()
-        print(history)
-        return chatbot, history
-    if len(history) > 0:
+    try:
+        if "☹️发生了错误" in chatbot[-1][1]:
+            chatbot.pop()
+            print(history)
+            return chatbot, history
         history.pop()
         history.pop()
+        chatbot.pop()
         print(history)
-    return chatbot, history
+        return chatbot, history
+    except:
+        return chatbot, history
 
 def save_chat_history(filename, system, history, chatbot):
     if filename == "":
@@ -232,11 +235,16 @@ def save_chat_history(filename, system, history, chatbot):
         json.dump(json_s, f)
 
 
-def load_chat_history(filename):
-    with open(os.path.join(HISTORY_DIR, filename), "r") as f:
-        json_s = json.load(f)
-    print(json_s)
-    return filename, json_s["system"], json_s["history"], json_s["chatbot"]
+def load_chat_history(filename, system, history, chatbot):
+    try:
+        print("Loading from history...")
+        with open(os.path.join(HISTORY_DIR, filename), "r") as f:
+            json_s = json.load(f)
+        print(json_s)
+        return filename, json_s["system"], json_s["history"], json_s["chatbot"]
+    except FileNotFoundError:
+        print("File not found.")
+        return filename, system, history, chatbot
 
 def sorted_by_pinyin(list):
     return sorted(list, key=lambda char: lazy_pinyin(char)[0][0])
@@ -250,6 +258,8 @@ def get_file_names(dir, plain=False, filetypes=[".json"]):
     except FileNotFoundError:
         files = []
     files = sorted_by_pinyin(files)
+    if files == []:
+        files = [""]
     if plain:
         return files
     else:
@@ -260,6 +270,7 @@ def get_history_names(plain=False):
 
 def load_template(filename, mode=0):
     lines = []
+    print("Loading template...")
     if filename.endswith(".json"):
         with open(os.path.join(TEMPLATES_DIR, filename), "r", encoding="utf8") as f:
             lines = json.load(f)
@@ -270,19 +281,25 @@ def load_template(filename, mode=0):
             lines = list(reader)
         lines = lines[1:]
     if mode == 1:
-        return sorted([row[0] for row in lines])
+        return sorted_by_pinyin([row[0] for row in lines])
     elif mode == 2:
         return {row[0]:row[1] for row in lines}
     else:
-        return {row[0]:row[1] for row in lines}, gr.Dropdown.update(choices=sorted_by_pinyin([row[0] for row in lines]))
+        choices = sorted_by_pinyin([row[0] for row in lines])
+        return {row[0]:row[1] for row in lines}, gr.Dropdown.update(choices=choices, value=choices[0])
 
 def get_template_names(plain=False):
     return get_file_names(TEMPLATES_DIR, plain, filetypes=[".csv", "json"])
 
+def get_template_content(templates, selection, original_system_prompt):
+    try:
+        return templates[selection]
+    except:
+        return original_system_prompt
+
 def reset_state():
     return [], []
 
-
 def compose_system(system_prompt):
     return {"role": "system", "content": system_prompt}