Update gradio design

app.py

@@ -98,8 +98,8 @@ def save_img(res, imgid, origin_shape, output_name, divide=False):
 
 
 
-def paint_img(img):
-    max_step = 40
+def paint_img(img, max_step = 40):
+    max_step = int(max_step)
     # imgid = 0
     # output_name = os.path.join('output', str(len(os.listdir('output'))) if os.path.exists('output') else '0')
     # os.makedirs(output_name, exist_ok= True)
@@ -188,20 +188,25 @@ def change_model(choice: str):
     actor = actor.to(device).eval()
     Decoder = Decoder.to(device).eval()
 
-
+from typing import Generator
 def wrapper(func):
+    event:Generator = range(0)
     def inner(*args, **kwargs):
+        nonlocal event
         val = args[0]
-        args_ = tuple(x for i,x in enumerate(args) if i > 0)
-        event = func(*args_, **kwargs)
-        for i in event:
-            if val == "Cancel":
-                yield i
-            else:
+        if val == "Cancel":
+            args_ = tuple(x for i,x in enumerate(args) if i > 0)
+            event = func(*args_, **kwargs)
+            yield from event
+        else:
+            try:
                 event.close()
-                break
+                yield 
+            except:
+                pass
     return inner
 
+
 examples = [
     ["image/chaoyue.png"],
     ["image/degang.png"],
@@ -209,29 +214,35 @@ examples = [
     ["image/Leslie.png"],
     ["image/mayun.png"],
 ]
-
+output = gr.Image(label="Painting Result")
 with gr.Blocks() as demo:
     with gr.Row():
         with gr.Column():
             input_image = gr.Image(label="Input image")
+            with gr.Row():
+                step = gr.Slider(20, 100, value= 40, step = 1, label= 'Painting step')
             with gr.Row():
                 dropdown = gr.Dropdown(['Default', 'Round', 'Triangle', 'Bezier wo trans'], value= 'Default', label= 'Stroke choice')
             with gr.Row():
                 with gr.Column():
-                    clr_btn = gr.ClearButton([input_image], variant= "stop")
+                    clr_btn = gr.ClearButton([input_image, output], variant= "stop")
                 with gr.Column():
                     translate_btn = gr.Button(value="Paint", variant="primary")
 
         with gr.Column():
-            output = gr.Image(label="Painting Result")
+            output.render()
+
+
     dropdown.select(change_model, dropdown)
-    translate_btn.click(lambda x: gr.Button(value="Cancel", variant="stop") if x == "Paint" else gr.Button(value="Paint", variant="primary"), translate_btn, translate_btn).then(wrapper(paint_img), inputs=[translate_btn, input_image], outputs=output)\
-                 .success(lambda x: gr.Button(value="Paint", variant="primary"), translate_btn, translate_btn)
+    click_event = translate_btn.click(lambda x: gr.Button(value="Cancel", variant="stop") if x == "Paint" else gr.Button(value="Paint", variant="primary"), translate_btn, translate_btn)\
+                 .then(wrapper(paint_img), inputs=[translate_btn, input_image, step], outputs=output, trigger_mode = 'multiple')\
+                 .then(lambda x: gr.Button(value="Paint", variant="primary"), translate_btn, translate_btn)
+    clr_btn.click(None, None, cancels=[click_event])
     examples = gr.Examples(examples=examples,
                            inputs=[input_image], cache_examples = False)
 
 
 
 # demo = gr.Interface(fn=paint_img, inputs=gr.Image(), outputs="image", examples = examples)
-demo.queue()
-demo.launch(server_name="0.0.0.0")
+demo.queue(default_concurrency_limit= 4)
+demo.launch(server_name="0.0.0.0", )