Upload 2 files

app.py

@@ -628,7 +628,7 @@ with gr.Blocks() as demo:
                                            "#FF0000", "#00FF00", "#0000FF"],
                                    color_mode="fixed"),
                     eraser=gr.Eraser(default_size=20),
-                    layers=True,
+                    layers=False,
                     sources=["upload", "clipboard"],
                     height=420,
                 )
@@ -810,7 +810,21 @@ with gr.Blocks() as demo:
 
     output_gallery.select(fn=on_gallery_select, inputs=[output_gallery],
                           outputs=[selected_output_state])
+    # Reset any stale gallery selection before a new run starts, so Send→Base
+    # / Send→Ref after this run can't accidentally reuse a path from the
+    # previous run's gallery contents.
+    run_button.click(fn=lambda: None, outputs=[selected_output_state])
 
+    run_event = run_button.click(
+        fn=infer,
+        inputs=[base_image, reference_images, prompt, lora_prompt_display, custom_prompt_display,
+                lora_selector, seed, randomize_seed, guidance_scale, steps, upscale_factor,
+                canvas_mode, custom_width, custom_height, canvas_fit_mode, pad_color,
+                batch_count, batch_vary, sweep_min, sweep_max,
+                dynamic_loras_state] + weight_sliders,
+        outputs=[output_gallery, used_seed],
+    )
+    
     run_event = run_button.click(
         fn=infer,
         inputs=[base_image, reference_images, prompt, lora_prompt_display, custom_prompt_display,
@@ -867,10 +881,18 @@ with gr.Blocks() as demo:
     for _c in (ext_up, ext_down, ext_left, ext_right, ext_fill):
         _c.change(fn=_update_extend_preview,
                   inputs=_extend_preview_inputs, outputs=_extend_preview_outputs)
-    # Also refresh whenever the editor content itself changes (upload, HEIC load,
-    # a fresh crop) — that way the schematic scale updates too.
-    editor.change(fn=_update_extend_preview,
+    # Refresh the schematic when a NEW image lands in the editor — not on every
+    # `change` event. `editor.change` fires very frequently on iOS Safari/Chrome
+    # (once per stroke/layer/crop-preview) and the round-trips OOM'd the tab
+    # even for small uploads. `.upload` fires only when a new image comes in
+    # via the upload/clipboard sources, which is the case the preview actually
+    # cares about (image dimensions changed → schematic scale needs redrawing).
+    editor.upload(fn=_update_extend_preview,
                   inputs=_extend_preview_inputs, outputs=_extend_preview_outputs)
+    # HEIC uploads bypass the editor's own upload event because they come from
+    # the separate File component, so wire that path in explicitly too.
+    heic_uploader.upload(fn=_update_extend_preview,
+                         inputs=_extend_preview_inputs, outputs=_extend_preview_outputs)
 
     # Run: extend, then hand the new PIL back to the editor. `render_extend_
     # schematic` re-runs via editor.change once the new image lands, so no

image_utils.py

@@ -221,16 +221,26 @@ def load_heic_to_editor(path):
 def _resolve_gallery_path(selected_path, gallery_value):
     """Pick the path the Send-to-* buttons should use.
 
-    Prefers the user's currently-selected gallery item; falls back to the most
-    recent (last) item so single-image runs and "didn't click anything" cases
-    both behave intuitively.
+    Bug we're guarding against: `selected_path` comes from a gr.State that
+    persists across generation runs, so after a new batch has replaced the
+    gallery it can still hold a stale path from a previous run — or even a
+    path from the *first* image of the current batch, because some Gradio
+    builds auto-fire .select(index=0) right after the gallery repopulates.
+
+    Rule: only honour the selection if it's actually still one of the paths
+    currently in the gallery. Otherwise use the *last* (most recent) item.
     """
-    if selected_path:
-        return selected_path
     if not gallery_value:
         return None
-    item = gallery_value[-1]
-    return item[0] if isinstance(item, (list, tuple)) else item
+
+    current_paths = []
+    for item in gallery_value:
+        p = item[0] if isinstance(item, (list, tuple)) else item
+        current_paths.append(p)
+
+    if selected_path and selected_path in current_paths:
+        return selected_path
+    return current_paths[-1]
 
 
 def send_output_to_base(selected_path, gallery_value):