Update app.py

app.py

@@ -11,83 +11,100 @@ 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"
 
-def swap_face(source_file, target_file, doFaceEnhancer):
+        source_image = Image.fromarray(source_file)
+        source_image.save(source_path)
+        target_image = Image.fromarray(target_file)
+        target_image.save(target_path)
 
-    source_path = "input.jpg"
-    target_path = "target.jpg"
+        # 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
+        )
 
-    source_image = Image.fromarray(source_file)
-    source_image.save(source_path)
-    target_image = Image.fromarray(target_file)
-    target_image.save(target_path)
+        # Configure frame processors
+        if doFaceEnhancer:
+            roop.globals.frame_processors = ["face_swapper", "face_enhancer"]
+        else:
+            roop.globals.frame_processors = ["face_swapper"]
 
-    print("source_path: ", source_path)
-    print("target_path: ", target_path)
+        # 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()
 
-    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
-    )
-    if doFaceEnhancer:
-        roop.globals.frame_processors = ["face_swapper", "face_enhancer"]
-    else:
-        roop.globals.frame_processors = ["face_swapper"]
-    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()
-    roop.globals.execution_providers = decode_execution_providers(["cuda"])
-    roop.globals.execution_threads = suggest_execution_threads()
+        # 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(
-        "start process",
-        roop.globals.source_path,
-        roop.globals.target_path,
-        roop.globals.output_path,
-    )
+        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"
+        )
 
-    for frame_processor in get_frame_processors_modules(
-        roop.globals.frame_processors
-    ):
-        if not frame_processor.pre_check():
-            return
+        # 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
+        start()
+        return output_path
 
+    except Exception as e:
+        return f"An error occurred: {e}"
 
-#html_section_1 = "<div><h1>Welcome to the Face Swap App</h1></div>"
-html_section_2 = "<div><p>This model is running on CPU an might be slow.</p></div>"
-html_section_3 = """<div>
-    <a href="https://ziverr.xyz/monica" target="_blank" style="display: inline-block;">
-        <img decoding="async" alt="banner" src="https://ziverr.xyz/wp-content/uploads/2024/06/PASSIVE-3.gif">
-    </a>
-    <a href="https://go.fiverr.com/visit/?bta=36184&brand=fiverrcpa&landingPage=https%253A%252F%252Fwww.fiverr.com%252Fcategories%252Fprogramming-tech%252Fai-coding%252Fai-applications%253Fsource%253Dcategory_tree" target="_blank" style="display: inline-block;">
-        <img fetchpriority="high" decoding="async" width="468" height="120" src="https://ziverr.xyz/wp-content/uploads/2024/06/PASSIVE-1.gif" class="attachment-large size-large wp-image-1266" alt="">
-    </a>
-    <a href="https://beta.publishers.adsterra.com/referral/UNXJYTziBP" target="_blank" style="display: inline-block;">
-        <img decoding="async" alt="banner" src="https://landings-cdn.adsterratech.com/referralBanners/gif/468x120_adsterra_reff.gif">
-    </a>
-</div>"""
+# 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
 app = gr.Blocks()
 
 with app:
-   # gr.HTML(html_section_1)
-    gr.HTML(html_section_2)
-    gr.HTML(html_section_3)
+    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.Interface(
         fn=swap_face,
-        inputs=[gr.Image(), gr.Image(), gr.Checkbox(label="Enhance", info="Face Enhancer")],
-        outputs="image"
-    )
+        inputs=inputs,
+        outputs=outputs
+    ).launch()
 
 app.launch()