error fix and subsequently trigger

app.py

@@ -176,14 +176,14 @@ def main_ui():
     cost_list = paras[5:8] + paras[10:12] + paras[17:19] + paras[21:23]
     for component in cost_list:
         component.change(update_btn_cost, inputs=cost_list, outputs=gen_btn)
-    gen_btn.click(lambda: (gr.Button(visible=False), gr.Button(visible=True)), inputs=None, outputs=[gen_btn, stop_btn])
-    gen = gen_btn.click(generate, paras, [image, info], concurrency_limit=1, concurrency_id="generate")
+    gen = gen_btn.click(lambda: (gr.Button(visible=False), gr.Button(visible=True)), inputs=None, outputs=[gen_btn, stop_btn]).then(
+                        generate, paras, [image, info], concurrency_limit=1, concurrency_id="generate").then(
+                        rename_save_img, inputs=[image, info, others[0]], outputs=image, trigger_mode="once").then(
+                        lambda: (gr.Button(visible=True), gr.Button(visible=False)), inputs=None, outputs=[gen_btn, stop_btn])
     others[2].click(lambda o, s: o if len(s) == 0 else s['parameters']['seed'], inputs=[paras[3], info], outputs=paras[3])
     others[3].click(lambda i: i, inputs=image, outputs=paras[17])
     others[4].click(lambda i: gr.ImageEditor(value=i), inputs=image, outputs=paras[21])
-    ren = image.change(rename_save_img, inputs=[image, info, others[0]], outputs=image, trigger_mode="once")
-    image.change(lambda: (gr.Button(visible=True), gr.Button(visible=False)), inputs=None, outputs=[gen_btn, stop_btn])
-    stop_btn.click(lambda: (gr.Button(visible=True), gr.Button(visible=False)), inputs=None, outputs=[gen_btn, stop_btn], cancels=[gen, ren])
+    stop_btn.click(lambda: (gr.Button(visible=True), gr.Button(visible=False)), inputs=None, outputs=[gen_btn, stop_btn], cancels=[gen])
     return image, paras, others, send_dtool
 
 def util_ui():
@@ -214,20 +214,20 @@ def load_javascript():
     gr.routes.templates.TemplateResponse = template_response
 
 def send_and_jump(component, fn, inputs, outputs, tab, trigger):
-    component.click(fn, inputs=inputs, outputs=outputs)
-    component.click(fn=None,
+    component.click(fn, inputs=inputs, outputs=outputs).success(
+                    fn=None,
                     js="(x) => { if (x !== null && x != 0) document.getElementById('" + tab + "-button').click(); return null; }",
                     inputs=trigger)
 
 def send_jump_select(component, fn, inputs, outputs, tab, accordin, trigger, secondary=None):
-    component.click(fn, inputs=inputs, outputs=outputs)
     extra_js = ''
     if secondary is not None:
         extra_js = "document.getElementById('" + secondary + "-button').click();"
-    component.click(fn=None,
+    component.click(fn, inputs=inputs, outputs=outputs).success(
+                    fn=None,
                     js="(x) => { if (x !== null && x != 0) document.getElementById('" + tab + "-button').click();" + extra_js + " return null; }",
-                    inputs=trigger)
-    component.click(lambda x: gr.Accordion(open=True) if x else gr.Accordion(), inputs=trigger, outputs=accordin)
+                    inputs=trigger).success(
+                    lambda x: gr.Accordion(open=True) if x else gr.Accordion(), inputs=trigger, outputs=accordin)
 
 def ui():
     load_javascript()

director_tools.py

@@ -89,10 +89,10 @@ def director_ui():
     tool_btn = gr.Button(value="生成", variant="primary", visible=False)
     dtool_stop = gr.Button(value="取消", variant="stop", visible=False)
     input_image.change(lambda i: gr.Button(visible=False) if i is None else gr.Button(visible=True), inputs=input_image, outputs=tool_btn)
-    tool_btn.click(lambda: (gr.Button(visible=False), gr.Button(visible=True), gr.Gallery(selected_index=None), -1), inputs=None, outputs=[tool_btn, dtool_stop, output_image, selected_index])
-    dtool_gen = tool_btn.click(augment_image, inputs=[input_image, width, height, req_type, selection, factor, defry, prompt], outputs=output_image, concurrency_id="generate")
+    dtool_gen =  tool_btn.click(lambda: (gr.Button(visible=False), gr.Button(visible=True), gr.Gallery(selected_index=None), -1), inputs=None, outputs=[tool_btn, dtool_stop, output_image, selected_index]).then(
+                                augment_image, inputs=[input_image, width, height, req_type, selection, factor, defry, prompt], outputs=output_image, concurrency_id="generate").then(
+                                lambda: (gr.Button(visible=True), gr.Button(visible=False)), inputs=None, outputs=[tool_btn, dtool_stop])
     dtool_stop.click(lambda: (gr.Button(visible=True), gr.Button(visible=False)), inputs=None, outputs=[tool_btn, dtool_stop], cancels=[dtool_gen])
-    output_image.change(lambda: (gr.Button(visible=True), gr.Button(visible=False)), inputs=None, outputs=[tool_btn, dtool_stop])
     reset.click(getWH, inputs=[input_image, width, height, factor], outputs=[width, height, hint])
     width.change(update_btn_cost, inputs=[width, height, req_type, selection, hint], outputs=tool_btn)
     height.change(update_btn_cost, inputs=[width, height, req_type, selection, hint], outputs=tool_btn)

utils.py

@@ -133,10 +133,10 @@ def generate_novelai_image(
                     return file.read(), payload
             else:
                 messages = json.loads(response.content)
-                raise gr.Error(messages["statusCode"] + ": " + messages["message"])
+                raise gr.Error(str(messages["statusCode"]) + ": " + messages["message"])
     else:
         messages = json.loads(response.content)
-        raise gr.Error(messages["statusCode"] + ": " + messages["message"])
+        raise gr.Error(str(messages["statusCode"]) + ": " + messages["message"])
 
 def image_from_bytes(data):
     img_file = io.BytesIO(data)
@@ -179,7 +179,7 @@ def augment_image(image, width, height, req_type, selection, factor=1, defry=0,
                 return images
             else:
                 messages = json.loads(response.content)
-                raise gr.Error(messages["statusCode"] + ": " + messages["message"])
+                raise gr.Error(str(messages["statusCode"]) + ": " + messages["message"])
     else:
         messages = json.loads(response.content)
-        raise gr.Error(messages["statusCode"] + ": " + messages["message"])
+        raise gr.Error(str(messages["statusCode"]) + ": " + messages["message"])