add: custom offsets

app.py

@@ -106,13 +106,13 @@ def can_expand(source_width, source_height, target_width, target_height, alignme
         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):
+def prepare_image_and_mask(image, width, height, overlap_percentage, resize_option, custom_resize_percentage, alignment, overlap_left, overlap_right, overlap_top, overlap_bottom, x_offset, y_offset):
     target_size = (width, height)
     scale_factor = min(target_size[0] / image.width, target_size[1] / image.height)
     new_width = int(image.width * scale_factor)
     new_height = int(image.height * scale_factor)
     source = image.resize((new_width, new_height), Image.LANCZOS)
+    
     if resize_option == "Full":
         resize_percentage = 100
     elif resize_option == "80%":
@@ -133,10 +133,12 @@ def prepare_image_and_mask(image, width, height, overlap_percentage, resize_opti
     new_width = max(new_width, 64)
     new_height = max(new_height, 64)
     source = source.resize((new_width, new_height), Image.LANCZOS)
+    
     overlap_x = int(new_width * (overlap_percentage / 100))
     overlap_y = int(new_height * (overlap_percentage / 100))
     overlap_x = max(overlap_x, 1)
     overlap_y = max(overlap_y, 1)
+    
     if alignment == "Middle":
         margin_x = (target_size[0] - new_width) // 2
         margin_y = (target_size[1] - new_height) // 2
@@ -152,39 +154,51 @@ def prepare_image_and_mask(image, width, height, overlap_percentage, resize_opti
     elif alignment == "Bottom":
         margin_x = (target_size[0] - new_width) // 2
         margin_y = target_size[1] - new_height
-    margin_x = max(0, min(margin_x, target_size[0] - new_width))
-    margin_y = max(0, min(margin_y, target_size[1] - new_height))
+    
+    margin_x = max(0, min(margin_x + x_offset, target_size[0] - new_width))
+    margin_y = max(0, min(margin_y + y_offset, target_size[1] - new_height))
+    
     background = Image.new('RGB', target_size, (255, 255, 255))
     background.paste(source, (margin_x, margin_y))
+    
     mask = Image.new('L', target_size, 255)
     mask_draw = ImageDraw.Draw(mask)
     white_gaps_patch = 2
+
     left_overlap = margin_x + overlap_x if overlap_left else margin_x + white_gaps_patch
     right_overlap = margin_x + new_width - overlap_x if overlap_right else margin_x + new_width - white_gaps_patch
     top_overlap = margin_y + overlap_y if overlap_top else margin_y + white_gaps_patch
     bottom_overlap = margin_y + new_height - overlap_y if overlap_bottom else margin_y + new_height - white_gaps_patch
-    if alignment == "Left":
-        left_overlap = margin_x + overlap_x if overlap_left else margin_x
-    elif alignment == "Right":
-        right_overlap = margin_x + new_width - overlap_x if overlap_right else margin_x + new_width
-    elif alignment == "Top":
-        top_overlap = margin_y + overlap_y if overlap_top else margin_y
-    elif alignment == "Bottom":
-        botttom_overlap = margin = margin = margin = margin_y + new_height - overlap_y if overlap_bottom else margin_y + new_height
+
     mask_draw.rectangle([
         (left_overlap, top_overlap),
         (right_overlap, bottom_overlap)
     ], fill=0)
+
     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)
+def preview_image_and_mask(image, width, height, overlap_percentage, resize_option, custom_resize_percentage, alignment, overlap_left, overlap_right, overlap_top, overlap_bottom, x_offset, y_offset):
+    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,
+        x_offset,
+        y_offset
+    )
     preview = background.copy().convert('RGBA')
     red_overlay = Image.new('RGBA', background.size, (255, 0, 0, 64))
     red_mask = Image.new('RGBA', background.size, (0, 0, 0, 0))
     red_mask.paste(red_overlay, (0, 0), mask)
     preview = Image.alpha_composite(preview, red_mask)
     return preview
-
+    
 @spaces.GPU(duration=12)
 def inpaint(prompt, image, inpaint_model, paste_back):
     global pipe
@@ -204,9 +218,9 @@ def inpaint(prompt, image, inpaint_model, paste_back):
         result.paste(image, (0, 0), Image.fromarray(255 - np.array(mask)))
     return result
 
-@spaces.GPU(duration=12)
-def outpaint(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)
+@spaces.GPU(duration=7)
+def outpaint(image, width, height, overlap_percentage, num_inference_steps, resize_option, custom_resize_percentage, prompt_input, alignment, overlap_left, overlap_right, overlap_top, overlap_bottom, x_offset, y_offset):
+    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, x_offset, y_offset)
     if not can_expand(background.width, background.height, width, height, alignment):
         alignment = "Middle"
     cnet_image = background.copy()
@@ -231,10 +245,10 @@ def outpaint(image, width, height, overlap_percentage, num_inference_steps, resi
     image = image.convert("RGBA")
     cnet_image.paste(image, (0, 0), mask)
     yield background, cnet_image
-
-@spaces.GPU(duration=12)
-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)
+    
+@spaces.GPU(duration=7)
+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, x_offset, y_offset):
+    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, x_offset, y_offset)
     if not can_expand(background.width, background.height, width, height, alignment):
         alignment = "Middle"
     cnet_image = background.copy()
