Update app.py

app.py

@@ -10,13 +10,12 @@ from controlnet_union import ControlNetModel_Union
 from pipeline_fill_sd_xl import StableDiffusionXLFillPipeline
 
 from PIL import Image, ImageDraw
-import numpy as np
 
+# ===== Load models (same as your original) =====
 config_file = hf_hub_download(
     "xinsir/controlnet-union-sdxl-1.0",
     filename="config_promax.json",
 )
-
 config = ControlNetModel_Union.load_config(config_file)
 controlnet_model = ControlNetModel_Union.from_config(config)
 
@@ -25,15 +24,12 @@ model_file = hf_hub_download(
     filename="diffusion_pytorch_model_promax.safetensors",
 )
 state_dict = load_state_dict(model_file)
-
 loaded_keys = list(state_dict.keys())
 
 result = ControlNetModel_Union._load_pretrained_model(
     controlnet_model, state_dict, model_file, "xinsir/controlnet-union-sdxl-1.0", loaded_keys
 )
-
-model = result[0]
-model = model.to(device="cuda", dtype=torch.float16)
+model = result[0].to(device="cuda", dtype=torch.float16)
 
 vae = AutoencoderKL.from_pretrained(
     "madebyollin/sdxl-vae-fp16-fix", torch_dtype=torch.float16
@@ -49,7 +45,7 @@ pipe = StableDiffusionXLFillPipeline.from_pretrained(
 
 pipe.scheduler = TCDScheduler.from_config(pipe.scheduler.config)
 
-
+# ===== Helpers (same as your original) =====
 def can_expand(source_width, source_height, target_width, target_height, alignment):
     if alignment in ("Left", "Right") and source_width >= target_width:
         return False
@@ -59,7 +55,6 @@ def can_expand(source_width, source_height, target_width, target_height, alignme
 
 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)
-
     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)
@@ -77,16 +72,12 @@ def prepare_image_and_mask(image, width, height, overlap_percentage, resize_opti
         resize_percentage = custom_resize_percentage
 
     resize_factor = resize_percentage / 100
-    new_width = int(source.width * resize_factor)
-    new_height = int(source.height * resize_factor)
-    new_width = max(new_width, 64)
-    new_height = max(new_height, 64)
+    new_width = max(int(source.width * resize_factor), 64)
+    new_height = max(int(source.height * resize_factor), 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)
+    overlap_x = max(int(new_width * (overlap_percentage / 100)), 1)
+    overlap_y = max(int(new_height * (overlap_percentage / 100)), 1)
 
     if alignment == "Middle":
         margin_x = (target_size[0] - new_width) // 2
@@ -133,8 +124,7 @@ def preview_image_and_mask(image, width, height, overlap_percentage, resize_opti
     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
+    return Image.alpha_composite(preview, red_mask)
 
 @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):
@@ -167,7 +157,6 @@ 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 clear_result():
@@ -241,30 +230,12 @@ with gr.Blocks(theme="soft", css=css) as demo:
                 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=720,
-                            )
-                            height_slider = gr.Slider(
-                                label="Target Height",
-                                minimum=720,
-                                maximum=1536,
-                                step=8,
-                                value=1280,
-                            )
+                            width_slider = gr.Slider(label="Target Width", minimum=720, maximum=1536, step=8, value=720)
+                            height_slider = gr.Slider(label="Target Height", minimum=720, maximum=1536, step=8, value=1280)
 
                         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=50,
-                                value=10,
-                                step=1
-                            )
+                            overlap_percentage = gr.Slider(label="Mask overlap (%)", minimum=1, maximum=50, 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)
@@ -272,20 +243,8 @@ with gr.Blocks(theme="soft", css=css) as demo:
                                 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", "50%", "33%", "25%", "Custom"],
-                                value="Full"
-                            )
-                            custom_resize_percentage = gr.Slider(
-                                label="Custom resize (%)",
-                                minimum=1,
-                                maximum=100,
-                                step=1,
-                                value=50,
-                                visible=False
-                            )
-
+                            resize_option = gr.Radio(label="Resize input image", choices=["Full", "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")
 
@@ -299,90 +258,100 @@ with gr.Blocks(theme="soft", css=css) as demo:
                 )
 
             with gr.Column():
-                result = ImageSlider(
-                    interactive=False,
-                    label="Generated Image",
-                )
+                result = ImageSlider(interactive=False, label="Generated Image")
                 use_as_input_button = gr.Button("Use as Input Image", visible=False)
-
                 history_gallery = gr.Gallery(label="History", columns=6, object_fit="contain", interactive=False)
                 preview_image = gr.Image(label="Preview")
 
+    # === Named API endpoints (critical for REST) ===
     def use_output_as_input(output_image):
         return gr.update(value=output_image[1])
 
     use_as_input_button.click(
         fn=use_output_as_input,
         inputs=[result],
-        outputs=[input_image]
+        outputs=[input_image],
+        api_name="use_output_as_input"
     )
 
     target_ratio.change(
         fn=preload_presets,
         inputs=[target_ratio, width_slider, height_slider],
         outputs=[width_slider, height_slider, settings_panel],
-        queue=False
+        queue=False,
+        api_name="preload_presets"
     )
 
     width_slider.change(
         fn=select_the_right_preset,
         inputs=[width_slider, height_slider],
         outputs=[target_ratio],
-        queue=False
+        queue=False,
+        api_name="select_the_right_preset"
     )
 
     height_slider.change(
         fn=select_the_right_preset,
         inputs=[width_slider, height_slider],
         outputs=[target_ratio],
-        queue=False
+        queue=False,
+        api_name="select_the_right_preset_1"
     )
 
     resize_option.change(
         fn=toggle_custom_resize_slider,
         inputs=[resize_option],
         outputs=[custom_resize_percentage],
-        queue=False
+        queue=False,
+        api_name="toggle_custom_resize_slider"
     )
 
     run_button.click(
         fn=clear_result,
         inputs=None,
         outputs=result,
+        api_name="clear_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,
+        api_name="infer"
     ).then(
         fn=lambda x, history: update_history(x[1], history) if x else history,
         inputs=[result, history_gallery],
         outputs=history_gallery,
+        api_name="lambda"
     ).then(
         fn=lambda: gr.update(visible=True),
         inputs=None,
         outputs=use_as_input_button,
+        api_name="lambda_1"
     )
 
     prompt_input.submit(
         fn=clear_result,
         inputs=None,
         outputs=result,
+        api_name="clear_result_1"
     ).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,
+        api_name="infer_1"
     ).then(
         fn=lambda x, history: update_history(x[1], history) if x else history,
         inputs=[result, history_gallery],
         outputs=history_gallery,
+        api_name="lambda_2"
     ).then(
         fn=lambda: gr.update(visible=True),
         inputs=None,
         outputs=use_as_input_button,
+        api_name="lambda_3"
     )
 
     preview_button.click(
@@ -390,7 +359,9 @@ with gr.Blocks(theme="soft", css=css) as demo:
         inputs=[input_image, width_slider, height_slider, overlap_percentage, resize_option, custom_resize_percentage, alignment_dropdown,
                 overlap_left, overlap_right, overlap_top, overlap_bottom],
         outputs=preview_image,
-        queue=False
+        queue=False,
+        api_name="preview_image_and_mask"
     )
 
-demo.queue(max_size=12).launch(share=False)
+# IMPORTANT: open REST API
+demo.queue(max_size=12, api_open=True).launch(share=False)