Update app.py

app.py

@@ -43,14 +43,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:
-        return False
-    return True
-
 def prepare_image_and_mask(image, width, height, overlap_percentage, resize_option, custom_resize_percentage, alignment, overlap_left, overlap_right, overlap_top, overlap_bottom):
     target_size = (width, height)
 
@@ -148,31 +140,10 @@ def prepare_image_and_mask(image, width, height, overlap_percentage, resize_opti
 
     return background, mask
 
-def preview_image_and_mask(image, width, height, overlap_percentage, resize_option, custom_resize_percentage, alignment, overlap_left, overlap_right, overlap_top, overlap_bottom):
-    background, mask = prepare_image_and_mask(image, width, height, overlap_percentage, resize_option, custom_resize_percentage, alignment, overlap_left, overlap_right, overlap_top, overlap_bottom)
-    
-    # Create a preview image showing the mask
-    preview = background.copy().convert('RGBA')
-    
-    # Create a semi-transparent red overlay
-    red_overlay = Image.new('RGBA', background.size, (255, 0, 0, 64))  # Reduced alpha to 64 (25% opacity)
-    
-    # Convert black pixels in the mask to semi-transparent red
-    red_mask = Image.new('RGBA', background.size, (0, 0, 0, 0))
-    red_mask.paste(red_overlay, (0, 0), mask)
-    
-    # Overlay the red mask on the background
-    preview = Image.alpha_composite(preview, red_mask)
-    
-    return preview
-
 @spaces.GPU(duration=24)
 def infer(image, width, height, overlap_percentage, num_inference_steps, resize_option, custom_resize_percentage, prompt_input, alignment, overlap_left, overlap_right, overlap_top, overlap_bottom):
     background, mask = prepare_image_and_mask(image, width, height, overlap_percentage, resize_option, custom_resize_percentage, alignment, overlap_left, overlap_right, overlap_top, overlap_bottom)
     
-    if not can_expand(background.width, background.height, width, height, alignment):
-        alignment = "Middle"
-
     cnet_image = background.copy()
     cnet_image.paste(0, (0, 0), mask)
 
@@ -332,9 +303,6 @@ with gr.Blocks(css=css) as demo:
                                 value=50,
                                 visible=False
                             )
-                        
-                        with gr.Column():
-                            preview_button = gr.Button("Preview alignment and mask")
                             
                 gr.Examples(
                     examples=[
@@ -348,7 +316,66 @@ with gr.Blocks(css=css) as demo:
 
             with gr.Column():
                 result = gr.Image(label="Generated Image", type="pil")
-                
                 history_gallery = gr.Gallery(label="History", columns=6, object_fit="contain", interactive=False)
 
+    target_ratio.change(
+        fn=preload_presets,
+        inputs=[target_ratio, width_slider, height_slider],
+        outputs=[width_slider, height_slider, settings_panel],
+        queue=False
+    )
+
+    width_slider.change(
+        fn=select_the_right_preset,
+        inputs=[width_slider, height_slider],
+        outputs=[target_ratio],
+        queue=False
+    )
+
+    height_slider.change(
+        fn=select_the_right_preset,
+        inputs=[width_slider, height_slider],
+        outputs=[target_ratio],
+        queue=False
+    )
+
+    resize_option.change(
+        fn=toggle_custom_resize_slider,
+        inputs=[resize_option],
+        outputs=[custom_resize_percentage],
+        queue=False
+    )
+    
+    run_button.click(
+        fn=clear_result,
+        inputs=None,
+        outputs=result,
+    ).then(
+        fn=infer,
+        inputs=[input_image, width_slider, height_slider, overlap_percentage, num_inference_steps,
+                resize_option, custom_resize_percentage, prompt_input, alignment_dropdown,
+                overlap_left, overlap_right, overlap_top, overlap_bottom],
+        outputs=result,
+    ).then(
+        fn=lambda x, history: update_history(x, history),
+        inputs=[result, history_gallery],
+        outputs=history_gallery,
+    )
+
+    prompt_input.submit(
+        fn=clear_result,
+        inputs=None,
+        outputs=result,
+    ).then(
+        fn=infer,
+        inputs=[input_image, width_slider, height_slider, overlap_percentage, num_inference_steps,
+                resize_option, custom_resize_percentage, prompt_input, alignment_dropdown,
+                overlap_left, overlap_right, overlap_top, overlap_bottom],
+        outputs=result,
+    ).then(
+        fn=lambda x, history: update_history(x, history),
+        inputs=[result, history_gallery],
+        outputs=history_gallery,
+    )
+
 demo.queue(max_size=20).launch(share=False, ssr_mode=False, show_error=True)