again revised app.py

app.py

@@ -10,11 +10,9 @@ import insightface
 from insightface.app import FaceAnalysis
 from huggingface_hub import hf_hub_download
 from fastapi import FastAPI, UploadFile, File
-from fastapi.responses import StreamingResponse, JSONResponse
+from fastapi.responses import StreamingResponse
 import io
-import threading
 import gradio as gr
-import uvicorn
 
 # -------------------------------------------------
 # Paths
@@ -88,18 +86,19 @@ def face_swap_and_enhance(src_img, tgt_img):
         if not src_faces or not tgt_faces:
             return None, "❌ Face not detected in one of the images."
 
+        # clean dirs
         shutil.rmtree(UPLOAD_DIR, ignore_errors=True)
         shutil.rmtree(RESULT_DIR, ignore_errors=True)
         os.makedirs(UPLOAD_DIR, exist_ok=True)
         os.makedirs(RESULT_DIR, exist_ok=True)
 
-        # Save swapped face
+        # save swapped
         unique_name = f"swapped_{uuid.uuid4().hex[:8]}.jpg"
         swapped_path = os.path.join(UPLOAD_DIR, unique_name)
         swapped_bgr = swapper.get(tgt_bgr, tgt_faces[0], src_faces[0])
         cv2.imwrite(swapped_path, swapped_bgr)
 
-        # Run CodeFormer
+        # run CodeFormer
         cmd = f"python {CODEFORMER_PATH} -w 0.7 --input_path {swapped_path} --output_path {RESULT_DIR} --bg_upsampler realesrgan --face_upsample"
         result = subprocess.run(cmd, shell=True, capture_output=True, text=True)
         if result.returncode != 0:
@@ -128,34 +127,24 @@ api = FastAPI()
 
 @api.post("/api/faceswap")
 async def faceswap(src_img: UploadFile = File(...), tgt_img: UploadFile = File(...)):
-    try:
-        src_bytes = await src_img.read()
-        tgt_bytes = await tgt_img.read()
-
-        src = cv2.imdecode(np.frombuffer(src_bytes, np.uint8), cv2.IMREAD_COLOR)
-        tgt = cv2.imdecode(np.frombuffer(tgt_bytes, np.uint8), cv2.IMREAD_COLOR)
-
-        if src is None or tgt is None:
-            return JSONResponse({"error": "Invalid images"}, status_code=400)
-
-        img_rgb_src = cv2.cvtColor(src, cv2.COLOR_BGR2RGB)
-        img_rgb_tgt = cv2.cvtColor(tgt, cv2.COLOR_BGR2RGB)
-
-        result_img, err = face_swap_and_enhance(img_rgb_src, img_rgb_tgt)
-        if result_img is None:
-            return JSONResponse({"error": err}, status_code=500)
+    src = cv2.imdecode(np.frombuffer(await src_img.read(), np.uint8), cv2.IMREAD_COLOR)
+    tgt = cv2.imdecode(np.frombuffer(await tgt_img.read(), np.uint8), cv2.IMREAD_COLOR)
 
-        _, buffer = cv2.imencode(".png", cv2.cvtColor(result_img, cv2.COLOR_RGB2BGR))
-        return StreamingResponse(io.BytesIO(buffer.tobytes()), media_type="image/png")
+    result_img, err = face_swap_and_enhance(
+        cv2.cvtColor(src, cv2.COLOR_BGR2RGB),
+        cv2.cvtColor(tgt, cv2.COLOR_BGR2RGB)
+    )
+    if result_img is None:
+        return {"error": err}
 
-    except Exception as e:
-        return JSONResponse({"error": str(e)}, status_code=500)
+    _, buffer = cv2.imencode(".png", cv2.cvtColor(result_img, cv2.COLOR_RGB2BGR))
+    return StreamingResponse(io.BytesIO(buffer.tobytes()), media_type="image/png")
 
 # -------------------------------------------------
-# Gradio UI (kept for demo)
+# Gradio UI
 # -------------------------------------------------
 with gr.Blocks() as demo:
-    gr.Markdown("Face Swap Demo")
+    gr.Markdown("### Face Swap + CodeFormer Enhancement")
 
     with gr.Row():
         src_input = gr.Image(type="numpy", label="Upload Your Face")
@@ -167,17 +156,12 @@ with gr.Blocks() as demo:
 
     def process(src, tgt):
         img, err = face_swap_and_enhance(src, tgt)
-        if img is None:
-            return None, err
-        return img, ""
+        return img, err
 
     btn.click(process, [src_input, tgt_input], [output_img, error_box])
 
-# -------------------------------------------------
-# Run both FastAPI + Gradio
-# -------------------------------------------------
-def run_api():
-    uvicorn.run(api, host="0.0.0.0", port=7861)
+# Mount FastAPI into Gradio
+demo.app = api
 
-threading.Thread(target=run_api).start()
-demo.launch(server_port=7860, server_name="0.0.0.0")
+# Launch (only once)
+demo.launch(server_name="0.0.0.0", server_port=7860)

requirements.txt

@@ -31,8 +31,6 @@ onnx
 # App deps
 gradio
 huggingface_hub
-
-# FastAPI REST API + server
 fastapi
 uvicorn