Update app.py

app.py

@@ -1,4 +1,3 @@
-import numpy as np
 import gradio as gr
 import roop.globals
 from roop.core import (
@@ -9,33 +8,37 @@ from roop.core import (
 )
 from roop.processors.frame.core import get_frame_processors_modules
 from roop.utilities import normalize_output_path
-import os
 from PIL import Image
+import io
 
+def process_face_swap(source_image, target_image, apply_face_enhancer):
+    # Convert images to PIL Image objects and save them to in-memory file-like objects
+    src_image_bytes = io.BytesIO()
+    tgt_image_bytes = io.BytesIO()
+    
+    source_image.save(src_image_bytes, format='JPEG')
+    target_image.save(tgt_image_bytes, format='JPEG')
 
-def swap_face(source_file, target_file, doFaceEnhancer):
+    src_image_bytes.seek(0)
+    tgt_image_bytes.seek(0)
 
-    source_path = "input.jpg"
-    target_path = "target.jpg"
+    src_image_path = "source_image.jpg"
+    tgt_image_path = "target_image.jpg"
+    output_path = "result_image.jpg"
 
-    source_image = Image.fromarray(source_file)
-    source_image.save(source_path)
-    target_image = Image.fromarray(target_file)
-    target_image.save(target_path)
+    with open(src_image_path, 'wb') as f:
+        f.write(src_image_bytes.getvalue())
+    
+    with open(tgt_image_path, 'wb') as f:
+        f.write(tgt_image_bytes.getvalue())
 
-    print("source_path: ", source_path)
-    print("target_path: ", target_path)
-
-    roop.globals.source_path = source_path
-    roop.globals.target_path = target_path
-    output_path = "output.jpg"
+    # Set Roop configuration
+    roop.globals.source_path = src_image_path
+    roop.globals.target_path = tgt_image_path
     roop.globals.output_path = normalize_output_path(
         roop.globals.source_path, roop.globals.target_path, output_path
     )
-    if doFaceEnhancer:
-        roop.globals.frame_processors = ["face_swapper", "face_enhancer"]
-    else:
-        roop.globals.frame_processors = ["face_swapper"]
+    roop.globals.frame_processors = ["face_swapper", "face_enhancer"] if apply_face_enhancer else ["face_swapper"]
     roop.globals.headless = True
     roop.globals.keep_fps = True
     roop.globals.keep_audio = True
@@ -44,34 +47,38 @@ def swap_face(source_file, target_file, doFaceEnhancer):
     roop.globals.video_encoder = "libx264"
     roop.globals.video_quality = 18
     roop.globals.max_memory = suggest_max_memory()
-    roop.globals.execution_providers = decode_execution_providers(["cuda"])
+    roop.globals.execution_providers = decode_execution_providers(["cuda", "cpu"])
     roop.globals.execution_threads = suggest_execution_threads()
 
-    print(
-        "start process",
-        roop.globals.source_path,
-        roop.globals.target_path,
-        roop.globals.output_path,
-    )
+    # Print paths for debugging
+    print(f"Starting the process with:")
+    print(f"Source: {roop.globals.source_path}")
+    print(f"Target: {roop.globals.target_path}")
+    print(f"Output: {roop.globals.output_path}")
 
-    for frame_processor in get_frame_processors_modules(
-        roop.globals.frame_processors
-    ):
-        if not frame_processor.pre_check():
+    # Execute face swap process
+    for processor in get_frame_processors_modules(roop.globals.frame_processors):
+        if not processor.pre_check():
             return
 
     start()
-    return output_path
-
+    
+    # Load and return the output image
+    with open(roop.globals.output_path, 'rb') as f:
+        output_image = f.read()
+    
+    return output_image
 
-app = gr.Blocks()
-
-with app:
-    gr.Interface(
-        fn=swap_face,
-        inputs=[gr.Image(), gr.Image(), gr.Checkbox(label="Enhance", info="Face Enhancer")],
-        outputs="image",
-        description="This model is running on CPU and might be slow."
-    )
+# Create Gradio interface
+iface = gr.Interface(
+    fn=process_face_swap,
+    inputs=[
+        gr.Image(type="pil", label="Source Image"),
+        gr.Image(type="pil", label="Target Image"),
+        gr.Checkbox(label="Apply Face Enhancer")
+    ],
+    outputs=gr.Image(type="pil"),
+    description="Swap faces between two images. Use the face enhancer option to improve the result. Processing may take longer if you use Face Enhancer. Becose this Modle is running using CPU."
+)
 
-app.launch()
+iface.launch()