Update bin_public/app/app.py

bin_public/app/app.py

@@ -1,7 +1,9 @@
 # -*- coding:utf-8 -*-
+
 import sys
-from bin.utils.utils import *
-from bin.config.presets import *
+from bin_public.utils.utils import *
+from bin_public.utils.utils_db import *
+from bin_public.config.presets import *
 
 my_api_key = ""
 
@@ -40,9 +42,10 @@ 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([])
+    invite_code = gr.State()
     promptTemplates = gr.State(load_template(get_template_names(plain=True)[0], mode=2))
     TRUECOMSTANT = gr.State(True)
     FALSECONSTANT = gr.State(False)
@@ -114,21 +117,31 @@ with gr.Blocks(css=customCSS, ) as demo:
                 with gr.Tab(label="保存/加载"):
                     with gr.Accordion(label="保存/加载对话历史记录", open=True):
                         with gr.Column():
+                            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],
+                                        visible=False
+                                    )
+
                             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")
+                                    gr.Markdown("默认保存于history文件夹")
                             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.Column():
+                                    downloadFile = gr.File(interactive=True)
 
     gr.HTML("""
     <div style="text-align: center; margin-top: 20px; margin-bottom: 20px;">
@@ -136,41 +149,59 @@ with gr.Blocks(css=customCSS, ) as demo:
     gr.Markdown(description)
 
     # 输入为api key则保持不变，为邀请码则调用中心的api key
-    key_button.click(key_preprocessing, [keyTXT], [status, keyTxt, status_display])
+    key_button.click(key_preprocessing, [keyTXT], [status_display, keyTxt, invite_code])
 
-    user_input.submit(predict, [keyTxt, systemPromptTxt, history, user_input, chatbot, token_count, top_p, temperature,
-                                use_streaming_checkbox, model_select_dropdown, use_websearch_checkbox],
+    user_input.submit(predict, [keyTxt, invite_code, 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])
 
-    submitBtn.click(predict, [keyTxt, systemPromptTxt, history, user_input, chatbot, token_count, top_p, temperature,
-                              use_streaming_checkbox, model_select_dropdown, use_websearch_checkbox],
+    submitBtn.click(predict, [keyTxt, invite_code, 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)
     submitBtn.click(reset_textbox, [], [user_input])
 
     emptyBtn.click(reset_state, outputs=[chatbot, history, token_count, status_display], show_progress=True)
 
     retryBtn.click(retry,
-                   [keyTxt, systemPromptTxt, history, chatbot, token_count, top_p, temperature, use_streaming_checkbox,
+                   [keyTxt, invite_code, systemPromptTxt, history, chatbot, token_count, top_p, temperature, use_streaming_checkbox,
                     model_select_dropdown], [chatbot, history, status_display, token_count], show_progress=True)
 
     delLastBtn.click(delete_last_conversation, [chatbot, history, token_count], [
         chatbot, history, token_count, status_display], show_progress=True)
 
-    reduceTokenBtn.click(reduce_token_size, [keyTxt, systemPromptTxt, history, chatbot, token_count, top_p, temperature,
-                                             use_streaming_checkbox, model_select_dropdown],
+    reduceTokenBtn.click(reduce_token_size, [keyTxt, invite_code, 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)
-
+    # History
+    saveHistoryBtn.click(
+        save_chat_history,
+        [saveFileName, systemPromptTxt, history, chatbot],
+        downloadFile,
+        show_progress=True,
+    )
     saveHistoryBtn.click(get_history_names, None, [historyFileSelectDropdown])
-
-    historyRefreshBtn.click(get_history_names, None, [historyFileSelectDropdown])
-
-    historyFileSelectDropdown.change(load_chat_history, [historyFileSelectDropdown, systemPromptTxt, history, chatbot],
-                                     [saveFileName, systemPromptTxt, history, chatbot], show_progress=True)
-
+    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],
+    )
+
+
+    # Template
     templateRefreshBtn.click(get_template_names, None, [templateFileSelectDropdown])
 
     templateFileSelectDropdown.change(load_template, [templateFileSelectDropdown],
@@ -179,7 +210,7 @@ with gr.Blocks(css=customCSS, ) as demo:
     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)
+logging.info( "\n访问 http://localhost:7860 查看界面")
 # 默认开启本地服务器，默认可以直接从IP访问，默认不创建公开分享链接
 demo.title = "ChatGPT-长江商学院 🚀"