Fix fomm model download (#160)

* Fix face alignment bug

* Update links to the executable and to the checkpoints

* fix lint and change onnxruntime version

* Update CHANGELOG

* Remove vcam plugin from readme

* Update executable download url

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+* Fix fomm model download by @Ghassen-Chaabouni in https://github.com/sensity-ai/dot/pull/160
 * Add video and image swap to the GUI by @Ghassen-Chaabouni in https://github.com/sensity-ai/dot/pull/116
 
 ## [1.3.0] - 2024-02-19

README.md

@@ -50,7 +50,7 @@ Supported methods:
 Download and run the dot executable for your OS:
 
 - Windows (Tested on Windows 10 and 11):
-  - Download `dot.zip` from [here](https://drive.google.com/file/d/1IgMaaKzFw4lBKa8MWnsH7nKwBQtrtLGJ/view), unzip it and then run `dot.exe`
+  - Download `dot.zip` from [here](https://drive.google.com/file/d/1_duaEs2SAUGfAvr5oC4V3XR-ZzBtWQXo/view), unzip it and then run `dot.exe`
 - Ubuntu:
   - ToDo
 - Mac (Tested on Apple M2 Sonoma 14.0):
@@ -147,7 +147,7 @@ pip install -e .
 
 ##### Download Models
 
-- Download dot model checkpoints from [here](https://drive.google.com/file/d/1nL3WkntTrVBZVQvOF2i7clY8eFRqSr8L/view)
+- Download dot model checkpoints from [here](https://drive.google.com/file/d/1Y_11R66DL4N1WY8cNlXVNR3RkHnGDGWX/view)
 - Unzip the downloaded file in the root of this project
 
 #### CLI Usage
@@ -303,10 +303,6 @@ Instructions vary depending on your operating system.
 
 - Install [OBS Studio](https://obsproject.com/).
 
-- Install [VirtualCam plugin](https://obsproject.com/forum/resources/obs-virtualcam.539/).
-
-Choose `Install and register only 1 virtual camera`.
-
 - Run OBS Studio.
 
 - In the Sources section, press on Add button ("+" sign),

envs/environment-gpu.yaml

@@ -7,5 +7,5 @@ dependencies:
     - python=3.8
     - pip=21.3
     - pip:
-          - onnxruntime-gpu==1.9.0
+          - onnxruntime-gpu==1.18.0
           - -r ../requirements.txt

requirements-dev.txt

@@ -42,8 +42,12 @@ colorama==0.4.6
     #   ipython
     #   pytest
     #   tqdm
+coloredlogs==15.0.1
+    # via onnxruntime-gpu
 coverage==6.4.2
-    # via pytest-cov
+    # via
+    #   coverage
+    #   pytest-cov
 customtkinter==5.2.0
     # via dot (setup.cfg)
 cycler==0.11.0
@@ -60,7 +64,7 @@ dlib==19.19.0
     # via dot (setup.cfg)
 executing==0.8.3
     # via stack-data
-face-alignment==1.3.3
+face-alignment==1.4.1
     # via dot (setup.cfg)
 filelock==3.7.1
     # via
@@ -71,9 +75,11 @@ flake8==3.9.2
 flatbuffers==2.0
     # via
     #   mediapipe
-    #   onnxruntime
+    #   onnxruntime-gpu
 fonttools==4.43.0
     # via matplotlib
+humanfriendly==10.0
+    # via coloredlogs
 identify==2.5.1
     # via pre-commit
 idna==2.10
@@ -130,15 +136,15 @@ numpy==1.22.0
     #   matplotlib
     #   mediapipe
     #   numba
-    #   onnxruntime
+    #   onnxruntime-gpu
     #   opencv-contrib-python
     #   opencv-python
     #   pywavelets
     #   scikit-image
     #   scipy
     #   tifffile
     #   torchvision
-onnxruntime==1.9.0
+onnxruntime-gpu==1.18.0
     # via dot (setup.cfg)
 opencv-contrib-python==4.5.5.62
     # via
@@ -152,6 +158,7 @@ packaging==21.3
     # via
     #   kornia
     #   matplotlib
+    #   onnxruntime-gpu
     #   pytest
     #   scikit-image
 parso==0.8.3
@@ -183,7 +190,7 @@ protobuf==3.20.2
     # via
     #   dot (setup.cfg)
     #   mediapipe
-    #   onnxruntime
+    #   onnxruntime-gpu
 pure-eval==0.2.2
     # via stack-data
 py==1.11.0
@@ -204,6 +211,8 @@ pyparsing==3.0.9
     # via
     #   matplotlib
     #   packaging
+pyreadline3==3.4.1
+    # via humanfriendly
 pytest==7.1.2
     # via
     #   dot (setup.cfg)
@@ -243,7 +252,9 @@ sounddevice==0.4.6
 stack-data==0.3.0
     # via ipython
 sympy==1.12
-    # via torch
+    # via
+    #   onnxruntime-gpu
+    #   torch
 tifffile==2022.5.4
     # via scikit-image
 toml==0.10.2

requirements.txt

@@ -21,6 +21,8 @@ colorama==0.4.6
     #   click
     #   pytest
     #   tqdm
+coloredlogs==15.0.1
+    # via onnxruntime-gpu
 customtkinter==5.2.0
     # via dot (setup.cfg)
 cycler==0.11.0
@@ -31,16 +33,18 @@ dlib==19.19.0
     # via dot (setup.cfg)
 exceptiongroup==1.1.2
     # via pytest
-face-alignment==1.3.3
+face-alignment==1.4.1
     # via dot (setup.cfg)
 filelock==3.12.2
     # via torch
 flatbuffers==2.0
     # via
     #   mediapipe
-    #   onnxruntime
+    #   onnxruntime-gpu
 fonttools==4.43.0
     # via matplotlib
+humanfriendly==10.0
+    # via coloredlogs
 idna==2.10
     # via requests
 imageio==2.19.3
@@ -77,15 +81,15 @@ numpy==1.22.0
     #   matplotlib
     #   mediapipe
     #   numba
-    #   onnxruntime
+    #   onnxruntime-gpu
     #   opencv-contrib-python
     #   opencv-python
     #   pywavelets
     #   scikit-image
     #   scipy
     #   tifffile
     #   torchvision
-onnxruntime==1.9.0
+onnxruntime-gpu==1.18.0
     # via dot (setup.cfg)
 opencv-contrib-python==4.5.5.62
     # via
@@ -99,6 +103,7 @@ packaging==21.3
     # via
     #   kornia
     #   matplotlib
+    #   onnxruntime-gpu
     #   pytest
     #   scikit-image
 pillow==10.0.1
@@ -114,13 +119,15 @@ protobuf==3.20.2
     # via
     #   dot (setup.cfg)
     #   mediapipe
-    #   onnxruntime
+    #   onnxruntime-gpu
 pycparser==2.21
     # via cffi
 pyparsing==3.0.9
     # via
     #   matplotlib
     #   packaging
+pyreadline3==3.4.1
+    # via humanfriendly
 pytest==7.4.0
     # via dot (setup.cfg)
 python-dateutil==2.8.2
@@ -147,7 +154,9 @@ six==1.16.0
 sounddevice==0.4.6
     # via mediapipe
 sympy==1.12
-    # via torch
+    # via
+    #   onnxruntime-gpu
+    #   torch
 tifffile==2022.5.4
     # via scikit-image
 tomli==2.0.1

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.3.0
+current_version = 1.4.0
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)?
@@ -30,11 +30,11 @@ python_requires = >=3.8,<3.9
 install_requires = 
 	click
 	dlib
-	face_alignment
+	face_alignment==1.4.1
 	kornia
 	mediapipe
 	numpy
-	onnxruntime
+	onnxruntime-gpu==1.18.0
 	opencv-contrib-python
 	opencv_python
 	Pillow

src/dot/__init__.py

@@ -6,7 +6,7 @@
 
 from .dot import DOT
 
-__version__ = "1.1.0"
+__version__ = "1.4.0"
 __author__ = "Sensity"
 __url__ = "https://github.com/sensity-ai/dot/tree/main/dot"
 __docs__ = "Deepfake offensive toolkit"

src/dot/commons/utils.py

@@ -15,9 +15,9 @@
 np.random.seed(SEED)
 
 
-def log(*args, file=sys.stderr, **kwargs):
+def log(*args, **kwargs):
     time_str = f"{time.time():.6f}"
-    print(f"[{time_str}]", *args, file=file, **kwargs)
+    print(f"[{time_str}]", *args, **kwargs)
 
 
 def info(*args, file=sys.stdout, **kwargs):