Use different structure

roop/core.py

@@ -3,7 +3,6 @@
 import os
 import sys
 
-from roop.frame_processors.core import get_frame_processor_modules
 
 # single thread doubles cuda performance - needs to be set before torch import
 if any(arg.startswith('--execution-provider') for arg in sys.argv):
@@ -26,8 +25,7 @@
 
 import roop.globals
 import roop.ui as ui
-import roop.frame_processors.face_swapper
-import roop.frame_processors.face_enhancer
+from roop.processors.frame.core import get_frame_processor_module
 from roop.utilities import has_image_extension, is_image, is_video, detect_fps, create_video, extract_frames, get_temp_frame_paths, restore_audio, create_temp, move_temp, clean_temp
 from roop.face_analyser import get_one_face
 
@@ -181,7 +179,7 @@ def start() -> None:
  destroy()
  for frame_processor in roop.globals.frame_processors:
  update_status(f'{frame_processor} in progress...')
- module = get_frame_processor_modules(frame_processor)
+ module = get_frame_processor_module(frame_processor)
  module.process_image(roop.globals.source_path, roop.globals.target_path, roop.globals.output_path)
  release_resources()
  if is_image(roop.globals.target_path):
@@ -200,7 +198,7 @@ def start() -> None:
  temp_frame_paths = get_temp_frame_paths(roop.globals.target_path)
  for frame_processor in roop.globals.frame_processors:
  update_status(f'{frame_processor} in progress...')
- module = get_frame_processor_modules(frame_processor)
+ module = get_frame_processor_module(frame_processor)
  conditional_process_video(roop.globals.source_path, temp_frame_paths, module.process_video)
  release_resources()
  if roop.globals.keep_fps:
@@ -236,7 +234,7 @@ def run() -> None:
  parse_args()
  pre_check()
  for frame_processor in roop.globals.frame_processors:
- module = get_frame_processor_modules(frame_processor)
+ module = get_frame_processor_module(frame_processor)
  module.pre_check()
  limit_resources()
  if roop.globals.headless:

roop/processors/frame/core.py

@@ -0,0 +1,16 @@
+import sys
+import importlib
+from typing import Any
+
+FRAME_PROCESSOR_MODULE = None
+
+
+def get_frame_processor_module(frame_processor: str) -> Any:
+ global FRAME_PROCESSOR_MODULE
+
+ if not FRAME_PROCESSOR_MODULE:
+ try:
+ FRAME_PROCESSOR_MODULE = importlib.import_module(f'roop.processors.frame.{frame_processor}')
+ except ImportError:
+ sys.exit()
+ return FRAME_PROCESSOR_MODULE

roop/frame_processors/face_enhancer.py → roop/processors/frame/face_enhancer.py

@@ -18,14 +18,14 @@
 
 
 def pre_check() -> None:
- download_directory_path = resolve_relative_path('../../models')
+ download_directory_path = resolve_relative_path('../../../models')
  conditional_download(download_directory_path, ['https://github.com/sczhou/CodeFormer/releases/download/v0.1.0/codeformer.pth'])
 
 
 def get_code_former():
  global CODE_FORMER
  with THREAD_LOCK:
- model_path = resolve_relative_path('../../models/codeformer.pth')
+ model_path = resolve_relative_path('../../../models/codeformer.pth')
  if CODE_FORMER is None:
  model = torch.load(model_path)['params_ema']
  CODE_FORMER = ARCH_REGISTRY.get('CodeFormer')(

roop/frame_processors/face_swapper.py → roop/processors/frame/face_swapper.py

@@ -13,7 +13,7 @@
 
 
 def pre_check() -> None:
- download_directory_path = resolve_relative_path('../../models')
+ download_directory_path = resolve_relative_path('../../../models')
  conditional_download(download_directory_path, ['https://huggingface.co/deepinsight/inswapper/resolve/main/inswapper_128.onnx'])
 
 
@@ -22,7 +22,7 @@ def get_face_swapper() -> None:
 
  with THREAD_LOCK:
  if FACE_SWAPPER is None:
- model_path = resolve_relative_path('../../models/inswapper_128.onnx')
+ model_path = resolve_relative_path('../../../models/inswapper_128.onnx')
  FACE_SWAPPER = insightface.model_zoo.get_model(model_path, providers=roop.globals.execution_providers)
  return FACE_SWAPPER
 

roop/ui.py

@@ -8,7 +8,7 @@
 import roop.globals
 from roop.face_analyser import get_one_face
 from roop.capturer import get_video_frame, get_video_frame_total
-from roop.frame_processors.core import get_frame_processor_modules
+from roop.processors.frame.core import get_frame_processor_module
 from roop.utilities import is_image, is_video, resolve_relative_path
 
 WINDOW_HEIGHT = 700
@@ -205,7 +205,7 @@ def init_preview() -> None:
 def update_preview(frame_number: int = 0) -> None:
  if roop.globals.source_path and roop.globals.target_path:
  for frame_processor in roop.globals.frame_processors:
- module = get_frame_processor_modules(frame_processor)
+ module = get_frame_processor_module(frame_processor)
  module.process_image(roop.globals.source_path, roop.globals.target_path, roop.globals.output_path)
  video_frame = module.process_faces(
  get_one_face(cv2.imread(roop.globals.source_path)),