From 1805f081d3a4749f10cd1a14f881862940eddf24 Mon Sep 17 00:00:00 2001 From: Tuchuanhuhuhu Date: Tue, 28 Mar 2023 23:33:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E2=80=9C=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E2=80=9D=E6=8C=89=E9=92=AE=EF=BC=8C=E6=8F=90=E4=BA=A4=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=E8=87=AA=E5=8A=A8=E6=B8=85=E7=A9=BA=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 14 +++++++++++--- toolbox.py | 8 ++++---- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/main.py b/main.py index c1c18a1..c2b4b94 100644 --- a/main.py +++ b/main.py @@ -51,7 +51,9 @@ with gr.Blocks(theme=set_theme, analytics_enabled=False) as demo: with gr.Column(scale=12): txt = gr.Textbox(show_label=False, placeholder="Input question here.").style(container=False) with gr.Column(scale=1): - submitBtn = gr.Button("提交", variant="primary") + with gr.Row(): + resetBtn = gr.Button("重置", variant="secondary") + submitBtn = gr.Button("提交", variant="primary") with gr.Row(): from check_proxy import check_proxy statusDisplay = gr.Markdown(f"Tip: 按Enter提交, 按Shift+Enter换行. \nNetwork: {check_proxy(proxies)}\nModel: {LLM_MODEL}") @@ -76,8 +78,14 @@ with gr.Blocks(theme=set_theme, analytics_enabled=False) as demo: top_p = gr.Slider(minimum=-0, maximum=1.0, value=1.0, step=0.01,interactive=True, label="Top-p (nucleus sampling)",) temperature = gr.Slider(minimum=-0, maximum=2.0, value=1.0, step=0.01, interactive=True, label="Temperature",) - txt.submit(predict, [txt, top_p, temperature, chatbot, history, systemPromptTxt], [chatbot, history, statusDisplay]) - submitBtn.click(predict, [txt, top_p, temperature, chatbot, history, systemPromptTxt], [chatbot, history, statusDisplay], show_progress=True) + predict_args = dict(fn=predict, inputs=[txt, top_p, temperature, chatbot, history, systemPromptTxt], outputs=[chatbot, history, statusDisplay], show_progress=True) + empty_txt_args = dict(fn=lambda: "", inputs=[], outputs=[txt]) + + txt.submit(**predict_args) + txt.submit(**empty_txt_args) + submitBtn.click(**predict_args) + submitBtn.click(**empty_txt_args) + resetBtn.click(lambda: ([], [], "已重置"), None, [chatbot, history, statusDisplay]) for k in functional: functional[k]["Button"].click(predict, [txt, top_p, temperature, chatbot, history, systemPromptTxt, TRUE, gr.State(k)], [chatbot, history, statusDisplay], show_progress=True) diff --git a/toolbox.py b/toolbox.py index 284067c..5491b5e 100644 --- a/toolbox.py +++ b/toolbox.py @@ -14,7 +14,7 @@ def predict_no_ui_but_counting_down(i_say, i_say_show_user, chatbot, top_p, temp # list就是最简单的mutable结构，我们第一个位置放gpt输出，第二个位置传递报错信息 mutable = [None, ''] # multi-threading worker - def mt(i_say, history): + def mt(i_say, history): while True: try: mutable[0] = predict_no_ui(inputs=i_say, top_p=top_p, temperature=temperature, history=history) @@ -124,7 +124,7 @@ def format_io(self, y): """ 将输入和输出解析为HTML格式。将y中最后一项的输入部分段落化，并将输出部分的Markdown和数学公式转换为HTML格式。 """ - if y is None: return [] + if y is None or y == []: return [] i_ask, gpt_reply = y[-1] i_ask = text_divide_paragraph(i_ask) # 输入部分太自由，预处理一波 y[-1] = ( @@ -144,7 +144,7 @@ def find_free_port(): s.bind(('', 0)) s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) return s.getsockname()[1] - + def extract_archive(file_path, dest_dir): import zipfile @@ -165,7 +165,7 @@ def extract_archive(file_path, dest_dir): print("Successfully extracted tar archive to {}".format(dest_dir)) else: return - + def find_recent_files(directory): """ me: find files that is created with in one minutes under a directory with python, write a function