Upload 3 files

app.py

@@ -43,7 +43,7 @@ else:
 
 gr.Chatbot.postprocess = postprocess
 
-with gr.Blocks(css=customCSS,) as demo:
+with gr.Blocks(css=customCSS) as demo:
     history = gr.State([])
     token_count = gr.State([])
     promptTemplates = gr.State(load_template(get_template_names(plain=True)[0], mode=2))
@@ -51,13 +51,11 @@ with gr.Blocks(css=customCSS,) as demo:
     FALSECONSTANT = gr.State(False)
     topic = gr.State("未命名对话历史记录")
 
-    # gr.HTML("""
-    # <div style="text-align: center; margin-top: 20px;">
-    # """)
-    gr.HTML(title)
+    with gr.Row():
+        gr.HTML(title)
+        status_display = gr.Markdown("status: ready", elem_id="status_display")
 
     with gr.Row(scale=1).style(equal_height=True):
-
         with gr.Column(scale=5):
             with gr.Row(scale=1):
                 chatbot = gr.Chatbot().style(height=600)  # .style(color_map=("#1D51EE", "#585A5B"))
@@ -73,11 +71,8 @@ with gr.Blocks(css=customCSS,) as demo:
                 delLastBtn = gr.Button("🗑️ 删除一条对话")
                 reduceTokenBtn = gr.Button("♻️ 总结对话")
 
-
-
         with gr.Column():
             with gr.Column(min_width=50,scale=1):
-                status_display = gr.Markdown("status: ready")
                 with gr.Tab(label="ChatGPT"):
                     keyTxt = gr.Textbox(show_label=True, placeholder=f"OpenAI API-key...",value=my_api_key, type="password", visible=not HIDE_MY_KEY, label="API-Key")
                     model_select_dropdown = gr.Dropdown(label="选择模型", choices=MODELS, multiselect=False, value=MODELS[0])
@@ -104,27 +99,27 @@ with gr.Blocks(css=customCSS,) as demo:
 
                 with gr.Tab(label="保存/加载"):
                     with gr.Accordion(label="保存/加载对话历史记录", open=True):
+                        gr.Markdown("对话历史默认保存在history文件夹中。")
                         with gr.Column():
                             with gr.Row():
                                 with gr.Column(scale=6):
                                     saveFileName = gr.Textbox(
-                                        show_label=True, placeholder=f"在这里输入保存的文件名...", label="设置保存文件名", value="对话历史记录").style(container=True)
+                                        show_label=True, placeholder=f"设置文件名: 默认为.json，可选为.md", label="设置保存文件名", value="对话历史记录").style(container=True)
                                 with gr.Column(scale=1):
                                     saveHistoryBtn = gr.Button("💾 保存对话")
+                                    exportMarkdownBtn = gr.Button("📝 导出为Markdown")
                             with gr.Row():
                                 with gr.Column(scale=6):
                                     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("🔄 刷新")
+                            with gr.Row():
+                                with gr.Column():
+                                    downloadFile = gr.File(interactive=True)
 
-
-
-    gr.HTML("""
-    <div style="text-align: center; margin-top: 20px; margin-bottom: 20px;">
-    """)
     gr.Markdown(description)
 
-
+    # Chatbot
     user_input.submit(predict, [keyTxt, systemPromptTxt, history, user_input, chatbot, token_count, top_p, temperature, use_streaming_checkbox, model_select_dropdown, use_websearch_checkbox], [chatbot, history, status_display, token_count], show_progress=True)
     user_input.submit(reset_textbox, [], [user_input])
 
@@ -140,20 +135,19 @@ with gr.Blocks(css=customCSS,) as demo:
 
     reduceTokenBtn.click(reduce_token_size, [keyTxt, systemPromptTxt, history, chatbot, token_count, top_p, temperature, use_streaming_checkbox, model_select_dropdown], [chatbot, history, status_display, token_count], show_progress=True)
 
