Update app.py

app.py

@@ -22,7 +22,7 @@ DEFAULT_NEGATIVE_PROMPT = (
 def run(*args):
     id_image = args[0]
     supp_images = args[1]
-    prompt, neg_prompt, scale, n_samples, seed, steps, H, W, id_scale, mode, id_mix = args[2:]
+    prompt, neg_prompt, id_scale, mode, id_mix, steps, seed, n_samples, scale, H, W = args[2:]
 
     pipeline.debug_img_list = []
     if mode == 'fidelity':
@@ -97,6 +97,7 @@ with gr.Blocks(title="ToonMagev2", js = js_func, theme = theme) as SAK:
     with gr.Row():
         with gr.Column():
             with gr.Row():
+                submit = gr.Button("Generate")
                 face_image = gr.Image(label="ID image (main)", sources="upload", type="numpy", height=256)
                 supp_image1 = gr.Image(
                     label="Additional ID image (auxiliary)", sources="upload", type="numpy", height=256
@@ -108,8 +109,20 @@ with gr.Blocks(title="ToonMagev2", js = js_func, theme = theme) as SAK:
                 #     label="Additional ID image (auxiliary)", sources="upload", type="numpy", height=256
                 # )
             prompt = gr.Textbox(label="Prompt", value='portrait,cinematic,wolf ears,white hair')
-            submit = gr.Button("Generate")
+
             neg_prompt = gr.Textbox(label="Negative Prompt", value=DEFAULT_NEGATIVE_PROMPT)
+            with gr.Row():
+                id_scale = gr.Slider(label="ID scale", minimum=0, maximum=5, step=0.05, value=0.8, interactive=True)
+                mode = gr.Dropdown(label="mode", choices=['fidelity', 'extremely style'], value='fidelity')
+                id_mix = gr.Checkbox(
+                    label="ID Mix (if you want to mix two ID image, please turn this on, otherwise, turn this off)",
+                    value=False,
+                )
+            steps = gr.Slider(label="Steps", value=4, minimum=1, maximum=8, step=1)
+            seed = gr.Slider(
+                label="Seed", value=42, minimum=np.iinfo(np.uint32).min, maximum=np.iinfo(np.uint32).max, step=1
+            )
+            n_samples = gr.Slider(label="Num samples", value=2, minimum=1, maximum=4, step=1)
             scale = gr.Slider(
                 label="CFG, recommend value range [1, 1.5], 1 will be faster ",
                 value=1.2,
@@ -117,21 +130,9 @@ with gr.Blocks(title="ToonMagev2", js = js_func, theme = theme) as SAK:
                 maximum=1.5,
                 step=0.1,
             )
-            n_samples = gr.Slider(label="Num samples", value=4, minimum=1, maximum=4, step=1)
-            seed = gr.Slider(
-                label="Seed", value=42, minimum=np.iinfo(np.uint32).min, maximum=np.iinfo(np.uint32).max, step=1
-            )
-            steps = gr.Slider(label="Steps", value=4, minimum=1, maximum=8, step=1)
             with gr.Row():
                 H = gr.Slider(label="Height", value=1024, minimum=512, maximum=1280, step=64)
                 W = gr.Slider(label="Width", value=768, minimum=512, maximum=1280, step=64)
-            with gr.Row():
-                id_scale = gr.Slider(label="ID scale", minimum=0, maximum=5, step=0.05, value=0.8, interactive=True)
-                mode = gr.Dropdown(label="mode", choices=['fidelity', 'extremely style'], value='fidelity')
-                id_mix = gr.Checkbox(
-                    label="ID Mix (if you want to mix two ID image, please turn this on, otherwise, turn this off)",
-                    value=False,
-                )
 
             gr.Markdown("## Examples")
             example_inps = [
@@ -146,7 +147,7 @@ with gr.Blocks(title="ToonMagev2", js = js_func, theme = theme) as SAK:
             example_inps = [
                 [
                     'portrait, impressionist painting, loose brushwork, vibrant color, light and shadow play',
-                    'sample_img/sample_img_test1.jpg',
+                    'sample_img/sample_img_test24.jpg',
                     'fidelity',
                 ]
             ]
@@ -155,7 +156,7 @@ with gr.Blocks(title="ToonMagev2", js = js_func, theme = theme) as SAK:
             example_inps = [
                 [
                     'portrait, flat papercut style, silhouette, clean cuts, paper, sharp edges, minimalist,color block,man',
-                    'sample_img/lecun.jpg',
+                    'sample_img/sample_img_test1.jpg',
                     'fidelity',
                 ]
             ]
@@ -202,10 +203,10 @@ with gr.Blocks(title="ToonMagev2", js = js_func, theme = theme) as SAK:
         # supp_image3,
         prompt,
         neg_prompt,
-        scale,
-        n_samples,
-        seed,
         steps,
+        seed,
+        n_samples,
+        scale,
         H,
         W,
         id_scale,