diff --git a/facefusion/face_detector.py b/facefusion/face_detector.py index 61323149..8801ec35 100644 --- a/facefusion/face_detector.py +++ b/facefusion/face_detector.py @@ -96,12 +96,15 @@ def collect_model_downloads() -> Tuple[DownloadSet, DownloadSet]: if state_manager.get_item('face_detector_model') in [ 'many', 'retinaface' ]: model_hashes['retinaface'] = model_set.get('retinaface').get('hashes').get('retinaface') model_sources['retinaface'] = model_set.get('retinaface').get('sources').get('retinaface') + if state_manager.get_item('face_detector_model') in [ 'many', 'scrfd' ]: model_hashes['scrfd'] = model_set.get('scrfd').get('hashes').get('scrfd') model_sources['scrfd'] = model_set.get('scrfd').get('sources').get('scrfd') + if state_manager.get_item('face_detector_model') in [ 'many', 'yoloface' ]: model_hashes['yoloface'] = model_set.get('yoloface').get('hashes').get('yoloface') model_sources['yoloface'] = model_set.get('yoloface').get('sources').get('yoloface') + return model_hashes, model_sources diff --git a/facefusion/face_landmarker.py b/facefusion/face_landmarker.py index 56b6645e..cd660d19 100644 --- a/facefusion/face_landmarker.py +++ b/facefusion/face_landmarker.py @@ -103,9 +103,11 @@ def collect_model_downloads() -> Tuple[DownloadSet, DownloadSet]: if state_manager.get_item('face_landmarker_model') in [ 'many', '2dfan4' ]: model_hashes['2dfan4'] = model_set.get('2dfan4').get('hashes').get('2dfan4') model_sources['2dfan4'] = model_set.get('2dfan4').get('sources').get('2dfan4') + if state_manager.get_item('face_landmarker_model') in [ 'many', 'peppa_wutz' ]: model_hashes['peppa_wutz'] = model_set.get('peppa_wutz').get('hashes').get('peppa_wutz') model_sources['peppa_wutz'] = model_set.get('peppa_wutz').get('sources').get('peppa_wutz') + return model_hashes, model_sources @@ -123,6 +125,7 @@ def detect_face_landmarks(vision_frame : VisionFrame, bounding_box : BoundingBox if state_manager.get_item('face_landmarker_model') in [ 'many', '2dfan4' ]: face_landmark_2dfan4, face_landmark_score_2dfan4 = detect_with_2dfan4(vision_frame, bounding_box, face_angle) + if state_manager.get_item('face_landmarker_model') in [ 'many', 'peppa_wutz' ]: face_landmark_peppa_wutz, face_landmark_score_peppa_wutz = detect_with_peppa_wutz(vision_frame, bounding_box, face_angle) diff --git a/facefusion/face_masker.py b/facefusion/face_masker.py index 007db421..b5d3fe48 100755 --- a/facefusion/face_masker.py +++ b/facefusion/face_masker.py @@ -110,12 +110,15 @@ def collect_model_downloads() -> Tuple[DownloadSet, DownloadSet]: if state_manager.get_item('face_occluder_model') == 'xseg_groggy_5': model_hashes['xseg_groggy_5'] = model_set.get('xseg_groggy_5').get('hashes').get('face_occluder') model_sources['xseg_groggy_5'] = model_set.get('xseg_groggy_5').get('sources').get('face_occluder') + if state_manager.get_item('face_parser_model') == 'bisenet_resnet_18': model_hashes['bisenet_resnet_18'] = model_set.get('bisenet_resnet_18').get('hashes').get('face_parser') model_sources['bisenet_resnet_18'] = model_set.get('bisenet_resnet_18').get('sources').get('face_parser') + if state_manager.get_item('face_parser_model') == 'bisenet_resnet_34': model_hashes['bisenet_resnet_34'] = model_set.get('bisenet_resnet_34').get('hashes').get('face_parser') model_sources['bisenet_resnet_34'] = model_set.get('bisenet_resnet_34').get('sources').get('face_parser') + return model_hashes, model_sources