Merge 130f096cd5 into f0fae811d8

should improve the performance by 30%

README.md

@@ -98,7 +98,7 @@ Users are expected to use this software responsibly and legally. If using a real
 
 ## Installation (Manual)
 
-**Please be aware that the installation requires technical skills and is not for beginners. Consider downloading the prebuilt version.**
+**Please be aware that the installation requires technical skills and is not for beginners. Consider downloading the quickstart version.**
 
 <details>
 <summary>Click to see the process</summary>
@@ -109,7 +109,7 @@ This is more likely to work on your computer but will be slower as it utilizes t
 
 **1. Set up Your Platform**
 
--   Python (3.10 recommended)
+-   Python (3.11 recommended)
 -   pip
 -   git
 -   [ffmpeg](https://www.youtube.com/watch?v=OlNWCpFdVMA) - ```iex (irm ffmpeg.tc.ht)```
@@ -153,14 +153,14 @@ pip install -r requirements.txt
 Apple Silicon (M1/M2/M3) requires specific setup:
 
 ```bash
-# Install Python 3.10 (specific version is important)
-brew install python@3.10
+# Install Python 3.11 (specific version is important)
+brew install python@3.11
 
 # Install tkinter package (required for the GUI)
 brew install python-tk@3.10
 
-# Create and activate virtual environment with Python 3.10
-python3.10 -m venv venv
+# Create and activate virtual environment with Python 3.11
+python3.11 -m venv venv
 source venv/bin/activate
 
 # Install dependencies
@@ -236,7 +236,7 @@ python3.10 run.py --execution-provider coreml
   # Uninstall conflicting versions if needed
   brew uninstall --ignore-dependencies python@3.11 python@3.13
   
-  # Keep only Python 3.10
+  # Keep only Python 3.11
   brew cleanup
   ```
 
@@ -246,7 +246,7 @@ python3.10 run.py --execution-provider coreml
 
 ```bash
 pip uninstall onnxruntime onnxruntime-coreml
-pip install onnxruntime-coreml==1.13.1
+pip install onnxruntime-coreml==1.21.0
 ```
 
 2. Usage:
@@ -261,7 +261,7 @@ python run.py --execution-provider coreml
 
 ```bash
 pip uninstall onnxruntime onnxruntime-directml
-pip install onnxruntime-directml==1.15.1
+pip install onnxruntime-directml==1.21.0
 ```
 
 2. Usage:
@@ -276,7 +276,7 @@ python run.py --execution-provider directml
 
 ```bash
 pip uninstall onnxruntime onnxruntime-openvino
-pip install onnxruntime-openvino==1.15.0
+pip install onnxruntime-openvino==1.21.0
 ```
 
 2. Usage:

modules/processors/frame/core.py

@@ -1,12 +1,129 @@
 import sys
 import importlib
+from typing import Set, Optional
+
+# Define a whitelist of allowed modules that can be dynamically imported
+ALLOWED_MODULES: Set[str] = {
+    'modules.processors.frame.blur',
+    'modules.processors.frame.censor',
+    'modules.processors.frame.crop',
+    'modules.processors.frame.resize',
+    'modules.processors.frame.rotate',
+    # Add all legitimate processor modules that should be importable
+}
+
+def safe_import_module(module_name: str) -> Optional[object]:
+    """
+    Safely import a module by checking against a whitelist.
+    
+    Args:
+        module_name: The name of the module to import
+        
+    Returns:
+        The imported module or None if the module is not in the whitelist
+    """
+    if module_name in ALLOWED_MODULES:
+        return safe_import_module(module_name)
+    else:
+        # Log the attempt to import a non-whitelisted module
+        print(f"Warning: Attempted to import non-whitelisted module: {module_name}")
+        return None
+
+import importlib
+from typing import Set, Optional
+
+# Define a whitelist of allowed modules that can be dynamically imported
+ALLOWED_MODULES: Set[str] = {
+    'modules.processors.frame.blur',
+    'modules.processors.frame.censor',
+    'modules.processors.frame.crop',
+    'modules.processors.frame.resize',
+    'modules.processors.frame.rotate',
+    # Add all legitimate processor modules that should be importable
+}
+
+def safe_import_module(module_name: str) -> Optional[object]:
+    """
+    Safely import a module by checking against a whitelist.
+    
+    Args:
+        module_name: The name of the module to import
+        
+    Returns:
+        The imported module or None if the module is not in the whitelist
+    """
+    if module_name in ALLOWED_MODULES:
+        return safe_import_module(module_name)
+    else:
+        # Log the attempt to import a non-whitelisted module
+        print(f"Warning: Attempted to import non-whitelisted module: {module_name}")
+        return None
+
 from concurrent.futures import ThreadPoolExecutor
 from types import ModuleType
 from typing import Any, List, Callable
 from tqdm import tqdm
 
-import modules
-import modules.globals                   
+import importlib
+from typing import Set, Optional
+
+# Define a whitelist of allowed modules that can be dynamically imported
+ALLOWED_MODULES: Set[str] = {
+    'modules.processors.frame.blur',
+    'modules.processors.frame.censor',
+    'modules.processors.frame.crop',
+    'modules.processors.frame.resize',
+    'modules.processors.frame.rotate',
+    # Add all legitimate processor modules that should be importable
+}
+
+def safe_import_module(module_name: str) -> Optional[object]:
+    """
+    Safely import a module by checking against a whitelist.
+    
+    Args:
+        module_name: The name of the module to import
+        
+    Returns:
+        The imported module or None if the module is not in the whitelist
+    """
+    if module_name in ALLOWED_MODULES:
+        return safe_import_module(module_name)
+    else:
+        # Log the attempt to import a non-whitelisted module
+        print(f"Warning: Attempted to import non-whitelisted module: {module_name}")
+        return None
+
+import importlib
+from typing import Set, Optional
+
+# Define a whitelist of allowed modules that can be dynamically imported
+ALLOWED_MODULES: Set[str] = {
+    'modules.processors.frame.blur',
+    'modules.processors.frame.censor',
+    'modules.processors.frame.crop',
+    'modules.processors.frame.resize',
+    'modules.processors.frame.rotate',
+    # Add all legitimate processor modules that should be importable
+}
+
+def safe_import_module(module_name: str) -> Optional[object]:
+    """
+    Safely import a module by checking against a whitelist.
+    
+    Args:
+        module_name: The name of the module to import
+        
+    Returns:
+        The imported module or None if the module is not in the whitelist
+    """
+    if module_name in ALLOWED_MODULES:
+        return safe_import_module(module_name)
+    else:
+        # Log the attempt to import a non-whitelisted module
+        print(f"Warning: Attempted to import non-whitelisted module: {module_name}")
+        return None
+
 
 FRAME_PROCESSORS_MODULES: List[ModuleType] = []
 FRAME_PROCESSORS_INTERFACE = [
@@ -20,7 +137,7 @@ FRAME_PROCESSORS_INTERFACE = [
 
 def load_frame_processor_module(frame_processor: str) -> Any:
     try:
-        frame_processor_module = importlib.import_module(f'modules.processors.frame.{frame_processor}')
+        frame_processor_module = safe_import_module(f'modules.processors.frame.{frame_processor}')
         for method_name in FRAME_PROCESSORS_INTERFACE:
             if not hasattr(frame_processor_module, method_name):
                 sys.exit()

modules/processors/frame/core.py.bak

@@ -0,0 +1,84 @@
+import sys
+import importlib
+from concurrent.futures import ThreadPoolExecutor
+from types import ModuleType
+from typing import Any, List, Callable
+from tqdm import tqdm
+
+import modules
+import modules.globals                   
+
+FRAME_PROCESSORS_MODULES: List[ModuleType] = []
+FRAME_PROCESSORS_INTERFACE = [
+    'pre_check',
+    'pre_start',
+    'process_frame',
+    'process_image',
+    'process_video'
+]
+
+
+def load_frame_processor_module(frame_processor: str) -> Any:
+    try:
+        frame_processor_module = importlib.import_module(f'modules.processors.frame.{frame_processor}')
+        for method_name in FRAME_PROCESSORS_INTERFACE:
+            if not hasattr(frame_processor_module, method_name):
+                sys.exit()
+    except ImportError:
+        print(f"Frame processor {frame_processor} not found")
+        sys.exit()
+    return frame_processor_module
+
+
+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:
+            frame_processor_module = load_frame_processor_module(frame_processor)
+            FRAME_PROCESSORS_MODULES.append(frame_processor_module)
+    set_frame_processors_modules_from_ui(frame_processors)
+    return FRAME_PROCESSORS_MODULES
+
+def set_frame_processors_modules_from_ui(frame_processors: List[str]) -> None:
+    global FRAME_PROCESSORS_MODULES
+    current_processor_names = [proc.__name__.split('.')[-1] for proc in FRAME_PROCESSORS_MODULES]
+
+    for frame_processor, state in modules.globals.fp_ui.items():
+        if state == True and frame_processor not in current_processor_names:
+            try:
+                frame_processor_module = load_frame_processor_module(frame_processor)
+                FRAME_PROCESSORS_MODULES.append(frame_processor_module)
+                if frame_processor not in modules.globals.frame_processors:
+                     modules.globals.frame_processors.append(frame_processor)
+            except SystemExit:
+                 print(f"Warning: Failed to load frame processor {frame_processor} requested by UI state.")
+            except Exception as e:
+                 print(f"Warning: Error loading frame processor {frame_processor} requested by UI state: {e}")
+
+        elif state == False and frame_processor in current_processor_names:
+            try:
+                module_to_remove = next((mod for mod in FRAME_PROCESSORS_MODULES if mod.__name__.endswith(f'.{frame_processor}')), None)
+                if module_to_remove:
+                    FRAME_PROCESSORS_MODULES.remove(module_to_remove)
+                if frame_processor in modules.globals.frame_processors:
+                    modules.globals.frame_processors.remove(frame_processor)
+            except Exception as e:
+                 print(f"Warning: Error removing frame processor {frame_processor}: {e}")
+
+def multi_process_frame(source_path: str, temp_frame_paths: List[str], process_frames: Callable[[str, List[str], Any], None], progress: Any = None) -> None:
+    with ThreadPoolExecutor(max_workers=modules.globals.execution_threads) as executor:
+        futures = []
+        for path in temp_frame_paths:
+            future = executor.submit(process_frames, source_path, [path], progress)
+            futures.append(future)
+        for future in futures:
+            future.result()
+
+
+def process_video(source_path: str, frame_paths: list[str], process_frames: Callable[[str, List[str], Any], None]) -> None:
+    progress_bar_format = '{l_bar}{bar}| {n_fmt}/{total_fmt} [{elapsed}<{remaining}, {rate_fmt}{postfix}]'
+    total = len(frame_paths)
+    with tqdm(total=total, desc='Processing', unit='frame', dynamic_ncols=True, bar_format=progress_bar_format) as progress:
+        progress.set_postfix({'execution_providers': modules.globals.execution_providers, 'execution_threads': modules.globals.execution_threads, 'max_memory': modules.globals.max_memory})
+        multi_process_frame(source_path, frame_paths, process_frames, progress)

requirements.txt

@@ -1,4 +1,4 @@
---extra-index-url https://download.pytorch.org/whl/cu118
+--extra-index-url https://download.pytorch.org/whl/cu128
 
 numpy>=1.23.5,<2
 typing-extensions>=4.8.0
@@ -10,12 +10,12 @@ psutil==5.9.8
 tk==0.1.0
 customtkinter==5.2.2
 pillow==11.1.0
-torch==2.5.1+cu118; sys_platform != 'darwin'
+torch; sys_platform != 'darwin'
 torch==2.5.1; sys_platform == 'darwin'
-torchvision==0.20.1; sys_platform != 'darwin'
+torchvision; sys_platform != 'darwin'
 torchvision==0.20.1; sys_platform == 'darwin'
-onnxruntime-silicon==1.16.3; sys_platform == 'darwin' and platform_machine == 'arm64'
-onnxruntime-gpu==1.17; sys_platform != 'darwin'
+onnxruntime-silicon==1.21.0; sys_platform == 'darwin' and platform_machine == 'arm64'
+onnxruntime-gpu==1.21.0; sys_platform != 'darwin'
 tensorflow; sys_platform != 'darwin'
 opennsfw2==0.10.2
 protobuf==4.23.2