Update app.py

app.py

@@ -13,8 +13,8 @@ from diffusers import AutoPipelineForInpainting, LCMScheduler, AutoencoderTiny
 
 
 MODEL_CHOICES = {
-    "Official SD1.5 Inpainting": "stable-diffusion-v1-5/stable-diffusion-inpainting",
     "DreamShaper 8 Inpainting": "Lykon/dreamshaper-8-inpainting",
+    "Official SD1.5 Inpainting": "stable-diffusion-v1-5/stable-diffusion-inpainting",
 }
 
 DEFAULT_MODEL_LABEL = "DreamShaper 8 Inpainting"
@@ -328,9 +328,9 @@ def run_inpaint(
     editor_value,
     model_label: str,
     prompt: str,
-    work_mode: str,
     crop_padding: int,
-    min_crop_side: int,
+    work_mode: str,
+    min_working_window: int,
     steps: int,
     guidance_scale: float,
     strength: float,
@@ -361,7 +361,7 @@ def run_inpaint(
             original_image,
             generation_mask_source,
             crop_padding=int(crop_padding),
-            min_crop_side=int(min_crop_side),
+            min_crop_side=int(min_working_window),
         )
 
         gen_image = crop_info["padded_image"]
@@ -410,7 +410,7 @@ def run_inpaint(
 
         if paste_whole_crop:
             final_result.paste(generated, (left, top))
-            paste_mode = "whole crop"
+            paste_mode = "whole generated crop"
         else:
             final_mask = original_mask.crop(crop_bbox)
 
@@ -424,8 +424,8 @@ def run_inpaint(
 
         crop_report = (
             f"- raw mask bbox: `{crop_info['raw_bbox']}`\n"
-            f"- crop bbox: `{crop_bbox}`\n"
-            f"- crop size: `{crop_size[0]}x{crop_size[1]}`\n"
+            f"- working crop bbox: `{crop_bbox}`\n"
+            f"- working crop size: `{crop_size[0]}x{crop_size[1]}`\n"
             f"- generation size: `{padded_size[0]}x{padded_size[1]}`\n"
             f"- paste mode: `{paste_mode}`"
         )
@@ -433,7 +433,7 @@ def run_inpaint(
     else:
         if paste_whole_crop:
             final_result = generated
-            paste_mode = "whole image"
+            paste_mode = "whole generated image"
         else:
             final_mask = original_mask
 
@@ -446,7 +446,7 @@ def run_inpaint(
             paste_mode = "masked area only"
 
         crop_report = (
-            "- crop: `none`\n"
+            "- working crop: `none`\n"
             f"- original size: `{original_image.size[0]}x{original_image.size[1]}`\n"
             f"- generation size: `{padded_size[0]}x{padded_size[1]}`\n"
             f"- paste mode: `{paste_mode}`"
@@ -463,6 +463,8 @@ def run_inpaint(
         "- vae: `TAESD`\n"
         f"- work mode: `{work_mode}`\n"
         "- resize: `none`\n"
+        f"- context around mask: `{crop_padding}` px\n"
+        f"- minimum working window: `{min_working_window}` px\n"
         f"- padding to multiple of 8: `{padding_used}`\n"
         f"{crop_report}\n"
         f"- steps: `{steps}`\n"
@@ -472,26 +474,25 @@ def run_inpaint(
         f"- seed: `{seed}`\n"
         f"- time: `{elapsed:.1f}s`\n\n"
         "This version does not downscale or upscale. "
-        "In crop mode it only sends the mask bbox plus surrounding context to the model, "
-        "then pastes the result back."
+        "In crop mode it sends the mask bbox plus surrounding context to the model, "
+        "then pastes the result back into the original image."
     )
 
     return final_result, info
 
 
-with gr.Blocks(title="SD15 Light Inpaint CPU - Crop Test") as demo:
+with gr.Blocks(title="SD15 Light Inpaint CPU") as demo:
     gr.Markdown(
-        "# SD15 Light Inpaint CPU — Crop Around Mask Test\n\n"
-        "This version does not resize the whole image.\n\n"
-        "Recommended mode:\n"
-        "mask bbox + context crop -> inpaint crop -> paste back into original image\n\n"
-        "This keeps the model working at the local visual scale instead of seeing the whole image as a tiny thumbnail."
+        "# SD15 Light Inpaint CPU\n\n"
+        "Upload an image, draw over the area you want to repaint, and describe what should appear there.\n\n"
+        "Default mode uses a local crop around the mask instead of resizing the whole image. "
+        "This keeps the model working at the original local visual scale while still reducing the amount of image sent to the model."
     )
 
     with gr.Row():
         with gr.Column():
             editor = gr.ImageEditor(
-                label="Image + mask. Upload image, then draw over the area to repaint.",
+                label="Image + mask",
                 type="pil",
             )
 
@@ -507,7 +508,15 @@ with gr.Blocks(title="SD15 Light Inpaint CPU - Crop Test") as demo:
                 lines=3,
             )
 
-            with gr.Accordion("Crop / diagnostic mode", open=True):
+            crop_padding = gr.Slider(
+                label="Context around mask",
+                minimum=32,
+                maximum=384,
+                step=32,
+                value=128,
+            )
+
+            with gr.Accordion("Advanced", open=False):
                 work_mode = gr.Radio(
                     label="Work mode",
                     choices=[
@@ -517,16 +526,8 @@ with gr.Blocks(title="SD15 Light Inpaint CPU - Crop Test") as demo:
                     value="Crop around mask",
                 )
 
-                crop_padding = gr.Slider(
-                    label="Crop padding / context around mask",
-                    minimum=32,
-                    maximum=384,
-                    step=32,
-                    value=128,
-                )
-
-                min_crop_side = gr.Slider(
-                    label="Minimum crop side",
+                min_working_window = gr.Slider(
+                    label="Minimum working window size",
                     minimum=128,
                     maximum=768,
                     step=64,
@@ -534,11 +535,10 @@ with gr.Blocks(title="SD15 Light Inpaint CPU - Crop Test") as demo:
                 )
 
                 paste_whole_crop = gr.Checkbox(
-                    label="Paste whole generated crop back (diagnostic)",
+                    label="Paste whole generated crop back, diagnostic",
                     value=False,
                 )
 
-            with gr.Accordion("Generation settings", open=True):
                 steps = gr.Slider(
                     label="Steps",
                     minimum=2,
@@ -548,7 +548,7 @@ with gr.Blocks(title="SD15 Light Inpaint CPU - Crop Test") as demo:
                 )
 
                 guidance_scale = gr.Slider(
-                    label="Guidance scale / CFG. LCM usually works best around 1.0–2.0",
+                    label="Guidance scale / CFG. LCM usually works best around 1.0-2.0",
                     minimum=1.0,
                     maximum=8.0,
                     step=0.1,
@@ -594,9 +594,9 @@ with gr.Blocks(title="SD15 Light Inpaint CPU - Crop Test") as demo:
             editor,
             model_label,
             prompt,
-            work_mode,
             crop_padding,
-            min_crop_side,
+            work_mode,
+            min_working_window,
             steps,
             guidance_scale,
             strength,