Update app.py

app.py

@@ -11,100 +11,75 @@ from roop.processors.frame.core import get_frame_processors_modules
 from roop.utilities import normalize_output_path
 import os
 from PIL import Image
-from datetime import datetime
-
-def swap_face(source_file, target_file, doFaceEnhancer, use_gpu):
-    try:
-        # Save input images temporarily
-        source_path = "input.jpg"
-        target_path = "target.jpg"
-
-        source_image = Image.fromarray(source_file)
-        source_image.save(source_path)
-        target_image = Image.fromarray(target_file)
-        target_image.save(target_path)
-
-        # Set global variables for Roop
-        roop.globals.source_path = source_path
-        roop.globals.target_path = target_path
-        
-        # Create a dynamic output path
-        timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-        output_path = f"output_{timestamp}.jpg"
-        roop.globals.output_path = normalize_output_path(
-            roop.globals.source_path, roop.globals.target_path, output_path
-        )
-
-        # Configure frame processors
-        if doFaceEnhancer:
-            roop.globals.frame_processors = ["face_swapper", "face_enhancer"]
-        else:
-            roop.globals.frame_processors = ["face_swapper"]
-
-        # Global settings
-        roop.globals.headless = True
-        roop.globals.keep_fps = True
-        roop.globals.keep_audio = True
-        roop.globals.keep_frames = False
-        roop.globals.many_faces = False
-        roop.globals.video_encoder = "libx264"
-        roop.globals.video_quality = 18
-        roop.globals.max_memory = suggest_max_memory()
-
-        # Execution providers
-        if use_gpu:
-            roop.globals.execution_providers = decode_execution_providers(["cuda"])
-        else:
-            roop.globals.execution_providers = decode_execution_providers(["cpu"])
-        roop.globals.execution_threads = suggest_execution_threads()
-
-        print(
-            "Starting process with the following parameters:",
-            f"Source: {roop.globals.source_path}",
-            f"Target: {roop.globals.target_path}",
-            f"Output: {roop.globals.output_path}",
-            f"Enhancer: {doFaceEnhancer}",
-            f"Using GPU: {use_gpu}",
-            sep="\n"
-        )
-
-        # Pre-check and start process
-        for frame_processor in get_frame_processors_modules(roop.globals.frame_processors):
-            if not frame_processor.pre_check():
-                return "Pre-check failed for frame processors."
-
-        start()
-        return output_path
-
-    except Exception as e:
-        return f"An error occurred: {e}"
-
-# HTML content for UI information
-html_section_1 = "<div><p>This model is running on the selected hardware (CPU/GPU). Processing might take some time.</p></div>"
-
-# Create the Gradio interface
+
+def swap_face(source_file, target_file, doFaceEnhancer):
+
+    # Resize images to reduce processing load
+    source_image = Image.fromarray(source_file)
+    target_image = Image.fromarray(target_file)
+
+    # Resize to a smaller dimension if necessary
+    source_image.thumbnail((512, 512))
+    target_image.thumbnail((512, 512))
+
+    source_path = "input.jpg"
+    target_path = "target.jpg"
+
+    source_image.save(source_path, format="JPEG")
+    target_image.save(target_path, format="JPEG")
+
+    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"
+    roop.globals.output_path = normalize_output_path(
+        roop.globals.source_path, roop.globals.target_path, output_path
+    )
+
+    # Limit processing to what is necessary for CPU
+    if doFaceEnhancer:
+        roop.globals.frame_processors = ["face_swapper", "face_enhancer"]
+    else:
+        roop.globals.frame_processors = ["face_swapper"]
+
+    # Optimize for CPU
+    roop.globals.headless = True
+    roop.globals.keep_fps = False  # Disable to reduce processing
+    roop.globals.keep_audio = False  # Disable to reduce processing
+    roop.globals.keep_frames = False
+    roop.globals.many_faces = False
+    roop.globals.video_encoder = "libx264"
+    roop.globals.video_quality = 24  # Lower quality for faster processing
+    roop.globals.max_memory = suggest_max_memory()  # Use all available memory
+    roop.globals.execution_providers = decode_execution_providers(["cpu"])  # Use CPU only
+    roop.globals.execution_threads = suggest_execution_threads()  # Utilize all CPU cores
+
+    print(
+        "start process",
+        roop.globals.source_path,
+        roop.globals.target_path,
+        roop.globals.output_path,
+    )
+
+    for frame_processor in get_frame_processors_modules(roop.globals.frame_processors):
+        if not frame_processor.pre_check():
+            return
+
+    start()
+    return output_path
+
+html_section_2 = "<div><p>This model is running on CPU and might be slow.</p></div>"
+
 app = gr.Blocks()
 
 with app:
-    gr.HTML(html_section_1)
-    gr.Markdown("## Face Swap Application")
-    gr.Markdown("Upload a source and target image to swap faces. Optionally, enhance the swapped face.")
-    
-    # Inputs and Interface
-    inputs = [
-        gr.Image(label="Source Image"),
-        gr.Image(label="Target Image"),
-        gr.Checkbox(label="Enhance", info="Use Face Enhancer"),
-        gr.Checkbox(label="Use GPU (if available)", value=True)
-    ]
-    
-    outputs = gr.Image(label="Swapped Image")
-    
-    # Interface function call
+    gr.HTML(html_section_2)
     gr.Interface(
         fn=swap_face,
-        inputs=inputs,
-        outputs=outputs
-    ).launch()
+        inputs=[gr.Image(), gr.Image(), gr.Checkbox(label="Enhance", info="Face Enhancer")],
+        outputs="image"
+    )
 
 app.launch()