Update app.py

app.py

@@ -7,13 +7,13 @@ HF_TOKEN = os.getenv("HF_TOKEN")
 TARGET_SPACE = "selfit-camera/omni-image-editor"
 
 def remote_bridge(inputs, prompt, mode):
-    if not inputs and mode != "/t2i":
-        return None, "Status: Please provide input files."
     try:
         client = Client(TARGET_SPACE, hf_token=HF_TOKEN)
         if mode == "/multi_edit":
-            file_paths = [handle_file(f.name) for f in inputs]
-            result = client.predict(images=file_paths, prompt=prompt, api_name="/multi_edit")
+            # กรองเอาเฉพาะช่องที่มีการอัปโหลดรูปจริง
+            valid_files = [handle_file(img) for img in inputs if img is not None]
+            if not valid_files: return None, "Status: Please upload at least one image."
+            result = client.predict(images=valid_files, prompt=prompt, api_name="/multi_edit")
         elif mode == "/t2i":
             result = client.predict(prompt=prompt, api_name="/t2i")
         else:
@@ -22,67 +22,52 @@ def remote_bridge(inputs, prompt, mode):
     except Exception as e:
         return None, f"❌ Error: {str(e)}"
 
-with gr.Blocks(css=".container { max-width: 1100px; margin: auto; }") as demo:
-    gr.HTML("<h1 style='text-align: center; margin-bottom: 0;'>🎨 Omni Editor 2.0 (Remote)</h1>")
-    gr.HTML("<p style='text-align: center; opacity: 0.8;'>Bridge Mode: Powered by 8B MM-DiT</p>")
+with gr.Blocks(css=".container { max-width: 1200px; margin: auto; }") as demo:
+    gr.HTML("<h1 style='text-align: center;'>🎨 Omni Editor 2.0 (Remote)</h1>")
     
     with gr.Tabs():
         # --- TAB 1: Single Image ---
         with gr.TabItem("🖼️ Single Image Edit"):
             with gr.Row():
                 with gr.Column(scale=5):
-                    s_in = gr.Image(type="filepath", label="Input Image", height=400)
-                    s_prompt = gr.Textbox(label="Prompt", placeholder="Describe your edit...", lines=2)
-                    s_run = gr.Button("🎨 Execute Edit", variant="primary")
+                    s_in = gr.Image(type="filepath", label="Input Image")
+                    s_prompt = gr.Textbox(label="Prompt", lines=2)
+                    s_run = gr.Button("🎨 Execute", variant="primary")
                 with gr.Column(scale=5):
-                    s_out = gr.Image(label="Result", height=400)
-                    s_status = gr.Textbox(label="System Status", interactive=False)
-                    s_use = gr.Button("🔄 Use Result as New Input")
-            
+                    s_out = gr.Image(label="Result")
+                    s_status = gr.Textbox(label="Status", interactive=False)
             s_run.click(lambda i, p: remote_bridge(i, p, "/predict"), [s_in, s_prompt], [s_out, s_status])
-            s_use.click(fn=lambda x: x, inputs=s_out, outputs=s_in)
 
-        # --- TAB 2: Multi-Image (Layout ใหม่ ไม่มั่ว) ---
+        # --- TAB 2: Multi-Image (แก้ให้มี 3 ช่องแยกตามสเปก 8B MM-DiT) ---
         with gr.TabItem("🖼️🖼️ Multi-Image Edit"):
-            gr.Markdown("### 🚀 Multi-Modal Fusion (Select up to 3 images)")
+            gr.Markdown("### 🚀 Multi-Modal Fusion (Adaptive Multi-Modal Gating)")
             with gr.Row():
                 with gr.Column(scale=5):
-                    m_in = gr.File(label="Upload Images (Base/Ref/Style)", file_count="multiple", file_types=["image"], height=200)
-                    m_prompt = gr.Textbox(label="Instruction", placeholder="How to fuse these images?", lines=2)
-                    m_run = gr.Button("🎯 Execute Multi-Edit", variant="primary")
+                    with gr.Row(): # แบ่งช่องใส่รูปย่อยๆ
+                        m_in1 = gr.Image(type="filepath", label="Base Image (A)", height=200)
+                        m_in2 = gr.Image(type="filepath", label="Ref Image (B)", height=200)
+                        m_in3 = gr.Image(type="filepath", label="Style Image (C)", height=200)
+                    m_prompt = gr.Textbox(label="Fusion Instruction", placeholder="e.g., Apply style C to object in A using B as reference", lines=2)
+                    m_run = gr.Button("🎯 Execute Multi-Fusion", variant="primary")
                 with gr.Column(scale=5):
-                    m_out = gr.Image(label="Fused Result", height=400)
+                    m_out = gr.Image(label="Fused Result", height=450)
                     m_status = gr.Textbox(label="Status", interactive=False)
-            m_run.click(lambda i, p: remote_bridge(i, p, "/multi_edit"), [m_in, m_prompt], [m_out, m_status])
+            
+            # ส่ง List ของทั้ง 3 ช่องไปที่ฟังก์ชัน
+            m_run.click(
+                fn=lambda i1, i2, i3, p: remote_bridge([i1, i2, i3], p, "/multi_edit"), 
+                inputs=[m_in1, m_in2, m_in3, m_prompt], 
+                outputs=[m_out, m_status]
+            )
 
-        # --- TAB 3: Text to Image ---
+        # --- TAB 3: Text to Image / Tools --- (ส่วนที่เหลือคงเดิม)
         with gr.TabItem("✨ Text to Image"):
             with gr.Row():
                 with gr.Column(scale=5):
-                    t_prompt = gr.Textbox(label="Description", placeholder="What do you want to create?", lines=5)
-                    t_run = gr.Button("✨ Generate Image", variant="primary")
+                    t_prompt = gr.Textbox(label="Description", lines=4)
+                    t_run = gr.Button("✨ Generate", variant="primary")
                 with gr.Column(scale=5):
-                    t_out = gr.Image(label="AI Result", height=400)
-                    t_status = gr.Textbox(label="Status", interactive=False)
-            t_run.click(lambda p: remote_bridge(None, p, "/t2i"), [t_prompt], [t_out, t_status])
-
-        # --- TAB 4: Tools ---
-        with gr.TabItem("🔍 Tools"):
-            with gr.Row():
-                with gr.Column(scale=4):
-                    tool_mode = gr.Radio(["Upscale", "Watermark"], label="Mode", value="Upscale")
-                    tool_in = gr.Image(type="filepath", label="Source Image")
-                    tool_run = gr.Button("🚀 Process", variant="primary")
-                with gr.Column(scale=6):
-                    tool_out = gr.Image(label="Output")
-                    tool_status = gr.Textbox(label="Status", interactive=False)
-            
-            def tool_router(mode, img):
-                api_path = "/upscale" if mode == "Upscale" else "/remove_watermark"
-                return remote_bridge(img, "", api_path)
-            
-            tool_run.click(tool_router, [tool_mode, tool_in], [tool_out, tool_status])
-
-    gr.HTML("<hr><p style='text-align: center; font-size: 0.8em;'>Omni Creator 2.0 | FP8 + RoPE + AMG Optimization</p>")
+                    t_out = gr.Image(label="AI Result")
+            t_run.click(lambda p: remote_bridge(None, p, "/t2i"), [t_prompt], [t_out, s_status])
 
 demo.queue().launch()