update app

app.py

@@ -105,20 +105,20 @@ pipe.fuse_lora(adapter_names=["lightning"], lora_scale=1.0)
 
 print("Loading Task Adapters...")
 
-pipe.load_lora_weights("tarn59/apply_texture_qwen_image_edit_2509",
-                       weight_name="apply_texture_v2_qwen_image_edit_2509.safetensors",
+pipe.load_lora_weights("tarn59/apply_texture_qwen_image_edit_2509", 
+                       weight_name="apply_texture_v2_qwen_image_edit_2509.safetensors", 
                        adapter_name="texture")
 
-pipe.load_lora_weights("ostris/qwen_image_edit_inpainting",
-                       weight_name="qwen_image_edit_inpainting.safetensors",
+pipe.load_lora_weights("ostris/qwen_image_edit_inpainting", 
+                       weight_name="qwen_image_edit_inpainting.safetensors", 
                        adapter_name="fusion")
 
-pipe.load_lora_weights("ostris/qwen_image_edit_2509_shirt_design",
-                       weight_name="qwen_image_edit_2509_shirt_design.safetensors",
+pipe.load_lora_weights("ostris/qwen_image_edit_2509_shirt_design", 
+                       weight_name="qwen_image_edit_2509_shirt_design.safetensors", 
                        adapter_name="shirt_design")
 
-pipe.load_lora_weights("dx8152/Qwen-Image-Edit-2509-Fusion",
-                       weight_name="溶图.safetensors",
+pipe.load_lora_weights("dx8152/Qwen-Image-Edit-2509-Fusion", 
+                       weight_name="溶图.safetensors", 
                        adapter_name="fusion-x")
 
 try:
@@ -144,6 +144,7 @@ def update_dimensions_on_upload(image):
         aspect_ratio = original_width / original_height
         new_width = int(new_height * aspect_ratio)
         
+    # Ensure dimensions are multiples of 16
     new_width = (new_width // 16) * 16
     new_height = (new_height // 16) * 16
     
@@ -161,14 +162,9 @@ def infer(
     steps,
     progress=gr.Progress(track_tqdm=True)
 ):
-    if image_1 is None:
-        raise gr.Error("Please upload a base image.")
-
-    is_two_image_task = lora_adapter in ["Texture Edit", "Fuse-Objects", "Cloth-Design-Fuse", "Super-Fusion"]
-
-    if is_two_image_task and image_2 is None:
-        raise gr.Error("Please upload both images for this editing style.")
-
+    if image_1 is None or image_2 is None:
+        raise gr.Error("Please upload both images for Fusion/Texture/FaceSwap tasks.")
+    
     if not prompt:
         if lora_adapter == "Cloth-Design-Fuse":
             prompt = "Put this design on their shirt."
@@ -178,9 +174,7 @@ def infer(
             prompt = "Fuse object into background."
         elif lora_adapter == "Super-Fusion":
             prompt = "Blend the product into the background, correct its perspective and lighting, and make it naturally integrated with the scene."
-        elif lora_adapter == "General Edit":
-            raise gr.Error("Please provide a prompt for General Edit.")
-
+            
     adapters_map = {
         "Texture Edit": "texture",
         "Fuse-Objects": "fusion",
@@ -202,16 +196,12 @@ def infer(
     negative_prompt = "worst quality, low quality, bad anatomy, bad hands, text, error, missing fingers, extra digit, fewer digits, cropped, jpeg artifacts, signature, watermark, username, blurry"
 
     img1_pil = image_1.convert("RGB")
-    images_to_process = [img1_pil]
-
-    if is_two_image_task:
-        img2_pil = image_2.convert("RGB")
-        images_to_process.append(img2_pil)
+    img2_pil = image_2.convert("RGB")
     
     width, height = update_dimensions_on_upload(img1_pil)
 
     result = pipe(
-        image=images_to_process,
+        image=[img1_pil, img2_pil],
         prompt=prompt,
         negative_prompt=negative_prompt,
         height=height,
@@ -225,18 +215,13 @@ def infer(
 
 @spaces.GPU(duration=30)
 def infer_example(image_1, image_2, prompt, lora_adapter):
-    if image_1 is None:
+    if image_1 is None or image_2 is None:
         return None, 0
-    
-    # For single-image examples, image_2 might be None
-    img1_converted = image_1.convert("RGB")
-    img2_converted = image_2.convert("RGB") if image_2 else None
-
     result, seed = infer(
-        img1_converted,
-        img2_converted,
-        prompt,
-        lora_adapter,
+        image_1.convert("RGB"), 
+        image_2.convert("RGB"), 
+        prompt, 
+        lora_adapter, 
         0,
         True,
         1.0,
@@ -261,17 +246,17 @@ with gr.Blocks(css=css, theme=orange_red_theme) as demo:
             with gr.Column(scale=1):
                 with gr.Row():
                     image_1 = gr.Image(label="Base Image", type="pil", height=290)
-                    image_2 = gr.Image(label="Reference Image (for 2-image edits)", type="pil", height=290)
+                    image_2 = gr.Image(label="Reference Image", type="pil", height=290)
 
                 prompt = gr.Text(
                     label="Edit Prompt",
                     show_label=True,
-                    placeholder="e.g., A cat wearing sunglasses...",
+                    placeholder="e.g., Apply wood texture to the mug...",
                 )
                 
                 run_button = gr.Button("Edit Image", variant="primary")
 
-                with gr.Accordion("Advanced Settings", open=False):
+                with gr.Accordion("Advanced Settings", open=False, visible=False):
                     seed = gr.Slider(label="Seed", minimum=0, maximum=MAX_SEED, step=1, value=0)
                     randomize_seed = gr.Checkbox(label="Randomize Seed", value=True)
                     guidance_scale = gr.Slider(label="True Guidance Scale", minimum=1.0, maximum=10.0, step=0.1, value=1.0)
@@ -283,8 +268,8 @@ with gr.Blocks(css=css, theme=orange_red_theme) as demo:
                 with gr.Row():
                     lora_adapter = gr.Dropdown(
                         label="Choose Editing Style",
-                        choices=["General Edit", "Texture Edit", "Cloth-Design-Fuse", "Fuse-Objects", "Super-Fusion"],
-                        value="General Edit",
+                        choices=["Texture Edit", "Cloth-Design-Fuse", "Fuse-Objects", "Super-Fusion"],
+                        value="Texture Edit",
                     )        
  
         gr.Examples(