Industry leading face manipulation platform
Rename blendface to blendswap
henryruhs2e5cce112cef
diff --git a/facefusion/face_analyser.py b/facefusion/face_analyser.pyindex 97ee5f58..d45aadf5 100644--- a/facefusion/face_analyser.py+++ b/facefusion/face_analyser.py@@ -26,7 +26,7 @@ MODELS : Dict[str, ModelValue] =\'url': 'https://github.com/facefusion/facefusion-assets/releases/download/models/yunet_2023mar.onnx','path': resolve_relative_path('../.assets/models/yunet_2023mar.onnx')},- 'face_recognizer_arcface_blendface':+ 'face_recognizer_arcface_blendswap':{'url': 'https://github.com/facefusion/facefusion-assets/releases/download/models/arcface_w600k_r50.onnx','path': resolve_relative_path('../.assets/models/arcface_w600k_r50.onnx')@@ -58,8 +58,8 @@ def get_face_analyser() -> Any:face_detector = onnxruntime.InferenceSession(MODELS.get('face_detector_retinaface').get('path'), providers = facefusion.globals.execution_providers)if facefusion.globals.face_detector_model == 'yunet':face_detector = cv2.FaceDetectorYN.create(MODELS.get('face_detector_yunet').get('path'), '', (0, 0))- if facefusion.globals.face_recognizer_model == 'arcface_blendface':- face_recognizer = onnxruntime.InferenceSession(MODELS.get('face_recognizer_arcface_blendface').get('path'), providers = facefusion.globals.execution_providers)+ if facefusion.globals.face_recognizer_model == 'arcface_blendswap':+ face_recognizer = onnxruntime.InferenceSession(MODELS.get('face_recognizer_arcface_blendswap').get('path'), providers = facefusion.globals.execution_providers)if facefusion.globals.face_recognizer_model == 'arcface_inswapper':face_recognizer = onnxruntime.InferenceSession(MODELS.get('face_recognizer_arcface_inswapper').get('path'), providers = facefusion.globals.execution_providers)if facefusion.globals.face_recognizer_model == 'arcface_simswap':diff --git a/facefusion/processors/frame/choices.py b/facefusion/processors/frame/choices.pyindex c8119d46..64e35c47 100755--- a/facefusion/processors/frame/choices.py+++ b/facefusion/processors/frame/choices.py@@ -3,7 +3,7 @@ import numpyfrom facefusion.processors.frame.typings import FaceSwapperModel, FaceEnhancerModel, FrameEnhancerModel, FaceDebuggerItem-face_swapper_models : List[FaceSwapperModel] = [ 'blendface_256', 'inswapper_128', 'inswapper_128_fp16', 'simswap_256', 'simswap_512_unofficial' ]+face_swapper_models : List[FaceSwapperModel] = [ 'blendswap_256', 'inswapper_128', 'inswapper_128_fp16', 'simswap_256', 'simswap_512_unofficial' ]face_enhancer_models : List[FaceEnhancerModel] = [ 'codeformer', 'gfpgan_1.2', 'gfpgan_1.3', 'gfpgan_1.4', 'gpen_bfr_256', 'gpen_bfr_512', 'restoreformer' ]frame_enhancer_models : List[FrameEnhancerModel] = [ 'real_esrgan_x2plus', 'real_esrgan_x4plus', 'real_esrnet_x4plus' ]diff --git a/facefusion/processors/frame/modules/face_swapper.py b/facefusion/processors/frame/modules/face_swapper.pyindex 5453348a..ed12ca7e 100755--- a/facefusion/processors/frame/modules/face_swapper.py+++ b/facefusion/processors/frame/modules/face_swapper.py@@ -25,11 +25,11 @@ THREAD_LOCK : threading.Lock = threading.Lock()NAME = 'FACEFUSION.FRAME_PROCESSOR.FACE_SWAPPER'MODELS : Dict[str, ModelValue] =\{- 'blendface_256':+ 'blendswap_256':{- 'type': 'blendface',- 'url': 'https://github.com/facefusion/facefusion-assets/releases/download/models/blendface_256.onnx',- 'path': resolve_relative_path('../.assets/models/blendface_256.onnx'),+ 'type': 'blendswap',+ 'url': 'https://github.com/facefusion/facefusion-assets/releases/download/models/blendswap_256.onnx',+ 'path': resolve_relative_path('../.assets/models/blendswap_256.onnx'),'template': 'ffhq','size': (512, 256),'mean': [ 0.0, 0.0, 0.0 ],@@ -136,8 +136,8 @@ def register_args(program : ArgumentParser) -> None:def apply_args(program : ArgumentParser) -> None:args = program.parse_args()frame_processors_globals.face_swapper_model = args.face_swapper_model- if args.face_swapper_model == 'blendface_256':- facefusion.globals.face_recognizer_model = 'arcface_blendface'+ if args.face_swapper_model == 'blendswap_256':+ facefusion.globals.face_recognizer_model = 'arcface_blendswap'if args.face_swapper_model == 'inswapper_128' or args.face_swapper_model == 'inswapper_128_fp16':facefusion.globals.face_recognizer_model = 'arcface_inswapper'if args.face_swapper_model == 'simswap_256' or args.face_swapper_model == 'simswap_512_unofficial':@@ -194,7 +194,7 @@ def swap_face(source_face : Face, target_face : Face, temp_frame : Frame) -> Fraframe_processor_inputs = {}for frame_processor_input in frame_processor.get_inputs():if frame_processor_input.name == 'source':- if model_type == 'blendface':+ if model_type == 'blendswap':frame_processor_inputs[frame_processor_input.name] = prepare_source_frame(source_face)else:frame_processor_inputs[frame_processor_input.name] = prepare_source_embedding(source_face)diff --git a/facefusion/processors/frame/typings.py b/facefusion/processors/frame/typings.pyindex 7323188a..a397eef7 100644--- a/facefusion/processors/frame/typings.py+++ b/facefusion/processors/frame/typings.py@@ -1,6 +1,6 @@from typing import Literal-FaceSwapperModel = Literal['blendface_256', 'inswapper_128', 'inswapper_128_fp16', 'simswap_256', 'simswap_512_unofficial']+FaceSwapperModel = Literal['blendswap_256', 'inswapper_128', 'inswapper_128_fp16', 'simswap_256', 'simswap_512_unofficial']FaceEnhancerModel = Literal['codeformer', 'gfpgan_1.2', 'gfpgan_1.3', 'gfpgan_1.4', 'gpen_bfr_256', 'gpen_bfr_512', 'restoreformer']FrameEnhancerModel = Literal['real_esrgan_x2plus', 'real_esrgan_x4plus', 'real_esrnet_x4plus']diff --git a/facefusion/typing.py b/facefusion/typing.pyindex 64a24e8e..9db019de 100755--- a/facefusion/typing.py+++ b/facefusion/typing.py@@ -30,7 +30,7 @@ FaceAnalyserOrder = Literal['left-right', 'right-left', 'top-bottom', 'bottom-toFaceAnalyserAge = Literal['child', 'teen', 'adult', 'senior']FaceAnalyserGender = Literal['male', 'female']FaceDetectorModel = Literal['retinaface', 'yunet']-FaceRecognizerModel = Literal['arcface_blendface', 'arcface_inswapper', 'arcface_simswap']+FaceRecognizerModel = Literal['arcface_blendswap', 'arcface_inswapper', 'arcface_simswap']TempFrameFormat = Literal['jpg', 'png']OutputVideoEncoder = Literal['libx264', 'libx265', 'libvpx-vp9', 'h264_nvenc', 'hevc_nvenc']diff --git a/facefusion/uis/components/frame_processors_options.py b/facefusion/uis/components/frame_processors_options.pyindex 0b4aa547..40f73ca6 100755--- a/facefusion/uis/components/frame_processors_options.py+++ b/facefusion/uis/components/frame_processors_options.py@@ -87,8 +87,8 @@ def listen() -> None:def update_face_swapper_model(face_swapper_model : FaceSwapperModel) -> gradio.Dropdown:frame_processors_globals.face_swapper_model = face_swapper_model- if face_swapper_model == 'blendface_256':- facefusion.globals.face_recognizer_model = 'arcface_blendface'+ if face_swapper_model == 'blendswap_256':+ facefusion.globals.face_recognizer_model = 'arcface_blendswap'if face_swapper_model == 'inswapper_128' or face_swapper_model == 'inswapper_128_fp16':facefusion.globals.face_recognizer_model = 'arcface_inswapper'if face_swapper_model == 'simswap_256' or face_swapper_model == 'simswap_512_unofficial':