Update app.py

app.py

@@ -102,8 +102,8 @@ 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, prompt):
-    """Build the relighting prompt based on user selections."""
+def build_relight_prompt(light_type, light_direction, light_intensity, illumination_env, prompt):
+    """Build the relighting prompt based on user selections - Qwen style."""
     
     # Priority 1: User's prompt (translated to Chinese if needed)
     if prompt and prompt.strip():
@@ -116,38 +116,129 @@ def build_relight_prompt(light_type, light_direction, light_intensity, prompt):
     # Priority 2: Build from controls
     prompt_parts = ["重新照明"]
     
-    # Light type descriptions
+    # Light type descriptions (expanded from IC-Light style but in Chinese)
     light_descriptions = {
-        "soft_window": "使用窗帘透光（柔和漫射）的光线",  # Soft diffuse light from curtains
-        "golden_hour": "使用金色黄昏的温暖光线",  # Warm golden hour light
-        "studio": "使用专业摄影棚的均匀光线",  # Professional studio lighting
-        "dramatic": "使用戏剧性的高对比度光线",  # Dramatic high-contrast lighting
-        "natural": "使用自然日光",  # Natural daylight
-        "neon": "使用霓虹灯光效果",  # Neon lighting effect
-        "candlelight": "使用烛光的温暖氛围",  # Warm candlelight ambiance
-        "moonlight": "使用月光的冷色调",  # Cool-toned moonlight
+        "none": "",
+        "soft_window": "窗帘透光（柔和漫射）",
+        "golden_hour": "金色黄昏的温暖光线",
+        "studio": "专业摄影棚的均匀光线",
+        "dramatic": "戏剧性的高对比度光线",
+        "natural": "自然日光",
+        "neon": "霓虹灯光效果",
+        "candlelight": "烛光的温暖氛围",
+        "moonlight": "月光的冷色调",
+        "sunrise": "日出的柔和光线",
+        "sunset_sea": "海面日落光线",
+        "overcast": "阴天的柔和漫射光",
+        "harsh_sun": "强烈的正午阳光",
+        "twilight": "黄昏时分的神秘光线",
+        "aurora": "极光般的多彩光线",
+        "firelight": "篝火的跳动光线",
+        "lightning": "闪电的瞬间强光",
+        "underwater": "水下的柔和蓝光",
+        "foggy": "雾气中的柔和扩散光",
+        "magic": "魔法般的神秘光芒",
+        "cyberpunk": "赛博朋克风格的RGB霓虹光",
+        "warm_home": "家庭温馨的暖色光",
+        "cold_industrial": "冷酷的工业照明",
+        "spotlight": "聚光灯效果",
+        "rim_light": "边缘光效果",
     }
     
-    # Direction descriptions
+    # Direction descriptions (from IC-Light)
     direction_descriptions = {
-        "front": "从正面照射",  # From the front
-        "side": "从侧面照射",  # From the side
-        "back": "从背后照射",  # From behind (backlight)
-        "top": "从上方照射",  # From above
-        "bottom": "从下方照射",  # From below
+        "none": "",
+        "front": "正面照射",
+        "side": "侧面照射",
+        "left": "左侧照射",
+        "right": "右侧照射",
+        "back": "背后照射（逆光）",
+        "top": "上方照射",
+        "bottom": "下方照射",
+        "diagonal": "对角线照射",
     }
     
     # Intensity descriptions
     intensity_descriptions = {
-        "soft": "柔和强度",  # Soft intensity
-        "medium": "中等强度",  # Medium intensity
-        "strong": "强烈强度",  # Strong intensity
+        "none": "",
+        "soft": "柔和强度",
+        "medium": "中等强度",
+        "strong": "强烈强度",
     }
     