-    saveHistoryBtn.click(save_chat_history, [
-                  saveFileName, systemPromptTxt, history, chatbot], None, show_progress=True)
+    # Template
+    templateRefreshBtn.click(get_template_names, None, [templateFileSelectDropdown])
+    templateFileSelectDropdown.change(load_template, [templateFileSelectDropdown],  [promptTemplates, templateSelectDropdown], show_progress=True)
+    templateSelectDropdown.change(get_template_content, [promptTemplates, templateSelectDropdown, systemPromptTxt],  [systemPromptTxt], show_progress=True)
 
+    # S&L
+    saveHistoryBtn.click(save_chat_history, [saveFileName, systemPromptTxt, history, chatbot], downloadFile, show_progress=True)
     saveHistoryBtn.click(get_history_names, None, [historyFileSelectDropdown])
-
+    exportMarkdownBtn.click(export_markdown, [saveFileName, systemPromptTxt, history, chatbot], downloadFile, show_progress=True)
     historyRefreshBtn.click(get_history_names, None, [historyFileSelectDropdown])
-
     historyFileSelectDropdown.change(load_chat_history, [historyFileSelectDropdown, systemPromptTxt, history, chatbot],  [saveFileName, systemPromptTxt, history, chatbot], show_progress=True)
+    downloadFile.change(load_chat_history, [downloadFile, systemPromptTxt, history, chatbot],  [saveFileName, systemPromptTxt, history, chatbot])
 
-    templateRefreshBtn.click(get_template_names, None, [templateFileSelectDropdown])
-
-    templateFileSelectDropdown.change(load_template, [templateFileSelectDropdown],  [promptTemplates, templateSelectDropdown], show_progress=True)
-
-    templateSelectDropdown.change(get_template_content, [promptTemplates, templateSelectDropdown, systemPromptTxt],  [systemPromptTxt], show_progress=True)
 
 logging.info(colorama.Back.GREEN + "\n川虎的温馨提示：访问 http://localhost:7860 查看界面" + colorama.Style.RESET_ALL)
 # 默认开启本地服务器，默认可以直接从IP访问，默认不创建公开分享链接

presets.py

@@ -1,6 +1,6 @@
 # -*- coding:utf-8 -*-
