Merge 677a4dd096 into fc86365a90

faster and better requirements

modules/processors/frame/face_swapper.py

@@ -28,11 +28,21 @@ models_dir = os.path.join(
 
 
 def pre_check() -> bool:
-    download_directory_path = abs_dir
+    # Use models_dir instead of abs_dir to save to the correct location
+    download_directory_path = models_dir
+    
+    # Make sure the models directory exists, catch permission errors if they occur
+    try:
+        os.makedirs(download_directory_path, exist_ok=True)
+    except OSError as e:
+        logging.error(f"Failed to create directory {download_directory_path} due to permission error: {e}")
+        return False
+    
+    # Use the direct download URL from Hugging Face
     conditional_download(
         download_directory_path,
         [
-            "https://huggingface.co/hacksider/deep-live-cam/blob/main/inswapper_128_fp16.onnx"
+            "https://huggingface.co/hacksider/deep-live-cam/resolve/main/inswapper_128_fp16.onnx"
         ],
     )
     return True

requirements.txt

@@ -4,7 +4,7 @@ numpy>=1.23.5,<2
 typing-extensions>=4.8.0
 opencv-python==4.10.0.84
 cv2_enumerate_cameras==1.1.15
-onnx==1.16.0
+onnx==1.18.0
 insightface==0.7.3
 psutil==5.9.8
 tk==0.1.0
@@ -15,7 +15,7 @@ torch==2.5.1; sys_platform == 'darwin'
 torchvision; sys_platform != 'darwin'
 torchvision==0.20.1; sys_platform == 'darwin'
 onnxruntime-silicon==1.21.0; sys_platform == 'darwin' and platform_machine == 'arm64'
-onnxruntime-gpu==1.21.0; sys_platform != 'darwin'
+onnxruntime-gpu==1.22.0; sys_platform != 'darwin'
 tensorflow; sys_platform != 'darwin'
 opennsfw2==0.10.2
-protobuf==4.23.2
+protobuf==4.25.1