From 72a0edb6bae6d7a8d8d15c1c0c9794e4c947d3a2 Mon Sep 17 00:00:00 2001 From: henryruhs Date: Wed, 16 Apr 2025 12:06:36 +0200 Subject: [PATCH] Use module_name everywhere --- facefusion/face_masker.py | 16 ++++++++-------- facefusion/processors/modules/age_modifier.py | 4 ++-- facefusion/processors/modules/deep_swapper.py | 4 ++-- .../processors/modules/expression_restorer.py | 4 ++-- facefusion/processors/modules/face_editor.py | 4 ++-- facefusion/processors/modules/face_enhancer.py | 4 ++-- facefusion/processors/modules/face_swapper.py | 16 ++++++++-------- facefusion/processors/modules/frame_colorizer.py | 4 ++-- facefusion/processors/modules/frame_enhancer.py | 4 ++-- facefusion/processors/modules/lip_syncer.py | 4 ++-- 10 files changed, 32 insertions(+), 32 deletions(-) diff --git a/facefusion/face_masker.py b/facefusion/face_masker.py index 09f5cb8..60c9d06 100755 --- a/facefusion/face_masker.py +++ b/facefusion/face_masker.py @@ -171,8 +171,8 @@ def create_static_box_mask(crop_size : Size, face_mask_blur : float, face_mask_p def create_occlusion_mask(crop_vision_frame : VisionFrame) -> Mask: - face_occluder_model = state_manager.get_item('face_occluder_model') - model_size = create_static_model_set('full').get(face_occluder_model).get('size') + model_name = state_manager.get_item('face_occluder_model') + model_size = create_static_model_set('full').get(model_name).get('size') prepare_vision_frame = cv2.resize(crop_vision_frame, model_size) prepare_vision_frame = numpy.expand_dims(prepare_vision_frame, axis = 0).astype(numpy.float32) / 255.0 prepare_vision_frame = prepare_vision_frame.transpose(0, 1, 2, 3) @@ -184,8 +184,8 @@ def create_occlusion_mask(crop_vision_frame : VisionFrame) -> Mask: def create_region_mask(crop_vision_frame : VisionFrame, face_mask_regions : List[FaceMaskRegion]) -> Mask: - face_parser_model = state_manager.get_item('face_parser_model') - model_size = create_static_model_set('full').get(face_parser_model).get('size') + model_name = state_manager.get_item('face_parser_model') + model_size = create_static_model_set('full').get(model_name).get('size') prepare_vision_frame = cv2.resize(crop_vision_frame, model_size) prepare_vision_frame = prepare_vision_frame[:, :, ::-1].astype(numpy.float32) / 255.0 prepare_vision_frame = numpy.subtract(prepare_vision_frame, numpy.array([ 0.485, 0.456, 0.406 ]).astype(numpy.float32)) @@ -209,8 +209,8 @@ def create_mouth_mask(face_landmark_68 : FaceLandmark68) -> Mask: def forward_occlude_face(prepare_vision_frame : VisionFrame) -> Mask: - face_occluder_model = state_manager.get_item('face_occluder_model') - face_occluder = get_inference_pool().get(face_occluder_model) + model_name = state_manager.get_item('face_occluder_model') + face_occluder = get_inference_pool().get(model_name) with conditional_thread_semaphore(): occlusion_mask : Mask = face_occluder.run(None, @@ -222,8 +222,8 @@ def forward_occlude_face(prepare_vision_frame : VisionFrame) -> Mask: def forward_parse_face(prepare_vision_frame : VisionFrame) -> Mask: - face_parser_model = state_manager.get_item('face_parser_model') - face_parser = get_inference_pool().get(face_parser_model) + model_name = state_manager.get_item('face_parser_model') + face_parser = get_inference_pool().get(model_name) with conditional_thread_semaphore(): region_mask : Mask = face_parser.run(None, diff --git a/facefusion/processors/modules/age_modifier.py b/facefusion/processors/modules/age_modifier.py index f386f23..925808b 100755 --- a/facefusion/processors/modules/age_modifier.py +++ b/facefusion/processors/modules/age_modifier.py @@ -76,8 +76,8 @@ def clear_inference_pool() -> None: def get_model_options() -> ModelOptions: - age_modifier_model = state_manager.get_item('age_modifier_model') - return create_static_model_set('full').get(age_modifier_model) + model_name = state_manager.get_item('age_modifier_model') + return create_static_model_set('full').get(model_name) def register_args(program : ArgumentParser) -> None: diff --git a/facefusion/processors/modules/deep_swapper.py b/facefusion/processors/modules/deep_swapper.py index 7916e96..d6ea6df 100755 --- a/facefusion/processors/modules/deep_swapper.py +++ b/facefusion/processors/modules/deep_swapper.py @@ -252,8 +252,8 @@ def clear_inference_pool() -> None: def get_model_options() -> ModelOptions: - deep_swapper_model = state_manager.get_item('deep_swapper_model') - return create_static_model_set('full').get(deep_swapper_model) + model_name = state_manager.get_item('deep_swapper_model') + return create_static_model_set('full').get(model_name) def get_model_size() -> Size: diff --git a/facefusion/processors/modules/expression_restorer.py b/facefusion/processors/modules/expression_restorer.py index 1957cbc..0a49970 100755 --- a/facefusion/processors/modules/expression_restorer.py +++ b/facefusion/processors/modules/expression_restorer.py @@ -87,8 +87,8 @@ def clear_inference_pool() -> None: def get_model_options() -> ModelOptions: - expression_restorer_model = state_manager.get_item('expression_restorer_model') - return create_static_model_set('full').get(expression_restorer_model) + model_name = state_manager.get_item('expression_restorer_model') + return create_static_model_set('full').get(model_name) def register_args(program : ArgumentParser) -> None: diff --git a/facefusion/processors/modules/face_editor.py b/facefusion/processors/modules/face_editor.py index 5a0f527..3f494d8 100755 --- a/facefusion/processors/modules/face_editor.py +++ b/facefusion/processors/modules/face_editor.py @@ -117,8 +117,8 @@ def clear_inference_pool() -> None: def get_model_options() -> ModelOptions: - face_editor_model = state_manager.get_item('face_editor_model') - return create_static_model_set('full').get(face_editor_model) + model_name = state_manager.get_item('face_editor_model') + return create_static_model_set('full').get(model_name) def register_args(program : ArgumentParser) -> None: diff --git a/facefusion/processors/modules/face_enhancer.py b/facefusion/processors/modules/face_enhancer.py index 622c2e3..4e71a58 100755 --- a/facefusion/processors/modules/face_enhancer.py +++ b/facefusion/processors/modules/face_enhancer.py @@ -234,8 +234,8 @@ def clear_inference_pool() -> None: def get_model_options() -> ModelOptions: - face_enhancer_model = state_manager.get_item('face_enhancer_model') - return create_static_model_set('full').get(face_enhancer_model) + model_name = state_manager.get_item('face_enhancer_model') + return create_static_model_set('full').get(model_name) def register_args(program : ArgumentParser) -> None: diff --git a/facefusion/processors/modules/face_swapper.py b/facefusion/processors/modules/face_swapper.py index ebdd4c8..791a308 100755 --- a/facefusion/processors/modules/face_swapper.py +++ b/facefusion/processors/modules/face_swapper.py @@ -336,28 +336,28 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet: def get_inference_pool() -> InferencePool: - model_names = [ get_face_swapper_model() ] + model_names = [ get_model_name() ] model_source_set = get_model_options().get('sources') return inference_manager.get_inference_pool(__name__, model_names, model_source_set) def clear_inference_pool() -> None: - model_names = [ get_face_swapper_model() ] + model_names = [ get_model_name() ] inference_manager.clear_inference_pool(__name__, model_names) def get_model_options() -> ModelOptions: - face_swapper_model = get_face_swapper_model() - return create_static_model_set('full').get(face_swapper_model) + model_name = get_model_name() + return create_static_model_set('full').get(model_name) -def get_face_swapper_model() -> str: - face_swapper_model = state_manager.get_item('face_swapper_model') +def get_model_name() -> str: + model_name = state_manager.get_item('face_swapper_model') - if has_execution_provider('coreml') and face_swapper_model == 'inswapper_128_fp16': + if has_execution_provider('coreml') and model_name == 'inswapper_128_fp16': return 'inswapper_128' - return face_swapper_model + return model_name def register_args(program : ArgumentParser) -> None: diff --git a/facefusion/processors/modules/frame_colorizer.py b/facefusion/processors/modules/frame_colorizer.py index 6b9dffb..12a1942 100644 --- a/facefusion/processors/modules/frame_colorizer.py +++ b/facefusion/processors/modules/frame_colorizer.py @@ -147,8 +147,8 @@ def resolve_execution_providers() -> List[ExecutionProvider]: def get_model_options() -> ModelOptions: - frame_colorizer_model = state_manager.get_item('frame_colorizer_model') - return create_static_model_set('full').get(frame_colorizer_model) + model_name = state_manager.get_item('frame_colorizer_model') + return create_static_model_set('full').get(model_name) def register_args(program : ArgumentParser) -> None: diff --git a/facefusion/processors/modules/frame_enhancer.py b/facefusion/processors/modules/frame_enhancer.py index a06c21d..5b653a7 100644 --- a/facefusion/processors/modules/frame_enhancer.py +++ b/facefusion/processors/modules/frame_enhancer.py @@ -398,8 +398,8 @@ def clear_inference_pool() -> None: def get_model_options() -> ModelOptions: - frame_enhancer_model = get_frame_enhancer_model() - return create_static_model_set('full').get(frame_enhancer_model) + model_name = get_frame_enhancer_model() + return create_static_model_set('full').get(model_name) def get_frame_enhancer_model() -> str: diff --git a/facefusion/processors/modules/lip_syncer.py b/facefusion/processors/modules/lip_syncer.py index 9da028d..1b6faa2 100755 --- a/facefusion/processors/modules/lip_syncer.py +++ b/facefusion/processors/modules/lip_syncer.py @@ -86,8 +86,8 @@ def clear_inference_pool() -> None: def get_model_options() -> ModelOptions: - lip_syncer_model = state_manager.get_item('lip_syncer_model') - return create_static_model_set('full').get(lip_syncer_model) + model_name = state_manager.get_item('lip_syncer_model') + return create_static_model_set('full').get(model_name) def register_args(program : ArgumentParser) -> None: