From 071b5683135f24c74c617e6225c99c8b91ce48bc Mon Sep 17 00:00:00 2001 From: henryruhs Date: Wed, 6 Nov 2024 21:56:51 +0100 Subject: [PATCH] Remove vendor from model name --- facefusion/processors/choices.py | 2 +- .../processors/modules/frame_enhancer.py | 42 +++++++++---------- facefusion/processors/typing.py | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/facefusion/processors/choices.py b/facefusion/processors/choices.py index 4c6b5e0e..f8eeb5da 100755 --- a/facefusion/processors/choices.py +++ b/facefusion/processors/choices.py @@ -24,7 +24,7 @@ face_swapper_set : FaceSwapperSet =\ } frame_colorizer_models : List[FrameColorizerModel] = [ 'ddcolor', 'ddcolor_artistic', 'deoldify', 'deoldify_artistic', 'deoldify_stable' ] frame_colorizer_sizes : List[str] = [ '192x192', '256x256', '384x384', '512x512' ] -frame_enhancer_models : List[FrameEnhancerModel] = [ 'clear_reality_x4', 'foolhardy_remacri_x4', 'lsdir_x4', 'nmkd_siax_x4', 'nomos8k_sc_x4', 'real_esrgan_x2', 'real_esrgan_x2_fp16', 'real_esrgan_x4', 'real_esrgan_x4_fp16', 'real_esrgan_x8', 'real_esrgan_x8_fp16', 'real_hatgan_x4', 'real_web_photo_x4', 'realistic_rescaler_x4', 'span_kendata_x4', 'swin2_sr_x4', 'ultra_sharp_x4' ] +frame_enhancer_models : List[FrameEnhancerModel] = [ 'clear_reality_x4', 'lsdir_x4', 'nmkd_siax_x4', 'nomos8k_sc_x4', 'real_esrgan_x2', 'real_esrgan_x2_fp16', 'real_esrgan_x4', 'real_esrgan_x4_fp16', 'real_esrgan_x8', 'real_esrgan_x8_fp16', 'real_hatgan_x4', 'real_web_photo_x4', 'realistic_rescaler_x4', 'remacri_x4', 'span_kendata_x4', 'swin2_sr_x4', 'ultra_sharp_x4' ] lip_syncer_models : List[LipSyncerModel] = [ 'wav2lip_96', 'wav2lip_gan_96' ] age_modifier_direction_range : Sequence[int] = create_int_range(-100, 100, 1) diff --git a/facefusion/processors/modules/frame_enhancer.py b/facefusion/processors/modules/frame_enhancer.py index e2b4dff7..ecdcd834 100644 --- a/facefusion/processors/modules/frame_enhancer.py +++ b/facefusion/processors/modules/frame_enhancer.py @@ -41,27 +41,6 @@ MODEL_SET : ModelSet =\ 'size': (128, 8, 4), 'scale': 4 }, - 'foolhardy_remacri_x4': - { - 'hashes': - { - 'frame_enhancer': - { - 'url': 'https://github.com/facefusion/facefusion-assets/releases/download/models-3.1.0/foolhardy_remacri_x4.hash', - 'path': resolve_relative_path('../.assets/models/foolhardy_remacri_x4.hash') - } - }, - 'sources': - { - 'frame_enhancer': - { - 'url': 'https://github.com/facefusion/facefusion-assets/releases/download/models-3.1.0/foolhardy_remacri_x4.onnx', - 'path': resolve_relative_path('../.assets/models/foolhardy_remacri_x4.onnx') - } - }, - 'size': (128, 8, 4), - 'scale': 4 - }, 'lsdir_x4': { 'hashes': @@ -314,6 +293,27 @@ MODEL_SET : ModelSet =\ 'size': (128, 8, 4), 'scale': 4 }, + 'remacri_x4': + { + 'hashes': + { + 'frame_enhancer': + { + 'url': 'https://github.com/facefusion/facefusion-assets/releases/download/models-3.1.0/remacri_x4.hash', + 'path': resolve_relative_path('../.assets/models/remacri_x4.hash') + } + }, + 'sources': + { + 'frame_enhancer': + { + 'url': 'https://github.com/facefusion/facefusion-assets/releases/download/models-3.1.0/remacri_x4.onnx', + 'path': resolve_relative_path('../.assets/models/remacri_x4.onnx') + } + }, + 'size': (128, 8, 4), + 'scale': 4 + }, 'span_kendata_x4': { 'hashes': diff --git a/facefusion/processors/typing.py b/facefusion/processors/typing.py index 8aa5cec1..db494a34 100644 --- a/facefusion/processors/typing.py +++ b/facefusion/processors/typing.py @@ -12,7 +12,7 @@ FaceEditorModel = Literal['live_portrait'] FaceEnhancerModel = Literal['codeformer', 'gfpgan_1.2', 'gfpgan_1.3', 'gfpgan_1.4', 'gpen_bfr_256', 'gpen_bfr_512', 'gpen_bfr_1024', 'gpen_bfr_2048', 'restoreformer_plus_plus'] FaceSwapperModel = Literal['blendswap_256', 'ghost_1_256', 'ghost_2_256', 'ghost_3_256', 'hififace_unofficial_256', 'inswapper_128', 'inswapper_128_fp16', 'simswap_256', 'simswap_unofficial_512', 'uniface_256'] FrameColorizerModel = Literal['ddcolor', 'ddcolor_artistic', 'deoldify', 'deoldify_artistic', 'deoldify_stable'] -FrameEnhancerModel = Literal['clear_reality_x4', 'foolhardy_remacri_x4', 'lsdir_x4', 'nmkd_siax_x4', 'nomos8k_sc_x4', 'real_esrgan_x2', 'real_esrgan_x2_fp16', 'real_esrgan_x4', 'real_esrgan_x4_fp16', 'real_esrgan_x8', 'real_esrgan_x8_fp16', 'real_hatgan_x4', 'real_web_photo_x4', 'realistic_rescaler_x4', 'span_kendata_x4', 'swin2_sr_x4', 'ultra_sharp_x4'] +FrameEnhancerModel = Literal['clear_reality_x4', 'lsdir_x4', 'nmkd_siax_x4', 'nomos8k_sc_x4', 'real_esrgan_x2', 'real_esrgan_x2_fp16', 'real_esrgan_x4', 'real_esrgan_x4_fp16', 'real_esrgan_x8', 'real_esrgan_x8_fp16', 'real_hatgan_x4', 'real_web_photo_x4', 'realistic_rescaler_x4', 'remacri_x4', 'span_kendata_x4', 'swin2_sr_x4', 'ultra_sharp_x4'] LipSyncerModel = Literal['wav2lip_96', 'wav2lip_gan_96'] FaceSwapperSet = Dict[FaceSwapperModel, List[str]]