Update app.py

app.py

@@ -102,22 +102,18 @@ def _generate_video_segment(input_image_path: str, output_image_path: str, promp
     )
     return result[0]["video"]
 
-def build_relight_prompt(light_type, light_direction, light_intensity, custom_prompt, user_prompt):
+def build_relight_prompt(light_type, light_direction, light_intensity, prompt):
     """Build the relighting prompt based on user selections."""
     
-    # Priority 1: User's own prompt (translated to Chinese)
-    if user_prompt and user_prompt.strip():
-        translated = translate_to_chinese(user_prompt)
+    # Priority 1: User's prompt (translated to Chinese if needed)
+    if prompt and prompt.strip():
+        translated = translate_to_chinese(prompt)
         # Add trigger word if not already present
         if "重新照明" not in translated:
             return f"重新照明,{translated}"
         return translated
     
-    # Priority 2: Custom prompt field
-    if custom_prompt and custom_prompt.strip():
-        return f"重新照明,{custom_prompt}"
-    
-    # Priority 3: Build from controls
+    # Priority 2: Build from controls
     prompt_parts = ["重新照明"]
     
     # Light type descriptions
@@ -173,8 +169,7 @@ def infer_relight(
     light_type,
     light_direction,
     light_intensity,
-    custom_prompt,
-    user_prompt,
+    prompt,
     seed,
     randomize_seed,
     true_guidance_scale,
@@ -184,8 +179,8 @@ def infer_relight(
     prev_output = None,
     progress=gr.Progress(track_tqdm=True)
 ):
-    prompt = build_relight_prompt(light_type, light_direction, light_intensity, custom_prompt, user_prompt)
-    print(f"Generated Prompt: {prompt}")
+    final_prompt = build_relight_prompt(light_type, light_direction, light_intensity, prompt)
+    print(f"Generated Prompt: {final_prompt}")
 
     if randomize_seed:
         seed = random.randint(0, MAX_SEED)
@@ -206,7 +201,7 @@ def infer_relight(
 
     result = pipe(
         image=pil_images,
-        prompt=prompt,
+        prompt=final_prompt,
         height=height if height != 0 else None,
         width=width if width != 0 else None,
         num_inference_steps=num_inference_steps,
@@ -215,7 +210,7 @@ def infer_relight(
         num_images_per_prompt=1,
     ).images[0]
 
-    return result, seed, prompt
+    return result, seed, final_prompt
 
 def create_video_between_images(input_image, output_image, prompt: str, request: gr.Request) -> str:
     """Create a video between the input and output images."""
@@ -250,7 +245,7 @@ css = '''#col-container { max-width: 800px; margin: 0 auto; }
 #examples{max-width: 800px; margin: 0 auto; }'''
 
 def reset_all():
-    return ["none", "none", "none", "", "", False, True]
+    return ["none", "none", "none", "", False, True]
 
 def end_reset():
     return False
@@ -283,13 +278,6 @@ with gr.Blocks(theme=gr.themes.Citrus(), css=css) as demo:
         gr.Markdown("""
             Qwen Image Edit 2509 for Image Relighting ✨ 
             Using [dx8152's Qwen-Image-Edit-2509-Relight LoRA](https://huggingface.co/dx8152/Qwen-Image-Edit-2509-Relight) and [linoyts/Qwen-Image-Edit-Rapid-AIO](https://huggingface.co/linoyts/Qwen-Image-Edit-Rapid-AIO) for 4-step inference 💨
-            
-            **Three ways to use:**
-            1. 🌟 **Write your own prompt** in any language (automatically translated to Chinese)
-            2. Use the preset lighting controls
-            3. Write a custom Chinese prompt with the trigger word "重新照明"
-            
-            Example: `Add dramatic sunset lighting from the left` or `使用窗帘透光（柔和漫射）的光线对图片进行重新照明`
             """
         )
 
@@ -299,16 +287,6 @@ with gr.Blocks(theme=gr.themes.Citrus(), css=css) as demo:
                 prev_output = gr.Image(value=None, visible=False)
                 is_reset = gr.Checkbox(value=False, visible=False)
 
-                # User's own prompt (highest priority)
-                with gr.Group():
-                    gr.Markdown("### 🌟 Your Prompt (Any Language)")
-                    user_prompt = gr.Textbox(
-                        label="Describe the lighting you want",
-                        placeholder="Example: 'Add warm sunset lighting from the right' or 'Make it look like it's lit by neon signs' or 'Add dramatic spotlight from above'",
-                        lines=2,
-                        info="Write in any language! It will be automatically translated to Chinese for the model."
-                    )
-
                 with gr.Tab("Lighting Controls"):
                     light_type = gr.Dropdown(
                         label="Light Type",
@@ -351,12 +329,11 @@ with gr.Blocks(theme=gr.themes.Citrus(), css=css) as demo:
                     )
                 
                 with gr.Tab("Custom Prompt"):
-                    custom_prompt = gr.Textbox(
-                        label="Custom Chinese Relighting Prompt (Optional)",
-                        placeholder="Example: 使用窗帘透光（柔和漫射）的光线对图片进行重新照明\nLeave empty to use controls or user prompt above",
+                    prompt = gr.Textbox(
+                        label="Relighting Prompt",
+                        placeholder="Example: Add warm sunset lighting from the right",
                         lines=3
                     )
-                    gr.Markdown("*Note: This field is for Chinese prompts. The trigger word '重新照明' will be added automatically. If you entered text in 'Your Prompt' above, it takes priority.*")
                 
                 with gr.Row():
                     reset_btn = gr.Button("Reset")
@@ -378,7 +355,7 @@ with gr.Blocks(theme=gr.themes.Citrus(), css=css) as demo:
                     video_output = gr.Video(label="Generated Video", show_download_button=True, autoplay=True)
                     
     inputs = [
-        image, light_type, light_direction, light_intensity, custom_prompt, user_prompt,
+        image, light_type, light_direction, light_intensity, prompt,
         seed, randomize_seed, true_guidance_scale, num_inference_steps, height, width, prev_output
     ]
     outputs = [result, seed, prompt_preview]
@@ -387,7 +364,7 @@ with gr.Blocks(theme=gr.themes.Citrus(), css=css) as demo:
     reset_btn.click(
         fn=reset_all,
         inputs=None,
-        outputs=[light_type, light_direction, light_intensity, custom_prompt, user_prompt, is_reset],
+        outputs=[light_type, light_direction, light_intensity, prompt, is_reset],
         queue=False
     ).then(fn=end_reset, inputs=None, outputs=[is_reset], queue=False)
 
@@ -419,13 +396,13 @@ with gr.Blocks(theme=gr.themes.Citrus(), css=css) as demo:
     # Examples - You'll need to add your own example images
     gr.Examples(
         examples=[
-            [None, "soft_window", "side", "soft", "", "", 0, True, 1.0, 4, 1024, 1024],
-            [None, "golden_hour", "front", "medium", "", "", 0, True, 1.0, 4, 1024, 1024],
-            [None, "dramatic", "side", "strong", "", "", 0, True, 1.0, 4, 1024, 1024],
-            [None, "neon", "front", "medium", "", "", 0, True, 1.0, 4, 1024, 1024],
-            [None, "candlelight", "front", "soft", "", "", 0, True, 1.0, 4, 1024, 1024],
+            [None, "soft_window", "side", "soft", "", 0, True, 1.0, 4, 1024, 1024],
+            [None, "golden_hour", "front", "medium", "", 0, True, 1.0, 4, 1024, 1024],
+            [None, "dramatic", "side", "strong", "", 0, True, 1.0, 4, 1024, 1024],
+            [None, "neon", "front", "medium", "", 0, True, 1.0, 4, 1024, 1024],
+            [None, "candlelight", "front", "soft", "", 0, True, 1.0, 4, 1024, 1024],
         ],
-        inputs=[image, light_type, light_direction, light_intensity, custom_prompt, user_prompt,
+        inputs=[image, light_type, light_direction, light_intensity, prompt,
                 seed, randomize_seed, true_guidance_scale, num_inference_steps, height, width],
         outputs=outputs,
         fn=infer_relight,
@@ -441,7 +418,7 @@ with gr.Blocks(theme=gr.themes.Citrus(), css=css) as demo:
     ).then(
         fn=reset_all,
         inputs=None,
-        outputs=[light_type, light_direction, light_intensity, custom_prompt, user_prompt, is_reset],
+        outputs=[light_type, light_direction, light_intensity, prompt, is_reset],
         queue=False
     ).then(
         fn=end_reset, 
@@ -462,17 +439,16 @@ with gr.Blocks(theme=gr.themes.Citrus(), css=css) as demo:
             return result_img, result_seed, result_prompt, gr.update(visible=show_button)
 
     control_inputs = [
-        image, light_type, light_direction, light_intensity, custom_prompt, user_prompt,
+        image, light_type, light_direction, light_intensity, prompt,
         seed, randomize_seed, true_guidance_scale, num_inference_steps, height, width, prev_output
     ]
     control_inputs_with_flag = [is_reset] + control_inputs
 
     for control in [light_type, light_direction, light_intensity]:
-        control.change(fn=maybe_infer, inputs=control_inputs_with_flag, outputs=outputs + [create_video_button])
+        control.input(fn=maybe_infer, inputs=control_inputs_with_flag, outputs=outputs + [create_video_button])
     
-    custom_prompt.change(fn=maybe_infer, inputs=control_inputs_with_flag, outputs=outputs + [create_video_button])
-    user_prompt.change(fn=maybe_infer, inputs=control_inputs_with_flag, outputs=outputs + [create_video_button])
+    # prompt.change(fn=maybe_infer, inputs=control_inputs_with_flag, outputs=outputs + [create_video_button])
     
     run_event.then(lambda img, *_: img, inputs=[result], outputs=[prev_output])
 
-demo.launch()
+demo.launch()