-title = """<h1 align="left">川虎ChatGPT 🚀</h1>"""
-description = """<div align=center>
+title = """<h1 align="left" style="min-width:200px; margin-top:0;">川虎ChatGPT 🚀</h1>"""
+description = """<div align="center" style="margin:16px 0">
 
 由Bilibili [土川虎虎虎](https://space.bilibili.com/29125536) 和 [明昭MZhao](https://space.bilibili.com/24807452)开发
 
@@ -10,6 +10,33 @@ description = """<div align=center>
 </div>
 """
 customCSS = """
+#status_display {
+    display: flex;
+    min-height: 2.5em;
+    align-items: flex-end;
+    justify-content: flex-end;
+}
+#status_display p {
+    font-size: .85em;
+    font-family: monospace;
+    color: var(--text-color-subdued) !important;
+}
+[class *= "message"] {
+    border-radius: var(--radius-xl) !important;
+    border: none;
+    padding: var(--spacing-xl) !important;
+    font-size: var(--text-md) !important;
+    line-height: var(--line-md) !important;
+}
+[data-testid = "bot"] {
+    max-width: 85%;
+    border-bottom-left-radius: 0 !important;
+}
+[data-testid = "user"] {
+    max-width: 85%;
+    width: auto !important;
+    border-bottom-right-radius: 0 !important;
+}
 code {
     display: inline;
     white-space: break-spaces;
@@ -30,11 +57,9 @@ pre code {
     box-shadow: inset 0px 8px 16px hsla(0, 0%, 0%, .2)
 }
 
-*{
+* {
     transition: all 0.6s;
 }
-
-
 """
 
 summarize_prompt = "你是谁？我们刚才聊了什么？" # 总结对话时的 prompt
@@ -58,7 +83,7 @@ ssl_error_prompt = "SSL错误，无法获取对话。" # SSL 错误
 no_apikey_msg = "API key长度不是51位，请检查是否输入正确。" # API key 长度不足 51 位
 
 max_token_streaming = 3500 # 流式对话时的最大 token 数
-timeout_streaming = 15 # 流式对话时的超时时间
+timeout_streaming = 30 # 流式对话时的超时时间
 max_token_all = 3500 # 非流式对话时的最大 token 数
 timeout_all = 200 # 非流式对话时的超时时间
 enable_streaming_option = True  # 是否启用选择选择是否实时显示回答的勾选框

utils.py

@@ -48,13 +48,14 @@ def postprocess(
             y[i] = (
                 # None if message is None else markdown.markdown(message),
                 # None if response is None else markdown.markdown(response),
-                None if message is None else mdtex2html.convert((message)),
+                None if message is None else message,
                 None if response is None else mdtex2html.convert(response),
             )
         return y
 
-def count_token(input_str):
+def count_token(message):
     encoding = tiktoken.get_encoding("cl100k_base")
+    input_str = f"role: {message['role']}, content: {message['content']}"
     length = len(encoding.encode(input_str))
     return length
 
@@ -142,10 +143,10 @@ def stream_predict(openai_api_key, system_prompt, history, inputs, chatbot, all_
     chatbot.append((parse_text(inputs), ""))
     user_token_count = 0
     if len(all_token_counts) == 0:
-        system_prompt_token_count = count_token(system_prompt)
-        user_token_count = count_token(inputs) + system_prompt_token_count
+        system_prompt_token_count = count_token(construct_system(system_prompt))
+        user_token_count = count_token(construct_user(inputs)) + system_prompt_token_count
     else:
-        user_token_count = count_token(inputs)
+        user_token_count = count_token(construct_user(inputs))
     all_token_counts.append(user_token_count)
     logging.info(f"输入token计数: {user_token_count}")
     yield get_return_value()
@@ -204,7 +205,7 @@ def predict_all(openai_api_key, system_prompt, history, inputs, chatbot, all_tok
     history.append(construct_user(inputs))
     history.append(construct_assistant(""))
     chatbot.append((parse_text(inputs), ""))
-    all_token_counts.append(count_token(inputs))
+    all_token_counts.append(count_token(construct_user(inputs)))
     try:
         response = get_response(openai_api_key, system_prompt, history, temperature, top_p, False, selected_model)
     except requests.exceptions.ConnectTimeout:
@@ -322,22 +323,42 @@ def delete_last_conversation(chatbot, history, previous_token_count):
     return chatbot, history, previous_token_count, construct_token_message(sum(previous_token_count))
 
 
-def save_chat_history(filename, system, history, chatbot):
+def save_file(filename, system, history, chatbot):
     logging.info("保存对话历史中……")
+    os.makedirs(HISTORY_DIR, exist_ok=True)
+    if filename.endswith(".json"):
+        json_s = {"system": system, "history": history, "chatbot": chatbot}
+        print(json_s)
+        with open(os.path.join(HISTORY_DIR, filename), "w") as f:
+            json.dump(json_s, f)
+    elif filename.endswith(".md"):
+        md_s = f"system: \n- {system} \n"
+        for data in history:
+            md_s += f"\n{data['role']}: \n- {data['content']} \n"
+        with open(os.path.join(HISTORY_DIR, filename), "w", encoding="utf8") as f:
+            f.write(md_s)
+    logging.info("保存对话历史完毕")
+    return os.path.join(HISTORY_DIR, filename)
+
+def save_chat_history(filename, system, history, chatbot):
     if filename == "":
         return
     if not filename.endswith(".json"):
         filename += ".json"
-    os.makedirs(HISTORY_DIR, exist_ok=True)
-    json_s = {"system": system, "history": history, "chatbot": chatbot}
-    logging.info(json_s)
-    with open(os.path.join(HISTORY_DIR, filename), "w") as f:
-        json.dump(json_s, f, ensure_ascii=False, indent=4)
-    logging.info("保存对话历史完毕")
+    return save_file(filename, system, history, chatbot)
+
+def export_markdown(filename, system, history, chatbot):
+    if filename == "":
+        return
+    if not filename.endswith(".md"):
+        filename += ".md"
+    return save_file(filename, system, history, chatbot)
 
 
 def load_chat_history(filename, system, history, chatbot):
     logging.info("加载对话历史中……")
+    if type(filename) != str:
+        filename = filename.name
     try:
         with open(os.path.join(HISTORY_DIR, filename), "r") as f:
             json_s = json.load(f)