Update app.py

app.py

@@ -11,36 +11,26 @@ from roop.processors.frame.core import get_frame_processors_modules
 from roop.utilities import normalize_output_path
 import os
 from PIL import Image
-import cv2
 
-def swap_face(source_file, target_file, doFaceEnhancer):
 
+def swap_face(source_file, target_file, target_type, doFaceEnhancer):
     source_path = "input.jpg"
     target_path = "target"
-    
-    if isinstance(source_file, np.ndarray):
-        # Handle source image
-        source_image = Image.fromarray(source_file)
-        source_path += ".jpg"
-        source_image.save(source_path)
-    else:
-        raise ValueError("Source file should be an image.")
-    
-    if isinstance(target_file, np.ndarray):
-        # Handle target image
+
+    # Handle source image
+    source_image = Image.fromarray(source_file)
+    source_image.save(source_path)
+
+    if target_type == "Image":
         target_image = Image.fromarray(target_file)
         target_path += ".jpg"
         target_image.save(target_path)
-    elif isinstance(target_file, str):
-        # Handle target video
-        if target_file.endswith(".mp4"):
-            target_path += ".mp4"
-            os.rename(target_file, target_path)
-        else:
-            raise ValueError("Target file should be a video with .mp4 extension.")
+    elif target_type == "Video":
+        target_path += ".mp4"
+        os.rename(target_file, target_path)
     else:
-        raise ValueError("Target file should be an image or video.")
-    
+        raise ValueError("Unsupported target type.")
+
     print("source_path: ", source_path)
     print("target_path: ", target_path)
 
@@ -51,16 +41,16 @@ def swap_face(source_file, target_file, doFaceEnhancer):
         output_path += ".mp4"
     else:
         output_path += ".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
@@ -87,9 +77,29 @@ def swap_face(source_file, target_file, doFaceEnhancer):
     return output_path
 
 
+def get_target_input(target_type):
+    if target_type == "Image":
+        return gr.Image()
+    elif target_type == "Video":
+        return gr.Video()
+    else:
+        return None
+
+
 app = gr.Interface(
     fn=swap_face,
-    inputs=[gr.Image(), gr.Video() | gr.Image(), gr.Checkbox(label="face_enhancer?", info="do face enhancer?")],
-    outputs="auto"
+    inputs=[
+        gr.Image(),
+        gr.Radio(["Image", "Video"], label="Target Type"),
+        gr.State(),
+        gr.Checkbox(label="face_enhancer?", info="do face enhancer?")
+    ],
+    outputs="auto",
+    live=True
 )
+
+
+def update_target_input(target_type):
+    return gr.update(inputs=[gr.Image(), get_target_input(target_type), gr.Checkbox(label="face_enhancer?", info="do face enhancer?")])
+
 app.launch()