@@ -258,7 +272,7 @@ def infer(image, width, height, overlap_percentage, num_inference_steps, resize_
     image = image.convert("RGBA")
     cnet_image.paste(image, (0, 0), mask)
     yield background, cnet_image
-
+    
 def use_output_as_input(output_image):
     return gr.update(value=output_image[1])
 
@@ -444,54 +458,69 @@ with gr.Blocks(css=css, fill_height=True) as demo:
                                 value="Middle",
                                 label="Alignment"
                             )
-                        with gr.Accordion(label="Advanced settings", open=False) as settings_panel:
-                            with gr.Column():
-                                with gr.Row():
-                                    width_slider = gr.Slider(
-                                        label="Target Width",
-                                        minimum=720,
-                                        maximum=1536,
-                                        step=8,
-                                        value=1024,
-                                    )
-                                    height_slider = gr.Slider(
-                                        label="Target Height",
-                                        minimum=720,
-                                        maximum=1536,
-                                        step=8,
-                                        value=1024,
-                                    )
-                                num_inference_steps = gr.Slider(label="Steps", minimum=4, maximum=12, step=1, value=8)
-                                with gr.Group():
-                                    overlap_percentage = gr.Slider(
-                                        label="Mask overlap (%)",
-                                        minimum=1,
-                                        maximum=80,
-                                        value=10,
-                                        step=1
-                                    )
-                                    with gr.Row():
-                                        overlap_top = gr.Checkbox(label="Overlap Top", value=True)
-                                        overlap_right = gr.Checkbox(label="Overlap Right", value=True)
-                                    with gr.Row():
-                                        overlap_left = gr.Checkbox(label="Overlap Left", value=True)
-                                        overlap_bottom = gr.Checkbox(label="Overlap Bottom", value=True)
-                                with gr.Row():
-                                    resize_option = gr.Radio(
-                                        label="Resize input image",
-                                        choices=["Full", "80%", "66%", "50%", "33%", "25%", "Custom"],
-                                        value="Full"
-                                    )
-                                    custom_resize_percentage = gr.Slider(
-                                        label="Custom resize (%)",
-                                        minimum=1,
-                                        maximum=100,
-                                        step=1,
-                                        value=50,
-                                        visible=False
-                                    )
-                                with gr.Column():
-                                    preview_button = gr.Button("Preview alignment and mask")
+                with gr.Accordion(label="Advanced settings", open=False) as settings_panel:
+                    with gr.Column():
+                        with gr.Row():
+                            width_slider = gr.Slider(
+                                label="Target Width",
+                                minimum=720,
+                                maximum=1536,
+                                step=8,
+                                value=1024,
+                            )
+                            height_slider = gr.Slider(
+                                label="Target Height",
+                                minimum=720,
+                                maximum=1536,
+                                step=8,
+                                value=1024,
+                            )
+                        num_inference_steps = gr.Slider(label="Steps", minimum=4, maximum=12, step=1, value=8)
+                        with gr.Group():
+                            overlap_percentage = gr.Slider(
+                                label="Mask overlap (%)",
+                                minimum=1,
+                                maximum=80,
+                                value=10,
+                                step=1
+                            )
+                            with gr.Row():
+                                overlap_top = gr.Checkbox(label="Overlap Top", value=True)
+                                overlap_right = gr.Checkbox(label="Overlap Right", value=True)
+                            with gr.Row():
+                                overlap_left = gr.Checkbox(label="Overlap Left", value=True)
+                                overlap_bottom = gr.Checkbox(label="Overlap Bottom", value=True)
+                        with gr.Row():
+                            x_offset_slider = gr.Slider(
+                                label="X Offset",
+                                minimum=-100,
+                                maximum=100,
+                                value=0,
+                                step=1
+                            )
+                            y_offset_slider = gr.Slider(
+                                label="Y Offset",
+                                minimum=-100,
+                                maximum=100,
+                                value=0,
+                                step=1
+                            )
+                        with gr.Row():
+                            resize_option = gr.Radio(
+                                label="Resize input image",
+                                choices=["Full", "80%", "66%", "50%", "33%", "25%", "Custom"],
+                                value="Full"
+                            )
+                            custom_resize_percentage = gr.Slider(
+                                label="Custom resize (%)",
+                                minimum=1,
+                                maximum=100,
+                                step=1,
+                                value=50,
+                                visible=False
+                            )
+                        with gr.Column():
+                            preview_button = gr.Button("Preview alignment and mask")
                         # gr.Examples(
                         #     examples=[
                         #         ["./examples/example_1.webp", 1280, 720, "Middle"],
@@ -588,7 +617,7 @@ with gr.Blocks(css=css, fill_height=True) as demo:
         fn=infer,
         inputs=[input_image_outpaint, 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],
+                overlap_left, overlap_right, overlap_top, overlap_bottom, x_offset_slider, y_offset_slider],
         outputs=[result_outpaint],
     ).then(
         fn=lambda x, history: update_history(x[1], history),
@@ -599,10 +628,12 @@ with gr.Blocks(css=css, fill_height=True) as demo:
         inputs=None,
         outputs=[use_as_input_button_outpaint],
     )
+
+
     preview_button.click(
         fn=preview_image_and_mask,
         inputs=[input_image_outpaint, width_slider, height_slider, overlap_percentage, resize_option, custom_resize_percentage, alignment_dropdown,
-                overlap_left, overlap_right, overlap_top, overlap_bottom],
+                overlap_left, overlap_right, overlap_top, overlap_bottom, x_offset_slider, y_offset_slider],
         outputs=[preview_image],
         queue=False
     )