Update app.py

app.py

@@ -44,7 +44,6 @@ pipe = StableDiffusionXLFillPipeline.from_pretrained(
 pipe.scheduler = TCDScheduler.from_config(pipe.scheduler.config)
 
 def can_expand(source_width, source_height, target_width, target_height, alignment):
-    """Checks if the image can be expanded based on the alignment."""
     if alignment in ("Left", "Right") and source_width >= target_width:
         return False
     if alignment in ("Top", "Bottom") and source_height >= target_height:
@@ -52,36 +51,30 @@ def can_expand(source_width, source_height, target_width, target_height, alignme
     return True
 
 @spaces.GPU
-def infer(image, width, height, overlap_width, num_inference_steps, resize_size, prompt_input=None, alignment="Middle"):
+def infer(image, width, height, overlap_width, num_inference_steps, resize_option, custom_resize_size, prompt_input=None, alignment="Middle"):
     source = image
     target_size = (width, height)
     overlap = overlap_width
 
-    # New resizing logic based on resize_size
-    if resize_size != -1:
-        # Calculate new height to maintain aspect ratio
-        aspect_ratio = source.height / source.width
-        new_height = int(resize_size * aspect_ratio)
-        source = source.resize((resize_size, new_height), Image.LANCZOS)
-
-    # Existing resizing logic (now only applied if resize_size is -1)
-    if resize_size == -1:
-        if source.width < target_size[0] and source.height < target_size[1]:
-            scale_factor = min(target_size[0] / source.width, target_size[1] / source.height)
-            new_width = int(source.width * scale_factor)
-            new_height = int(source.height * scale_factor)
-            source = source.resize((new_width, new_height), Image.LANCZOS)
-
-        if source.width > target_size[0] or source.height > target_size[1]:
-            scale_factor = min(target_size[0] / source.width, target_size[1] / source.height)
-            new_width = int(source.width * scale_factor)
-            new_height = int(source.height * scale_factor)
-            source = source.resize((new_width, new_height), Image.LANCZOS)
+    if resize_option == "Full":
+        resize_size = max(source.width, source.height)
+    elif resize_option == "1/2":
+        resize_size = max(source.width, source.height) // 2
+    elif resize_option == "1/3":
+        resize_size = max(source.width, source.height) // 3
+    elif resize_option == "1/4":
+        resize_size = max(source.width, source.height) // 4
+    else:  # Custom
+        resize_size = custom_resize_size
+
+    aspect_ratio = source.height / source.width
+    new_width = resize_size
+    new_height = int(resize_size * aspect_ratio)
+    source = source.resize((new_width, new_height), Image.LANCZOS)
 
     if not can_expand(source.width, source.height, target_size[0], target_size[1], alignment):
         alignment = "Middle"
 
-    # Calculate margins based on alignment
     if alignment == "Middle":
         margin_x = (target_size[0] - source.width) // 2
         margin_y = (target_size[1] - source.height) // 2
@@ -104,7 +97,6 @@ def infer(image, width, height, overlap_width, num_inference_steps, resize_size,
     mask = Image.new('L', target_size, 255)
     mask_draw = ImageDraw.Draw(mask)
 
-    # Adjust mask generation based on alignment
     if alignment == "Middle":
         mask_draw.rectangle([
             (margin_x + overlap, margin_y + overlap),
@@ -159,11 +151,9 @@ def infer(image, width, height, overlap_width, num_inference_steps, resize_size,
     yield background, cnet_image
 
 def clear_result():
-    """Clears the result ImageSlider."""
     return gr.update(value=None)
 
 def preload_presets(target_ratio, ui_width, ui_height):
-    """Updates the width and height sliders based on the selected aspect ratio."""
     if target_ratio == "9:16":
         changed_width = 720
         changed_height = 1280
@@ -183,6 +173,9 @@ def select_the_right_preset(user_width, user_height):
     else:
         return "Custom"
 
+def toggle_custom_resize_slider(resize_option):
+    return gr.update(visible=(resize_option == "Custom"))
+
 css = """
 .gradio-container {
     width: 1200px !important;
@@ -257,11 +250,20 @@ with gr.Blocks(css=css) as demo:
                                 value=42,
                                 step=1
                             )
-                        resize_size = gr.Number(
-                            label="Resize Size (-1 for default behavior)",
-                            value=-1,
-                            precision=0
-                        )
+                        with gr.Row():
+                            resize_option = gr.Radio(
+                                label="Resize input image",
+                                choices=["Full", "1/2", "1/3", "1/4", "Custom"],
+                                value="Full"
+                            )
+                            custom_resize_size = gr.Slider(
+                                label="Custom resize size",
+                                minimum=64,
+                                maximum=1024,
+                                step=8,
+                                value=512,
+                                visible=False
+                            )
                             
                 gr.Examples(
                     examples=[
@@ -281,7 +283,6 @@ with gr.Blocks(css=css) as demo:
                 use_as_input_button = gr.Button("Use as Input Image", visible=False)
 
     def use_output_as_input(output_image):
-        """Sets the generated output as the new input image."""
         return gr.update(value=output_image[1])
 
     use_as_input_button.click(
@@ -310,6 +311,13 @@ with gr.Blocks(css=css) as demo:
         outputs=[target_ratio],
         queue=False
     )
+
+    resize_option.change(
+        fn=toggle_custom_resize_slider,
+        inputs=[resize_option],
+        outputs=[custom_resize_size],
+        queue=False
+    )
     
     run_button.click(
         fn=clear_result,
@@ -318,7 +326,7 @@ with gr.Blocks(css=css) as demo:
     ).then(
         fn=infer,
         inputs=[input_image, width_slider, height_slider, overlap_width, num_inference_steps,
-                resize_size, prompt_input, alignment_dropdown],
+                resize_option, custom_resize_size, prompt_input, alignment_dropdown],
         outputs=result,
     ).then(
         fn=lambda: gr.update(visible=True),
@@ -333,7 +341,7 @@ with gr.Blocks(css=css) as demo:
     ).then(
         fn=infer,
         inputs=[input_image, width_slider, height_slider, overlap_width, num_inference_steps,
-                resize_size, prompt_input, alignment_dropdown],
+                resize_option, custom_resize_size, prompt_input, alignment_dropdown],
         outputs=result,
     ).then(
         fn=lambda: gr.update(visible=True),