From 3b50def4069320d02405e59673d08066e888f961 Mon Sep 17 00:00:00 2001 From: Gourieff <777@lovemet.ru> Date: Sat, 9 Dec 2023 21:27:08 +0700 Subject: [PATCH] UPDATE: Save Original On/Off w/Multiple Source Feature Request #250 +VersionUP (0.6.0 alpha2) --- README.md | 2 +- README_RU.md | 4 +++- reactor_ui/reactor_main_ui.py | 23 ++++++++++++----------- scripts/reactor_faceswap.py | 5 ++++- scripts/reactor_version.py | 2 +- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 8939559..4e06349 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ logo - ![Version](https://img.shields.io/badge/version-0.6.0_alpha1-lightgreen?style=for-the-badge&labelColor=darkgreen) + ![Version](https://img.shields.io/badge/version-0.6.0_alpha2-lightgreen?style=for-the-badge&labelColor=darkgreen) Support Me on Boosty diff --git a/README_RU.md b/README_RU.md index 962af74..a1ba1f0 100644 --- a/README_RU.md +++ b/README_RU.md @@ -2,7 +2,7 @@ logo - ![Version](https://img.shields.io/badge/версия-0.6.0_alpha1-lightgreen?style=for-the-badge&labelColor=darkgreen) + ![Version](https://img.shields.io/badge/версия-0.6.0_alpha2-lightgreen?style=for-the-badge&labelColor=darkgreen) Поддержать проект на Boosty @@ -46,6 +46,8 @@ 0.6.0-whatsnew-01 +0.6.0-whatsnew-02 + ### 0.5.1 - Теперь можно сохранять модели лиц в качестве файлов "safetensors" (находятся в `\models\reactor\faces`) и загружать их с ReActor, храня супер легкие модели лиц, которые вы чаще всего используете; diff --git a/reactor_ui/reactor_main_ui.py b/reactor_ui/reactor_main_ui.py index 5ed4212..6672be2 100644 --- a/reactor_ui/reactor_main_ui.py +++ b/reactor_ui/reactor_main_ui.py @@ -8,7 +8,7 @@ from scripts.reactor_swapper import ( ) from modules import shared -SAVE_ORIGINAL: bool = False +# SAVE_ORIGINAL: bool = False def update_fm_list(selected: str): return gr.Dropdown.update( @@ -18,16 +18,17 @@ def update_fm_list(selected: str): # TAB MAIN def show(is_img2img: bool, show_br: bool = True, **msgs): - def on_select_source(selected: bool, evt: gr.SelectData): - global SAVE_ORIGINAL + # def on_select_source(selected: bool, evt: gr.SelectData): + def on_select_source(evt: gr.SelectData): + # global SAVE_ORIGINAL if evt.index == 2: - if SAVE_ORIGINAL != selected: - SAVE_ORIGINAL = selected + # if SAVE_ORIGINAL != selected: + # SAVE_ORIGINAL = selected return { control_col_1: gr.Column.update(visible=False), control_col_2: gr.Column.update(visible=False), control_col_3: gr.Column.update(visible=True), - save_original: gr.Checkbox.update(value=False,visible=False), + # save_original: gr.Checkbox.update(value=False,visible=False), imgs_hash_clear: gr.Button.update(visible=True) } if evt.index == 0: @@ -35,7 +36,7 @@ def show(is_img2img: bool, show_br: bool = True, **msgs): control_col_1: gr.Column.update(visible=True), control_col_2: gr.Column.update(visible=False), control_col_3: gr.Column.update(visible=False), - save_original: gr.Checkbox.update(value=SAVE_ORIGINAL,visible=show_br), + # save_original: gr.Checkbox.update(value=SAVE_ORIGINAL,visible=show_br), imgs_hash_clear: gr.Button.update(visible=False) } if evt.index == 1: @@ -43,7 +44,7 @@ def show(is_img2img: bool, show_br: bool = True, **msgs): control_col_1: gr.Column.update(visible=False), control_col_2: gr.Column.update(visible=True), control_col_3: gr.Column.update(visible=False), - save_original: gr.Checkbox.update(value=SAVE_ORIGINAL,visible=show_br), + # save_original: gr.Checkbox.update(value=SAVE_ORIGINAL,visible=show_br), imgs_hash_clear: gr.Button.update(visible=False) } @@ -106,13 +107,13 @@ def show(is_img2img: bool, show_br: bool = True, **msgs): save_original = gr.Checkbox( False, label="Save Original (Swap in generated only)", - info="Save the original image(s) made before swapping (it always saves Original when you use Multiple Images or Folder)" + info="Save the original image(s) made before swapping" ) else: save_original = gr.Checkbox( False, label="Save Original", - info="Save the original image(s) made before swapping (it always saves Original when you use Multiple Images or Folder)", + info="Save the original image(s) made before swapping", visible=show_br ) # imgs.upload(on_files_upload_uncheck_so,[save_original],[save_original],show_progress=False) @@ -177,6 +178,6 @@ def show(is_img2img: bool, show_br: bool = True, **msgs): label="Swap in generated image", visible=is_img2img, ) - select_source.select(on_select_source,[save_original],[control_col_1,control_col_2,control_col_3,save_original,imgs_hash_clear],show_progress=False) + select_source.select(on_select_source,None,[control_col_1,control_col_2,control_col_3,imgs_hash_clear],show_progress=False) return img, imgs, select_source, face_model, source_folder, save_original, mask_face, source_faces_index, gender_source, faces_index, gender_target, face_restorer_name, face_restorer_visibility, codeformer_weight, swap_in_source, swap_in_generated diff --git a/scripts/reactor_faceswap.py b/scripts/reactor_faceswap.py index 8812a4f..924510d 100644 --- a/scripts/reactor_faceswap.py +++ b/scripts/reactor_faceswap.py @@ -309,7 +309,10 @@ class FaceSwapScript(scripts.Script): if self.select_source == 2 or (self.select_source == 0 and self.source_imgs is not None and self.source is None): if len(result) > 0 and swapped > 0: - result_images.extend(result) + if self.save_original: + result_images.extend(result) + else: + result_images = result suffix = "-swapped" for i,x in enumerate(result): try: diff --git a/scripts/reactor_version.py b/scripts/reactor_version.py index 996347a..6a8d6fb 100644 --- a/scripts/reactor_version.py +++ b/scripts/reactor_version.py @@ -1,5 +1,5 @@ app_title = "ReActor" -version_flag = "v0.6.0-a1" +version_flag = "v0.6.0-a2" from scripts.reactor_logger import logger, get_Run, set_Run