From 9778e4f2082a89d25d999c6fdf8ba4de3b3f9d45 Mon Sep 17 00:00:00 2001 From: Art Gourieff <85128026+Gourieff@users.noreply.github.com> Date: Tue, 20 Feb 2024 19:19:05 +0700 Subject: [PATCH] UPDATE: det_size with face model build FR #247 --- README.md | 2 +- README_RU.md | 2 +- scripts/reactor_swapper.py | 9 +++++++-- scripts/reactor_version.py | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 63ddfef..ced5a3c 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ logo - ![Version](https://img.shields.io/badge/version-0.7.0_alpha1-lightgreen?style=for-the-badge&labelColor=darkgreen) + ![Version](https://img.shields.io/badge/version-0.7.0_alpha2-lightgreen?style=for-the-badge&labelColor=darkgreen) Support Me on Boosty diff --git a/README_RU.md b/README_RU.md index ab50a72..7e36971 100644 --- a/README_RU.md +++ b/README_RU.md @@ -2,7 +2,7 @@ logo - ![Version](https://img.shields.io/badge/версия-0.7.0_alpha1-lightgreen?style=for-the-badge&labelColor=darkgreen) + ![Version](https://img.shields.io/badge/версия-0.7.0_alpha2-lightgreen?style=for-the-badge&labelColor=darkgreen) Поддержать проект на Boosty diff --git a/scripts/reactor_swapper.py b/scripts/reactor_swapper.py index 76a6e39..d001930 100644 --- a/scripts/reactor_swapper.py +++ b/scripts/reactor_swapper.py @@ -626,7 +626,7 @@ def swap_face( return result_image, [], 0 -def build_face_model(image: Image.Image, name: str, save_model: bool = True): +def build_face_model(image: Image.Image, name: str, save_model: bool = True, det_size=(640, 640)): if image is None: error_msg = "Please load an Image" logger.error(error_msg) @@ -639,7 +639,12 @@ def build_face_model(image: Image.Image, name: str, save_model: bool = True): image = cv2.cvtColor(np.array(image), cv2.COLOR_RGB2BGR) if save_model: logger.status("Building Face Model...") - face_model = analyze_faces(image) + face_model = analyze_faces(image, det_size) + + if len(face_model) == 0: + det_size_half = half_det_size(det_size) + face_model = analyze_faces(image, det_size_half) + if face_model is not None and len(face_model) > 0: if save_model: face_model_path = os.path.join(FACE_MODELS_PATH, name + ".safetensors") diff --git a/scripts/reactor_version.py b/scripts/reactor_version.py index 9c9c4c8..302ca2e 100644 --- a/scripts/reactor_version.py +++ b/scripts/reactor_version.py @@ -1,5 +1,5 @@ app_title = "ReActor" -version_flag = "v0.7.0-a1" +version_flag = "v0.7.0-a2" from scripts.reactor_logger import logger, get_Run, set_Run from scripts.reactor_globals import DEVICE