From 038802ae2b85e3c04af796126f7fce59375a0b92 Mon Sep 17 00:00:00 2001 From: henryruhs Date: Sun, 23 Aug 2026 23:24:55 +0200 Subject: [PATCH] restructure config for processors --- facefusion.ini | 22 ++++++++++++++ .../processors/modules/age_modifier/core.py | 4 +-- .../modules/background_remover/core.py | 6 ++-- .../processors/modules/deep_swapper/core.py | 4 +-- .../modules/expression_restorer/core.py | 6 ++-- .../processors/modules/face_debugger/core.py | 2 +- .../processors/modules/face_editor/core.py | 30 +++++++++---------- .../processors/modules/face_enhancer/core.py | 6 ++-- .../processors/modules/face_swapper/core.py | 6 ++-- .../modules/frame_colorizer/core.py | 6 ++-- .../processors/modules/frame_enhancer/core.py | 4 +-- .../processors/modules/lip_syncer/core.py | 4 +-- 12 files changed, 61 insertions(+), 39 deletions(-) diff --git a/facefusion.ini b/facefusion.ini index f4b32f87..68657359 100644 --- a/facefusion.ini +++ b/facefusion.ini @@ -75,17 +75,29 @@ workflow_strategy = [processors] processors = + +[processors.age_modifier] age_modifier_model = age_modifier_direction = + +[processors.background_remover] background_remover_model = background_remover_fill_color = background_remover_despill_color = + +[processors.deep_swapper] deep_swapper_model = deep_swapper_morph = + +[processors.expression_restorer] expression_restorer_model = expression_restorer_factor = expression_restorer_areas = + +[processors.face_debugger] face_debugger_items = + +[processors.face_editor] face_editor_model = face_editor_eyebrow_direction = face_editor_eye_gaze_horizontal = @@ -101,17 +113,27 @@ face_editor_mouth_position_vertical = face_editor_head_pitch = face_editor_head_yaw = face_editor_head_roll = + +[processors.face_enhancer] face_enhancer_model = face_enhancer_blend = face_enhancer_weight = + +[processors.face_swapper] face_swapper_model = face_swapper_pixel_boost = face_swapper_weight = + +[processors.frame_colorizer] frame_colorizer_model = frame_colorizer_size = frame_colorizer_blend = + +[processors.frame_enhancer] frame_enhancer_model = frame_enhancer_blend = + +[processors.lip_syncer] lip_syncer_model = lip_syncer_weight = diff --git a/facefusion/processors/modules/age_modifier/core.py b/facefusion/processors/modules/age_modifier/core.py index 03840fd0..9f08dd5c 100755 --- a/facefusion/processors/modules/age_modifier/core.py +++ b/facefusion/processors/modules/age_modifier/core.py @@ -130,14 +130,14 @@ def register_args(program : ArgumentParser) -> None: group_processors.add_argument( '--age-modifier-model', help = translator.get('help.model', __package__), - default = config.get_str_value('processors', 'age_modifier_model', 'fran'), + default = config.get_str_value('processors.age_modifier', 'age_modifier_model', 'fran'), choices = age_modifier_choices.age_modifier_models ), group_processors.add_argument( '--age-modifier-direction', help = translator.get('help.direction', __package__), type = int, - default = config.get_int_value('processors', 'age_modifier_direction', '0'), + default = config.get_int_value('processors.age_modifier', 'age_modifier_direction', '0'), choices = age_modifier_choices.age_modifier_direction_range, metavar = create_int_metavar(age_modifier_choices.age_modifier_direction_range) ) diff --git a/facefusion/processors/modules/background_remover/core.py b/facefusion/processors/modules/background_remover/core.py index 69824796..aff4979f 100644 --- a/facefusion/processors/modules/background_remover/core.py +++ b/facefusion/processors/modules/background_remover/core.py @@ -501,21 +501,21 @@ def register_args(program : ArgumentParser) -> None: group_processors.add_argument( '--background-remover-model', help = translator.get('help.model', __package__), - default = config.get_str_value('processors', 'background_remover_model', 'modnet'), + default = config.get_str_value('processors.background_remover', 'background_remover_model', 'modnet'), choices = background_remover_choices.background_remover_models ), group_processors.add_argument( '--background-remover-fill-color', help = translator.get('help.fill_color', __package__), type = partial(sanitize_int_range, int_range = background_remover_choices.background_remover_color_range), - default = config.get_int_list('processors', 'background_remover_fill_color', '0 0 0 0'), + default = config.get_int_list('processors.background_remover', 'background_remover_fill_color', '0 0 0 0'), nargs = '+' ), group_processors.add_argument( '--background-remover-despill-color', help = translator.get('help.despill_color', __package__), type = partial(sanitize_int_range, int_range = background_remover_choices.background_remover_color_range), - default = config.get_int_list('processors', 'background_remover_despill_color', '0 0 0 0'), + default = config.get_int_list('processors.background_remover', 'background_remover_despill_color', '0 0 0 0'), nargs = '+' ) ], diff --git a/facefusion/processors/modules/deep_swapper/core.py b/facefusion/processors/modules/deep_swapper/core.py index bd0d10d3..aafefc1e 100755 --- a/facefusion/processors/modules/deep_swapper/core.py +++ b/facefusion/processors/modules/deep_swapper/core.py @@ -282,14 +282,14 @@ def register_args(program : ArgumentParser) -> None: group_processors.add_argument( '--deep-swapper-model', help = translator.get('help.model', __package__), - default = config.get_str_value('processors', 'deep_swapper_model', 'iperov/elon_musk_224'), + default = config.get_str_value('processors.deep_swapper', 'deep_swapper_model', 'iperov/elon_musk_224'), choices = deep_swapper_choices.deep_swapper_models ), group_processors.add_argument( '--deep-swapper-morph', help = translator.get('help.morph', __package__), type = int, - default = config.get_int_value('processors', 'deep_swapper_morph', '100'), + default = config.get_int_value('processors.deep_swapper', 'deep_swapper_morph', '100'), choices = deep_swapper_choices.deep_swapper_morph_range, metavar = create_int_metavar(deep_swapper_choices.deep_swapper_morph_range) ) diff --git a/facefusion/processors/modules/expression_restorer/core.py b/facefusion/processors/modules/expression_restorer/core.py index f646e3bd..24b88a83 100755 --- a/facefusion/processors/modules/expression_restorer/core.py +++ b/facefusion/processors/modules/expression_restorer/core.py @@ -105,21 +105,21 @@ def register_args(program : ArgumentParser) -> None: group_processors.add_argument( '--expression-restorer-model', help = translator.get('help.model', __package__), - default = config.get_str_value('processors', 'expression_restorer_model', 'live_portrait'), + default = config.get_str_value('processors.expression_restorer', 'expression_restorer_model', 'live_portrait'), choices = expression_restorer_choices.expression_restorer_models ), group_processors.add_argument( '--expression-restorer-factor', help = translator.get('help.factor', __package__), type = int, - default = config.get_int_value('processors', 'expression_restorer_factor', '80'), + default = config.get_int_value('processors.expression_restorer', 'expression_restorer_factor', '80'), choices = expression_restorer_choices.expression_restorer_factor_range, metavar = create_int_metavar(expression_restorer_choices.expression_restorer_factor_range) ), group_processors.add_argument( '--expression-restorer-areas', help = translator.get('help.areas', __package__).format(choices = ', '.join(expression_restorer_choices.expression_restorer_areas)), - default = config.get_str_list('processors', 'expression_restorer_areas', ' '.join(expression_restorer_choices.expression_restorer_areas)), + default = config.get_str_list('processors.expression_restorer', 'expression_restorer_areas', ' '.join(expression_restorer_choices.expression_restorer_areas)), choices = expression_restorer_choices.expression_restorer_areas, nargs = '+', metavar = 'EXPRESSION_RESTORER_AREAS' diff --git a/facefusion/processors/modules/face_debugger/core.py b/facefusion/processors/modules/face_debugger/core.py index cded8512..cba64f17 100755 --- a/facefusion/processors/modules/face_debugger/core.py +++ b/facefusion/processors/modules/face_debugger/core.py @@ -38,7 +38,7 @@ def register_args(program : ArgumentParser) -> None: group_processors.add_argument( '--face-debugger-items', help = translator.get('help.items', __package__).format(choices = ', '.join(face_debugger_choices.face_debugger_items)), - default = config.get_str_list('processors', 'face_debugger_items', 'face-landmark-5/68 face-mask'), + default = config.get_str_list('processors.face_debugger', 'face_debugger_items', 'face-landmark-5/68 face-mask'), choices = face_debugger_choices.face_debugger_items, nargs = '+', metavar = 'FACE_DEBUGGER_ITEMS' diff --git a/facefusion/processors/modules/face_editor/core.py b/facefusion/processors/modules/face_editor/core.py index 0ba2e0da..fa7f3066 100755 --- a/facefusion/processors/modules/face_editor/core.py +++ b/facefusion/processors/modules/face_editor/core.py @@ -135,14 +135,14 @@ def register_args(program : ArgumentParser) -> None: group_processors.add_argument( '--face-editor-model', help = translator.get('help.model', __package__), - default = config.get_str_value('processors', 'face_editor_model', 'live_portrait'), + default = config.get_str_value('processors.face_editor', 'face_editor_model', 'live_portrait'), choices = face_editor_choices.face_editor_models ), group_processors.add_argument( '--face-editor-eyebrow-direction', help = translator.get('help.eyebrow_direction', __package__), type = float, - default = config.get_float_value('processors', 'face_editor_eyebrow_direction', '0'), + default = config.get_float_value('processors.face_editor', 'face_editor_eyebrow_direction', '0'), choices = face_editor_choices.face_editor_eyebrow_direction_range, metavar = create_float_metavar(face_editor_choices.face_editor_eyebrow_direction_range) ), @@ -150,7 +150,7 @@ def register_args(program : ArgumentParser) -> None: '--face-editor-eye-gaze-horizontal', help = translator.get('help.eye_gaze_horizontal', __package__), type = float, - default = config.get_float_value('processors', 'face_editor_eye_gaze_horizontal', '0'), + default = config.get_float_value('processors.face_editor', 'face_editor_eye_gaze_horizontal', '0'), choices = face_editor_choices.face_editor_eye_gaze_horizontal_range, metavar = create_float_metavar(face_editor_choices.face_editor_eye_gaze_horizontal_range) ), @@ -158,7 +158,7 @@ def register_args(program : ArgumentParser) -> None: '--face-editor-eye-gaze-vertical', help = translator.get('help.eye_gaze_vertical', __package__), type = float, - default = config.get_float_value('processors', 'face_editor_eye_gaze_vertical', '0'), + default = config.get_float_value('processors.face_editor', 'face_editor_eye_gaze_vertical', '0'), choices = face_editor_choices.face_editor_eye_gaze_vertical_range, metavar = create_float_metavar(face_editor_choices.face_editor_eye_gaze_vertical_range) ), @@ -166,7 +166,7 @@ def register_args(program : ArgumentParser) -> None: '--face-editor-eye-open-ratio', help = translator.get('help.eye_open_ratio', __package__), type = float, - default = config.get_float_value('processors', 'face_editor_eye_open_ratio', '0'), + default = config.get_float_value('processors.face_editor', 'face_editor_eye_open_ratio', '0'), choices = face_editor_choices.face_editor_eye_open_ratio_range, metavar = create_float_metavar(face_editor_choices.face_editor_eye_open_ratio_range) ), @@ -174,7 +174,7 @@ def register_args(program : ArgumentParser) -> None: '--face-editor-lip-open-ratio', help = translator.get('help.lip_open_ratio', __package__), type = float, - default = config.get_float_value('processors', 'face_editor_lip_open_ratio', '0'), + default = config.get_float_value('processors.face_editor', 'face_editor_lip_open_ratio', '0'), choices = face_editor_choices.face_editor_lip_open_ratio_range, metavar = create_float_metavar(face_editor_choices.face_editor_lip_open_ratio_range) ), @@ -182,7 +182,7 @@ def register_args(program : ArgumentParser) -> None: '--face-editor-mouth-grim', help = translator.get('help.mouth_grim', __package__), type = float, - default = config.get_float_value('processors', 'face_editor_mouth_grim', '0'), + default = config.get_float_value('processors.face_editor', 'face_editor_mouth_grim', '0'), choices = face_editor_choices.face_editor_mouth_grim_range, metavar = create_float_metavar(face_editor_choices.face_editor_mouth_grim_range) ), @@ -190,7 +190,7 @@ def register_args(program : ArgumentParser) -> None: '--face-editor-mouth-pout', help = translator.get('help.mouth_pout', __package__), type = float, - default = config.get_float_value('processors', 'face_editor_mouth_pout', '0'), + default = config.get_float_value('processors.face_editor', 'face_editor_mouth_pout', '0'), choices = face_editor_choices.face_editor_mouth_pout_range, metavar = create_float_metavar(face_editor_choices.face_editor_mouth_pout_range) ), @@ -198,7 +198,7 @@ def register_args(program : ArgumentParser) -> None: '--face-editor-mouth-purse', help = translator.get('help.mouth_purse', __package__), type = float, - default = config.get_float_value('processors', 'face_editor_mouth_purse', '0'), + default = config.get_float_value('processors.face_editor', 'face_editor_mouth_purse', '0'), choices = face_editor_choices.face_editor_mouth_purse_range, metavar = create_float_metavar(face_editor_choices.face_editor_mouth_purse_range) ), @@ -206,7 +206,7 @@ def register_args(program : ArgumentParser) -> None: '--face-editor-mouth-smile', help = translator.get('help.mouth_smile', __package__), type = float, - default = config.get_float_value('processors', 'face_editor_mouth_smile', '0'), + default = config.get_float_value('processors.face_editor', 'face_editor_mouth_smile', '0'), choices = face_editor_choices.face_editor_mouth_smile_range, metavar = create_float_metavar(face_editor_choices.face_editor_mouth_smile_range) ), @@ -214,7 +214,7 @@ def register_args(program : ArgumentParser) -> None: '--face-editor-mouth-position-horizontal', help = translator.get('help.mouth_position_horizontal', __package__), type = float, - default = config.get_float_value('processors', 'face_editor_mouth_position_horizontal', '0'), + default = config.get_float_value('processors.face_editor', 'face_editor_mouth_position_horizontal', '0'), choices = face_editor_choices.face_editor_mouth_position_horizontal_range, metavar = create_float_metavar(face_editor_choices.face_editor_mouth_position_horizontal_range) ), @@ -222,7 +222,7 @@ def register_args(program : ArgumentParser) -> None: '--face-editor-mouth-position-vertical', help = translator.get('help.mouth_position_vertical', __package__), type = float, - default = config.get_float_value('processors', 'face_editor_mouth_position_vertical', '0'), + default = config.get_float_value('processors.face_editor', 'face_editor_mouth_position_vertical', '0'), choices = face_editor_choices.face_editor_mouth_position_vertical_range, metavar = create_float_metavar(face_editor_choices.face_editor_mouth_position_vertical_range) ), @@ -230,7 +230,7 @@ def register_args(program : ArgumentParser) -> None: '--face-editor-head-pitch', help = translator.get('help.head_pitch', __package__), type = float, - default = config.get_float_value('processors', 'face_editor_head_pitch', '0'), + default = config.get_float_value('processors.face_editor', 'face_editor_head_pitch', '0'), choices = face_editor_choices.face_editor_head_pitch_range, metavar = create_float_metavar(face_editor_choices.face_editor_head_pitch_range) ), @@ -238,7 +238,7 @@ def register_args(program : ArgumentParser) -> None: '--face-editor-head-yaw', help = translator.get('help.head_yaw', __package__), type = float, - default = config.get_float_value('processors', 'face_editor_head_yaw', '0'), + default = config.get_float_value('processors.face_editor', 'face_editor_head_yaw', '0'), choices = face_editor_choices.face_editor_head_yaw_range, metavar = create_float_metavar(face_editor_choices.face_editor_head_yaw_range) ), @@ -246,7 +246,7 @@ def register_args(program : ArgumentParser) -> None: '--face-editor-head-roll', help = translator.get('help.head_roll', __package__), type = float, - default = config.get_float_value('processors', 'face_editor_head_roll', '0'), + default = config.get_float_value('processors.face_editor', 'face_editor_head_roll', '0'), choices = face_editor_choices.face_editor_head_roll_range, metavar = create_float_metavar(face_editor_choices.face_editor_head_roll_range) ) diff --git a/facefusion/processors/modules/face_enhancer/core.py b/facefusion/processors/modules/face_enhancer/core.py index 0f5429b5..0d01a26f 100755 --- a/facefusion/processors/modules/face_enhancer/core.py +++ b/facefusion/processors/modules/face_enhancer/core.py @@ -299,14 +299,14 @@ def register_args(program : ArgumentParser) -> None: group_processors.add_argument( '--face-enhancer-model', help = translator.get('help.model', __package__), - default = config.get_str_value('processors', 'face_enhancer_model', 'gfpgan_1.4'), + default = config.get_str_value('processors.face_enhancer', 'face_enhancer_model', 'gfpgan_1.4'), choices = face_enhancer_choices.face_enhancer_models ), group_processors.add_argument( '--face-enhancer-blend', help = translator.get('help.blend', __package__), type = int, - default = config.get_int_value('processors', 'face_enhancer_blend', '80'), + default = config.get_int_value('processors.face_enhancer', 'face_enhancer_blend', '80'), choices = face_enhancer_choices.face_enhancer_blend_range, metavar = create_int_metavar(face_enhancer_choices.face_enhancer_blend_range) ), @@ -314,7 +314,7 @@ def register_args(program : ArgumentParser) -> None: '--face-enhancer-weight', help = translator.get('help.weight', __package__), type = float, - default = config.get_float_value('processors', 'face_enhancer_weight', '0.5'), + default = config.get_float_value('processors.face_enhancer', 'face_enhancer_weight', '0.5'), choices = face_enhancer_choices.face_enhancer_weight_range, metavar = create_float_metavar(face_enhancer_choices.face_enhancer_weight_range) ) diff --git a/facefusion/processors/modules/face_swapper/core.py b/facefusion/processors/modules/face_swapper/core.py index 9c938fb8..2427049d 100755 --- a/facefusion/processors/modules/face_swapper/core.py +++ b/facefusion/processors/modules/face_swapper/core.py @@ -532,7 +532,7 @@ def register_args(program : ArgumentParser) -> None: group_processors.add_argument( '--face-swapper-model', help = translator.get('help.model', __package__), - default = config.get_str_value('processors', 'face_swapper_model', 'hyperswap_1a_256'), + default = config.get_str_value('processors.face_swapper', 'face_swapper_model', 'hyperswap_1a_256'), choices = face_swapper_choices.face_swapper_models ) ], @@ -546,14 +546,14 @@ def register_args(program : ArgumentParser) -> None: group_processors.add_argument( '--face-swapper-pixel-boost', help = translator.get('help.pixel_boost', __package__), - default = config.get_str_value('processors', 'face_swapper_pixel_boost', get_first(face_swapper_pixel_boost_choices)), + default = config.get_str_value('processors.face_swapper', 'face_swapper_pixel_boost', get_first(face_swapper_pixel_boost_choices)), choices = face_swapper_pixel_boost_choices ), group_processors.add_argument( '--face-swapper-weight', help = translator.get('help.weight', __package__), type = float, - default = config.get_float_value('processors', 'face_swapper_weight', '0.5'), + default = config.get_float_value('processors.face_swapper', 'face_swapper_weight', '0.5'), choices = face_swapper_choices.face_swapper_weight_range ) ], diff --git a/facefusion/processors/modules/frame_colorizer/core.py b/facefusion/processors/modules/frame_colorizer/core.py index 89cd4670..ddf27621 100644 --- a/facefusion/processors/modules/frame_colorizer/core.py +++ b/facefusion/processors/modules/frame_colorizer/core.py @@ -192,21 +192,21 @@ def register_args(program : ArgumentParser) -> None: group_processors.add_argument( '--frame-colorizer-model', help = translator.get('help.model', __package__), - default = config.get_str_value('processors', 'frame_colorizer_model', 'ddcolor'), + default = config.get_str_value('processors.frame_colorizer', 'frame_colorizer_model', 'ddcolor'), choices = frame_colorizer_choices.frame_colorizer_models ), group_processors.add_argument( '--frame-colorizer-size', help = translator.get('help.size', __package__), type = str, - default = config.get_str_value('processors', 'frame_colorizer_size', '256x256'), + default = config.get_str_value('processors.frame_colorizer', 'frame_colorizer_size', '256x256'), choices = frame_colorizer_choices.frame_colorizer_sizes ), group_processors.add_argument( '--frame-colorizer-blend', help = translator.get('help.blend', __package__), type = int, - default = config.get_int_value('processors', 'frame_colorizer_blend', '100'), + default = config.get_int_value('processors.frame_colorizer', 'frame_colorizer_blend', '100'), choices = frame_colorizer_choices.frame_colorizer_blend_range, metavar = create_int_metavar(frame_colorizer_choices.frame_colorizer_blend_range) ) diff --git a/facefusion/processors/modules/frame_enhancer/core.py b/facefusion/processors/modules/frame_enhancer/core.py index cc6f32f9..a705a9b3 100644 --- a/facefusion/processors/modules/frame_enhancer/core.py +++ b/facefusion/processors/modules/frame_enhancer/core.py @@ -586,14 +586,14 @@ def register_args(program : ArgumentParser) -> None: group_processors.add_argument( '--frame-enhancer-model', help = translator.get('help.model', __package__), - default = config.get_str_value('processors', 'frame_enhancer_model', 'span_kendata_x4'), + default = config.get_str_value('processors.frame_enhancer', 'frame_enhancer_model', 'span_kendata_x4'), choices = frame_enhancer_choices.frame_enhancer_models ), group_processors.add_argument( '--frame-enhancer-blend', help = translator.get('help.blend', __package__), type = int, - default = config.get_int_value('processors', 'frame_enhancer_blend', '80'), + default = config.get_int_value('processors.frame_enhancer', 'frame_enhancer_blend', '80'), choices = frame_enhancer_choices.frame_enhancer_blend_range, metavar = create_int_metavar(frame_enhancer_choices.frame_enhancer_blend_range) ) diff --git a/facefusion/processors/modules/lip_syncer/core.py b/facefusion/processors/modules/lip_syncer/core.py index 85a4069b..2ba1cd82 100755 --- a/facefusion/processors/modules/lip_syncer/core.py +++ b/facefusion/processors/modules/lip_syncer/core.py @@ -139,14 +139,14 @@ def register_args(program : ArgumentParser) -> None: group_processors.add_argument( '--lip-syncer-model', help = translator.get('help.model', __package__), - default = config.get_str_value('processors', 'lip_syncer_model', 'wav2lip_gan_96'), + default = config.get_str_value('processors.lip_syncer', 'lip_syncer_model', 'wav2lip_gan_96'), choices = lip_syncer_choices.lip_syncer_models ), group_processors.add_argument( '--lip-syncer-weight', help = translator.get('help.weight', __package__), type = float, - default = config.get_float_value('processors', 'lip_syncer_weight', '0.5'), + default = config.get_float_value('processors.lip_syncer', 'lip_syncer_weight', '0.5'), choices = lip_syncer_choices.lip_syncer_weight_range, metavar = create_float_metavar(lip_syncer_choices.lip_syncer_weight_range) )