From d8759c5863c98b7334e76a3439d78507a72d3416 Mon Sep 17 00:00:00 2001 From: w_xiaolizu Date: Sat, 3 Jun 2023 02:03:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B1=95=E7=A4=BA=EF=BD=9C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=B9=E8=AF=9D=E6=97=B6=E6=B8=85=E7=A9=BA?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- __main__.py | 32 ++++++++++++++++++++++---------- theme.py | 35 ++++++++++++++++++++++++++++++----- toolbox.py | 4 ++-- 3 files changed, 54 insertions(+), 17 deletions(-) diff --git a/__main__.py b/__main__.py index bcc7e89..100eb67 100644 --- a/__main__.py +++ b/__main__.py @@ -75,12 +75,17 @@ class ChatBot(ChatBotFrame): self.chatbot = gr.Chatbot(elem_id='main_chatbot', label=f"当前模型：{LLM_MODEL}") self.chatbot.style(height=CHATBOT_HEIGHT) self.history = gr.State([]) + temp_draw = [gr.HTML() for i in range(4)] with gr.Row(): - self.txt = gr.Textbox(show_label=False, placeholder="Input question here.").style(container=False) - self.submitBtn = gr.Button("提交", variant="primary").style(full_width=False) - with gr.Row(): + self.txt = gr.Textbox(show_label=False, placeholder="Input question here.", elem_id='chat_txt').style(container=False) + self.input_copy = gr.State('') + self.submitBtn = gr.Button("提交", variant="primary", visible=False).style(full_width=False) + with gr.Row(elem_id='debug_mes'): self.status = gr.Markdown(f"Tip: 按Enter提交, 按Shift+Enter换行。当前模型: {LLM_MODEL} \n {proxy_info}") + def __clear_input(self, inputs): + return '', inputs + def draw_prompt(self): with gr.Row(): self.pro_search_txt = gr.Textbox(show_label=False, placeholder="Enter the prompt you want.").style( @@ -118,6 +123,10 @@ class ChatBot(ChatBotFrame): inputs=[self.pro_search_txt, self.pro_prompt_state, self.pro_tf_slider, self.pro_private_check], outputs=[self.pro_prompt_list, self.pro_prompt_state]) + self.pro_search_txt.submit(fn=func_box.draw_results, + inputs=[self.pro_search_txt, self.pro_prompt_state, self.pro_tf_slider, + self.pro_private_check], + outputs=[self.pro_prompt_list, self.pro_prompt_state]) self.pro_entry_btn.click(fn=func_box.draw_results, inputs=[self.pro_search_txt, self.pro_prompt_state, self.pro_tf_slider, self.pro_private_check], @@ -244,23 +253,25 @@ class ChatBot(ChatBotFrame): self.agent_obj = gr.State({'obj': None, "start": self.submit_start, "next": self.submit_next, "text": self.text_continue}) + def signals_input_setting(self): # 注册input self.input_combo = [self.cookies, self.max_length_sl, self.md_dropdown, - self.txt, self.top_p, self.temperature, self.chatbot, self.history, + self.input_copy, self.top_p, self.temperature, self.chatbot, self.history, self.system_prompt, self.models_box, self.plugin_advanced_arg] - self.output_combo = [self.cookies, self.chatbot, self.history, self.status, self.txt] + self.output_combo = [self.cookies, self.chatbot, self.history, self.status] self.predict_args = dict(fn=ArgsGeneralWrapper(predict), inputs=self.input_combo, outputs=self.output_combo) + self.clear_agrs = dict(fn=self.__clear_input, inputs=[self.txt], outputs=[self.txt, self.input_copy]) # 提交按钮、重置按钮 - self.cancel_handles.append(self.txt.submit(**self.predict_args)) - self.cancel_handles.append(self.submitBtn.click(**self.predict_args)) + self.cancel_handles.append(self.txt.submit(**self.clear_agrs).then(**self.predict_args)) + self.cancel_handles.append(self.submitBtn.click(**self.clear_agrs).then(**self.predict_args)) # self.cpopyBtn.click(fn=func_box.copy_result, inputs=[self.history], outputs=[self.status]) self.resetBtn.click(lambda: ([], [], "已重置"), None, [self.chatbot, self.history, self.status]) def signals_function(self): # 基础功能区的回调函数注册 for k in functional: - self.click_handle = functional[k]["Button"].click(fn=ArgsGeneralWrapper(predict), + self.click_handle = functional[k]["Button"].click(**self.clear_agrs).then(fn=ArgsGeneralWrapper(predict), inputs=[*self.input_combo, gr.State(True), gr.State(k)], outputs=self.output_combo) self.cancel_handles.append(self.click_handle) @@ -274,10 +285,11 @@ class ChatBot(ChatBotFrame): # 函数插件-固定按钮区 for k in crazy_fns: if not crazy_fns[k].get("AsButton", True): continue - self.click_handle = crazy_fns[k]["Button"].click( + self.click_handle = crazy_fns[k]["Button"].click(**self.clear_agrs).then( ArgsGeneralWrapper(crazy_fns[k]["Function"]), [*self.input_combo, gr.State(PORT)], self.output_combo) self.click_handle.then(on_report_generated, [self.file_upload, self.chatbot], [self.file_upload, self.chatbot]) + # self.click_handle.then(fn=lambda x: '', inputs=[], outputs=self.txt) self.cancel_handles.append(self.click_handle) # 函数插件-下拉菜单与随变按钮的互动 @@ -302,7 +314,7 @@ class ChatBot(ChatBotFrame): args = tuple(append) yield from ArgsGeneralWrapper(crazy_fns[k]["Function"])(*args, **kwargs) - self.click_handle = self.switchy_bt.click(route, [self.switchy_bt, *self.input_combo, gr.State(PORT)], self.output_combo) + self.click_handle = self.switchy_bt.click(**self.clear_agrs).then(route, [self.switchy_bt, *self.input_combo, gr.State(PORT)], self.output_combo) self.click_handle.then(on_report_generated, [self.file_upload, self.chatbot], [self.file_upload, self.chatbot]) self.cancel_handles.append(self.click_handle) # 终止按钮的回调函数注册 diff --git a/theme.py b/theme.py index 90b9e0f..4736621 100644 --- a/theme.py +++ b/theme.py @@ -103,10 +103,35 @@ def adjust_theme(): advanced_css = """ -#main_chatbot{ - height: 100vh; - max-height: 75vh; - overflow: hidden !important; +#debug_mes { + position: absolute; + bottom: 0; + left: 0; + width: 100%; + z-index: 1; /* 设置更高的 z-index 值 */ + margin-bottom: 10px !important; +} +#chat_txt { + display: flex; + flex-direction: column-reverse; + overflow-y: auto !important; + z-index: 3; + flex-grow: 1; /* 自动填充剩余空间 */ + position: absolute; + bottom: 0; + left: 0; + width: 100%; + margin-bottom: 35px !important; +} +textarea { + resize: none; + height: 100%; /* 填充父元素的高度 */ +} +#main_chatbot { + height: 75vh !important; + max-height: 75vh !important; + overflow: auto !important; + z-index: 2; } .app.svelte-1mya07g.svelte-1mya07g { max-width: 100%; @@ -153,7 +178,7 @@ advanced_css = """ [data-testid = "bot"] { max-width: 95%; letter-spacing: 0.5px; - font-weight: normal; + font-weight: normal; /* width: auto !important; */ border-bottom-left-radius: 0 !important; } diff --git a/toolbox.py b/toolbox.py index 67d4368..0b66d11 100644 --- a/toolbox.py +++ b/toolbox.py @@ -94,12 +94,12 @@ def ArgsGeneralWrapper(f): pool = ThreadPoolExecutor(200) -def update_ui(chatbot, history, msg='正常', txt='', *args): # 刷新界面 +def update_ui(chatbot, history, msg='正常', *args): # 刷新界面 """ 刷新用户界面 """ assert isinstance(chatbot, ChatBotWithCookies), "在传递chatbot的过程中不要将其丢弃。必要时，可用clear将其清空，然后用for+append循环重新赋值。" - yield chatbot.get_cookies(), chatbot, history, msg, txt + yield chatbot.get_cookies(), chatbot, history, msg pool.submit(func_box.thread_write_chat, chatbot) def trimmed_format_exc():