From 28678109b507452ebfb1d5751a5e1f63043289eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Mar 2024 23:32:43 +0000 Subject: [PATCH 1/2] build(deps): bump the npm_and_yarn group across 1 directory with 2 updates Bumps the npm_and_yarn group with 2 updates in the /src/Demo/mobile directory: [follow-redirects](https://github.com/follow-redirects/follow-redirects) and [ip](https://github.com/indutny/node-ip). Updates `follow-redirects` from 1.15.4 to 1.15.6 - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.4...v1.15.6) Updates `ip` from 1.1.8 to 1.1.9 - [Commits](https://github.com/indutny/node-ip/compare/v1.1.8...v1.1.9) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect dependency-group: npm_and_yarn-security-group - dependency-name: ip dependency-type: indirect dependency-group: npm_and_yarn-security-group ... Signed-off-by: dependabot[bot] --- src/Demo/mobile/yarn.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Demo/mobile/yarn.lock b/src/Demo/mobile/yarn.lock index f80a910..856c8e3 100644 --- a/src/Demo/mobile/yarn.lock +++ b/src/Demo/mobile/yarn.lock @@ -5740,9 +5740,9 @@ flow-parser@^0.206.0: integrity sha512-HVzoK3r6Vsg+lKvlIZzaWNBVai+FXTX1wdYhz/wVlH13tb/gOdLXmlTqy6odmTBhT5UoWUbq0k8263Qhr9d88w== follow-redirects@^1.0.0, follow-redirects@^1.15.0: - version "1.15.4" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf" - integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw== + version "1.15.6" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" + integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== fontfaceobserver@^2.1.0: version "2.3.0" @@ -6511,14 +6511,14 @@ ip-regex@^5.0.0: integrity sha512-fOCG6lhoKKakwv+C6KdsOnGvgXnmgfmp0myi3bcNwj3qfwPAxRKWEuFhvEFF7ceYIz6+1jRZ+yguLFAmUNPEfw== ip@^1.1.5: - version "1.1.8" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz#ae05948f6b075435ed3307acce04629da8cdbf48" - integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg== + version "1.1.9" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.9.tgz#8dfbcc99a754d07f425310b86a99546b1151e396" + integrity sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ== ip@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" - integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== + version "2.0.1" + resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105" + integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ== ipaddr.js@1.9.1, ipaddr.js@^1.9.0: version "1.9.1" From db30e46905189a637ab4047708c638bcbc9fb1b0 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 16 Mar 2024 23:33:00 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/Demo/web/inference/__init__.py | 2 +- src/Demo/web/inference/component/camera.py | 2 +- src/Demo/web/inference/component/detector.py | 2 +- src/Demo/web/inference/component/identifier.py | 2 +- src/Demo/web/main.py | 11 ++++++++--- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/Demo/web/inference/__init__.py b/src/Demo/web/inference/__init__.py index de9da0d..449e3d6 100644 --- a/src/Demo/web/inference/__init__.py +++ b/src/Demo/web/inference/__init__.py @@ -8,12 +8,12 @@ import logging -from .settings import CameraConfig, DetectorConfig, TrackerConfig from .common import ImageFaces from .component.camera import Camera, CameraOpenError from .component.detector import Detector from .component.drawer import Drawer from .component.identifier import Identifier +from .settings import CameraConfig, DetectorConfig, TrackerConfig from .types import Image from .utils.decorator import error_handler from .utils.time_tracker import time_tracker diff --git a/src/Demo/web/inference/component/camera.py b/src/Demo/web/inference/component/camera.py index cc87afa..3b1864c 100644 --- a/src/Demo/web/inference/component/camera.py +++ b/src/Demo/web/inference/component/camera.py @@ -10,8 +10,8 @@ import cv2 -from ..settings import CameraConfig, SourceConfig from ..common import ImageFaces +from ..settings import CameraConfig, SourceConfig logger = logging.getLogger(__name__) diff --git a/src/Demo/web/inference/component/detector.py b/src/Demo/web/inference/component/detector.py index dd5c6b2..0a4b898 100644 --- a/src/Demo/web/inference/component/detector.py +++ b/src/Demo/web/inference/component/detector.py @@ -8,9 +8,9 @@ import logging -from ..settings import DetectorConfig, ModelsConfig from ..common import Face, ImageFaces from ..model_zoo.model_router import get_model +from ..settings import DetectorConfig, ModelsConfig logger = logging.getLogger(__name__) diff --git a/src/Demo/web/inference/component/identifier.py b/src/Demo/web/inference/component/identifier.py index 2b71d8f..d7da3e7 100644 --- a/src/Demo/web/inference/component/identifier.py +++ b/src/Demo/web/inference/component/identifier.py @@ -3,9 +3,9 @@ import numpy as np import streamlit as st -from ..settings import TrackerConfig from ..client import WebSocketClient from ..common import Face, ImageFaces +from ..settings import TrackerConfig from ..types import Bbox, Face2Search, IdentifyResult, Kps, MatchedResult from .sort_plus import KalmanBoxTracker, associate_detections_to_trackers diff --git a/src/Demo/web/main.py b/src/Demo/web/main.py index cc808e3..031da25 100644 --- a/src/Demo/web/main.py +++ b/src/Demo/web/main.py @@ -2,11 +2,16 @@ from pathlib import Path import streamlit as st -from pygizmokit.rich_logger import set_up_logging - from inference import BoostFace -from inference.settings import SourceConfig, InferenceProvider, CameraConfig, DetectorConfig, TrackerConfig +from inference.settings import ( + CameraConfig, + DetectorConfig, + InferenceProvider, + SourceConfig, + TrackerConfig, +) from inference.utils.decorator import calm_down +from pygizmokit.rich_logger import set_up_logging set_up_logging() logger = logging.getLogger(__file__)