From b6e394de6290d04081e30c0b1089032bba0f6ecb Mon Sep 17 00:00:00 2001 From: Art Gourieff <85128026+Gourieff@users.noreply.github.com> Date: Tue, 5 Mar 2024 01:15:28 +0700 Subject: [PATCH] FIX: No source 'face model' when batch Issue: https://github.com/Gourieff/sd-webui-reactor/discussions/379 +VersionUP (0.7.0 beta3) --- README.md | 2 +- README_RU.md | 2 +- scripts/reactor_faceswap.py | 9 +++++---- scripts/reactor_swapper.py | 9 +++++---- scripts/reactor_version.py | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 93b3ff0..8faaa1a 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ logo - ![Version](https://img.shields.io/badge/version-0.7.0_beta2-green?style=for-the-badge&labelColor=darkgreen) + ![Version](https://img.shields.io/badge/version-0.7.0_beta3-green?style=for-the-badge&labelColor=darkgreen) Support Me on Boosty diff --git a/README_RU.md b/README_RU.md index 111d326..246a318 100644 --- a/README_RU.md +++ b/README_RU.md @@ -2,7 +2,7 @@ logo - ![Version](https://img.shields.io/badge/версия-0.7.0_beta2-green?style=for-the-badge&labelColor=darkgreen) + ![Version](https://img.shields.io/badge/версия-0.7.0_beta3-green?style=for-the-badge&labelColor=darkgreen) Поддержать проект на Boosty diff --git a/scripts/reactor_faceswap.py b/scripts/reactor_faceswap.py index d02fc68..88e8b3c 100644 --- a/scripts/reactor_faceswap.py +++ b/scripts/reactor_faceswap.py @@ -253,10 +253,11 @@ class FaceSwapScript(scripts.Script): self.upscale_force = False if shared.state.job_count > 0: - self.face_restorer_visibility = shared.opts.data['restorer_visibility'] if 'restorer_visibility' in shared.opts.data.keys() else 1 - self.codeformer_weight = shared.opts.data['codeformer_weight'] if 'codeformer_weight' in shared.opts.data.keys() else 0.5 - self.mask_face = shared.opts.data['mask_face'] if 'mask_face' in shared.opts.data.keys() else False - self.face_model = shared.opts.data['face_model'] if 'face_model' in shared.opts.data.keys() else "None" + # logger.debug(f"Job count: {shared.state.job_count}") + self.face_restorer_visibility = shared.opts.data['restorer_visibility'] if 'restorer_visibility' in shared.opts.data.keys() else face_restorer_visibility + self.codeformer_weight = shared.opts.data['codeformer_weight'] if 'codeformer_weight' in shared.opts.data.keys() else codeformer_weight + self.mask_face = shared.opts.data['mask_face'] if 'mask_face' in shared.opts.data.keys() else mask_face + self.face_model = shared.opts.data['face_model'] if 'face_model' in shared.opts.data.keys() else face_model logger.debug("*** Set Device") set_Device(self.device) diff --git a/scripts/reactor_swapper.py b/scripts/reactor_swapper.py index d001930..77b2825 100644 --- a/scripts/reactor_swapper.py +++ b/scripts/reactor_swapper.py @@ -166,13 +166,14 @@ def restore_face(image: Image, enhancement_options: EnhancementOptions): if enhancement_options.face_restorer is not None: original_image = result_image.copy() - logger.status("Restoring the face with %s", enhancement_options.face_restorer.name()) numpy_image = np.array(result_image) if enhancement_options.face_restorer.name() == "CodeFormer": + logger.status("Restoring the face with %s (weight: %s)", enhancement_options.face_restorer.name(), enhancement_options.codeformer_weight) numpy_image = codeformer_model.codeformer.restore( numpy_image, w=enhancement_options.codeformer_weight ) else: # GFPGAN: + logger.status("Restoring the face with %s", enhancement_options.face_restorer.name()) numpy_image = gfpgan_model.gfpgan_fix_faces(numpy_image) # numpy_image = enhancement_options.face_restorer.restore(numpy_image) restored_image = Image.fromarray(numpy_image) @@ -554,10 +555,10 @@ def swap_face( source_face_model = [load_face_model(face_model)] if source_face_model is not None: source_faces_index = [0] - source_faces = source_face_model - logger.status("Using Loaded Source Face Model...") + source_faces = source_face_model + logger.status(f"Using Loaded Source Face Model: {face_model}") else: - logger.error(f"Cannot load Face Model File: {face_model}.safetensors") + logger.error(f"Cannot load Face Model File: {face_model}") else: logger.error("Cannot detect any Source") diff --git a/scripts/reactor_version.py b/scripts/reactor_version.py index 8de88e0..0b7b082 100644 --- a/scripts/reactor_version.py +++ b/scripts/reactor_version.py @@ -1,5 +1,5 @@ app_title = "ReActor" -version_flag = "v0.7.0-b1" +version_flag = "v0.7.0-b3" from scripts.reactor_logger import logger, get_Run, set_Run from scripts.reactor_globals import DEVICE