Revert repository to commit 1d4eb4e522c6572d69f5d06b1965a5ff48b664be

ui/events/run_handlers.py

@@ -96,26 +96,15 @@ def create_run_event(prefix: str, task_type: str, ui_components: dict):
     run_btn = ui_components.get(f'run_{prefix}') or ui_components.get(f'{prefix}_run_button')
     res_gal = ui_components.get(f'result_{prefix}') or ui_components.get(f'{prefix}_output_gallery')
     if run_btn and res_gal:
-        def _run_with_meta(*args, progress=gr.Progress(track_tqdm=True)):
-            # Build UI dict as before
-            ui_dict = create_ui_inputs_dict(*args)
-            # Run the pipeline – returns list of file paths
-            results = generate_image_wrapper(ui_dict, progress)
-            # If no results, return empty list and empty string
-            if not results:
-                return results, ""
-            # Load metadata from first generated PNG (parameters field)
-            try:
-                from PIL import Image
-                first_img_path = results[0]
-                with Image.open(first_img_path) as im:
-                    meta = im.info.get('parameters', '')
-            except Exception as e:
-                meta = f"(failed to read metadata: {e})"
-            return results, meta
+        outputs = [res_gal]
+        gallery_tab = ui_components.get('gallery')
+        # The global Gallery tab shows images from the output folder independently.
+        # Therefore we do NOT duplicate the result here.
+        # The Gallery component loads images via demo.load() on startup.
+        # No need to add it to the run button outputs.
 
         run_btn.click(
-            fn=_run_with_meta,
+            fn=lambda *args, progress=gr.Progress(track_tqdm=True): generate_image_wrapper(create_ui_inputs_dict(*args), progress),
             inputs=input_list_flat,
-            outputs=[res_gal, ui_components.get(f'metadata_{prefix}')]
+            outputs=outputs
         )

ui/shared/hires_fix_ui.py

@@ -85,12 +85,7 @@ def create_ui():
                 components[f'height_{prefix}'] = gr.State(value=512)
 
             with gr.Column(scale=1):
-                # Right side: gallery and metadata side by side
-                with gr.Row():
-                    components[f'result_{prefix}'] = gr.Gallery(label="Result", show_label=False, columns=1, object_fit="contain", height=610)
-                with gr.Row():
-                    components[f'metadata_{prefix}'] = gr.Textbox(label="Generation info", lines=4, interactive=False)
-
+                components[f'result_{prefix}'] = gr.Gallery(label="Result", show_label=False, columns=1, type="filepath", height=610)
 
 
         components.update(create_lora_settings_ui(prefix))

ui/shared/img2img_ui.py

@@ -66,11 +66,7 @@ def create_ui():
                     components[f'zero_gpu_{prefix}'] = gr.Number(label="ZeroGPU Duration (s)", value=None, placeholder="Default: 60s, Max: 120s", info="Optional: Set how long to reserve the GPU. Longer jobs may need more time.")
                 
             with gr.Column(scale=1):
-                # Right side: gallery and metadata side by side
-                with gr.Row():
-                    components[f'result_{prefix}'] = gr.Gallery(label="Result", show_label=False, columns=1, object_fit="contain", height=505)
-                with gr.Row():
-                    components[f'metadata_{prefix}'] = gr.Textbox(label="Generation info", lines=4, interactive=False)
+                components[f'result_{prefix}'] = gr.Gallery(label="Result", show_label=False, columns=1, type="filepath", height=505)
         
 
         components.update(create_lora_settings_ui(prefix))

ui/shared/inpaint_ui.py

@@ -95,12 +95,7 @@ def create_ui():
                 components[f'height_{prefix}'] = gr.State(value=512)
 
             with gr.Column(scale=1):
-                # Right side: gallery and metadata side by side
-                with gr.Row():
-                    components[f'result_{prefix}'] = gr.Gallery(label="Result", show_label=False, columns=1, object_fit="contain", height=510)
-                with gr.Row():
-                    components[f'metadata_{prefix}'] = gr.Textbox(label="Generation info", lines=4, interactive=False)
-
+                components[f'result_{prefix}'] = gr.Gallery(label="Result", show_label=False, columns=1, type="filepath", height=510)
         
         components[f'params_and_gallery_row_{prefix}'] = params_and_gallery_row
             

ui/shared/outpaint_ui.py

@@ -81,12 +81,7 @@ def create_ui():
                 components[f'height_{prefix}'] = gr.State(value=512)
 
             with gr.Column(scale=1):
-                # Right side: gallery and metadata side by side
-                with gr.Row():
-                    components[f'result_{prefix}'] = gr.Gallery(label="Result", show_label=False, columns=1, object_fit="contain", height=685)
-                with gr.Row():
-                    components[f'metadata_{prefix}'] = gr.Textbox(label="Generation info", lines=4, interactive=False)
-
+                components[f'result_{prefix}'] = gr.Gallery(label="Result", show_label=False, columns=1, type="filepath", height=685)
         
 
         components.update(create_lora_settings_ui(prefix))

ui/shared/txt2img_ui.py

@@ -1,13 +1,15 @@
 import gradio as gr
