From 7e07ccf040fdf55ff128030fcd37753e9a80be72 Mon Sep 17 00:00:00 2001 From: w_xiaolizu Date: Mon, 15 May 2023 13:34:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8B=E6=8B=89=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E5=92=8C=E6=99=AE=E9=80=9A=E9=97=AE=E7=AD=94=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- __main__.py | 9 ++++++--- crazy_functional.py | 4 +++- func_box.py | 4 ---- request_llm/bridge_chatgpt.py | 2 +- toolbox.py | 1 - 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/__main__.py b/__main__.py index e0857c4..8f30ed7 100644 --- a/__main__.py +++ b/__main__.py @@ -191,7 +191,7 @@ class ChatBot(ChatBotFrame): not crazy_fns[k].get("AsButton", True)] self.dropdown = gr.Dropdown(dropdown_fn_list, value=r"打开插件列表", label="").style( container=False) - self.plugin_advanced_arg = gr.Textbox(show_label=False, label="高级参数输入区", visible=True, + self.plugin_advanced_arg = gr.Textbox(show_label=True, label="高级参数输入区", visible=False, placeholder="这里是特殊函数插件的高级参数输入区").style( container=False) self.switchy_bt = gr.Button(r"请先从插件列表中选择", variant="secondary") @@ -297,9 +297,12 @@ class ChatBot(ChatBotFrame): # 随变按钮的回调函数注册 def route(k, ipaddr: gr.Request, *args, **kwargs): if k in [r"打开插件列表", r"请先从插件列表中选择"]: return - yield from ArgsGeneralWrapper(crazy_fns[k]["Function"])(ipaddr=ipaddr, *args, **kwargs) + append = list(args) + append.insert(10, ipaddr) + 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], self.output_combo) + self.click_handle = self.switchy_bt.click(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/crazy_functional.py b/crazy_functional.py index 6d23012..bdbb893 100644 --- a/crazy_functional.py +++ b/crazy_functional.py @@ -56,6 +56,7 @@ def get_crazy_functions(): "ArgsReminder": "若输入0，则不解析notebook中的Markdown块", # 高级参数输入区的显示提示 }, "批量总结Word文档": { + "AsButton": False, "Color": "stop", "Function": HotReload(总结word文档) }, @@ -102,6 +103,7 @@ def get_crazy_functions(): "Markdown/Readme英译中": { # HotReload 的意思是热更新，修改函数插件代码后，不需要重启程序，代码直接生效 "Color": "stop", + "AsButton": False, "Function": HotReload(Markdown英译中) }, "批量生成函数注释": { @@ -219,7 +221,7 @@ def get_crazy_functions(): from crazy_functions.联网的ChatGPT import 连接网络回答问题 function_plugins.update({ - "连接网络回答问题（先输入问题，再点击按钮，需要访问谷歌）": { + "连接网络回答问题": { "Color": "stop", "AsButton": True, # 加入下拉菜单中 "Function": HotReload(连接网络回答问题) diff --git a/func_box.py b/func_box.py index 6f75515..f763ced 100644 --- a/func_box.py +++ b/func_box.py @@ -417,10 +417,6 @@ class FileHandle: if __name__ == '__main__': - - txt = "Authorization: WPS-2:AqY7ik9XQ92tvO7+NlCRvA==:b2f626f496de9c256605a15985c855a8b3e4be99\nwps-Sid: V02SgISzdeWrYdwvW_xbib-fGlqUIIw00afc5b890008c1976f\nCookie: wpsua=V1BTVUEvMS4wIChhbmRyb2lkLW9mZmljZToxNy41O2FuZHJvaWQ6MTA7ZjIwZDAyNWQzYTM5MmExMDBiYzgxNWI2NmI3Y2E5ODI6ZG1sMmJ5QldNakF5TUVFPSl2aXZvL1YyMDIwQQ==" - txt = "Authorization: WPS-2:AqY7ik9XQ92tvO7+NlCRvA==:b2f626f496de9c256605a15985c855a8b3e4be99 客户发顺丰啦 这是其他文本哦" - print(YamlHandle().load()) diff --git a/request_llm/bridge_chatgpt.py b/request_llm/bridge_chatgpt.py index c80078d..84c4357 100644 --- a/request_llm/bridge_chatgpt.py +++ b/request_llm/bridge_chatgpt.py @@ -106,7 +106,7 @@ def predict_no_ui_long_connection(inputs, llm_kwargs, history=[], sys_prompt="", return result -def predict(inputs, llm_kwargs, plugin_kwargs, chatbot, history=[], system_prompt='', stream = True, additional_fn=None): +def predict(inputs, llm_kwargs, plugin_kwargs, chatbot, history=[], system_prompt='', stream=True, additional_fn=None): """ 发送至chatGPT，流式获取输出。 用于基础的对话功能。 diff --git a/toolbox.py b/toolbox.py index 53e052c..30b1a8d 100644 --- a/toolbox.py +++ b/toolbox.py @@ -82,7 +82,6 @@ def ArgsGeneralWrapper(f): chatbot_with_cookie.write_list(chatbot) txt_passon = txt if encrypt in models: txt_passon = func_box.encryption_str(txt) - if args == (): args = (ipaddr.client.port, ) if txt_passon == '' and txt_passon == ' ' and len(args) > 1: msgs = f'### {args[1]} Warning 输入框为空\n' \ 'tips: 使用基础功能时，请在输入区输入需要处理的文本内容'