Update app.py

app.py

@@ -2,13 +2,12 @@ import gradio as gr
 # import openai
 import os
 import sys
+import argparse
 from utils import *
 from presets import *
 
-my_api_key = ""    # 在这里输入你的 API 密钥
-HIDE_MY_KEY = False # 如果你想在UI中隐藏你的 API 密钥，将此值设置为 True
 
-gr.Chatbot.postprocess = postprocess
+my_api_key = ""    # 在这里输入你的 API 密钥
 
 #if we are running in Docker
 if os.environ.get('dockerrun') == 'yes':
@@ -29,7 +28,7 @@ if dockerflag:
     if not (isinstance(username, type(None)) or isinstance(password, type(None))):
         authflag = True
 else:
-    if os.path.exists("api_key.txt"):
+    if not my_api_key and os.path.exists("api_key.txt") and os.path.getsize("api_key.txt"):
         with open("api_key.txt", "r") as f:
             my_api_key = f.read().strip()
     if os.path.exists("auth.json"):
@@ -40,13 +39,18 @@ else:
             if username != "" and password != "":
                 authflag = True
 
+gr.Chatbot.postprocess = postprocess
+
 with gr.Blocks(css=customCSS) as demo:
     gr.HTML(title)
     gr.HTML('''<center><a href="https://huggingface.co/spaces/JohnSmith9982/ChuanhuChatGPT?duplicate=true"><img src="https://bit.ly/3gLdBN6" alt="复制 Space"></a>强烈建议点击上面的按钮复制一份这个Space，在你自己的Space里运行，响应更迅速、也更安全👆</center>''')
-    keyTxt = gr.Textbox(show_label=True, placeholder=f"在这里输入你的OpenAI API-key...",
-                        value=my_api_key, label="API Key", type="password", visible=not HIDE_MY_KEY).style(container=True)
+    with gr.Row():
+        keyTxt = gr.Textbox(show_label=False, placeholder=f"在这里输入你的OpenAI API-key...",
+                            value=my_api_key, type="password", visible=not HIDE_MY_KEY).style(container=True)
+        use_streaming_checkbox = gr.Checkbox(label="实时传输回答", value=True, visible=enable_streaming_option)
     chatbot = gr.Chatbot()  # .style(color_map=("#1D51EE", "#585A5B"))
     history = gr.State([])
+    token_count = gr.State([])
     promptTemplates = gr.State(load_template(get_template_names(plain=True)[0], mode=2))
     TRUECOMSTANT = gr.State(True)
     FALSECONSTANT = gr.State(False)
@@ -54,23 +58,23 @@ with gr.Blocks(css=customCSS) as demo:
 
     with gr.Row():
         with gr.Column(scale=12):
-            txt = gr.Textbox(show_label=False, placeholder="在这里输入").style(
+            user_input = gr.Textbox(show_label=False, placeholder="在这里输入").style(
                 container=False)
         with gr.Column(min_width=50, scale=1):
             submitBtn = gr.Button("🚀", variant="primary")
     with gr.Row():
         emptyBtn = gr.Button("🧹 新的对话")
         retryBtn = gr.Button("🔄 重新生成")
-        delLastBtn = gr.Button("🗑️ 删除上条对话")
+        delLastBtn = gr.Button("🗑️ 删除最近一条对话")
         reduceTokenBtn = gr.Button("♻️ 总结对话")
-    statusDisplay = gr.Markdown("status: ready")
+    status_display = gr.Markdown("status: ready")
     systemPromptTxt = gr.Textbox(show_label=True, placeholder=f"在这里输入System Prompt...",
                                  label="System prompt", value=initial_prompt).style(container=True)
     with gr.Accordion(label="加载Prompt模板", open=False):
         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, value=get_template_names(plain=True)[0])
+                    templateFileSelectDropdown = gr.Dropdown(label="选择Prompt模板集合文件", 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("📂 读入模板")
@@ -104,44 +108,53 @@ with gr.Blocks(css=customCSS) as demo:
     gr.Markdown(description)
 
 
-    txt.submit(predict, [txt, top_p, temperature, keyTxt,
-               chatbot, history, systemPromptTxt], [chatbot, history, statusDisplay])
-    txt.submit(reset_textbox, [], [txt])
-    submitBtn.click(predict, [txt, top_p, temperature, keyTxt, chatbot,
-                    history, systemPromptTxt], [chatbot, history, statusDisplay], show_progress=True)
-    submitBtn.click(reset_textbox, [], [txt])
-    emptyBtn.click(reset_state, outputs=[chatbot, history])
-    retryBtn.click(predict, [txt, top_p, temperature, keyTxt, chatbot, history,
-                   systemPromptTxt, TRUECOMSTANT], [chatbot, history, statusDisplay], show_progress=True)
-    delLastBtn.click(delete_last_conversation, [chatbot, history], [
-                     chatbot, history], show_progress=True)
-    reduceTokenBtn.click(predict, [txt, top_p, temperature, keyTxt, chatbot, history,
-                         systemPromptTxt, FALSECONSTANT, TRUECOMSTANT], [chatbot, history, statusDisplay], show_progress=True)
+    user_input.submit(predict, [keyTxt, systemPromptTxt, history, user_input, chatbot, token_count, top_p, temperature, use_streaming_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], [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], [chatbot, history, status_display, token_count], show_progress=True)
+
+    delLastBtn.click(delete_last_conversation, [chatbot, history, token_count, use_streaming_checkbox], [
+                     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], [chatbot, history, status_display, token_count], show_progress=True)
+
     saveHistoryBtn.click(save_chat_history, [
                   saveFileName, systemPromptTxt, history, chatbot], None, show_progress=True)
+
     saveHistoryBtn.click(get_history_names, None, [historyFileSelectDropdown])
+
     historyRefreshBtn.click(get_history_names, None, [historyFileSelectDropdown])
+
     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(get_template_content, [promptTemplates, templateSelectDropdown, systemPromptTxt],  [systemPromptTxt], show_progress=True)
 
 print("川虎的温馨提示：访问 http://localhost:7860 查看界面")
 # 默认开启本地服务器，默认可以直接从IP访问，默认不创建公开分享链接
 demo.title = "川虎ChatGPT 🚀"
 
-#if running in Docker
-if dockerflag:
-    if authflag:
-        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
-else:
-    if authflag:
-        demo.queue().launch(share=False, auth=(username, password))
+if __name__ == "__main__":
+    #if running in Docker
+    if dockerflag:
+        if authflag:
+            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
     else:
-        demo.queue().launch(share=False) # 改为 share=True 可以创建公开分享链接
-    #demo.queue().launch(server_name="0.0.0.0", server_port=7860, share=False) # 可自定义端口
-    #demo.queue().launch(server_name="0.0.0.0", server_port=7860,auth=("在这里填写用户名", "在这里填写密码")) # 可设置用户名与密码
-    #demo.queue().launch(auth=("在这里填写用户名", "在这里填写密码")) # 适合Nginx反向代理
+        if authflag:
+            demo.queue().launch(share=False, auth=(username, password))
+        else:
+            demo.queue().launch(share=False) # 改为 share=True 可以创建公开分享链接
+        #demo.queue().launch(server_name="0.0.0.0", server_port=7860, share=False) # 可自定义端口
+        #demo.queue().launch(server_name="0.0.0.0", server_port=7860,auth=("在这里填写用户名", "在这里填写密码")) # 可设置用户名与密码
+        #demo.queue().launch(auth=("在这里填写用户名", "在这里填写密码")) # 适合Nginx反向代理