-from core.settings import MODEL_MAP_CHECKPOINT
+from core.settings import MODEL_MAP_CHECKPOINT, RESOLUTION_MAP
+from comfy_integration.nodes import SAMPLER_CHOICES, SCHEDULER_CHOICES
 from .ui_components import (
-    create_base_parameter_ui, create_lora_settings_ui,
+    create_lora_settings_ui,
     create_controlnet_ui, create_anima_controlnet_lllite_ui, create_diffsynth_controlnet_ui, create_ipadapter_ui, create_embedding_ui,
     create_conditioning_ui, create_vae_override_ui,
     create_model_architecture_filter_ui, create_category_filter_ui,
     create_sd3_ipadapter_ui, create_flux1_ipadapter_ui, create_style_ui,
     create_reference_latent_ui, create_hidream_o1_reference_ui,
-    create_pid_ui
+    create_pid_ui,
+    DEFAULT_SAMPLER, DEFAULT_SCHEDULER, DEFAULT_STEPS, DEFAULT_CFG,
 )
 
 def create_ui():
@@ -18,34 +20,76 @@ def create_ui():
     with gr.Column():
         components.update(create_model_architecture_filter_ui(prefix))
         
+        # Layout for model selection and run button
         with gr.Row():
             components.update(create_category_filter_ui(prefix))
             components[f'base_model_{prefix}'] = gr.Dropdown(
-                label="Base Model", 
-                choices=list(MODEL_MAP_CHECKPOINT.keys()), 
-                value=list(MODEL_MAP_CHECKPOINT.keys())[0], 
+                label="Base Model",
+                choices=list(MODEL_MAP_CHECKPOINT.keys()),
+                value=list(MODEL_MAP_CHECKPOINT.keys())[0],
                 scale=3,
-                allow_custom_value=True
+                allow_custom_value=True,
             )
-            with gr.Column(scale=1): 
+            with gr.Column(scale=1):
                 components[f'run_{prefix}'] = gr.Button("Run", variant="primary")
         
+        # Prompt fields
         components[f'prompt_{prefix}'] = gr.Text(label="Prompt", lines=3)
         components[f'neg_prompt_{prefix}'] = gr.Text(label="Negative prompt", lines=3)
         
+        # Layout: left column – parameter blocks; right column – result gallery (same height as left)
         with gr.Row():
-            # Left: parameters (keep existing column)
-            with gr.Column(scale=1):
-                param_defaults = {'w': 1024, 'h': 1024, 'cs_vis': False, 'cs_val': 1}
-                components.update(create_base_parameter_ui(prefix, param_defaults))
-            # Right: result gallery and metadata side by side
-            with gr.Column(scale=2):
+            # LEFT: all parameter blocks stacked vertically
+            with gr.Column():
+                # Aspect Ratio block
+                components[f'aspect_ratio_{prefix}'] = gr.Dropdown(
+                    label="Aspect Ratio",
+                    choices=list(RESOLUTION_MAP.get('sdxl', {}).keys()),
+                    value="1:1 (Square)",
+                    interactive=True,
+                    allow_custom_value=True,
+                )
+                # Width & Height block
                 with gr.Row():
-                    components[f'result_{prefix}'] = gr.Gallery(label="Result", show_label=False, columns=2, object_fit="contain", height=627)
+                    components[f'width_{prefix}'] = gr.Number(label="Width", value=1024, interactive=True)
+                    components[f'height_{prefix}'] = gr.Number(label="Height", value=1024, interactive=True)
+                # Sampler & Scheduler block
                 with gr.Row():
-                    # Textbox for generation info (metadata)
-                    components[f'metadata_{prefix}'] = gr.Textbox(label="Generation info", lines=4, interactive=False)
-
+                    components[f'sampler_{prefix}'] = gr.Dropdown(
+                        label="Sampler",
+                        choices=SAMPLER_CHOICES,
+                        value=DEFAULT_SAMPLER if DEFAULT_SAMPLER in SAMPLER_CHOICES else (SAMPLER_CHOICES[0] if SAMPLER_CHOICES else 'euler')
+                    )
+                    components[f'scheduler_{prefix}'] = gr.Dropdown(
+                        label="Scheduler",
+                        choices=SCHEDULER_CHOICES,
+                        value=DEFAULT_SCHEDULER if DEFAULT_SCHEDULER in SCHEDULER_CHOICES else (SCHEDULER_CHOICES[0] if SCHEDULER_CHOICES else 'simple')
+                    )
+                # Steps & CFG Scale block
+                with gr.Row():
+                    components[f'steps_{prefix}'] = gr.Slider(label="Steps", minimum=1, maximum=100, step=1, value=DEFAULT_STEPS)
+                    components[f'cfg_{prefix}'] = gr.Slider(label="CFG Scale", minimum=1.0, maximum=20.0, step=0.1, value=DEFAULT_CFG)
+                # Seed & Batch Size block
+                with gr.Row():
+                    components[f'seed_{prefix}'] = gr.Number(label="Seed (-1 for random)", value=-1, precision=0)
+                    components[f'batch_size_{prefix}'] = gr.Slider(label="Batch Size", minimum=1, maximum=16, step=1, value=1)
+                # ZeroGPU Duration block
+                components[f'zero_gpu_{prefix}'] = gr.Number(
+                    label="ZeroGPU Duration (s)",
+                    value=None,
+                    placeholder="Default: 60s, Max: 120s",
+                    info="Optional: Set how long to reserve the GPU."
+                )
+            # RIGHT: result gallery – height matches combined left column height
+            with gr.Column():
+                components[f'result_{prefix}'] = gr.Gallery(
+                    label="Result",
+                    show_label=False,
+                    columns=2,
+                    type="filepath",
+                    height=627
+                )
+        
 
         components.update(create_lora_settings_ui(prefix))
         components.update(create_controlnet_ui(prefix))