Update bin_public/app/Chatbot.py

bin_public/app/Chatbot.py

@@ -1,9 +1,10 @@
 # -*- coding:utf-8 -*-
 
-import sys
 from overwrites import *
 from chat_func import *
-from bin_public.utils.tools import *
+from openai_func import *
+
+from bin_public.utils.utils import *
 from bin_public.utils.utils_db import *
 from bin_public.config.presets import *
 
@@ -32,8 +33,6 @@ else:
         with open("api_key.txt", "r") as f:
             my_api_key = f.read().strip()'''
 
-
-
     if os.path.exists("auth.json"):
         with open("auth.json", "r") as f:
             auth = json.load(f)
@@ -45,13 +44,17 @@ else:
 gr.Chatbot.postprocess = postprocess
 PromptHelper.compact_text_chunks = compact_text_chunks
 
+with open(CSS_path, "r", encoding="utf-8") as f:
+    customCSS = f.read()
+
 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)
+    user_api_key = gr.State(my_api_key)
+    user_question = gr.State("")
+    outputing = gr.State(False)
     topic = gr.State("未命名对话历史记录")
 
     # gr.HTML("""
@@ -69,10 +72,12 @@ with gr.Blocks(css=customCSS) as demo:
                         container=False)
                 with gr.Column(min_width=50, scale=1):
                     submitBtn = gr.Button("🚀", variant="primary")
+                    cancelBtn = gr.Button("取消", variant="secondary", visible=False)
             with gr.Row(scale=1):
                 emptyBtn = gr.Button("🧹 新的对话", )
                 retryBtn = gr.Button("🔄 重新生成")
-                delLastBtn = gr.Button("🗑️ 删除一条对话")
+                delFirstBtn = gr.Button("🗑️ 删除最旧对话")
+                delLastBtn = gr.Button("🗑️ 删除最新对话")
                 reduceTokenBtn = gr.Button("♻️ 总结对话")
 
         with gr.Column():
@@ -80,11 +85,14 @@ with gr.Blocks(css=customCSS) as demo:
                 status_display = gr.Markdown("status: ready")
                 with gr.Tab(label="ChatGPT"):
                     keyTXT = gr.Textbox(show_label=True, placeholder=f"OpenAI API-key...",
-                                        type="password", visible=not HIDE_MY_KEY, label="API-Key/Invite-Code")
+                                        type="password", visible=not HIDE_MY_KEY, label="API-Key/Invite-Code",
+                                        value="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")
+                    usageTxt = gr.Markdown("**发送消息** 或 **提交key** 以显示额度", elem_id="usage_display")
 
                     keyTxt = gr.Textbox(visible=False)
 
                     key_button = gr.Button("Enter")
+                    #usage_button = gr.Button("显示用量")
 
                     model_select_dropdown = gr.Dropdown(label="选择模型", choices=MODELS, multiselect=False,
                                                         value=MODELS[0])
@@ -97,7 +105,6 @@ with gr.Blocks(css=customCSS) as demo:
                     use_websearch_checkbox = gr.Checkbox(label="使用在线搜索", value=False)
                     index_files = gr.Files(label="上传索引文件", type="file", multiple=True)
 
-
                 with gr.Tab(label="Prompt"):
                     systemPromptTxt = gr.Textbox(show_label=True, placeholder=f"在这里输入System Prompt...",
                                                  label="System prompt", value=initial_prompt).style(container=True)
@@ -143,7 +150,6 @@ with gr.Blocks(css=customCSS) as demo:
                                 with gr.Column(scale=1):
                                     saveHistoryBtn = gr.Button("💾 保存对话")
                                     exportMarkdownBtn = gr.Button("📝 导出为Markdown")
-                                    #gr.Markdown("默认保存于history文件夹")
                             with gr.Row():
                                 with gr.Column():
                                     downloadFile = gr.File(interactive=True)
@@ -153,40 +159,49 @@ with gr.Blocks(css=customCSS) as demo:
     """)
     gr.Markdown(description)
 
+    get_usage_args = dict(
+        fn=get_usage, inputs=[keyTxt], outputs=[usageTxt], show_progress=False
+    )
+
     # 输入为api key则保持不变，为邀请码则调用中心的api key
-    key_button.click(key_preprocessing, [keyTXT], [status_display, keyTxt, invite_code])
-
-    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,
-            index_files],
+    key_button.click(key_preprocessing, [keyTXT], [status_display, keyTxt, invite_code]).then(**get_usage_args)
+
+    #usage_button.click(**get_usage_args)
+
+    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,
+                          index_files
+                      ],
                       [chatbot, history, status_display, token_count], show_progress=True)
+
     user_input.submit(reset_textbox, [], [user_input])
 
     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,
-            index_files],
+        keyTxt,
+        invite_code,
+        systemPromptTxt,
+        history,
+        user_input,
+        chatbot,
+        token_count,
+        top_p,
+        temperature,
+        use_streaming_checkbox,
+        model_select_dropdown,
+        use_websearch_checkbox,
+        index_files],
                     [chatbot, history, status_display, token_count], show_progress=True)
 
     submitBtn.click(reset_textbox, [], [user_input])
@@ -194,11 +209,20 @@ with gr.Blocks(css=customCSS) as demo:
     emptyBtn.click(reset_state, outputs=[chatbot, history, token_count, status_display], show_progress=True)
 
     retryBtn.click(retry,
-                   [keyTxt, invite_code, 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)
+    delFirstBtn.click(
+        delete_first_conversation,
+        [history, token_count],
+        [history, token_count, status_display],
+    )
+
+    delLastBtn.click(
+        delete_last_conversation,
+        [chatbot, history, token_count],
+        [chatbot, history, token_count, status_display], show_progress=True)
 
     reduceTokenBtn.click(reduce_token_size, [keyTxt, invite_code, systemPromptTxt, history, chatbot, token_count, top_p,
                                              temperature, use_streaming_checkbox, model_select_dropdown],
@@ -217,7 +241,7 @@ with gr.Blocks(css=customCSS) as demo:
         downloadFile,
         show_progress=True,
     )
-    #historyRefreshBtn.click(get_history_names, None, [historyFileSelectDropdown])
+    # historyRefreshBtn.click(get_history_names, None, [historyFileSelectDropdown])
     historyFileSelectDropdown.change(
         load_chat_history,
         [historyFileSelectDropdown, systemPromptTxt, history, chatbot],
@@ -230,30 +254,35 @@ with gr.Blocks(css=customCSS) as demo:
         [saveFileName, systemPromptTxt, history, chatbot],
     )
 
-
     # Template
     templateRefreshBtn.click(get_template_names, None, [templateFileSelectDropdown])
 
-    templateFileSelectDropdown.change(load_template, [templateFileSelectDropdown],
-                                      [promptTemplates, templateSelectDropdown], show_progress=True)
+    templateFileSelectDropdown.change(load_template,
+                                      [templateFileSelectDropdown],
+                                      [promptTemplates, templateSelectDropdown],
+                                      show_progress=True)
 
-    templateSelectDropdown.change(get_template_content, [promptTemplates, templateSelectDropdown, systemPromptTxt],
-                                  [systemPromptTxt], show_progress=True)
+    templateSelectDropdown.change(get_template_content,
+                                  [promptTemplates, templateSelectDropdown, systemPromptTxt],
+                                  [systemPromptTxt],
+                                  show_progress=True)
 
-logging.info( "\n访问 http://localhost:7860 查看界面")
+logging.info("\n访问 http://localhost:7860 查看界面")
 # 默认开启本地服务器，默认可以直接从IP访问，默认不创建公开分享链接
 demo.title = "ChatGPT-长江商学院 🚀"
 
 if __name__ == "__main__":
-    #if running in Docker
+    reload_javascript()
+
+    # if running in Docker
     if dockerflag:
         if authflag:
-            demo.queue().launch(server_name="0.0.0.0", server_port=7860,auth=(username, password))
+            demo.queue().launch(server_name="0.0.0.0", server_port=7860, auth=(username, password))
         else:
             demo.queue().launch(server_name="0.0.0.0", server_port=7860, share=False)
-    #if not running in Docker
+    # if not running in Docker
     else:
         if authflag:
             demo.queue().launch(share=False, auth=(username, password))
         else:
-            demo.queue().launch(share=False) # 改为 share=True 可以创建公开分享链接
+            demo.queue().launch(share=False)  # 改为 share=True 可以创建公开分享链接