add face_enhancer switch option

app.py

@@ -15,7 +15,7 @@ import os
 from PIL import Image
 
 
-def swap_face(source_file, target_file):
+def swap_face(source_file, target_file,doFaceEnhancer):
 
     source_path = "input.jpg"
     target_path = "target.jpg"
@@ -34,7 +34,10 @@ def swap_face(source_file, target_file):
     roop.globals.output_path = normalize_output_path(
         roop.globals.source_path, roop.globals.target_path, output_path
     )
-    roop.globals.frame_processors = ["face_swapper","face_enhancer"]
+    if doFaceEnhancer == True:
+        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
@@ -64,6 +67,6 @@ def swap_face(source_file, target_file):
 
 
 app = gr.Interface(
-    fn=swap_face, inputs=[gr.Image(), gr.Image()], outputs="image"
+    fn=swap_face, inputs=[gr.Image(), gr.Image(),gr.Checkbox(label="face_enhancer?", info="do face enhancer?")], outputs="image"
 )
 app.launch()

roop/core.py

@@ -146,10 +146,12 @@ def start() -> None:
             destroy()
         shutil.copy2(roop.globals.target_path, roop.globals.output_path)
         for frame_processor in get_frame_processors_modules(roop.globals.frame_processors):
-            update_status('Progressing...', frame_processor.NAME)
-            frame_processor.process_image(roop.globals.source_path, roop.globals.output_path, roop.globals.output_path)
-            frame_processor.post_process()
-            release_resources()
+            for frame_processor_name in roop.globals.frame_processors:
+                if frame_processor_name == frame_processor.frame_name:
+                    update_status('Progressing...', frame_processor.NAME)
+                    frame_processor.process_image(roop.globals.source_path, roop.globals.output_path, roop.globals.output_path)
+                    frame_processor.post_process()
+                    release_resources()
         if is_image(roop.globals.target_path):
             update_status('Processing to image succeed!')
         else:

roop/processors/frame/core.py

@@ -35,10 +35,17 @@ def load_frame_processor_module(frame_processor: str) -> Any:
 def get_frame_processors_modules(frame_processors: List[str]) -> List[ModuleType]:
     global FRAME_PROCESSORS_MODULES
 
-    if not FRAME_PROCESSORS_MODULES:
-        for frame_processor in frame_processors:
+    for frame_processor in frame_processors:
+        found = False
+        for frame_processor_module in FRAME_PROCESSORS_MODULES:
+            if frame_processor_module.frame_name == frame_processor:
+                found = True
+                break
+        if not found:
             frame_processor_module = load_frame_processor_module(frame_processor)
             FRAME_PROCESSORS_MODULES.append(frame_processor_module)
+    # if not FRAME_PROCESSORS_MODULES:
+        
     return FRAME_PROCESSORS_MODULES
 
 

roop/processors/frame/face_enhancer.py

@@ -14,6 +14,7 @@ FACE_ENHANCER = None
 THREAD_SEMAPHORE = threading.Semaphore()
 THREAD_LOCK = threading.Lock()
 NAME = 'ROOP.FACE-ENHANCER'
+frame_name = 'face_enhancer'
 
 
 def get_face_enhancer() -> Any:

roop/processors/frame/face_swapper.py

@@ -13,7 +13,7 @@ from roop.utilities import conditional_download, resolve_relative_path, is_image
 FACE_SWAPPER = None
 THREAD_LOCK = threading.Lock()
 NAME = 'ROOP.FACE-SWAPPER'
-
+frame_name = 'face_swapper'
 
 def get_face_swapper() -> Any:
     global FACE_SWAPPER