Update

.pre-commit-config.yaml

@@ -1,35 +1,60 @@
 repos:
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.2.0
-  hooks:
-  - id: check-executables-have-shebangs
-  - id: check-json
-  - id: check-merge-conflict
-  - id: check-shebang-scripts-are-executable
-  - id: check-toml
-  - id: check-yaml
-  - id: double-quote-string-fixer
-  - id: end-of-file-fixer
-  - id: mixed-line-ending
-    args: ['--fix=lf']
-  - id: requirements-txt-fixer
-  - id: trailing-whitespace
-- repo: https://github.com/myint/docformatter
-  rev: v1.4
-  hooks:
-  - id: docformatter
-    args: ['--in-place']
-- repo: https://github.com/pycqa/isort
-  rev: 5.12.0
-  hooks:
-    - id: isort
-- repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v0.991
-  hooks:
-    - id: mypy
-      args: ['--ignore-missing-imports']
-- repo: https://github.com/google/yapf
-  rev: v0.32.0
-  hooks:
-  - id: yapf
-    args: ['--parallel', '--in-place']
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
+    hooks:
+      - id: check-executables-have-shebangs
+      - id: check-json
+      - id: check-merge-conflict
+      - id: check-shebang-scripts-are-executable
+      - id: check-toml
+      - id: check-yaml
+      - id: end-of-file-fixer
+      - id: mixed-line-ending
+        args: ["--fix=lf"]
+      - id: requirements-txt-fixer
+      - id: trailing-whitespace
+  - repo: https://github.com/myint/docformatter
+    rev: v1.7.5
+    hooks:
+      - id: docformatter
+        args: ["--in-place"]
+  - repo: https://github.com/pycqa/isort
+    rev: 5.13.2
+    hooks:
+      - id: isort
+        args: ["--profile", "black"]
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.8.0
+    hooks:
+      - id: mypy
+        args: ["--ignore-missing-imports"]
+        additional_dependencies:
+          [
+            "types-python-slugify",
+            "types-requests",
+            "types-PyYAML",
+            "types-pytz",
+          ]
+  - repo: https://github.com/psf/black
+    rev: 24.2.0
+    hooks:
+      - id: black
+        language_version: python3.10
+        args: ["--line-length", "119"]
+  - repo: https://github.com/kynan/nbstripout
+    rev: 0.7.1
+    hooks:
+      - id: nbstripout
+        args:
+          [
+            "--extra-keys",
+            "metadata.interpreter metadata.kernelspec cell.metadata.pycharm",
+          ]
+  - repo: https://github.com/nbQA-dev/nbQA
+    rev: 1.7.1
+    hooks:
+      - id: nbqa-black
+      - id: nbqa-pyupgrade
+        args: ["--py37-plus"]
+      - id: nbqa-isort
+        args: ["--float-to-top"]

.style.yapf

@@ -1,5 +0,0 @@
-[style]
-based_on_style = pep8
-blank_line_before_nested_class_or_def = false
-spaces_before_comment = 2
-split_before_logical_operator = true

.vscode/settings.json

@@ -0,0 +1,30 @@
+{
+    "editor.formatOnSave": true,
+    "files.insertFinalNewline": false,
+    "[python]": {
+        "editor.defaultFormatter": "ms-python.black-formatter",
+        "editor.formatOnType": true,
+        "editor.codeActionsOnSave": {
+            "source.organizeImports": "explicit"
+        }
+    },
+    "[jupyter]": {
+        "files.insertFinalNewline": false
+    },
+    "black-formatter.args": [
+        "--line-length=119"
+    ],
+    "isort.args": ["--profile", "black"],
+    "flake8.args": [
+        "--max-line-length=119"
+    ],
+    "ruff.lint.args": [
+        "--line-length=119"
+    ],
+    "notebook.output.scrolling": true,
+    "notebook.formatOnCellExecution": true,
+    "notebook.formatOnSave.enabled": true,
+        "notebook.codeActionsOnSave": {
+            "source.organizeImports": "explicit"
+        }
+}

README.md

@@ -4,7 +4,7 @@ emoji: 💻
 colorFrom: pink
 colorTo: yellow
 sdk: gradio
-sdk_version: 3.36.1
+sdk_version: 4.20.0
 app_file: app.py
 pinned: false
 ---

app.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-import functools
+import os
 import pathlib
 
 import cv2
@@ -11,17 +11,15 @@ import gradio as gr
 import numpy as np
 import torch
 
-TITLE = 'face-alignment'
-DESCRIPTION = 'https://github.com/1adrianb/face-alignment'
+DESCRIPTION = "# [face-alignment](https://github.com/1adrianb/face-alignment)"
 
 MAX_IMAGE_SIZE = 1800
 
+device = torch.device("cuda:0" if torch.cuda.is_available() else "cpu")
+detector = face_alignment.FaceAlignment(face_alignment.LandmarksType.TWO_D, device=device.type)
 
-def detect(
-    image: np.ndarray,
-    detector,
-    device: torch.device,
-) -> np.ndarray:
+
+def detect(image: np.ndarray) -> np.ndarray:
     landmarks, _, boxes = detector.get_landmarks(image, return_bboxes=True)
     if landmarks is None:
         return image
@@ -39,19 +37,31 @@ def detect(
     return res
 
 
-device = torch.device('cuda:0' if torch.cuda.is_available() else 'cpu')
-detector = face_alignment.FaceAlignment(face_alignment.LandmarksType.TWO_D,
-                                        device=device.type)
-fn = functools.partial(detect, detector=detector, device=device)
-
-image_paths = sorted(pathlib.Path('images').glob('*.jpg'))
+image_paths = sorted(pathlib.Path("images").glob("*.jpg"))
 examples = [[path.as_posix()] for path in image_paths]
 
-gr.Interface(
-    fn=fn,
-    inputs=gr.Image(label='Input', type='numpy'),
-    outputs=gr.Image(label='Output', type='numpy'),
-    examples=examples,
-    title=TITLE,
-    description=DESCRIPTION,
-).queue().launch()
+with gr.Blocks(css="style.css") as demo:
+    gr.Markdown(DESCRIPTION)
+    with gr.Row():
+        with gr.Column():
+            image = gr.Image(label="Input", type="numpy")
+            run_button = gr.Button()
+        with gr.Column():
+            output = gr.Image(label="Output")
+    gr.Examples(
+        examples=examples,
+        inputs=image,
+        outputs=output,
+        fn=detect,
+        cache_examples=os.getenv("CACHE_EXAMPLES") == "1",
+    )
+
+    run_button.click(
+        fn=detect,
+        inputs=image,
+        outputs=output,
+        api_name="run",
+    )
+
+if __name__ == "__main__":
+    demo.queue(max_size=20).launch()

requirements.txt

@@ -1,9 +1,9 @@
-face-alignment==1.4.0
-numba==0.57.1
-numpy==1.24.4
-opencv-python-headless==4.8.0.74
-Pillow==10.0.0
-scikit-image==0.21.0
-scipy==1.10.1
+face-alignment==1.4.1
+numba==0.59.0
+numpy==1.26.4
+opencv-python-headless==4.9.0.80
+Pillow==10.2.0
+scikit-image==0.22.0
+scipy==1.12.0
 torch==2.0.1
 torchvision==0.15.2

style.css

@@ -0,0 +1,11 @@
+h1 {
+  text-align: center;
+  display: block;
+}
+
+#duplicate-button {
+  margin: auto;
+  color: #fff;
+  background: #1565c0;
+  border-radius: 100vh;
+}