Update app.py

app.py

@@ -46,6 +46,19 @@ def control_ui():
     with gr.Row():
         width = gr.Slider(label="Width", value=1024, minimum=64, maximum=2048, step=64)
         height = gr.Slider(label="Height", value=1024, minimum=64, maximum=2048, step=64)
+    with gr.Coloumn():
+        with gr.Accordion('风格迁移', open=False):
+            ref_image = gr.Image(label="上传图片", value=None, sources=["upload"], interactive=True, type="pil")
+            info_extract = gr.Slider(label='参考信息提取', value=1, minimum=0, maximum=1, step=0.1)
+            ref_str = gr.Slider(label='参考强度', value=0.6, minimum=0, maximum=1, step=0.1)
+            reuse_img_vibe = gr.Button(value='使用上一次生成的图片')
+        with gr.Accordion('蒙版重绘', open=False):
+            with gr.Row():
+                use_inp = gr.Checkbox(label='启用', value=False)
+                overlay = gr.Checkbox(label='覆盖原图', value=True)
+            inp_img = gr.ImageEditor(label="上传图片", value=None, sources=["upload"], interactive=True, type="pil", eraser=False, transforms=None, brush="imagemask")
+            inp_str = gr.Slider(label='重绘强度', value=0.7, minimum=0, maximum=0.99, step=0.01)
+            reuse_img_inp = gr.Button(value='使用上一次生成的图片')
     with gr.Row():
         with gr.Column():
             with gr.Accordion('Advanced Gen Setting', open=False):
@@ -63,22 +76,9 @@ def control_ui():
                 with gr.Row():
                     dyn_threshold = gr.Checkbox(False, label="Dynamic Thresholding")
                     cfg_rescale = gr.Slider(0, 1, 0, step=0.01, label="CFG rescale")
-            with gr.Accordion('风格迁移', open=False):
-                ref_image = gr.Image(label="上传图片", value=None, sources=["upload"], interactive=True, type="pil")
-                info_extract = gr.Slider(label='参考信息提取', value=1, minimum=0, maximum=1, step=0.1)
-                ref_str = gr.Slider(label='参考强度', value=0.6, minimum=0, maximum=1, step=0.1)
-                reuse_img_vibe = gr.Button(value='使用上一次生成的图片')
-            with gr.Accordion('蒙版重绘', open=False):
-                with gr.Row():
-                    use_inp = gr.Checkbox(label='启用', value=False)
-                    overlay = gr.Checkbox(label='覆盖原图', value=True)
-                inp_img = gr.ImageEditor(label="上传图片", value=None, sources=["upload"], interactive=True, type="pil", eraser=False, transforms=None, brush="imagemask")
-                inp_str = gr.Slider(label='重绘强度', value=0.7, minimum=0, maximum=0.99, step=0.01)
-                reuse_img_inp = gr.Button(value='使用上一次生成的图片')
         with gr.Column():
             gr.Textbox(value=get_count, label='Usage count', every=10)
             save = gr.Checkbox(value=False, label='Always save all generated images', visible=False)
-    
     gen_btn = gr.Button(value="Generate", variant="primary")
     rand_seed.click(fn=lambda: -1, inputs=None, outputs=seed)
     width.change(lambda w, h: h if w*h<=1024*1024 else (1024*1024//w//64)*64, [width, height], height)
@@ -120,7 +120,7 @@ def main_ui():
     gen_btn.click(generate, paras + [others[0], others[4]], [image, info])
     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[14])
-    others[5].click(lambda i: gr.ImageEditor(value=i), inputs=image, outputs=paras[17])
+    others[5].click(lambda i: i, inputs=image, outputs=paras[17])
     return page, paras[:14]
 
 
@@ -146,7 +146,7 @@ def ui():
                            inputs=[png_items] + paras,
                            outputs=paras)
             png2main.click(fn=None,
-                           js="(x) => { if (x !== null) document.getElementById('client_ui_main-button').click(); "
+                           _js="(x) => { if (x !== null) document.getElementById('client_ui_main-button').click(); "
                               "return null; }",
                            inputs=image)
             image.change(read_info_from_image, inputs=image, outputs=[info, png_items])