cline

app.py

@@ -1,83 +1,113 @@
-import os
+import numpy as np
 import gradio as gr
-from PIL import Image
+import roop.globals
 from roop.core import (
+    start,
     decode_execution_providers,
     suggest_max_memory,
     suggest_execution_threads,
 )
 from roop.processors.frame.core import get_frame_processors_modules
 from roop.utilities import normalize_output_path
+import os
+from PIL import Image
+import uuid
 
+# Global variable to store history
+history = []
 
+def swap_face(source_file, target_files, doFaceEnhancer):
+    global history
+    output_paths = []
 
-app = gr.Blocks()
+    source_path = f"input_{uuid.uuid4()}.jpg"
+    source_image = Image.fromarray(source_file)
+    source_image.save(source_path)
 
-with app:
-    
-    source_image = gr.Image(label="Source Image")
-    target_images = gr.File(label="Target Images", file_count="multiple")
-    do_face_enhancer = gr.Checkbox(label="Face Enhancer")
-    with gr.Tab("Result"):
-        result_images = gr.Gallery(label="Result Images")
-    with gr.Tab("History"):
-        history_images = gr.Gallery(label="Processed Images")
+    for idx, target_file in enumerate(target_files):
+        target_path = f"target_{uuid.uuid4()}.jpg"
+        target_image = Image.fromarray(target_file)
+        target_image.save(target_path)
 
-    def face_swap(source_image, target_images, do_face_enhancer):
-        result_images = []
-        for target_image in target_images:
-            source_path = "input.jpg"
-            target_path = "target.jpg"
+        print(f"Processing image {idx + 1}")
+        print("source_path: ", source_path)
+        print("target_path: ", target_path)
 
-            # Convert gr.Image to PIL Image
-            source_pil_image = Image.fromarray(source_image)
-            source_pil_image.save(source_path)
+        roop.globals.source_path = source_path
+        roop.globals.target_path = target_path
+        output_path = f"output_{uuid.uuid4()}.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()
 
-            # Convert gr.File to PIL Image
-            target_pil_image = Image.open(target_image.name)
-            target_pil_image.save(target_path)
+        print(
+            "start process",
+            roop.globals.source_path,
+            roop.globals.target_path,
+            roop.globals.output_path,
+        )
 
-            output_path = "output.jpg"
-            roop.globals.source_path = source_path
-            roop.globals.target_path = target_path
-            roop.globals.output_path = normalize_output_path(roop.globals.source_path, roop.globals.target_path, output_path)
-            if do_face_enhancer:
-                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()
+        for frame_processor in get_frame_processors_modules(
+            roop.globals.frame_processors
+        ):
+            if not frame_processor.pre_check():
+                return
 
-            for frame_processor in get_frame_processors_modules(
-                roop.globals.frame_processors
-            ):
-                if not frame_processor.pre_check():
-                    return
+        start()
+        output_paths.append(output_path)
 
-            swap.start()
-            result_image = Image.open(roop.globals.output_path)
-            result_images.append(result_image)
-        return result_images
+    # Add to history
+    history.extend(output_paths)
+    
+    return output_paths, gr.update(value=history)
 
-    gr.Button("Swap Faces").click(face_swap, inputs=[source_image, target_images, do_face_enhancer], outputs=result_images)
+def get_history():
+    return history
 
-    def save_history(result_images):
-        history_folder = "history"
-        if not os.path.exists(history_folder):
-            os.makedirs(history_folder)
-        for i, result_image in enumerate(result_images):
-            filename = f"result_{i}.jpg"
-            result_image.save(os.path.join(history_folder, filename))
-        return result_images
+html_section_1 = "<div><h1>Welcome to the Face Swap App</h1></div>"
+html_section_2 = '<div><p>Upload your source and target images to swap faces. Optionally, use the face enhancer feature for HD Results.</p><h2><br /><strong>For fast and bulk Swap:</strong>&nbsp;<a href="https://picfy.xyz/" target="_blank" rel="noopener">https://picfy.xyz/</a><br /> <strong>Support me USDT (TRC-20): TAe7hsSVWtMEYz3G5V1UiUdYPQVqm28bKx</h2></div>'
 
-    gr.Button("Save to History").click(save_history, inputs=result_images, outputs=history_images)
+with gr.Blocks() as app:
+    gr.HTML(html_section_1)
+    gr.HTML(html_section_2)
+    
+    with gr.Tab("Face Swap"):
+        with gr.Row():
+            source_input = gr.Image(label="Source Image")
+            target_input = gr.File(label="Target Image(s)", file_count="multiple")
+        
+        enhance_checkbox = gr.Checkbox(label="Use Face Enhancer", info="Apply face enhancement")
+        swap_button = gr.Button("Swap Faces")
+        output_gallery = gr.Gallery(label="Output Images")
+    
+    with gr.Tab("History"):
+        history_gallery = gr.Gallery(label="Previous Outputs")
+        refresh_button = gr.Button("Refresh History")
+    
+    swap_button.click(
+        fn=swap_face,
+        inputs=[source_input, target_input, enhance_checkbox],
+        outputs=[output_gallery, history_gallery]
+    )
+    
+    refresh_button.click(
+        fn=get_history,
+        inputs=[],
+        outputs=[history_gallery]
+    )
 
-app.launch()
+app.launch()