diff --git a/facefusion/types.py b/facefusion/types.py index c12e80f..587d5e1 100755 --- a/facefusion/types.py +++ b/facefusion/types.py @@ -108,7 +108,7 @@ FaceSelectorOrder = Literal['left-right', 'right-left', 'top-bottom', 'bottom-to FaceOccluderModel = Literal['xseg_1', 'xseg_2', 'xseg_3'] FaceParserModel = Literal['bisenet_resnet_18', 'bisenet_resnet_34'] FaceMaskType = Literal['box', 'occlusion', 'area', 'region'] -FaceMaskArea = Literal['upper-head', 'lower-head', 'mouth', 'jaw'] +FaceMaskArea = Literal['upper-head', 'lower-head', 'mouth'] FaceMaskRegion = Literal['skin', 'left-eyebrow', 'right-eyebrow', 'left-eye', 'right-eye', 'glasses', 'nose', 'mouth', 'upper-lip', 'lower-lip'] FaceMaskRegionSet : TypeAlias = Dict[FaceMaskRegion, int] FaceMaskAreaSet : TypeAlias = Dict[FaceMaskArea, List[int]] @@ -226,7 +226,6 @@ Job = TypedDict('Job', }) JobSet : TypeAlias = Dict[str, Job] -ApplyStateItem : TypeAlias = Callable[[Any, Any], None] StateKey = Literal\ [ 'command', @@ -257,10 +256,10 @@ StateKey = Literal\ 'face_occluder_model', 'face_parser_model', 'face_mask_types', + 'face_mask_areas', + 'face_mask_regions', 'face_mask_blur', 'face_mask_padding', - 'face_mask_regions', - 'face_mask_areas', 'trim_frame_start', 'trim_frame_end', 'temp_frame_format', @@ -293,6 +292,7 @@ StateKey = Literal\ 'job_status', 'step_index' ] +ApplyStateItem : TypeAlias = Callable[[Any, Any], None] State = TypedDict('State', { 'command' : str, diff --git a/facefusion/wording.py b/facefusion/wording.py index e09e7da..c2282ee 100755 --- a/facefusion/wording.py +++ b/facefusion/wording.py @@ -129,10 +129,10 @@ WORDING : Dict[str, Any] =\ 'face_occluder_model': 'choose the model responsible for the occlusion mask', 'face_parser_model': 'choose the model responsible for the region mask', 'face_mask_types': 'mix and match different face mask types (choices: {choices})', + 'face_mask_areas': 'choose the items used for the area mask (choices: {choices})', + 'face_mask_regions': 'choose the items used for the region mask (choices: {choices})', 'face_mask_blur': 'specify the degree of blur applied to the box mask', 'face_mask_padding': 'apply top, right, bottom and left padding to the box mask', - 'face_mask_areas': 'choose the facial features used for the area mask (choices: {choices})', - 'face_mask_regions': 'choose the facial features used for the region mask (choices: {choices})', # frame extraction 'trim_frame_start': 'specify the starting frame of the target video', 'trim_frame_end': 'specify the ending frame of the target video',