Update app.py

app.py

@@ -1,106 +1,85 @@
 import gradio as gr
 import os
 import sys
-import base64
-import uuid
-from fastapi import FastAPI
 
-# -------------------------------------------------------------------
-#  PART 1: CORE LOGIC (Yeh bilkul perfect hai, ismein koi change nahi)
-# -------------------------------------------------------------------
 sys.path.append('roop')
 from roop.core import run as roop_run
 
-def face_swap_logic(source_path, target_path):
+# CORE LOGIC - ISMEIN KOI BHI CHANGE NAHI HUA HAI. YEH PERFECT HAI.
+def face_swap(source_img, target_media, progress=gr.Progress(track_tqdm=True)):
+    if source_img is None or target_media is None:
+        raise gr.Error("Dono file upload karein.")
+
+    source_path = source_img
+    target_path = target_media
+    
     output_filename = os.path.basename(target_path)
     os.makedirs("output", exist_ok=True)
-    output_path = os.path.join("output", f"api_result_{output_filename}")
+    output_path = os.path.join("output", f"result_{output_filename}")
 
     args = [
-        "run.py", "--source", source_path, "--target", target_path,
-        "--output", output_path, "--execution-provider", "cpu",
+        "run.py",
+        "--source", source_path,
+        "--target", target_path,
+        "--output", output_path,
+        "--execution-provider", "cpu",
     ]
     sys.argv = args
     
+    print(f"Running roop with args: {sys.argv}")
+
     try:
         roop_run()
-    except SystemExit: pass
+    except SystemExit:
+        pass
     except Exception as e:
-        print(f"Face swap fail hua. Error: {str(e)}")
-        return None
+        raise gr.Error(f"Face swap fail hua. Error: {str(e)}")
 
     if not os.path.exists(output_path):
-        return None
-    
+        raise gr.Error("Processing fail hua. Model download nahi ho paaya ya koi aur error aayi. Logs check karein.")
+
+    print(f"Process poora hua. Result yahan hai: {output_path}")
     return output_path
 
-# -------------------------------------------------------------------
-#  PART 2: GRADIO UI DEFINITION (Aapka Web Interface)
-# -------------------------------------------------------------------
-with gr.Blocks(theme=gr.themes.Soft()) as gradio_ui:
+# --- Gradio UI (AAPKE IDEA KE SAATH) ---
+with gr.Blocks(theme=gr.themes.Soft()) as app:
     gr.Markdown("# 🎭 Roop Face Swap AI")
+    
+    # Step 1: Source Face (Yeh dono tabs ke liye common rahega)
+    gr.Markdown("### Step 1: Upload Source Face")
+    source_face = gr.Image(label="Source Face (Jiska Chehra Lagana Hai)", type="filepath")
+
+    # Step 2: Alag-alag Tabs banana (Image aur Video ke liye)
     with gr.Tabs():
+        # TAB 1: IMAGE KE LIYE
         with gr.TabItem("🖼️ Swap on Image"):
-            # ... (UI ka baaki code bilkul same)
-            with gr.Row():
-                source_face_img = gr.Image(label="Source Face", type="filepath")
-                target_image = gr.Image(label="Target Image", type="filepath")
-            submit_btn_image = gr.Button("Swap Face on Image")
-            result_image = gr.Image(label="Result Image")
+            gr.Markdown("### Step 2: Upload Target Image")
+            target_image = gr.Image(label="Target Image (Jispar Chehra Lagana Hai)", type="filepath")
+            submit_btn_image = gr.Button("Swap Face on Image", variant="primary")
+            gr.Markdown("### Step 3: Result")
+            result_image = gr.Image(label="Result Image", interactive=False)
 
+        # TAB 2: VIDEO KE LIYE
         with gr.TabItem("🎬 Swap on Video"):
-            with gr.Row():
-                source_face_vid = gr.Image(label="Source Face", type="filepath")
-                target_video = gr.Video(label="Target Video")
-            submit_btn_video = gr.Button("Swap Face on Video")
-            result_video = gr.Video(label="Result Video")
-
-    # UI ke buttons ko logic se jodna
-    submit_btn_image.click(fn=face_swap_logic, inputs=[source_face_img, target_image], outputs=result_image)
-    submit_btn_video.click(fn=face_swap_logic, inputs=[source_face_vid, target_video], outputs=result_video)
-
-# -------------------------------------------------------------------
-#  PART 3: FASTAPI APP DEFINITION (Aapke Android App ke liye)
-# -------------------------------------------------------------------
-# Yahan hum main app banayenge jo Hugging Face chalaayega
-app = FastAPI()
-
-def save_base64_to_file(b64_string, extension):
-    filename = f"/tmp/{uuid.uuid4().hex}.{extension}"
-    with open(filename, "wb") as f:
-        f.write(base64.b64decode(b64_string))
-    return filename
-
-# API ka darwaza
-@app.post("/api/swap-face")
-async def api_face_swap(payload: dict):
-    source_b64 = payload.get("source_face_b64")
-    target_b64 = payload.get("target_media_b64")
-    target_ext = payload.get("target_ext", "jpg")
-
-    if not source_b64 or not target_b64:
-        return {"error": "Source ya Target file nahi mili."}
-
-    source_file_path = save_base64_to_file(source_b64, "jpg")
-    target_file_path = save_base64_to_file(target_b64, target_ext)
-
-    result_path = face_swap_logic(source_file_path, target_file_path)
-
-    if result_path:
-        with open(result_path, "rb") as f:
-            result_b64 = base64.b64encode(f.read()).decode("utf-8")
-        
-        os.remove(source_file_path)
-        os.remove(target_file_path)
-        os.remove(result_path)
-        return {"result_b64": result_b64}
-    else:
-        return {"error": "Face swap fail hua."}
-
-# -------------------------------------------------------------------
-#  PART 4: MOUNTING (Dono ko Jodna)
-# -------------------------------------------------------------------
-# Yeh aakhri line Gradio UI (gradio_ui) ko FastAPI app (app) ke upar mount karti hai
-app = gr.mount_gradio_app(app, gradio_ui, path="/")
+            gr.Markdown("### Step 2: Upload Target Video")
+            target_video = gr.Video(label="Target Video (Jispar Chehra Lagana Hai)")
+            submit_btn_video = gr.Button("Swap Face on Video", variant="primary")
+            gr.Markdown("### Step 3: Result")
+            result_video = gr.Video(label="Result Video", interactive=False)
+
+    # Dono buttons ke liye alag-alag click event
+    # Yeh dono event ek hi 'face_swap' function ko call karte hain
+    
+    submit_btn_image.click(
+        fn=face_swap,
+        inputs=[source_face, target_image],
+        outputs=result_image
+    )
+    
+    submit_btn_video.click(
+        fn=face_swap,
+        inputs=[source_face, target_video],
+        outputs=result_video
+    )
 
-# Ismein app.launch() ki zaroorat nahi hoti. Hugging Face khud 'app' object ko chala leta hai.
+app.launch()