From 48016eaba3dc58efdcd574033d8245c8a90be1fe Mon Sep 17 00:00:00 2001 From: Henry Ruhs Date: Mon, 18 Nov 2024 10:59:40 +0100 Subject: [PATCH] Show/hide morph slider for deep swapper (#822) --- facefusion/processors/modules/deep_swapper.py | 15 ++++++++--- .../uis/components/deep_swapper_options.py | 26 ++++++++++--------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/facefusion/processors/modules/deep_swapper.py b/facefusion/processors/modules/deep_swapper.py index f65c9f9b..4f467147 100755 --- a/facefusion/processors/modules/deep_swapper.py +++ b/facefusion/processors/modules/deep_swapper.py @@ -182,10 +182,10 @@ def forward(crop_vision_frame : VisionFrame, deep_swapper_morph : DeepSwapperMor deep_swapper = get_inference_pool().get('deep_swapper') deep_swapper_inputs = {} - for index, deep_swapper_input in enumerate(deep_swapper.get_inputs()): - if index == 0: + for deep_swapper_input in deep_swapper.get_inputs(): + if deep_swapper_input.name == 'in_face:0': deep_swapper_inputs[deep_swapper_input.name] = crop_vision_frame - if index == 1: + if deep_swapper_input.name == 'morph_value:0': deep_swapper_inputs[deep_swapper_input.name] = deep_swapper_morph with thread_semaphore(): @@ -194,6 +194,15 @@ def forward(crop_vision_frame : VisionFrame, deep_swapper_morph : DeepSwapperMor return crop_vision_frame[0], crop_source_mask[0], crop_target_mask[0] +def has_morph_input() -> bool: + deep_swapper = get_inference_pool().get('deep_swapper') + + for deep_swapper_input in deep_swapper.get_inputs(): + if deep_swapper_input.name == 'morph_value:0': + return True + return False + + def prepare_crop_frame(crop_vision_frame : VisionFrame) -> VisionFrame: crop_vision_frame = cv2.addWeighted(crop_vision_frame, 1.75, cv2.GaussianBlur(crop_vision_frame, (0, 0), 2), -0.75, 0) crop_vision_frame = crop_vision_frame / 255.0 diff --git a/facefusion/uis/components/deep_swapper_options.py b/facefusion/uis/components/deep_swapper_options.py index fe816940..61386acf 100755 --- a/facefusion/uis/components/deep_swapper_options.py +++ b/facefusion/uis/components/deep_swapper_options.py @@ -6,6 +6,7 @@ from facefusion import state_manager, wording from facefusion.common_helper import calc_int_step from facefusion.processors import choices as processors_choices from facefusion.processors.core import load_processor_module +from facefusion.processors.modules.deep_swapper import has_morph_input from facefusion.processors.typing import DeepSwapperModel from facefusion.uis.core import get_ui_component, register_ui_component @@ -17,26 +18,27 @@ def render() -> None: global DEEP_SWAPPER_MODEL_DROPDOWN global DEEP_SWAPPER_MORPH_SLIDER + has_deep_swapper = 'deep_swapper' in state_manager.get_item('processors') DEEP_SWAPPER_MODEL_DROPDOWN = gradio.Dropdown( label = wording.get('uis.deep_swapper_model_dropdown'), choices = processors_choices.deep_swapper_models, value = state_manager.get_item('deep_swapper_model'), - visible = 'deep_swapper' in state_manager.get_item('processors') + visible = has_deep_swapper ) DEEP_SWAPPER_MORPH_SLIDER = gradio.Slider( - label=wording.get('uis.deep_swapper_morph_slider'), - value=state_manager.get_item('deep_swapper_morph'), - step=calc_int_step(processors_choices.deep_swapper_morph_range), - minimum=processors_choices.deep_swapper_morph_range[0], - maximum=processors_choices.deep_swapper_morph_range[-1], - visible='deep_swapper' in state_manager.get_item('processors') + label = wording.get('uis.deep_swapper_morph_slider'), + value = state_manager.get_item('deep_swapper_morph'), + step = calc_int_step(processors_choices.deep_swapper_morph_range), + minimum = processors_choices.deep_swapper_morph_range[0], + maximum = processors_choices.deep_swapper_morph_range[-1], + visible = has_deep_swapper and has_morph_input() ) register_ui_component('deep_swapper_model_dropdown', DEEP_SWAPPER_MODEL_DROPDOWN) register_ui_component('deep_swapper_morph_slider', DEEP_SWAPPER_MORPH_SLIDER) def listen() -> None: - DEEP_SWAPPER_MODEL_DROPDOWN.change(update_deep_swapper_model, inputs = DEEP_SWAPPER_MODEL_DROPDOWN, outputs = DEEP_SWAPPER_MODEL_DROPDOWN) + DEEP_SWAPPER_MODEL_DROPDOWN.change(update_deep_swapper_model, inputs = DEEP_SWAPPER_MODEL_DROPDOWN, outputs = [ DEEP_SWAPPER_MODEL_DROPDOWN, DEEP_SWAPPER_MORPH_SLIDER ]) DEEP_SWAPPER_MORPH_SLIDER.release(update_deep_swapper_morph, inputs = DEEP_SWAPPER_MORPH_SLIDER) processors_checkbox_group = get_ui_component('processors_checkbox_group') @@ -46,17 +48,17 @@ def listen() -> None: def remote_update(processors : List[str]) -> Tuple[gradio.Dropdown, gradio.Slider]: has_deep_swapper = 'deep_swapper' in processors - return gradio.Dropdown(visible = has_deep_swapper), gradio.Slider(visible = has_deep_swapper) + return gradio.Dropdown(visible = has_deep_swapper), gradio.Slider(visible = has_deep_swapper and has_morph_input()) -def update_deep_swapper_model(deep_swapper_model : DeepSwapperModel) -> gradio.Dropdown: +def update_deep_swapper_model(deep_swapper_model : DeepSwapperModel) -> Tuple[gradio.Dropdown, gradio.Slider]: deep_swapper_module = load_processor_module('deep_swapper') deep_swapper_module.clear_inference_pool() state_manager.set_item('deep_swapper_model', deep_swapper_model) if deep_swapper_module.pre_check(): - return gradio.Dropdown(value = state_manager.get_item('deep_swapper_model')) - return gradio.Dropdown() + return gradio.Dropdown(value = state_manager.get_item('deep_swapper_model')), gradio.Slider(visible = has_morph_input()) + return gradio.Dropdown(), gradio.Slider() def update_deep_swapper_morph(deep_swapper_morph : int) -> None: