diff --git a/main.py b/main.py index 479acde..f9511b0 100644 --- a/main.py +++ b/main.py @@ -135,7 +135,7 @@ with gr.Blocks(theme=set_theme, analytics_enabled=False, css=advanced_css) as de # 函数插件-固定按钮区 for k in crazy_fns: if not crazy_fns[k].get("AsButton", True): continue - click_handle = crazy_fns[k]["Button"].click(crazy_fns[k]["Function"], [*input_combo, gr.State(PORT)], output_combo) + click_handle = crazy_fns[k]["Button"].click(ArgsGeneralWrapper(crazy_fns[k]["Function"]), [*input_combo, gr.State(PORT)], output_combo) click_handle.then(on_report_generated, [file_upload, chatbot], [file_upload, chatbot]) cancel_handles.append(click_handle) # 函数插件-下拉菜单与随变按钮的互动 diff --git a/toolbox.py b/toolbox.py index 3925e83..011cb44 100644 --- a/toolbox.py +++ b/toolbox.py @@ -6,10 +6,10 @@ def ArgsGeneralWrapper(f): """ 装饰器函数,用于重组输入参数,改变输入参数的顺序与结构。 """ - def decorated(txt, txt2, top_p, temperature, chatbot, history, system_prompt, *args, **kwargs): + def decorated(txt, txt2, *args, **kwargs): txt_passon = txt if txt == "" and txt2 != "": txt_passon = txt2 - yield from f(txt_passon, top_p, temperature, chatbot, history, system_prompt, *args, **kwargs) + yield from f(txt_passon, *args, **kwargs) return decorated