Update app.py

app.py

@@ -1,67 +1,105 @@
 import gradio as gr
 import subprocess
 import os
+import shutil
 from datetime import datetime
 from PIL import Image
-from huggingface_hub import login, upload_file
-
-# --- Config ---
-# REPO_ID = os.environ.get("HFPATH")
-# HF_TOKEN = os.environ.get("MAGIC")
-# login(HF_TOKEN)
-# def upload_to_hf(filepath):
-#     filename = os.path.basename(filepath)
-#     SUBFOLDER = datetime.now().strftime("%Y%m%d")
-#     path_in_repo = f"{SUBFOLDER}/{filename}"
-#     upload_file(
-#         path_or_fileobj=filepath,
-#         path_in_repo=path_in_repo,
-#         repo_id=REPO_ID,
-#         repo_type="dataset"
-#     )
-#     return f"https://huggingface.co/datasets/{REPO_ID}/blob/main/{filename}"
-
-def run_scripts(target, source, use_face_enhancer):
-    output_images = []  # List to store processed images
-    for target_file in target:
-        target_extension = os.path.splitext(target_file.name)[-1]  # Get file extension
-        timestamp = datetime.now().strftime("%Y%m%d%H%M%S")
-        output_path1 = f"output_{timestamp}{target_extension}"  # Output path
-
-        # Run subprocess command to process the image
-        cmd1 = [
-            "python3", "run.py", "-s", source.name, "-t", target_file.name,
-            "-o", output_path1, "--frame-processor", "face_swapper"
+import uuid
+
+OUTPUT_DIR = "outputs"
+os.makedirs(OUTPUT_DIR, exist_ok=True)
+
+
+def run_scripts(target_files, source_file, use_face_enhancer):
+
+    if not target_files or not source_file:
+        return []
+
+    output_results = []
+
+    for target_file in target_files:
+
+        # ===== Unique filename =====
+        unique_id = uuid.uuid4().hex[:8]
+        extension = os.path.splitext(target_file.name)[-1]
+        output_path = os.path.join(
+            OUTPUT_DIR,
+            f"swap_{unique_id}{extension}"
+        )
+
+        # ===== Build command =====
+        cmd = [
+            "python3",
+            "run.py",
+            "-s", source_file.name,
+            "-t", target_file.name,
+            "-o", output_path,
+            "--frame-processor", "face_swapper"
         ]
-        result = subprocess.run(cmd1)
 
-        if result.returncode != 0:
-            print("Subprocess failed.")
-            continue  # Skip to the next file
+        if use_face_enhancer:
+            cmd += ["--face-enhancer"]
+
+        print("Running:", " ".join(cmd))
+
+        try:
+            result = subprocess.run(
+                cmd,
+                capture_output=True,
+                text=True
+            )
+
+            if result.returncode != 0:
+                print("Error:")
+                print(result.stderr)
+                continue
+
+        except Exception as e:
+            print("Subprocess crashed:", str(e))
+            continue
+
+        # ===== Check output exists =====
+        if not os.path.exists(output_path):
+            print("Output not found:", output_path)
+            continue
+
+        # ===== Handle file types =====
+        ext = extension.lower()
+
+        try:
+            if ext in [".png", ".jpg", ".jpeg", ".webp"]:
+                img = Image.open(output_path).convert("RGB")
+                output_results.append(img)
+
+            elif ext == ".gif":
+                # Return gif path directly (Gallery hiển thị được)
+                output_results.append(output_path)
+
+            elif ext in [".mp4", ".mov", ".avi"]:
+                output_results.append(output_path)
+
+            else:
+                output_results.append(output_path)
+
+        except Exception as e:
+            print("Error loading result:", str(e))
+            continue
 
-        # Check if the file exists before opening it
-        if os.path.isfile(output_path1):
-            output_image = Image.open(output_path1)
-            output_images.append(output_image)
-        else:
-            print(f"File not found: {output_path1}")
-            continue  # Optionally skip to the next file
+    return output_results
 
-    return output_images  # Return the list of processed images
 
-# Gradio interface
 iface = gr.Interface(
     fn=run_scripts,
     inputs=[
-        gr.Files(label="Target Files"),  # Input for target files (image/video)
-        gr.File(label="Source File"),     # Input for source file (image)
-        gr.Checkbox(label="Use Face Enhancer")  # Option for face enhancer
+        gr.Files(label="Target Files (Image / GIF / Video)"),
+        gr.File(label="Source Face Image"),
+        gr.Checkbox(label="Use Face Enhancer", value=False)
     ],
-    outputs=gr.Gallery(label="Output Images"),  # Output for processed images
+    outputs=gr.Gallery(label="Results"),
     title="Face Swapper",
-    description="Upload a target image/video and a source image to swap faces.",
+    description="Upload target images/videos and a source image to swap faces.",
     live=False
 )
 
 if __name__ == "__main__":
-    iface.launch()
+    iface.launch()