From 8402497f110260223c29cf734af309faad080cd3 Mon Sep 17 00:00:00 2001 From: Bingsu Date: Wed, 20 Sep 2023 00:26:19 +0900 Subject: [PATCH 1/3] chore: update versions --- .pre-commit-config.yaml | 4 ++-- install.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8d30896..af459ce 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,12 +8,12 @@ repos: - id: mixed-line-ending - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.0.287" + rev: "v0.0.290" hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] - repo: https://github.com/psf/black-pre-commit-mirror - rev: 23.9.0 + rev: 23.9.1 hooks: - id: black diff --git a/install.py b/install.py index 426d8fe..ceab808 100644 --- a/install.py +++ b/install.py @@ -44,8 +44,8 @@ def run_pip(*args): def install(): deps = [ # requirements - ("ultralytics", "8.0.173", None), - ("mediapipe", "0.10.3", None), + ("ultralytics", "8.0.181", None), + ("mediapipe", "0.10.5", None), ("rich", "13.0.0", None), # mediapipe ("protobuf", "3.20", "3.9999"), From bfddf681dee2d8f2c6ec2b2641aceb0900e0f127 Mon Sep 17 00:00:00 2001 From: Bingsu Date: Wed, 20 Sep 2023 00:26:32 +0900 Subject: [PATCH 2/3] fix: lazy import --- adetailer/mediapipe.py | 7 ++++++- adetailer/ultralytics.py | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/adetailer/mediapipe.py b/adetailer/mediapipe.py index e52b620..17fb2cc 100644 --- a/adetailer/mediapipe.py +++ b/adetailer/mediapipe.py @@ -2,7 +2,6 @@ from __future__ import annotations from functools import partial -import mediapipe as mp import numpy as np from PIL import Image, ImageDraw @@ -29,6 +28,8 @@ def mediapipe_predict( def mediapipe_face_detection( model_type: int, image: Image.Image, confidence: float = 0.3 ) -> PredictOutput: + import mediapipe as mp + img_width, img_height = image.size mp_face_detection = mp.solutions.face_detection @@ -84,6 +85,8 @@ def get_convexhull(points: np.ndarray) -> list[tuple[int, int]]: def mediapipe_face_mesh(image: Image.Image, confidence: float = 0.3) -> PredictOutput: + import mediapipe as mp + mp_face_mesh = mp.solutions.face_mesh draw_util = mp.solutions.drawing_utils drawing_styles = mp.solutions.drawing_styles @@ -127,6 +130,8 @@ def mediapipe_face_mesh(image: Image.Image, confidence: float = 0.3) -> PredictO def mediapipe_face_mesh_eyes_only( image: Image.Image, confidence: float = 0.3 ) -> PredictOutput: + import mediapipe as mp + mp_face_mesh = mp.solutions.face_mesh left_idx = np.array(list(mp_face_mesh.FACEMESH_LEFT_EYE)).flatten() diff --git a/adetailer/ultralytics.py b/adetailer/ultralytics.py index addd0f5..36062b7 100644 --- a/adetailer/ultralytics.py +++ b/adetailer/ultralytics.py @@ -5,7 +5,6 @@ from pathlib import Path import cv2 from PIL import Image from torchvision.transforms.functional import to_pil_image -from ultralytics import YOLO from adetailer import PredictOutput from adetailer.common import create_mask_from_bbox @@ -17,6 +16,8 @@ def ultralytics_predict( confidence: float = 0.3, device: str = "", ) -> PredictOutput: + from ultralytics import YOLO + model = YOLO(model_path) pred = model(image, conf=confidence, device=device) From 56c4cf07b501ef6e12697dde03a64bcdaabb438e Mon Sep 17 00:00:00 2001 From: Bingsu Date: Wed, 20 Sep 2023 00:30:26 +0900 Subject: [PATCH 3/3] chore: v23.9.3 --- CHANGELOG.md | 6 ++++++ adetailer/__version__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89909b5..a2196f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 2023-09-20 + +- v23.9.3 +- ultralytics 버전 8.0.181로 업데이트 (https://github.com/ultralytics/ultralytics/pull/4891) +- mediapipe와 ultralytics의 lazy import + ## 2023-09-10 - v23.9.2 diff --git a/adetailer/__version__.py b/adetailer/__version__.py index 0a9df8e..88729b7 100644 --- a/adetailer/__version__.py +++ b/adetailer/__version__.py @@ -1 +1 @@ -__version__ = "23.9.2" +__version__ = "23.9.3"