-    # Build the prompt
+    # Illumination environments (from IC-Light vary, translated)
+    illumination_envs = {
+        "none": "",
+        "sunshine_window": "阳光从窗户透入",
+        "neon_city": "霓虹夜景，城市灯光",
+        "sci_fi_rgb": "科幻RGB发光，赛博朋克风格",
+        "warm_bedroom": "温暖氛围，家中，卧室",
+        "magic_lit": "魔法照明",
+        "gothic_cave": "邪恶哥特风格，洞穴中",
+        "light_shadow": "光影交错",
+        "window_shadow": "窗户投影",
+        "soft_studio": "柔和摄影棚灯光",
+        "cozy_bedroom": "家庭氛围，温馨卧室照明",
+        "wong_kar_wai": "王家卫风格霓虹灯，温暖色调",
+        "moonlight_curtains": "月光透过窗帘",
+        "stormy_sky": "暴风雨天空照明",
+        "underwater_glow": "水下发光，深海",
+        "foggy_forest": "雾中森林黎明",
+        "meadow_golden": "草地上的黄金时刻",
+        "rainbow_neon": "彩虹反射，霓虹",
+        "apocalyptic": "末日烟雾氛围",
+        "emergency_red": "红色紧急灯光",
+        "mystical_forest": "神秘发光，魔法森林",
+        "campfire": "篝火光芒",
+        "industrial_harsh": "严酷工业照明",
+        "mountain_sunrise": "山中日出",
+        "desert_evening": "沙漠黄昏",
+        "dark_alley": "黑暗小巷的月光",
+        "fairground": "游乐场的金色光芒",
+        "forest_midnight": "森林深夜",
+        "twilight_purple": "黄昏的紫粉色调",
+        "foggy_morning": "雾蒙蒙的早晨",
+        "rustic_candle": "乡村风格烛光",
+        "office_fluorescent": "办公室荧光灯",
+        "storm_lightning": "暴风雨中的闪电",
+        "fireplace_night": "夜晚壁炉的温暖光芒",
+        "ethereal_magic": "空灵发光，魔法森林",
+        "beach_dusky": "海滩的黄昏",
+        "trees_afternoon": "树林中的午后光线",
+        "urban_blue_neon": "蓝色霓虹灯，城市街道",
+        "rain_police": "雨中红蓝警灯",
+        "aurora_arctic": "极光，北极景观",
+        "foggy_mountains": "雾中山峦日出",
+        "city_skyline": "城市天际线的黄金时刻",
+        "twilight_mist": "神秘黄昏，浓雾",
+        "forest_rays": "森林空地的清晨光线",
+        "festival_lantern": "节日多彩灯笼光",
+        "stained_glass": "彩色玻璃的柔和光芒",
+        "dark_spotlight": "黑暗房间的强烈聚光",
+        "lake_evening": "湖面柔和的黄昏光",
+        "cave_crystal": "洞穴水晶反射",
+        "autumn_forest": "秋林中的鲜艳光线",
+        "snowfall_dusk": "黄昏轻柔降雪",
+        "winter_hazy": "冬日清晨的朦胧光",
+        "rain_city": "雨中城市灯光倒影",
+        "trees_golden_sun": "金色阳光穿过树林",
+        "fireflies_summer": "萤火虫点亮夏夜",
+        "forge_embers": "锻造炉的发光余烬",
+        "gothic_castle": "哥特城堡的昏暗烛光",
+        "starlight_midnight": "午夜明亮星光",
+        "rural_sunset": "乡村的温暖日落",
+        "haunted_flicker": "闹鬼房屋的闪烁灯光",
+        "desert_mirage": "沙漠日落海市蜃楼般的光",
+        "storm_beams": "风暴云中穿透的金色光束",
+    }
+    
+    # Build the prompt - Qwen style (comma-separated, Chinese)
     if light_type != "none":
         prompt_parts.append(light_descriptions.get(light_type, ""))
     
+    if illumination_env != "none":
+        prompt_parts.append(illumination_envs.get(illumination_env, ""))
+    
     if light_direction != "none":
         prompt_parts.append(direction_descriptions.get(light_direction, ""))
     
@@ -158,7 +249,7 @@ def build_relight_prompt(light_type, light_direction, light_intensity, prompt):
     
     # Add instruction if we have settings
     if len(prompt_parts) > 1:
-        final_prompt += "对图片进行重新照明"  # Relight the image
+        final_prompt += ",对图片进行重新照明"
     
     return final_prompt if len(prompt_parts) > 1 else "重新照明,使用自然光线对图片进行重新照明"
 
@@ -169,6 +260,7 @@ def infer_relight(
     light_type,
     light_direction,
     light_intensity,
+    illumination_env,
     prompt,
     seed,
     randomize_seed,
@@ -179,7 +271,7 @@ def infer_relight(
     prev_output = None,
     progress=gr.Progress(track_tqdm=True)
 ):
-    final_prompt = build_relight_prompt(light_type, light_direction, light_intensity, prompt)
+    final_prompt = build_relight_prompt(light_type, light_direction, light_intensity, illumination_env, prompt)
     print(f"Generated Prompt: {final_prompt}")
 
     if randomize_seed:
@@ -240,12 +332,15 @@ def create_video_between_images(input_image, output_image, prompt: str, request:
 
 
 # --- UI ---
-css = '''#col-container { max-width: 800px; margin: 0 auto; }
+css = '''
+#col-container { max-width: 1200px; margin: 0 auto; }
 .dark .progress-text{color: white !important}
-#examples{max-width: 800px; margin: 0 auto; }'''
+#examples{max-width: 1200px; margin: 0 auto; }
+.radio-group {display: grid; grid-template-columns: repeat(auto-fit, minmax(200px, 1fr)); gap: 8px;}
+'''
 
 def reset_all():
-    return ["none", "none", "none", "", False, True]
+    return ["none", "none", "none", "none", "", False, True]
 
 def end_reset():
     return False
@@ -278,56 +373,153 @@ 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 💨
+            
+            Expanded lighting options inspired by IC-Light v2 🎨
             """
         )
         with gr.Row():
-            with gr.Column():
+            with gr.Column(scale=1):
                 image = gr.Image(label="Input Image", type="pil")
                 prev_output = gr.Image(value=None, visible=False)
                 is_reset = gr.Checkbox(value=False, visible=False)
 
-                with gr.Tab("Lighting Controls"):
-                    light_type = gr.Dropdown(
-                        label="Light Type",
+                with gr.Accordion("💡 Light Type", open=True):
+                    light_type = gr.Radio(
+                        label="Select Light Source",
                         choices=[
                             ("None", "none"),
-                            ("Soft Window Light (柔和窗光)", "soft_window"),
-                            ("Golden Hour (金色黄昏)", "golden_hour"),
-                            ("Studio Lighting (摄影棚灯光)", "studio"),
-                            ("Dramatic (戏剧性)", "dramatic"),
-                            ("Natural Daylight (自然日光)", "natural"),
-                            ("Neon (霓虹灯)", "neon"),
-                            ("Candlelight (烛光)", "candlelight"),
-                            ("Moonlight (月光)", "moonlight"),
+                            ("Soft Window Light", "soft_window"),
+                            ("Golden Hour", "golden_hour"),
+                            ("Studio Lighting", "studio"),
+                            ("Dramatic", "dramatic"),
+                            ("Natural Daylight", "natural"),
+                            ("Neon", "neon"),
+                            ("Candlelight", "candlelight"),
+                            ("Moonlight", "moonlight"),
+                            ("Sunrise", "sunrise"),
+                            ("Sunset over Sea", "sunset_sea"),
+                            ("Overcast", "overcast"),
+                            ("Harsh Sunlight", "harsh_sun"),
+                            ("Twilight", "twilight"),
+                            ("Aurora", "aurora"),
+                            ("Firelight", "firelight"),
+                            ("Lightning", "lightning"),
+                            ("Underwater", "underwater"),
+                            ("Foggy", "foggy"),
+                            ("Magic Light", "magic"),
+                            ("Cyberpunk", "cyberpunk"),
+                            ("Warm Home", "warm_home"),
+                            ("Cold Industrial", "cold_industrial"),
+                            ("Spotlight", "spotlight"),
+                            ("Rim Light", "rim_light"),
                         ],
-                        value="none"
+                        value="none",
+                        elem_classes="radio-group"
                     )
-                    
-                    light_direction = gr.Dropdown(
-                        label="Light Direction",
+                
+                with gr.Accordion("🧭 Light Direction", open=True):
+                    light_direction = gr.Radio(
+                        label="Select Direction",
                         choices=[
                             ("None", "none"),
-                            ("Front (正面)", "front"),
-                            ("Side (侧面)", "side"),
-                            ("Back (背光)", "back"),
-                            ("Top (上方)", "top"),
-                            ("Bottom (下方)", "bottom"),
+                            ("Front", "front"),
+                            ("Side", "side"),
+                            ("Left", "left"),
+                            ("Right", "right"),
+                            ("Back (Backlight)", "back"),
+                            ("Top", "top"),
+                            ("Bottom", "bottom"),
+                            ("Diagonal", "diagonal"),
                         ],
-                        value="none"
+                        value="none",
+                        elem_classes="radio-group"
                     )
-                    
-                    light_intensity = gr.Dropdown(
-                        label="Light Intensity",
+                
+                with gr.Accordion("⚡ Light Intensity", open=True):
+                    light_intensity = gr.Radio(
+                        label="Select Intensity",
+                        choices=[
+                            ("None", "none"),
+                            ("Soft", "soft"),
+                            ("Medium", "medium"),
+                            ("Strong", "strong"),
+                        ],
+                        value="none",
+                        elem_classes="radio-group"
+                    )
+                
+                with gr.Accordion("🌍 Illumination Environment", open=False):
+                    illumination_env = gr.Radio(
+                        label="Select Environment",
                         choices=[
                             ("None", "none"),
-                            ("Soft (柔和)", "soft"),
-                            ("Medium (中等)", "medium"),
-                            ("Strong (强烈)", "strong"),
+                            ("Sunshine from Window", "sunshine_window"),
+                            ("Neon Night, City", "neon_city"),
+                            ("Sci-Fi RGB Glowing, Cyberpunk", "sci_fi_rgb"),
+                            ("Warm Atmosphere, at Home, Bedroom", "warm_bedroom"),
+                            ("Magic Lit", "magic_lit"),
+                            ("Evil, Gothic, in a Cave", "gothic_cave"),
+                            ("Light and Shadow", "light_shadow"),
+                            ("Shadow from Window", "window_shadow"),
+                            ("Soft Studio Lighting", "soft_studio"),
+                            ("Home Atmosphere, Cozy Bedroom", "cozy_bedroom"),
+                            ("Neon, Wong Kar-wai, Warm", "wong_kar_wai"),
+                            ("Moonlight through Curtains", "moonlight_curtains"),
+                            ("Stormy Sky Lighting", "stormy_sky"),
+                            ("Underwater Glow, Deep Sea", "underwater_glow"),
+                            ("Foggy Forest at Dawn", "foggy_forest"),
+                            ("Golden Hour in a Meadow", "meadow_golden"),
+                            ("Rainbow Reflections, Neon", "rainbow_neon"),
+                            ("Apocalyptic, Smoky Atmosphere", "apocalyptic"),
+                            ("Red Glow, Emergency Lights", "emergency_red"),
+                            ("Mystical Glow, Enchanted Forest", "mystical_forest"),
+                            ("Campfire Light", "campfire"),
+                            ("Harsh, Industrial Lighting", "industrial_harsh"),
+                            ("Sunrise in the Mountains", "mountain_sunrise"),
+                            ("Evening Glow in the Desert", "desert_evening"),
+                            ("Moonlight in a Dark Alley", "dark_alley"),
+                            ("Golden Glow at a Fairground", "fairground"),
+                            ("Midnight in the Forest", "forest_midnight"),
+                            ("Purple and Pink Hues at Twilight", "twilight_purple"),
+                            ("Foggy Morning, Muted Light", "foggy_morning"),
+                            ("Candle-lit Room, Rustic Vibe", "rustic_candle"),
+                            ("Fluorescent Office Lighting", "office_fluorescent"),
+                            ("Lightning Flash in Storm", "storm_lightning"),
+                            ("Night, Cozy Warm Light from Fireplace", "fireplace_night"),
+                            ("Ethereal Glow, Magical Forest", "ethereal_magic"),
+                            ("Dusky Evening on a Beach", "beach_dusky"),
+                            ("Afternoon Light Filtering through Trees", "trees_afternoon"),
+                            ("Blue Neon Light, Urban Street", "urban_blue_neon"),
+                            ("Red and Blue Police Lights in Rain", "rain_police"),
+                            ("Aurora Borealis Glow, Arctic Landscape", "aurora_arctic"),
+                            ("Sunrise through Foggy Mountains", "foggy_mountains"),
+                            ("Golden Hour on a City Skyline", "city_skyline"),
+                            ("Mysterious Twilight, Heavy Mist", "twilight_mist"),
+                            ("Early Morning Rays, Forest Clearing", "forest_rays"),
+                            ("Colorful Lantern Light at Festival", "festival_lantern"),
+                            ("Soft Glow through Stained Glass", "stained_glass"),
+                            ("Harsh Spotlight in Dark Room", "dark_spotlight"),
+                            ("Mellow Evening Glow on a Lake", "lake_evening"),
+                            ("Crystal Reflections in a Cave", "cave_crystal"),
+                            ("Vibrant Autumn Lighting in a Forest", "autumn_forest"),
+                            ("Gentle Snowfall at Dusk", "snowfall_dusk"),
+                            ("Hazy Light of a Winter Morning", "winter_hazy"),
+                            ("Rain-soaked Reflections in City Lights", "rain_city"),
+                            ("Golden Sunlight Streaming through Trees", "trees_golden_sun"),
+                            ("Fireflies Lighting up a Summer Night", "fireflies_summer"),
+                            ("Glowing Embers from a Forge", "forge_embers"),
+                            ("Dim Candlelight in a Gothic Castle", "gothic_castle"),
+                            ("Midnight Sky with Bright Starlight", "starlight_midnight"),
+                            ("Warm Sunset in a Rural Village", "rural_sunset"),
+                            ("Flickering Light in a Haunted House", "haunted_flicker"),
+                            ("Desert Sunset with Mirage-like Glow", "desert_mirage"),
+                            ("Golden Beams Piercing through Storm Clouds", "storm_beams"),
                         ],
-                        value="none"
+                        value="none",
+                        elem_classes="radio-group"
                     )
                 
-                with gr.Tab("Custom Prompt"):
+                with gr.Accordion("✍️ Custom Prompt", open=False):
                     prompt = gr.Textbox(
                         label="Relighting Prompt",
                         placeholder="Example: Add warm sunset lighting from the right",
@@ -335,10 +527,10 @@ with gr.Blocks(theme=gr.themes.Citrus(), css=css) as demo:
                     )
                 
                 with gr.Row():
-                    reset_btn = gr.Button("Reset")
-                    run_btn = gr.Button("Generate", variant="primary")
+                    reset_btn = gr.Button("🔄 Reset")
+                    run_btn = gr.Button("✨ Generate", variant="primary")
 
-                with gr.Accordion("Advanced Settings", open=False):
+                with gr.Accordion("⚙️ Advanced Settings", open=False):
                     seed = gr.Slider(label="Seed", minimum=0, maximum=MAX_SEED, step=1, value=0)
                     randomize_seed = gr.Checkbox(label="Randomize Seed", value=True)
                     true_guidance_scale = gr.Slider(label="True Guidance Scale", minimum=1.0, maximum=10.0, step=0.1, value=1.0)
@@ -346,7 +538,7 @@ with gr.Blocks(theme=gr.themes.Citrus(), css=css) as demo:
                     height = gr.Slider(label="Height", minimum=256, maximum=2048, step=8, value=1024)
                     width = gr.Slider(label="Width", minimum=256, maximum=2048, step=8, value=1024)
 
-            with gr.Column():
+            with gr.Column(scale=1):
                 result = gr.Image(label="Output Image", interactive=False)
                 prompt_preview = gr.Textbox(label="Processed Prompt", interactive=False)
                 create_video_button = gr.Button("🎥 Create Video Between Images", variant="secondary", visible=False)
@@ -354,7 +546,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, prompt,
+        image, light_type, light_direction, light_intensity, illumination_env, prompt,
         seed, randomize_seed, true_guidance_scale, num_inference_steps, height, width, prev_output
     ]
     outputs = [result, seed, prompt_preview]
@@ -363,7 +555,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, prompt, is_reset],
+        outputs=[light_type, light_direction, light_intensity, illumination_env, prompt, is_reset],
         queue=False
     ).then(fn=end_reset, inputs=None, outputs=[is_reset], queue=False)
 
@@ -392,16 +584,18 @@ with gr.Blocks(theme=gr.themes.Citrus(), css=css) as demo:
         api_name=False
     )
 
-    # Examples - You'll need to add your own example images
+    # Examples
     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", "none", "", 0, True, 1.0, 4, 1024, 1024],
+            [None, "golden_hour", "front", "medium", "none", "", 0, True, 1.0, 4, 1024, 1024],
+            [None, "dramatic", "side", "strong", "none", "", 0, True, 1.0, 4, 1024, 1024],
+            [None, "neon", "front", "medium", "neon_city", "", 0, True, 1.0, 4, 1024, 1024],
+            [None, "candlelight", "front", "soft", "cozy_bedroom", "", 0, True, 1.0, 4, 1024, 1024],
+            [None, "moonlight", "top", "soft", "moonlight_curtains", "", 0, True, 1.0, 4, 1024, 1024],
+            [None, "cyberpunk", "side", "strong", "sci_fi_rgb", "", 0, True, 1.0, 4, 1024, 1024],
         ],
-        inputs=[image, light_type, light_direction, light_intensity, prompt,
+        inputs=[image, light_type, light_direction, light_intensity, illumination_env, prompt,
                 seed, randomize_seed, true_guidance_scale, num_inference_steps, height, width],
         outputs=outputs,
         fn=infer_relight,
@@ -417,7 +611,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, prompt, is_reset],
+        outputs=[light_type, light_direction, light_intensity, illumination_env, prompt, is_reset],
         queue=False
     ).then(
         fn=end_reset, 
@@ -438,14 +632,14 @@ 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, prompt,
+        image, light_type, light_direction, light_intensity, illumination_env, 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]:
+    for control in [light_type, light_direction, light_intensity, illumination_env]:
         control.input(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()