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.6.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.10.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.4.2
+    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.8.5
+    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: blue
 colorTo: yellow
 sdk: gradio
-sdk_version: 3.36.1
+sdk_version: 4.33.0
 app_file: app.py
 pinned: false
 ---

app.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import functools
 import pathlib
 
 import cv2
@@ -12,22 +11,19 @@ import insightface
 import numpy as np
 import onnxruntime as ort
 
-TITLE = 'insightface Person Detection'
-DESCRIPTION = 'https://github.com/deepinsight/insightface/tree/master/examples/person_detection'
+TITLE = "insightface Person Detection"
+DESCRIPTION = "https://github.com/deepinsight/insightface/tree/master/examples/person_detection"
 
 
 def load_model():
-    path = huggingface_hub.hf_hub_download('public-data/insightface',
-                                           'models/scrfd_person_2.5g.onnx')
+    path = huggingface_hub.hf_hub_download("public-data/insightface", "models/scrfd_person_2.5g.onnx")
     options = ort.SessionOptions()
     options.intra_op_num_threads = 8
     options.inter_op_num_threads = 8
     session = ort.InferenceSession(
-        path,
-        sess_options=options,
-        providers=['CPUExecutionProvider', 'CUDAExecutionProvider'])
-    model = insightface.model_zoo.retinaface.RetinaFace(model_file=path,
-                                                        session=session)
+        path, sess_options=options, providers=["CPUExecutionProvider", "CUDAExecutionProvider"]
+    )
+    model = insightface.model_zoo.retinaface.RetinaFace(model_file=path, session=session)
     return model
 
 
@@ -47,8 +43,7 @@ def detect_person(
     return bboxes, vbboxes
 
 
-def visualize(image: np.ndarray, bboxes: np.ndarray,
-              vbboxes: np.ndarray) -> np.ndarray:
+def visualize(image: np.ndarray, bboxes: np.ndarray, vbboxes: np.ndarray) -> np.ndarray:
     res = image.copy()
     for i in range(bboxes.shape[0]):
         bbox = bboxes[i]
@@ -59,9 +54,7 @@ def visualize(image: np.ndarray, bboxes: np.ndarray,
         alpha = 0.8
         color = (255, 0, 0)
         for c in range(3):
-            res[vy1:vy2, vx1:vx2,
-                c] = res[vy1:vy2, vx1:vx2,
-                         c] * alpha + color[c] * (1.0 - alpha)
+            res[vy1:vy2, vx1:vx2, c] = res[vy1:vy2, vx1:vx2, c] * alpha + color[c] * (1.0 - alpha)
         cv2.circle(res, (vx1, vy1), 1, color, 2)
         cv2.circle(res, (vx1, vy2), 1, color, 2)
         cv2.circle(res, (vx2, vy1), 1, color, 2)
@@ -69,26 +62,28 @@ def visualize(image: np.ndarray, bboxes: np.ndarray,
     return res
 
 
-def detect(image: np.ndarray, detector) -> np.ndarray:
+detector = load_model()
+detector.prepare(-1, nms_thresh=0.5, input_size=(640, 640))
+
+
+def detect(image: np.ndarray) -> np.ndarray:
     image = image[:, :, ::-1]  # RGB -> BGR
     bboxes, vbboxes = detect_person(image, detector)
     res = visualize(image, bboxes, vbboxes)
     return res[:, :, ::-1]  # BGR -> RGB
 
 
-detector = load_model()
-detector.prepare(-1, nms_thresh=0.5, input_size=(640, 640))
-fn = functools.partial(detect, detector=detector)
+examples = sorted(pathlib.Path("images").glob("*.jpg"))
 
-image_dir = pathlib.Path('images')
-examples = [[path.as_posix()] for path in sorted(image_dir.glob('*.jpg'))]
-
-gr.Interface(
-    fn=fn,
-    inputs=gr.Image(label='Input', type='numpy'),
-    outputs=gr.Image(label='Output', height=600),
+demo = gr.Interface(
+    fn=detect,
+    inputs=gr.Image(label="Input", type="numpy"),
+    outputs=gr.Image(label="Output"),
     examples=examples,
     examples_per_page=30,
     title=TITLE,
     description=DESCRIPTION,
-).queue().launch()
+)
+
+if __name__ == "__main__":
+    demo.queue(max_size=10).launch()

pre-requirements.txt

@@ -1 +1 @@
-Cython==0.29.36
+Cython==3.0.10

requirements.txt

@@ -1,3 +1,3 @@
 insightface==0.7.3
-onnxruntime==1.15.1
-opencv-python-headless==4.8.0.74
+onnxruntime==1.18.0
+opencv-python-headless==4.10.0.82