Merge branch 'staging'

docs/full/plugins/extract.rst

@@ -7,9 +7,9 @@ The Extract Package handles the various plugins available for extracting face se
 .. contents:: Contents
    :local:
 
+
 pipeline module
 ===============
-
 .. rubric:: Module Summary
 
 .. autosummary::
@@ -25,54 +25,63 @@ pipeline module
    :undoc-members:
    :show-inheritance:
 
-extract plugins package
-=======================
-
-.. contents:: Contents
-   :local:
 
 _base module
-------------
-
+============
 .. automodule:: plugins.extract._base
    :members:
    :undoc-members:
    :show-inheritance:
 
-align._base module
-------------------
 
-.. automodule:: plugins.extract.align._base
+align plugins package
+=====================
+.. contents:: Contents
+   :local:
+
+align._base.aligner module
+--------------------------
+.. automodule:: plugins.extract.align._base.aligner
    :members:
    :undoc-members:
    :show-inheritance:
 
-vgg\_face2\_keras module
-------------------------
+align._base.processing module
+-----------------------------
+.. automodule:: plugins.extract.align._base.processing
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+align.cv2_dnn module
+-------------------
+.. automodule:: plugins.extract.align.cv2_dnn
+   :members:
+   :undoc-members:
+   :show-inheritance:
 
-.. automodule:: plugins.extract.recognition.vgg_face2_keras
+align.fan module
+-------------------
+.. automodule:: plugins.extract.align.fan
    :members:
    :undoc-members:
    :show-inheritance:
 
 
 detect plugins package
 ======================
-
 .. contents:: Contents
    :local:
 
 detect._base module
 -------------------
-
 .. automodule:: plugins.extract.detect._base
    :members:
    :undoc-members:
    :show-inheritance:
 
 detect.mtcnn module
 -------------------
-
 .. automodule:: plugins.extract.detect.mtcnn
    :members:
    :undoc-members:
@@ -81,13 +90,11 @@ detect.mtcnn module
 
 mask plugins package
 ====================
-
 .. contents:: Contents
    :local:
 
 mask._base module
 -----------------
-
 .. automodule:: plugins.extract.mask._base
    :members:
    :undoc-members:
@@ -98,4 +105,25 @@ mask.bisenet_fp module
 .. automodule:: plugins.extract.mask.bisenet_fp
    :members:
    :undoc-members:
-   :show-inheritance:
+   :show-inheritance:
+
+
+recognition plugins package
+===========================
+.. contents:: Contents
+   :local:
+
+recognition._base module
+------------------------
+.. automodule:: plugins.extract.recognition._base
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+
+recognition.vgg_face2 module
+----------------------------
+.. automodule:: plugins.extract.recognition.vgg_face2
+   :members:
+   :undoc-members:
+   :show-inheritance:

lib/cli/args.py

@@ -485,6 +485,15 @@ def get_optional_arguments() -> List[Dict[str, Any]]:
                    "remove 'micro-jitter' but at the cost of slower extraction speed. The more "
                    "times the face is re-fed into the aligner, the less micro-jitter should occur "
                    "but the longer extraction will take.")))
+        argument_list.append(dict(
+            opts=("-a", "--re-align"),
+            action="store_true",
+            dest="re_align",
+            default=False,
+            group=_("Plugins"),
+            help=_("Re-feed the initially found aligned face through the aligner. Can help "
+                   "produce better alignments for faces that are rotated beyond 45 degrees in "
+                   "the frame or are at extreme angles. Slows down extraction.")))
         argument_list.append(dict(
             opts=("-r", "--rotate-images"),
             type=str,

lib/utils.py

@@ -34,7 +34,7 @@
 _video_extensions = [  # pylint:disable=invalid-name
     ".avi", ".flv", ".mkv", ".mov", ".mp4", ".mpeg", ".mpg", ".webm", ".wmv",
     ".ts", ".vob"]
-_TF_VERS = None
+_TF_VERS: Optional[float] = None
 ValidBackends = Literal["amd", "nvidia", "cpu", "apple_silicon"]