Update app.py

app.py

@@ -122,7 +122,7 @@ def generate(
     inference_steps: int = 4,
     randomize_seed: bool = False,
     use_resolution_binning: bool = True,
-    **kwargs
+    **kwargs  # This will capture all the dynamic inputs like color selections and ratios
 ):
     seed = int(randomize_seed_fn(seed, randomize_seed))
     generator = torch.Generator().manual_seed(seed)
@@ -130,6 +130,7 @@ def generate(
     if not use_negative_prompt:
         negative_prompt = None
     
+    # Extract color selections and ratios from kwargs
     color_selections = {
         color: {
             "selected": kwargs.get(f"{color.lower()}_selected", False),
@@ -157,7 +158,6 @@ def generate(
         return [], seed
     
     image_paths = [save_image(img) for img in images]
-    print(image_paths)
     return image_paths, seed
 
 # Example prompts
@@ -175,78 +175,37 @@ color_checkboxes = {}
 color_sliders = {}
 
 # Set up the Gradio interface
+# Initialize color checkboxes and sliders before using them
+color_checkboxes = {color: gr.Checkbox(label=f"{color} Selected", value=False) for color in color_attributes}
+color_sliders = {color: gr.Slider(label=f"{color} Influence Ratio", minimum=0, maximum=1, step=0.01, value=0) for color in color_attributes}
+
 with gr.Blocks() as demo:
     gr.Markdown(DESCRIPTION)
-    with gr.Row(equal_height=False):
-        with gr.Group():
-            with gr.Row():
-                prompt = gr.Text(
-                    label="Prompt",
-                    show_label=False,
-                    max_lines=1,
-                    placeholder="Enter your prompt",
-                    container=False,
-                )
-                run_button = gr.Button("Run", scale=0)
-            result = gr.Gallery(label="Result", columns=NUM_IMAGES_PER_PROMPT, show_label=False)
-                    
-    with gr.Accordion("Color Influences", open=False):
-        with gr.Group():
-            for color in color_attributes:
-                with gr.Row():
-                    color_checkboxes[color] = gr.Checkbox(label=f"{color} Selected", value=False)
-                    color_sliders[color] = gr.Slider(label=f"{color} Influence Ratio", minimum=0, maximum=1, step=0.01, value=0)
     
-    with gr.Accordion("Advanced options", open=False):
-        with gr.Group():
+    with gr.Row():
+        prompt = gr.Text(label="Prompt", placeholder="Enter your prompt")
+        run_button = gr.Button("Run")
+    
+    result = gr.Gallery(label="Result", columns=NUM_IMAGES_PER_PROMPT)
+    
+    with gr.Accordion("Color Influences", open=False):
+        for color in color_attributes:
             with gr.Row():
-                use_negative_prompt = gr.Checkbox(label="Use negative prompt", value=False, visible=True)
-                negative_prompt = gr.Text(
-                    label="Negative prompt",
-                    max_lines=1,
-                    placeholder="Enter a negative prompt",
-                    visible=True,
-                )
-            style_selection = gr.Radio(
-                show_label=True,
-                container=True,
-                interactive=True,
-                choices=STYLE_NAMES,
-                value=DEFAULT_STYLE_NAME,
-                label="Image Style",
-            )
-            seed = gr.Slider(
-                label="Seed",
-                minimum=0,
-                maximum=MAX_SEED,
-                step=1,
-                value=0,
-            )
-            randomize_seed = gr.Checkbox(label="Randomize seed", value=True)
-            with gr.Row(visible=True):
-                width = gr.Slider(
-                    label="Width",
-                    minimum=256,
-                    maximum=MAX_IMAGE_SIZE,
-                    step=32,
-                    value=1024,
-                )
-                height = gr.Slider(
-                    label="Height",
-                    minimum=256,
-                    maximum=MAX_IMAGE_SIZE,
-                    step=32,
-                    value=1024,
-                )
-        with gr.Row():
-            inference_steps = gr.Slider(
-                label="Steps",
-                minimum=4,
-                maximum=20,
-                step=1,
-                value=4,
-            )
+                color_checkboxes[color]
+                color_sliders[color]
 
+    with gr.Accordion("Advanced options", open=False):
+        with gr.Column():
+            negative_prompt = gr.Text(label="Negative Prompt", placeholder="Enter a negative prompt")
+            use_negative_prompt = gr.Checkbox(label="Use Negative Prompt", value=False)
+            style_selection = gr.Radio(choices=STYLE_NAMES, label="Style", value=DEFAULT_STYLE_NAME)
+            seed = gr.Number(label="Seed", value=0)
+            width = gr.Number(label="Width", value=1024)
+            height = gr.Number(label="Height", value=1024)
+            inference_steps = gr.Slider(minimum=4, maximum=20, label="Inference Steps", value=4)
+            randomize_seed = gr.Checkbox(label="Randomize Seed", value=True)
+
+    # Set examples for predefined prompts
     gr.Examples(
         examples=examples,
         inputs=prompt,
@@ -256,34 +215,31 @@ with gr.Blocks() as demo:
     )
 
     use_negative_prompt.change(
-        fn=lambda x: gr.update(visible=x),
+        fn=lambda visible: gr.update(visible=visible),
         inputs=use_negative_prompt,
         outputs=negative_prompt,
-        api_name=False,
     )
 
-    gr.on(
-        triggers=[
-            prompt.submit,
-            negative_prompt.submit,
-            run_button.click,
-        ],
+    # Define the inputs for the generate function using a dictionary for clear mapping
+    generate_inputs = {
+        "prompt": prompt,
+        "negative_prompt": negative_prompt,
+        "style": style_selection,
+        "use_negative_prompt": use_negative_prompt,
+        "seed": seed,
+        "width": width,
+        "height": height,
+        "inference_steps": inference_steps,
+        "randomize_seed": randomize_seed,
+        **{f"{color.lower()}_selected": color_checkboxes[color] for color in color_attributes},
+        **{f"{color.lower()}_ratio": color_sliders[color] for color in color_attributes}
+    }
+
+    # Connect the UI with the generate function
+    run_button.click(
         fn=generate,
-        inputs=[
-            prompt,
-            negative_prompt,
-            style_selection,
-            use_negative_prompt,
-            seed,
-            width,
-            height,
-            inference_steps,
-            randomize_seed,
-            *[color_checkboxes[color] for color in color_attributes],
-            *[color_sliders[color] for color in color_attributes],
-        ],
-        outputs=[result, seed],
-        api_name="run",
+        inputs=generate_inputs,
+        outputs=[result, seed]
     )
 
 if __name__ == "__main__":