Update main.py

main.py

@@ -1,9 +1,8 @@
-from fastapi import FastAPI, File, UploadFile, Form
+from fastapi import FastAPI
 from fastapi.staticfiles import StaticFiles
 from fastapi.responses import FileResponse
-from io import BytesIO
-import cv2
-import numpy as np
+
+
 import insightface
 from insightface.app import FaceAnalysis
 
@@ -23,10 +22,10 @@ def sort_faces(faces):
 def get_face(faces, face_id):
     try:
         if len(faces) < face_id or face_id < 1:
-            raise ValueError(f"The image includes only {len(faces)} faces, however, you asked for face {face_id}")
+            raise gr.Error(f"The image includes only {len(faces)} faces, however, you asked for face {face_id}")
         return faces[face_id-1]
     except Exception as e:
-        raise ValueError(f"An error occurred: {str(e)}")
+        raise gr.Error(f"An error occurred: {str(e)}")
 
 app, swapper = prepare_app()
 
@@ -41,39 +40,22 @@ def swap_faces(sourceImage, sourceFaceIndex, destinationImage, destinationFaceIn
     result = swapper.get(destinationImage, res_face, source_face, paste_back=True)
     return result
 
-@app.post("/swap-faces/")
-async def swap_faces_endpoint(source_image: UploadFile = File(...), 
-                              source_face_index: int = Form(...), 
-                              destination_image: UploadFile = File(...), 
-                              destination_face_index: int = Form(...)):
+@app.get("/swap-faces/")
+async def swap_faces_endpoint(sourceImage: str, sourceFaceIndex: int, destinationImage: str, destinationFaceIndex: int):
     """
     Endpoint to swap faces between two images.
-
+    
     Parameters:
-    - source_image: UploadFile for the source image.
-    - source_face_index: Index of the face in the source image to be swapped.
-    - destination_image: UploadFile for the destination image.
-    - destination_face_index: Index of the face in the destination image to be swapped.
+    - sourceImage: URL or path to the source image.
+    - sourceFaceIndex: Index of the face in the source image to be swapped.
+    - destinationImage: URL or path to the destination image.
+    - destinationFaceIndex: Index of the face in the destination image to be swapped.
     """
-    # Read source image
-    source_image_content = await source_image.read()
-    nparr = np.fromstring(source_image_content, np.uint8)
-    source_image_np = cv2.imdecode(nparr, cv2.IMREAD_COLOR)
-
-    # Read destination image
-    destination_image_content = await destination_image.read()
-    nparr = np.fromstring(destination_image_content, np.uint8)
-    destination_image_np = cv2.imdecode(nparr, cv2.IMREAD_COLOR)
-
-    # Swap faces
-    result_image_np = swap_faces(source_image_np, source_face_index, destination_image_np, destination_face_index)
-
-    # Encode the result image to send back
-    _, img_encoded = cv2.imencode('.jpg', result_image_np)
-    return img_encoded.tobytes()
+    result = swap_faces(sourceImage, sourceFaceIndex, destinationImage, destinationFaceIndex)
+    return result
 
 app.mount("/", StaticFiles(directory="static", html=True), name="static")
 
 @app.get("/")
 def index() -> FileResponse:
-    return FileResponse(path="/app/static/index.html", media_type="text/html")
+    return FileResponse(path="/app/static/index.html", media_type="text/html")