自动查询API使用情况，去掉查询按钮

ChuanhuChatbot.py

@@ -103,7 +103,6 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
                         label="API-Key",
                     )
                     usageTxt = gr.Markdown(get_usage(my_api_key), elem_id="usage_display")
-                    usageUpdateBtn = gr.Button("🔄 更新API使用情况")
                     model_select_dropdown = gr.Dropdown(
                         label="选择模型", choices=MODELS, multiselect=False, value=MODELS[0]
                     )
@@ -262,17 +261,19 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
     transfer_input_args = dict(
         fn=transfer_input, inputs=[user_input], outputs=[user_question, user_input, submitBtn, cancelBtn], show_progress=True
     )
+    
+    get_usage_args = dict(
+        fn=get_usage, inputs=[user_api_key], outputs=[usageTxt], show_progress=False
+    )
 
-    keyTxt.submit(submit_key, keyTxt, [user_api_key, status_display, usageTxt])
-    keyTxt.change(submit_key, keyTxt, [user_api_key, status_display, usageTxt])
     # Chatbot
     cancelBtn.click(cancel_outputing, [], [])
 
-    usageUpdateBtn.click(get_usage, [user_api_key], [usageTxt], show_progress=True)
-
     user_input.submit(**transfer_input_args).then(**chatgpt_predict_args).then(**end_outputing_args)
+    user_input.submit(**get_usage_args)
 
     submitBtn.click(**transfer_input_args).then(**chatgpt_predict_args).then(**end_outputing_args)
+    submitBtn.click(**get_usage_args)
 
     emptyBtn.click(
         reset_state,
@@ -298,6 +299,7 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
         [chatbot, history, status_display, token_count],
         show_progress=True,
     ).then(**end_outputing_args)
+    retryBtn.click(**get_usage_args)
 
     delLastBtn.click(
         delete_last_conversation,
@@ -323,6 +325,10 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
         [chatbot, history, status_display, token_count],
         show_progress=True,
     )
+    reduceTokenBtn.click(**get_usage_args)
+    
+    # ChatGPT
+    keyTxt.change(submit_key, keyTxt, [user_api_key, status_display]).then(**get_usage_args)
 
     # Template
     templateRefreshBtn.click(get_template_names, None, [templateFileSelectDropdown])

modules/utils.py

@@ -22,7 +22,6 @@ from pygments.formatters import HtmlFormatter
 
 from modules.presets import *
 import modules.shared as shared
-from modules.openai_func import get_usage
 
 logging.basicConfig(
     level=logging.INFO,
@@ -116,7 +115,8 @@ def convert_mdtext(md_text):
 
 
 def convert_asis(userinput):
-    return f"<p style=\"white-space:pre-wrap;\">{html.escape(userinput)}</p>"+ALREADY_CONVERTED_MARK
+    escaped_html = html.escape(userinput).replace(" ", "&nbsp;").replace("\n", "<br>")
+    return f"{escaped_html}"+ALREADY_CONVERTED_MARK
 
 def detect_converted_mark(userinput):
     if userinput.endswith(ALREADY_CONVERTED_MARK):
@@ -350,7 +350,7 @@ def submit_key(key):
     key = key.strip()
     msg = f"API密钥更改为了{hide_middle_chars(key)}"
     logging.info(msg)
-    return key, msg, get_usage(key)
+    return key, msg
 
 
 def sha1sum(filename):