Industry leading face manipulation platform
Rename typing to types
henryruhs44165eb0b782
diff --git a/facefusion/app_context.py b/facefusion/app_context.pyindex f1a273af..d54f961e 100644--- a/facefusion/app_context.py+++ b/facefusion/app_context.py@@ -1,7 +1,7 @@import osimport sys-from facefusion.typing import AppContext+from facefusion.types import AppContextdef detect_app_context() -> AppContext:diff --git a/facefusion/args.py b/facefusion/args.pyindex 7cccdaf9..71ca1790 100644--- a/facefusion/args.py+++ b/facefusion/args.py@@ -3,7 +3,7 @@ from facefusion.filesystem import get_file_name, is_image, is_video, resolve_filfrom facefusion.jobs import job_storefrom facefusion.normalizer import normalize_fps, normalize_paddingfrom facefusion.processors.core import get_processors_modules-from facefusion.typing import ApplyStateItem, Args+from facefusion.types import ApplyStateItem, Argsfrom facefusion.vision import create_image_resolutions, create_video_resolutions, detect_image_resolution, detect_video_fps, detect_video_resolution, pack_resolutiondiff --git a/facefusion/audio.py b/facefusion/audio.pyindex bf5418af..300c3949 100644--- a/facefusion/audio.py+++ b/facefusion/audio.py@@ -7,7 +7,7 @@ from numpy.typing import NDArrayfrom facefusion.ffmpeg import read_audio_bufferfrom facefusion.filesystem import is_audio-from facefusion.typing import Audio, AudioFrame, Fps, Mel, MelFilterBank, Spectrogram+from facefusion.types import Audio, AudioFrame, Fps, Mel, MelFilterBank, Spectrogramfrom facefusion.voice_extractor import batch_extract_voicediff --git a/facefusion/choices.py b/facefusion/choices.pyindex e5a77707..b95f4b28 100755--- a/facefusion/choices.py+++ b/facefusion/choices.py@@ -2,7 +2,7 @@ import loggingfrom typing import List, Sequencefrom facefusion.common_helper import create_float_range, create_int_range-from facefusion.typing import Angle, AudioEncoder, AudioFormat, AudioTypeSet, DownloadProvider, DownloadProviderSet, DownloadScope, EncoderSet, ExecutionProvider, ExecutionProviderSet, FaceDetectorModel, FaceDetectorSet, FaceLandmarkerModel, FaceMaskRegion, FaceMaskRegionSet, FaceMaskType, FaceOccluderModel, FaceParserModel, FaceSelectorMode, FaceSelectorOrder, Gender, ImageFormat, ImageTypeSet, JobStatus, LogLevel, LogLevelSet, Race, Score, UiWorkflow, VideoEncoder, VideoFormat, VideoMemoryStrategy, VideoPreset, VideoTypeSet, WebcamMode+from facefusion.types import Angle, AudioEncoder, AudioFormat, AudioTypeSet, DownloadProvider, DownloadProviderSet, DownloadScope, EncoderSet, ExecutionProvider, ExecutionProviderSet, FaceDetectorModel, FaceDetectorSet, FaceLandmarkerModel, FaceMaskRegion, FaceMaskRegionSet, FaceMaskType, FaceOccluderModel, FaceParserModel, FaceSelectorMode, FaceSelectorOrder, Gender, ImageFormat, ImageTypeSet, JobStatus, LogLevel, LogLevelSet, Race, Score, UiWorkflow, VideoEncoder, VideoFormat, VideoMemoryStrategy, VideoPreset, VideoTypeSet, WebcamModeface_detector_set : FaceDetectorSet =\{diff --git a/facefusion/cli_helper.py b/facefusion/cli_helper.pyindex 189e6428..6bb3d26c 100644--- a/facefusion/cli_helper.py+++ b/facefusion/cli_helper.py@@ -1,7 +1,7 @@from typing import Tuplefrom facefusion.logger import get_package_logger-from facefusion.typing import TableContents, TableHeaders+from facefusion.types import TableContents, TableHeadersdef render_table(headers : TableHeaders, contents : TableContents) -> None:diff --git a/facefusion/content_analyser.py b/facefusion/content_analyser.pyindex 7e2bbf8e..8b5de1b5 100644--- a/facefusion/content_analyser.py+++ b/facefusion/content_analyser.py@@ -8,7 +8,7 @@ from facefusion import inference_manager, state_manager, wordingfrom facefusion.download import conditional_download_hashes, conditional_download_sources, resolve_download_urlfrom facefusion.filesystem import resolve_relative_pathfrom facefusion.thread_helper import conditional_thread_semaphore-from facefusion.typing import Detection, DownloadScope, Fps, InferencePool, ModelOptions, ModelSet, Score, VisionFrame+from facefusion.types import Detection, DownloadScope, Fps, InferencePool, ModelOptions, ModelSet, Score, VisionFramefrom facefusion.vision import detect_video_fps, fit_frame, read_image, read_video_frameSTREAM_COUNTER = 0diff --git a/facefusion/core.py b/facefusion/core.pyindex 51ab6063..9fb216ee 100755--- a/facefusion/core.py+++ b/facefusion/core.py@@ -25,7 +25,7 @@ from facefusion.program import create_programfrom facefusion.program_helper import validate_argsfrom facefusion.statistics import conditional_log_statisticsfrom facefusion.temp_helper import clear_temp_directory, create_temp_directory, get_temp_file_path, move_temp_file, resolve_temp_frame_paths-from facefusion.typing import Args, ErrorCode+from facefusion.types import Args, ErrorCodefrom facefusion.vision import pack_resolution, read_image, read_static_images, read_video_frame, restrict_image_resolution, restrict_trim_frame, restrict_video_fps, restrict_video_resolution, unpack_resolutiondiff --git a/facefusion/curl_builder.py b/facefusion/curl_builder.pyindex 7b60dc41..a720353b 100644--- a/facefusion/curl_builder.py+++ b/facefusion/curl_builder.py@@ -2,7 +2,7 @@ import itertoolsimport shutilfrom facefusion import metadata-from facefusion.typing import Commands+from facefusion.types import Commandsdef run(commands : Commands) -> Commands:diff --git a/facefusion/download.py b/facefusion/download.pyindex f56f515d..cafd6bc3 100644--- a/facefusion/download.py+++ b/facefusion/download.py@@ -10,7 +10,7 @@ import facefusion.choicesfrom facefusion import curl_builder, logger, process_manager, state_manager, wordingfrom facefusion.filesystem import get_file_name, get_file_size, is_file, remove_filefrom facefusion.hash_helper import validate_hash-from facefusion.typing import Commands, DownloadProvider, DownloadSet+from facefusion.types import Commands, DownloadProvider, DownloadSetdef open_curl(commands : Commands) -> subprocess.Popen[bytes]:diff --git a/facefusion/execution.py b/facefusion/execution.pyindex 4d54bd1b..f2a2f352 100644--- a/facefusion/execution.py+++ b/facefusion/execution.py@@ -8,7 +8,7 @@ from onnxruntime import get_available_providers, set_default_logger_severityimport facefusion.choicesfrom facefusion.common_helper import get_last-from facefusion.typing import ExecutionDevice, ExecutionProvider, InferenceSessionProvider, ValueAndUnit+from facefusion.types import ExecutionDevice, ExecutionProvider, InferenceSessionProvider, ValueAndUnitset_default_logger_severity(3)diff --git a/facefusion/exit_helper.py b/facefusion/exit_helper.pyindex 5c30acab..26b936a7 100644--- a/facefusion/exit_helper.py+++ b/facefusion/exit_helper.py@@ -4,7 +4,7 @@ from time import sleepfrom facefusion import process_manager, state_managerfrom facefusion.temp_helper import clear_temp_directory-from facefusion.typing import ErrorCode+from facefusion.types import ErrorCodedef hard_exit(error_code : ErrorCode) -> None:diff --git a/facefusion/face_analyser.py b/facefusion/face_analyser.pyindex 8e870d62..a80384be 100644--- a/facefusion/face_analyser.py+++ b/facefusion/face_analyser.py@@ -10,7 +10,7 @@ from facefusion.face_helper import apply_nms, convert_to_face_landmark_5, estimafrom facefusion.face_landmarker import detect_face_landmarks, estimate_face_landmark_68_5from facefusion.face_recognizer import calc_embeddingfrom facefusion.face_store import get_static_faces, set_static_faces-from facefusion.typing import BoundingBox, Face, FaceLandmark5, FaceLandmarkSet, FaceScoreSet, Score, VisionFrame+from facefusion.types import BoundingBox, Face, FaceLandmark5, FaceLandmarkSet, FaceScoreSet, Score, VisionFramedef create_faces(vision_frame : VisionFrame, bounding_boxes : List[BoundingBox], face_scores : List[Score], face_landmarks_5 : List[FaceLandmark5]) -> List[Face]:diff --git a/facefusion/face_classifier.py b/facefusion/face_classifier.pyindex ce093cff..dcae123d 100644--- a/facefusion/face_classifier.py+++ b/facefusion/face_classifier.py@@ -8,7 +8,7 @@ from facefusion.download import conditional_download_hashes, conditional_downloafrom facefusion.face_helper import warp_face_by_face_landmark_5from facefusion.filesystem import resolve_relative_pathfrom facefusion.thread_helper import conditional_thread_semaphore-from facefusion.typing import Age, DownloadScope, FaceLandmark5, Gender, InferencePool, ModelOptions, ModelSet, Race, VisionFrame+from facefusion.types import Age, DownloadScope, FaceLandmark5, Gender, InferencePool, ModelOptions, ModelSet, Race, VisionFrame@lru_cache(maxsize = None)diff --git a/facefusion/face_detector.py b/facefusion/face_detector.pyindex c5d29d21..590bc3f6 100644--- a/facefusion/face_detector.py+++ b/facefusion/face_detector.py@@ -9,7 +9,7 @@ from facefusion.download import conditional_download_hashes, conditional_downloafrom facefusion.face_helper import create_rotated_matrix_and_size, create_static_anchors, distance_to_bounding_box, distance_to_face_landmark_5, normalize_bounding_box, transform_bounding_box, transform_pointsfrom facefusion.filesystem import resolve_relative_pathfrom facefusion.thread_helper import thread_semaphore-from facefusion.typing import Angle, BoundingBox, Detection, DownloadScope, DownloadSet, FaceLandmark5, InferencePool, ModelSet, Score, VisionFrame+from facefusion.types import Angle, BoundingBox, Detection, DownloadScope, DownloadSet, FaceLandmark5, InferencePool, ModelSet, Score, VisionFramefrom facefusion.vision import restrict_frame, unpack_resolutiondiff --git a/facefusion/face_helper.py b/facefusion/face_helper.pyindex 970d3289..846d4810 100644--- a/facefusion/face_helper.py+++ b/facefusion/face_helper.py@@ -5,7 +5,7 @@ import cv2import numpyfrom cv2.typing import Size-from facefusion.typing import Anchors, Angle, BoundingBox, Distance, FaceDetectorModel, FaceLandmark5, FaceLandmark68, Mask, Matrix, Points, Scale, Score, Translation, VisionFrame, WarpTemplate, WarpTemplateSet+from facefusion.types import Anchors, Angle, BoundingBox, Distance, FaceDetectorModel, FaceLandmark5, FaceLandmark68, Mask, Matrix, Points, Scale, Score, Translation, VisionFrame, WarpTemplate, WarpTemplateSetWARP_TEMPLATES : WarpTemplateSet =\{diff --git a/facefusion/face_landmarker.py b/facefusion/face_landmarker.pyindex eb5d5fd1..e2453f5a 100644--- a/facefusion/face_landmarker.py+++ b/facefusion/face_landmarker.py@@ -9,7 +9,7 @@ from facefusion.download import conditional_download_hashes, conditional_downloafrom facefusion.face_helper import create_rotated_matrix_and_size, estimate_matrix_by_face_landmark_5, transform_points, warp_face_by_translationfrom facefusion.filesystem import resolve_relative_pathfrom facefusion.thread_helper import conditional_thread_semaphore-from facefusion.typing import Angle, BoundingBox, DownloadScope, DownloadSet, FaceLandmark5, FaceLandmark68, InferencePool, ModelSet, Prediction, Score, VisionFrame+from facefusion.types import Angle, BoundingBox, DownloadScope, DownloadSet, FaceLandmark5, FaceLandmark68, InferencePool, ModelSet, Prediction, Score, VisionFrame@lru_cache(maxsize = None)diff --git a/facefusion/face_masker.py b/facefusion/face_masker.pyindex 362e2538..cd1fc519 100755--- a/facefusion/face_masker.py+++ b/facefusion/face_masker.py@@ -10,7 +10,7 @@ from facefusion import inference_manager, state_managerfrom facefusion.download import conditional_download_hashes, conditional_download_sources, resolve_download_urlfrom facefusion.filesystem import resolve_relative_pathfrom facefusion.thread_helper import conditional_thread_semaphore-from facefusion.typing import DownloadScope, DownloadSet, FaceLandmark68, FaceMaskRegion, InferencePool, Mask, ModelSet, Padding, VisionFrame+from facefusion.types import DownloadScope, DownloadSet, FaceLandmark68, FaceMaskRegion, InferencePool, Mask, ModelSet, Padding, VisionFrame@lru_cache(maxsize = None)diff --git a/facefusion/face_recognizer.py b/facefusion/face_recognizer.pyindex 9bcd703b..af95a07b 100644--- a/facefusion/face_recognizer.py+++ b/facefusion/face_recognizer.py@@ -8,7 +8,7 @@ from facefusion.download import conditional_download_hashes, conditional_downloafrom facefusion.face_helper import warp_face_by_face_landmark_5from facefusion.filesystem import resolve_relative_pathfrom facefusion.thread_helper import conditional_thread_semaphore-from facefusion.typing import DownloadScope, Embedding, FaceLandmark5, InferencePool, ModelOptions, ModelSet, VisionFrame+from facefusion.types import DownloadScope, Embedding, FaceLandmark5, InferencePool, ModelOptions, ModelSet, VisionFrame@lru_cache(maxsize = None)diff --git a/facefusion/face_selector.py b/facefusion/face_selector.pyindex 3b5131ae..e87711d6 100644--- a/facefusion/face_selector.py+++ b/facefusion/face_selector.py@@ -3,7 +3,7 @@ from typing import Listimport numpyfrom facefusion import state_manager-from facefusion.typing import Face, FaceSelectorOrder, FaceSet, Gender, Race+from facefusion.types import Face, FaceSelectorOrder, FaceSet, Gender, Racedef find_similar_faces(faces : List[Face], reference_faces : FaceSet, face_distance : float) -> List[Face]:diff --git a/facefusion/face_store.py b/facefusion/face_store.pyindex 7957c50f..eb576a1b 100644--- a/facefusion/face_store.py+++ b/facefusion/face_store.py@@ -3,7 +3,7 @@ from typing import List, Optionalimport numpy-from facefusion.typing import Face, FaceSet, FaceStore, VisionFrame+from facefusion.types import Face, FaceSet, FaceStore, VisionFrameFACE_STORE : FaceStore =\{diff --git a/facefusion/ffmpeg.py b/facefusion/ffmpeg.pyindex 16387456..dc9f21e8 100644--- a/facefusion/ffmpeg.py+++ b/facefusion/ffmpeg.py@@ -9,7 +9,7 @@ import facefusion.choicesfrom facefusion import ffmpeg_builder, logger, process_manager, state_manager, wordingfrom facefusion.filesystem import get_file_format, remove_filefrom facefusion.temp_helper import get_temp_file_path, get_temp_frames_pattern, resolve_temp_frame_paths-from facefusion.typing import AudioBuffer, Commands, EncoderSet, Fps, UpdateProgress+from facefusion.types import AudioBuffer, Commands, EncoderSet, Fps, UpdateProgressfrom facefusion.vision import count_trim_frame_total, detect_video_duration, detect_video_fps, restrict_video_fpsdiff --git a/facefusion/ffmpeg_builder.py b/facefusion/ffmpeg_builder.pyindex b2ac2f25..cc7e1e6e 100644--- a/facefusion/ffmpeg_builder.py+++ b/facefusion/ffmpeg_builder.py@@ -5,7 +5,7 @@ from typing import Optionalimport numpyfrom facefusion.filesystem import get_file_format-from facefusion.typing import AudioEncoder, Commands, Duration, Fps, StreamMode, VideoEncoder, VideoPreset+from facefusion.types import AudioEncoder, Commands, Duration, Fps, StreamMode, VideoEncoder, VideoPresetdef run(commands : Commands) -> Commands:diff --git a/facefusion/inference_manager.py b/facefusion/inference_manager.pyindex 45608011..0ae81031 100644--- a/facefusion/inference_manager.py+++ b/facefusion/inference_manager.py@@ -8,7 +8,7 @@ from facefusion import process_manager, state_managerfrom facefusion.app_context import detect_app_contextfrom facefusion.execution import create_inference_session_providersfrom facefusion.filesystem import is_file-from facefusion.typing import DownloadSet, ExecutionProvider, InferencePool, InferencePoolSet+from facefusion.types import DownloadSet, ExecutionProvider, InferencePool, InferencePoolSetINFERENCE_POOLS : InferencePoolSet =\{diff --git a/facefusion/jobs/job_list.py b/facefusion/jobs/job_list.pyindex a7b6e841..2003b96e 100644--- a/facefusion/jobs/job_list.py+++ b/facefusion/jobs/job_list.py@@ -3,7 +3,7 @@ from typing import Optional, Tuplefrom facefusion.date_helper import describe_time_agofrom facefusion.jobs import job_manager-from facefusion.typing import JobStatus, TableContents, TableHeaders+from facefusion.types import JobStatus, TableContents, TableHeadersdef compose_job_list(job_status : JobStatus) -> Tuple[TableHeaders, TableContents]:diff --git a/facefusion/jobs/job_manager.py b/facefusion/jobs/job_manager.pyindex a503c869..1a45a49d 100644--- a/facefusion/jobs/job_manager.py+++ b/facefusion/jobs/job_manager.py@@ -7,7 +7,7 @@ from facefusion.date_helper import get_current_date_timefrom facefusion.filesystem import create_directory, get_file_name, is_directory, is_file, move_file, remove_directory, remove_file, resolve_file_patternfrom facefusion.jobs.job_helper import get_step_output_pathfrom facefusion.json import read_json, write_json-from facefusion.typing import Args, Job, JobSet, JobStatus, JobStep, JobStepStatus+from facefusion.types import Args, Job, JobSet, JobStatus, JobStep, JobStepStatusJOBS_PATH : Optional[str] = Nonediff --git a/facefusion/jobs/job_runner.py b/facefusion/jobs/job_runner.pyindex ab6f92a7..30ad14b3 100644--- a/facefusion/jobs/job_runner.py+++ b/facefusion/jobs/job_runner.py@@ -1,7 +1,7 @@from facefusion.ffmpeg import concat_videofrom facefusion.filesystem import are_images, are_videos, move_file, remove_filefrom facefusion.jobs import job_helper, job_manager-from facefusion.typing import JobOutputSet, JobStep, ProcessStep+from facefusion.types import JobOutputSet, JobStep, ProcessStepdef run_job(job_id : str, process_step : ProcessStep) -> bool:diff --git a/facefusion/jobs/job_store.py b/facefusion/jobs/job_store.pyindex 9d330d09..5a13ef12 100644--- a/facefusion/jobs/job_store.py+++ b/facefusion/jobs/job_store.py@@ -1,6 +1,6 @@from typing import List-from facefusion.typing import JobStore+from facefusion.types import JobStoreJOB_STORE : JobStore =\{diff --git a/facefusion/json.py b/facefusion/json.pyindex e1ba2ae4..d688683f 100644--- a/facefusion/json.py+++ b/facefusion/json.py@@ -3,7 +3,7 @@ from json import JSONDecodeErrorfrom typing import Optionalfrom facefusion.filesystem import is_file-from facefusion.typing import Content+from facefusion.types import Contentdef read_json(json_path : str) -> Optional[Content]:diff --git a/facefusion/logger.py b/facefusion/logger.pyindex 621aa45e..66ecb653 100644--- a/facefusion/logger.py+++ b/facefusion/logger.py@@ -2,7 +2,7 @@ from logging import Logger, basicConfig, getLoggerimport facefusion.choicesfrom facefusion.common_helper import get_first, get_last-from facefusion.typing import LogLevel+from facefusion.types import LogLeveldef init(log_level : LogLevel) -> None:diff --git a/facefusion/model_helper.py b/facefusion/model_helper.pyindex f5bbfad3..0646cda7 100644--- a/facefusion/model_helper.py+++ b/facefusion/model_helper.py@@ -2,7 +2,7 @@ from functools import lru_cacheimport onnx-from facefusion.typing import ModelInitializer+from facefusion.types import ModelInitializer@lru_cache(maxsize = None)diff --git a/facefusion/normalizer.py b/facefusion/normalizer.pyindex 560dc5ff..2c03dc97 100644--- a/facefusion/normalizer.py+++ b/facefusion/normalizer.py@@ -1,6 +1,6 @@from typing import List, Optional-from facefusion.typing import Fps, Padding+from facefusion.types import Fps, Paddingdef normalize_padding(padding : Optional[List[int]]) -> Optional[Padding]:diff --git a/facefusion/process_manager.py b/facefusion/process_manager.pyindex 6ba526ad..ce15014a 100644--- a/facefusion/process_manager.py+++ b/facefusion/process_manager.py@@ -1,6 +1,6 @@from typing import Generator, List-from facefusion.typing import ProcessState, QueuePayload+from facefusion.types import ProcessState, QueuePayloadPROCESS_STATE : ProcessState = 'pending'diff --git a/facefusion/processors/choices.py b/facefusion/processors/choices.pyindex f6e5da17..f6b5c364 100755--- a/facefusion/processors/choices.py+++ b/facefusion/processors/choices.py@@ -2,7 +2,7 @@ from typing import List, Sequencefrom facefusion.common_helper import create_float_range, create_int_rangefrom facefusion.filesystem import get_file_name, resolve_file_paths, resolve_relative_path-from facefusion.processors.typing import AgeModifierModel, DeepSwapperModel, ExpressionRestorerModel, FaceDebuggerItem, FaceEditorModel, FaceEnhancerModel, FaceSwapperModel, FaceSwapperSet, FrameColorizerModel, FrameEnhancerModel, LipSyncerModel+from facefusion.processors.types import AgeModifierModel, DeepSwapperModel, ExpressionRestorerModel, FaceDebuggerItem, FaceEditorModel, FaceEnhancerModel, FaceSwapperModel, FaceSwapperSet, FrameColorizerModel, FrameEnhancerModel, LipSyncerModelage_modifier_models : List[AgeModifierModel] = [ 'styleganex_age' ]deep_swapper_models : List[DeepSwapperModel] =\diff --git a/facefusion/processors/core.py b/facefusion/processors/core.pyindex af65b210..545370f0 100644--- a/facefusion/processors/core.py+++ b/facefusion/processors/core.py@@ -9,7 +9,7 @@ from tqdm import tqdmfrom facefusion import logger, state_manager, wordingfrom facefusion.exit_helper import hard_exit-from facefusion.typing import ProcessFrames, QueuePayload+from facefusion.types import ProcessFrames, QueuePayloadPROCESSORS_METHODS =\[diff --git a/facefusion/processors/live_portrait.py b/facefusion/processors/live_portrait.pyindex 06ac82ef..5805bc58 100644--- a/facefusion/processors/live_portrait.py+++ b/facefusion/processors/live_portrait.py@@ -3,7 +3,7 @@ from typing import Tupleimport numpyimport scipy-from facefusion.processors.typing import LivePortraitExpression, LivePortraitPitch, LivePortraitRoll, LivePortraitRotation, LivePortraitYaw+from facefusion.processors.types import LivePortraitExpression, LivePortraitPitch, LivePortraitRoll, LivePortraitRotation, LivePortraitYawEXPRESSION_MIN = numpy.array([diff --git a/facefusion/processors/modules/age_modifier.py b/facefusion/processors/modules/age_modifier.pyindex 783bd1c3..79903bf3 100755--- a/facefusion/processors/modules/age_modifier.py+++ b/facefusion/processors/modules/age_modifier.py@@ -20,10 +20,10 @@ from facefusion.face_selector import find_similar_faces, sort_and_filter_facesfrom facefusion.face_store import get_reference_facesfrom facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path, same_file_extensionfrom facefusion.processors import choices as processors_choices-from facefusion.processors.typing import AgeModifierDirection, AgeModifierInputs+from facefusion.processors.types import AgeModifierDirection, AgeModifierInputsfrom facefusion.program_helper import find_argument_groupfrom facefusion.thread_helper import thread_semaphore-from facefusion.typing import ApplyStateItem, Args, DownloadScope, Face, InferencePool, ModelOptions, ModelSet, ProcessMode, QueuePayload, UpdateProgress, VisionFrame+from facefusion.types import ApplyStateItem, Args, DownloadScope, Face, InferencePool, ModelOptions, ModelSet, ProcessMode, QueuePayload, UpdateProgress, VisionFramefrom facefusion.vision import match_frame_color, read_image, read_static_image, write_image@@ -145,7 +145,7 @@ def modify_age(target_face : Face, temp_vision_frame : VisionFrame) -> VisionFracrop_vision_frame = prepare_vision_frame(crop_vision_frame)extend_vision_frame = prepare_vision_frame(extend_vision_frame)- age_modifier_direction = numpy.array(numpy.interp(state_manager.get_item('age_modifier_direction'), [-100, 100], [2.5, -2.5])).astype(numpy.float32)+ age_modifier_direction = numpy.array(numpy.interp(state_manager.get_item('age_modifier_direction'), [ -100, 100 ], [ 2.5, -2.5 ])).astype(numpy.float32)extend_vision_frame = forward(crop_vision_frame, extend_vision_frame, age_modifier_direction)extend_vision_frame = normalize_extend_frame(extend_vision_frame)extend_vision_frame = match_frame_color(extend_vision_frame_raw, extend_vision_frame)diff --git a/facefusion/processors/modules/deep_swapper.py b/facefusion/processors/modules/deep_swapper.pyindex 7f5a3e2c..786a4fc5 100755--- a/facefusion/processors/modules/deep_swapper.py+++ b/facefusion/processors/modules/deep_swapper.py@@ -19,10 +19,10 @@ from facefusion.face_selector import find_similar_faces, sort_and_filter_facesfrom facefusion.face_store import get_reference_facesfrom facefusion.filesystem import get_file_name, in_directory, is_image, is_video, resolve_file_paths, resolve_relative_path, same_file_extensionfrom facefusion.processors import choices as processors_choices-from facefusion.processors.typing import DeepSwapperInputs, DeepSwapperMorph+from facefusion.processors.types import DeepSwapperInputs, DeepSwapperMorphfrom facefusion.program_helper import find_argument_groupfrom facefusion.thread_helper import thread_semaphore-from facefusion.typing import ApplyStateItem, Args, DownloadScope, Face, InferencePool, Mask, ModelOptions, ModelSet, ProcessMode, QueuePayload, UpdateProgress, VisionFrame+from facefusion.types import ApplyStateItem, Args, DownloadScope, Face, InferencePool, Mask, ModelOptions, ModelSet, ProcessMode, QueuePayload, UpdateProgress, VisionFramefrom facefusion.vision import conditional_match_frame_color, read_image, read_static_image, write_imagediff --git a/facefusion/processors/modules/expression_restorer.py b/facefusion/processors/modules/expression_restorer.pyindex 9ac4880d..68a9c78d 100755--- a/facefusion/processors/modules/expression_restorer.py+++ b/facefusion/processors/modules/expression_restorer.py@@ -19,10 +19,10 @@ from facefusion.face_store import get_reference_facesfrom facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path, same_file_extensionfrom facefusion.processors import choices as processors_choicesfrom facefusion.processors.live_portrait import create_rotation, limit_expression-from facefusion.processors.typing import ExpressionRestorerInputs, LivePortraitExpression, LivePortraitFeatureVolume, LivePortraitMotionPoints, LivePortraitPitch, LivePortraitRoll, LivePortraitScale, LivePortraitTranslation, LivePortraitYaw+from facefusion.processors.types import ExpressionRestorerInputs, LivePortraitExpression, LivePortraitFeatureVolume, LivePortraitMotionPoints, LivePortraitPitch, LivePortraitRoll, LivePortraitScale, LivePortraitTranslation, LivePortraitYawfrom facefusion.program_helper import find_argument_groupfrom facefusion.thread_helper import conditional_thread_semaphore, thread_semaphore-from facefusion.typing import ApplyStateItem, Args, DownloadScope, Face, InferencePool, ModelOptions, ModelSet, ProcessMode, QueuePayload, UpdateProgress, VisionFrame+from facefusion.types import ApplyStateItem, Args, DownloadScope, Face, InferencePool, ModelOptions, ModelSet, ProcessMode, QueuePayload, UpdateProgress, VisionFramefrom facefusion.vision import read_image, read_static_image, read_video_frame, write_imagediff --git a/facefusion/processors/modules/face_debugger.py b/facefusion/processors/modules/face_debugger.pyindex dd0c1423..c3e4f264 100755--- a/facefusion/processors/modules/face_debugger.py+++ b/facefusion/processors/modules/face_debugger.py@@ -15,9 +15,9 @@ from facefusion.face_selector import find_similar_faces, sort_and_filter_facesfrom facefusion.face_store import get_reference_facesfrom facefusion.filesystem import in_directory, same_file_extensionfrom facefusion.processors import choices as processors_choices-from facefusion.processors.typing import FaceDebuggerInputs+from facefusion.processors.types import FaceDebuggerInputsfrom facefusion.program_helper import find_argument_group-from facefusion.typing import ApplyStateItem, Args, Face, InferencePool, ProcessMode, QueuePayload, UpdateProgress, VisionFrame+from facefusion.types import ApplyStateItem, Args, Face, InferencePool, ProcessMode, QueuePayload, UpdateProgress, VisionFramefrom facefusion.vision import read_image, read_static_image, write_imagediff --git a/facefusion/processors/modules/face_editor.py b/facefusion/processors/modules/face_editor.pyindex 0759a2b8..4d33cfe2 100755--- a/facefusion/processors/modules/face_editor.py+++ b/facefusion/processors/modules/face_editor.py@@ -19,10 +19,10 @@ from facefusion.face_store import get_reference_facesfrom facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path, same_file_extensionfrom facefusion.processors import choices as processors_choicesfrom facefusion.processors.live_portrait import create_rotation, limit_euler_angles, limit_expression-from facefusion.processors.typing import FaceEditorInputs, LivePortraitExpression, LivePortraitFeatureVolume, LivePortraitMotionPoints, LivePortraitPitch, LivePortraitRoll, LivePortraitRotation, LivePortraitScale, LivePortraitTranslation, LivePortraitYaw+from facefusion.processors.types import FaceEditorInputs, LivePortraitExpression, LivePortraitFeatureVolume, LivePortraitMotionPoints, LivePortraitPitch, LivePortraitRoll, LivePortraitRotation, LivePortraitScale, LivePortraitTranslation, LivePortraitYawfrom facefusion.program_helper import find_argument_groupfrom facefusion.thread_helper import conditional_thread_semaphore, thread_semaphore-from facefusion.typing import ApplyStateItem, Args, DownloadScope, Face, FaceLandmark68, InferencePool, ModelOptions, ModelSet, ProcessMode, QueuePayload, UpdateProgress, VisionFrame+from facefusion.types import ApplyStateItem, Args, DownloadScope, Face, FaceLandmark68, InferencePool, ModelOptions, ModelSet, ProcessMode, QueuePayload, UpdateProgress, VisionFramefrom facefusion.vision import read_image, read_static_image, write_imagediff --git a/facefusion/processors/modules/face_enhancer.py b/facefusion/processors/modules/face_enhancer.pyindex 48a896a6..f722e7b2 100755--- a/facefusion/processors/modules/face_enhancer.py+++ b/facefusion/processors/modules/face_enhancer.py@@ -18,10 +18,10 @@ from facefusion.face_selector import find_similar_faces, sort_and_filter_facesfrom facefusion.face_store import get_reference_facesfrom facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path, same_file_extensionfrom facefusion.processors import choices as processors_choices-from facefusion.processors.typing import FaceEnhancerInputs, FaceEnhancerWeight+from facefusion.processors.types import FaceEnhancerInputs, FaceEnhancerWeightfrom facefusion.program_helper import find_argument_groupfrom facefusion.thread_helper import thread_semaphore-from facefusion.typing import ApplyStateItem, Args, DownloadScope, Face, InferencePool, ModelOptions, ModelSet, ProcessMode, QueuePayload, UpdateProgress, VisionFrame+from facefusion.types import ApplyStateItem, Args, DownloadScope, Face, InferencePool, ModelOptions, ModelSet, ProcessMode, QueuePayload, UpdateProgress, VisionFramefrom facefusion.vision import read_image, read_static_image, write_imagediff --git a/facefusion/processors/modules/face_swapper.py b/facefusion/processors/modules/face_swapper.pyindex 16f59324..d432bf88 100755--- a/facefusion/processors/modules/face_swapper.py+++ b/facefusion/processors/modules/face_swapper.py@@ -21,10 +21,10 @@ from facefusion.filesystem import filter_image_paths, has_image, in_directory, ifrom facefusion.model_helper import get_static_model_initializerfrom facefusion.processors import choices as processors_choicesfrom facefusion.processors.pixel_boost import explode_pixel_boost, implode_pixel_boost-from facefusion.processors.typing import FaceSwapperInputs+from facefusion.processors.types import FaceSwapperInputsfrom facefusion.program_helper import find_argument_groupfrom facefusion.thread_helper import conditional_thread_semaphore-from facefusion.typing import ApplyStateItem, Args, DownloadScope, Embedding, Face, InferencePool, ModelOptions, ModelSet, ProcessMode, QueuePayload, UpdateProgress, VisionFrame+from facefusion.types import ApplyStateItem, Args, DownloadScope, Embedding, Face, InferencePool, ModelOptions, ModelSet, ProcessMode, QueuePayload, UpdateProgress, VisionFramefrom facefusion.vision import read_image, read_static_image, read_static_images, unpack_resolution, write_imagediff --git a/facefusion/processors/modules/frame_colorizer.py b/facefusion/processors/modules/frame_colorizer.pyindex 789cb115..9fef9c14 100644--- a/facefusion/processors/modules/frame_colorizer.py+++ b/facefusion/processors/modules/frame_colorizer.py@@ -14,10 +14,10 @@ from facefusion.download import conditional_download_hashes, conditional_downloafrom facefusion.execution import has_execution_providerfrom facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path, same_file_extensionfrom facefusion.processors import choices as processors_choices-from facefusion.processors.typing import FrameColorizerInputs+from facefusion.processors.types import FrameColorizerInputsfrom facefusion.program_helper import find_argument_groupfrom facefusion.thread_helper import thread_semaphore-from facefusion.typing import ApplyStateItem, Args, DownloadScope, ExecutionProvider, Face, InferencePool, ModelOptions, ModelSet, ProcessMode, QueuePayload, UpdateProgress, VisionFrame+from facefusion.types import ApplyStateItem, Args, DownloadScope, ExecutionProvider, Face, InferencePool, ModelOptions, ModelSet, ProcessMode, QueuePayload, UpdateProgress, VisionFramefrom facefusion.vision import read_image, read_static_image, unpack_resolution, write_imagediff --git a/facefusion/processors/modules/frame_enhancer.py b/facefusion/processors/modules/frame_enhancer.pyindex 1c84db89..d360e358 100644--- a/facefusion/processors/modules/frame_enhancer.py+++ b/facefusion/processors/modules/frame_enhancer.py@@ -14,10 +14,10 @@ from facefusion.download import conditional_download_hashes, conditional_downloafrom facefusion.execution import has_execution_providerfrom facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path, same_file_extensionfrom facefusion.processors import choices as processors_choices-from facefusion.processors.typing import FrameEnhancerInputs+from facefusion.processors.types import FrameEnhancerInputsfrom facefusion.program_helper import find_argument_groupfrom facefusion.thread_helper import conditional_thread_semaphore-from facefusion.typing import ApplyStateItem, Args, DownloadScope, Face, InferencePool, ModelOptions, ModelSet, ProcessMode, QueuePayload, UpdateProgress, VisionFrame+from facefusion.types import ApplyStateItem, Args, DownloadScope, Face, InferencePool, ModelOptions, ModelSet, ProcessMode, QueuePayload, UpdateProgress, VisionFramefrom facefusion.vision import create_tile_frames, merge_tile_frames, read_image, read_static_image, write_imagediff --git a/facefusion/processors/modules/lip_syncer.py b/facefusion/processors/modules/lip_syncer.pyindex a92ed49d..ad497718 100755--- a/facefusion/processors/modules/lip_syncer.py+++ b/facefusion/processors/modules/lip_syncer.py@@ -19,10 +19,10 @@ from facefusion.face_selector import find_similar_faces, sort_and_filter_facesfrom facefusion.face_store import get_reference_facesfrom facefusion.filesystem import filter_audio_paths, has_audio, in_directory, is_image, is_video, resolve_relative_path, same_file_extensionfrom facefusion.processors import choices as processors_choices-from facefusion.processors.typing import LipSyncerInputs+from facefusion.processors.types import LipSyncerInputsfrom facefusion.program_helper import find_argument_groupfrom facefusion.thread_helper import conditional_thread_semaphore-from facefusion.typing import ApplyStateItem, Args, AudioFrame, DownloadScope, Face, InferencePool, ModelOptions, ModelSet, ProcessMode, QueuePayload, UpdateProgress, VisionFrame+from facefusion.types import ApplyStateItem, Args, AudioFrame, DownloadScope, Face, InferencePool, ModelOptions, ModelSet, ProcessMode, QueuePayload, UpdateProgress, VisionFramefrom facefusion.vision import read_image, read_static_image, restrict_video_fps, write_imagediff --git a/facefusion/processors/pixel_boost.py b/facefusion/processors/pixel_boost.pyindex 8282f359..3b857d14 100644--- a/facefusion/processors/pixel_boost.py+++ b/facefusion/processors/pixel_boost.py@@ -3,7 +3,7 @@ from typing import Listimport numpyfrom cv2.typing import Size-from facefusion.typing import VisionFrame+from facefusion.types import VisionFramedef implode_pixel_boost(crop_vision_frame : VisionFrame, pixel_boost_total : int, model_size : Size) -> VisionFrame:diff --git a/facefusion/processors/typing.py b/facefusion/processors/types.pysimilarity index 98%rename from facefusion/processors/typing.pyrename to facefusion/processors/types.pyindex 0e0236d1..9a2f9636 100644--- a/facefusion/processors/typing.py+++ b/facefusion/processors/types.py@@ -2,7 +2,7 @@ from typing import Any, Dict, List, Literal, TypedDictfrom numpy.typing import NDArray-from facefusion.typing import AppContext, AudioFrame, Face, FaceSet, VisionFrame+from facefusion.types import AppContext, AudioFrame, Face, FaceSet, VisionFrameAgeModifierModel = Literal['styleganex_age']DeepSwapperModel = strdiff --git a/facefusion/state_manager.py b/facefusion/state_manager.pyindex d0e5f1a1..23ba08a6 100644--- a/facefusion/state_manager.py+++ b/facefusion/state_manager.py@@ -1,8 +1,8 @@from typing import Any, Unionfrom facefusion.app_context import detect_app_context-from facefusion.processors.typing import ProcessorState, ProcessorStateKey-from facefusion.typing import State, StateKey, StateSet+from facefusion.processors.types import ProcessorState, ProcessorStateKey+from facefusion.types import State, StateKey, StateSetSTATES : Union[StateSet, ProcessorState] =\{diff --git a/facefusion/statistics.py b/facefusion/statistics.pyindex 5f500a0b..2e6b518f 100644--- a/facefusion/statistics.py+++ b/facefusion/statistics.py@@ -4,7 +4,7 @@ import numpyfrom facefusion import logger, state_managerfrom facefusion.face_store import get_face_store-from facefusion.typing import FaceSet+from facefusion.types import FaceSetdef create_statistics(static_faces : FaceSet) -> Dict[str, Any]:diff --git a/facefusion/typing.py b/facefusion/types.pysimilarity index 100%rename from facefusion/typing.pyrename to facefusion/types.pydiff --git a/facefusion/uis/choices.py b/facefusion/uis/choices.pyindex 4d36dc44..228a67b5 100644--- a/facefusion/uis/choices.py+++ b/facefusion/uis/choices.py@@ -1,6 +1,6 @@from typing import List-from facefusion.uis.typing import JobManagerAction, JobRunnerAction+from facefusion.uis.types import JobManagerAction, JobRunnerActionjob_manager_actions : List[JobManagerAction] = [ 'job-create', 'job-submit', 'job-delete', 'job-add-step', 'job-remix-step', 'job-insert-step', 'job-remove-step' ]job_runner_actions : List[JobRunnerAction] = [ 'job-run', 'job-run-all', 'job-retry', 'job-retry-all' ]diff --git a/facefusion/uis/components/age_modifier_options.py b/facefusion/uis/components/age_modifier_options.pyindex ef80b78a..e42065e5 100755--- a/facefusion/uis/components/age_modifier_options.py+++ b/facefusion/uis/components/age_modifier_options.py@@ -6,7 +6,7 @@ from facefusion import state_manager, wordingfrom facefusion.common_helper import calc_float_stepfrom facefusion.processors import choices as processors_choicesfrom facefusion.processors.core import load_processor_module-from facefusion.processors.typing import AgeModifierModel+from facefusion.processors.types import AgeModifierModelfrom facefusion.uis.core import get_ui_component, register_ui_componentAGE_MODIFIER_MODEL_DROPDOWN : Optional[gradio.Dropdown] = Nonediff --git a/facefusion/uis/components/deep_swapper_options.py b/facefusion/uis/components/deep_swapper_options.pyindex 590d4243..210193d5 100755--- a/facefusion/uis/components/deep_swapper_options.py+++ b/facefusion/uis/components/deep_swapper_options.py@@ -6,7 +6,7 @@ from facefusion import state_manager, wordingfrom facefusion.common_helper import calc_int_stepfrom facefusion.processors import choices as processors_choicesfrom facefusion.processors.core import load_processor_module-from facefusion.processors.typing import DeepSwapperModel+from facefusion.processors.types import DeepSwapperModelfrom facefusion.uis.core import get_ui_component, register_ui_componentDEEP_SWAPPER_MODEL_DROPDOWN : Optional[gradio.Dropdown] = Nonediff --git a/facefusion/uis/components/download.py b/facefusion/uis/components/download.pyindex 8943c7be..547e2ba3 100644--- a/facefusion/uis/components/download.py+++ b/facefusion/uis/components/download.py@@ -6,7 +6,7 @@ import facefusion.choicesfrom facefusion import content_analyser, face_classifier, face_detector, face_landmarker, face_masker, face_recognizer, state_manager, voice_extractor, wordingfrom facefusion.filesystem import get_file_name, resolve_file_pathsfrom facefusion.processors.core import get_processors_modules-from facefusion.typing import DownloadProvider+from facefusion.types import DownloadProviderDOWNLOAD_PROVIDERS_CHECKBOX_GROUP : Optional[gradio.CheckboxGroup] = Nonediff --git a/facefusion/uis/components/execution.py b/facefusion/uis/components/execution.pyindex 841f420a..4be6eafc 100644--- a/facefusion/uis/components/execution.py+++ b/facefusion/uis/components/execution.py@@ -6,7 +6,7 @@ from facefusion import content_analyser, face_classifier, face_detector, face_lafrom facefusion.execution import get_available_execution_providersfrom facefusion.filesystem import get_file_name, resolve_file_pathsfrom facefusion.processors.core import get_processors_modules-from facefusion.typing import ExecutionProvider+from facefusion.types import ExecutionProviderEXECUTION_PROVIDERS_CHECKBOX_GROUP : Optional[gradio.CheckboxGroup] = Nonediff --git a/facefusion/uis/components/expression_restorer_options.py b/facefusion/uis/components/expression_restorer_options.pyindex 06bc3fa3..bf5eec4e 100755--- a/facefusion/uis/components/expression_restorer_options.py+++ b/facefusion/uis/components/expression_restorer_options.py@@ -6,7 +6,7 @@ from facefusion import state_manager, wordingfrom facefusion.common_helper import calc_float_stepfrom facefusion.processors import choices as processors_choicesfrom facefusion.processors.core import load_processor_module-from facefusion.processors.typing import ExpressionRestorerModel+from facefusion.processors.types import ExpressionRestorerModelfrom facefusion.uis.core import get_ui_component, register_ui_componentEXPRESSION_RESTORER_MODEL_DROPDOWN : Optional[gradio.Dropdown] = Nonediff --git a/facefusion/uis/components/face_debugger_options.py b/facefusion/uis/components/face_debugger_options.pyindex 4133638d..032eb24e 100755--- a/facefusion/uis/components/face_debugger_options.py+++ b/facefusion/uis/components/face_debugger_options.py@@ -4,7 +4,7 @@ import gradiofrom facefusion import state_manager, wordingfrom facefusion.processors import choices as processors_choices-from facefusion.processors.typing import FaceDebuggerItem+from facefusion.processors.types import FaceDebuggerItemfrom facefusion.uis.core import get_ui_component, register_ui_componentFACE_DEBUGGER_ITEMS_CHECKBOX_GROUP : Optional[gradio.CheckboxGroup] = Nonediff --git a/facefusion/uis/components/face_detector.py b/facefusion/uis/components/face_detector.pyindex 1b1c30d7..756154d9 100644--- a/facefusion/uis/components/face_detector.py+++ b/facefusion/uis/components/face_detector.py@@ -5,9 +5,9 @@ import gradioimport facefusion.choicesfrom facefusion import face_detector, state_manager, wordingfrom facefusion.common_helper import calc_float_step, get_last-from facefusion.typing import Angle, FaceDetectorModel, Score+from facefusion.types import Angle, FaceDetectorModel, Scorefrom facefusion.uis.core import register_ui_component-from facefusion.uis.typing import ComponentOptions+from facefusion.uis.types import ComponentOptionsFACE_DETECTOR_MODEL_DROPDOWN : Optional[gradio.Dropdown] = NoneFACE_DETECTOR_SIZE_DROPDOWN : Optional[gradio.Dropdown] = Nonediff --git a/facefusion/uis/components/face_editor_options.py b/facefusion/uis/components/face_editor_options.pyindex ef846aaf..486f30dc 100755--- a/facefusion/uis/components/face_editor_options.py+++ b/facefusion/uis/components/face_editor_options.py@@ -6,7 +6,7 @@ from facefusion import state_manager, wordingfrom facefusion.common_helper import calc_float_stepfrom facefusion.processors import choices as processors_choicesfrom facefusion.processors.core import load_processor_module-from facefusion.processors.typing import FaceEditorModel+from facefusion.processors.types import FaceEditorModelfrom facefusion.uis.core import get_ui_component, register_ui_componentFACE_EDITOR_MODEL_DROPDOWN : Optional[gradio.Dropdown] = Nonediff --git a/facefusion/uis/components/face_enhancer_options.py b/facefusion/uis/components/face_enhancer_options.pyindex 65d20af9..0e02d865 100755--- a/facefusion/uis/components/face_enhancer_options.py+++ b/facefusion/uis/components/face_enhancer_options.py@@ -6,7 +6,7 @@ from facefusion import state_manager, wordingfrom facefusion.common_helper import calc_float_step, calc_int_stepfrom facefusion.processors import choices as processors_choicesfrom facefusion.processors.core import load_processor_module-from facefusion.processors.typing import FaceEnhancerModel+from facefusion.processors.types import FaceEnhancerModelfrom facefusion.uis.core import get_ui_component, register_ui_componentFACE_ENHANCER_MODEL_DROPDOWN : Optional[gradio.Dropdown] = Nonediff --git a/facefusion/uis/components/face_landmarker.py b/facefusion/uis/components/face_landmarker.pyindex f6a179d7..7fab429d 100644--- a/facefusion/uis/components/face_landmarker.py+++ b/facefusion/uis/components/face_landmarker.py@@ -5,7 +5,7 @@ import gradioimport facefusion.choicesfrom facefusion import face_landmarker, state_manager, wordingfrom facefusion.common_helper import calc_float_step-from facefusion.typing import FaceLandmarkerModel, Score+from facefusion.types import FaceLandmarkerModel, Scorefrom facefusion.uis.core import register_ui_componentFACE_LANDMARKER_MODEL_DROPDOWN : Optional[gradio.Dropdown] = Nonediff --git a/facefusion/uis/components/face_masker.py b/facefusion/uis/components/face_masker.pyindex fcb830ae..6856c348 100755--- a/facefusion/uis/components/face_masker.py+++ b/facefusion/uis/components/face_masker.py@@ -5,7 +5,7 @@ import gradioimport facefusion.choicesfrom facefusion import face_masker, state_manager, wordingfrom facefusion.common_helper import calc_float_step, calc_int_step-from facefusion.typing import FaceMaskRegion, FaceMaskType, FaceOccluderModel, FaceParserModel+from facefusion.types import FaceMaskRegion, FaceMaskType, FaceOccluderModel, FaceParserModelfrom facefusion.uis.core import register_ui_componentFACE_OCCLUDER_MODEL_DROPDOWN : Optional[gradio.Dropdown] = Nonediff --git a/facefusion/uis/components/face_selector.py b/facefusion/uis/components/face_selector.pyindex 69b0e061..58f21c84 100644--- a/facefusion/uis/components/face_selector.py+++ b/facefusion/uis/components/face_selector.py@@ -10,9 +10,9 @@ from facefusion.face_analyser import get_many_facesfrom facefusion.face_selector import sort_and_filter_facesfrom facefusion.face_store import clear_reference_faces, clear_static_facesfrom facefusion.filesystem import is_image, is_video-from facefusion.typing import FaceSelectorMode, FaceSelectorOrder, Gender, Race, VisionFrame+from facefusion.types import FaceSelectorMode, FaceSelectorOrder, Gender, Race, VisionFramefrom facefusion.uis.core import get_ui_component, get_ui_components, register_ui_component-from facefusion.uis.typing import ComponentOptions+from facefusion.uis.types import ComponentOptionsfrom facefusion.uis.ui_helper import convert_str_nonefrom facefusion.vision import normalize_frame_color, read_static_image, read_video_framediff --git a/facefusion/uis/components/face_swapper_options.py b/facefusion/uis/components/face_swapper_options.pyindex 049cf16c..92f08dc3 100755--- a/facefusion/uis/components/face_swapper_options.py+++ b/facefusion/uis/components/face_swapper_options.py@@ -6,7 +6,7 @@ from facefusion import state_manager, wordingfrom facefusion.common_helper import get_firstfrom facefusion.processors import choices as processors_choicesfrom facefusion.processors.core import load_processor_module-from facefusion.processors.typing import FaceSwapperModel+from facefusion.processors.types import FaceSwapperModelfrom facefusion.uis.core import get_ui_component, register_ui_componentFACE_SWAPPER_MODEL_DROPDOWN : Optional[gradio.Dropdown] = Nonediff --git a/facefusion/uis/components/frame_colorizer_options.py b/facefusion/uis/components/frame_colorizer_options.pyindex 5d7ed802..1ef4a47e 100755--- a/facefusion/uis/components/frame_colorizer_options.py+++ b/facefusion/uis/components/frame_colorizer_options.py@@ -6,7 +6,7 @@ from facefusion import state_manager, wordingfrom facefusion.common_helper import calc_int_stepfrom facefusion.processors import choices as processors_choicesfrom facefusion.processors.core import load_processor_module-from facefusion.processors.typing import FrameColorizerModel+from facefusion.processors.types import FrameColorizerModelfrom facefusion.uis.core import get_ui_component, register_ui_componentFRAME_COLORIZER_MODEL_DROPDOWN : Optional[gradio.Dropdown] = Nonediff --git a/facefusion/uis/components/frame_enhancer_options.py b/facefusion/uis/components/frame_enhancer_options.pyindex 99547ed2..db0df537 100755--- a/facefusion/uis/components/frame_enhancer_options.py+++ b/facefusion/uis/components/frame_enhancer_options.py@@ -6,7 +6,7 @@ from facefusion import state_manager, wordingfrom facefusion.common_helper import calc_int_stepfrom facefusion.processors import choices as processors_choicesfrom facefusion.processors.core import load_processor_module-from facefusion.processors.typing import FrameEnhancerModel+from facefusion.processors.types import FrameEnhancerModelfrom facefusion.uis.core import get_ui_component, register_ui_componentFRAME_ENHANCER_MODEL_DROPDOWN : Optional[gradio.Dropdown] = Nonediff --git a/facefusion/uis/components/instant_runner.py b/facefusion/uis/components/instant_runner.pyindex 1d3ab136..fce29bd0 100644--- a/facefusion/uis/components/instant_runner.py+++ b/facefusion/uis/components/instant_runner.py@@ -9,7 +9,7 @@ from facefusion.core import process_stepfrom facefusion.filesystem import is_directory, is_image, is_videofrom facefusion.jobs import job_helper, job_manager, job_runner, job_storefrom facefusion.temp_helper import clear_temp_directory-from facefusion.typing import Args, UiWorkflow+from facefusion.types import Args, UiWorkflowfrom facefusion.uis.core import get_ui_componentfrom facefusion.uis.ui_helper import suggest_output_pathdiff --git a/facefusion/uis/components/job_list.py b/facefusion/uis/components/job_list.pyindex ae808881..bb954cf0 100644--- a/facefusion/uis/components/job_list.py+++ b/facefusion/uis/components/job_list.py@@ -6,7 +6,7 @@ import facefusion.choicesfrom facefusion import state_manager, wordingfrom facefusion.common_helper import get_firstfrom facefusion.jobs import job_list, job_manager-from facefusion.typing import JobStatus+from facefusion.types import JobStatusfrom facefusion.uis.core import get_ui_componentJOB_LIST_JOBS_DATAFRAME : Optional[gradio.Dataframe] = Nonediff --git a/facefusion/uis/components/job_list_options.py b/facefusion/uis/components/job_list_options.pyindex 87636267..eae763eb 100644--- a/facefusion/uis/components/job_list_options.py+++ b/facefusion/uis/components/job_list_options.py@@ -6,7 +6,7 @@ import facefusion.choicesfrom facefusion import state_manager, wordingfrom facefusion.common_helper import get_firstfrom facefusion.jobs import job_manager-from facefusion.typing import JobStatus+from facefusion.types import JobStatusfrom facefusion.uis.core import register_ui_componentJOB_LIST_JOB_STATUS_CHECKBOX_GROUP : Optional[gradio.CheckboxGroup] = Nonediff --git a/facefusion/uis/components/job_manager.py b/facefusion/uis/components/job_manager.pyindex 727aaf98..618af955 100644--- a/facefusion/uis/components/job_manager.py+++ b/facefusion/uis/components/job_manager.py@@ -7,10 +7,10 @@ from facefusion.args import collect_step_argsfrom facefusion.common_helper import get_first, get_lastfrom facefusion.filesystem import is_directoryfrom facefusion.jobs import job_manager-from facefusion.typing import UiWorkflow+from facefusion.types import UiWorkflowfrom facefusion.uis import choices as uis_choicesfrom facefusion.uis.core import get_ui_component-from facefusion.uis.typing import JobManagerAction+from facefusion.uis.types import JobManagerActionfrom facefusion.uis.ui_helper import convert_int_none, convert_str_none, suggest_output_pathJOB_MANAGER_WRAPPER : Optional[gradio.Column] = Nonediff --git a/facefusion/uis/components/job_runner.py b/facefusion/uis/components/job_runner.pyindex 90bccb20..55a53b99 100644--- a/facefusion/uis/components/job_runner.py+++ b/facefusion/uis/components/job_runner.py@@ -7,10 +7,10 @@ from facefusion import logger, process_manager, state_manager, wordingfrom facefusion.common_helper import get_first, get_lastfrom facefusion.core import process_stepfrom facefusion.jobs import job_manager, job_runner, job_store-from facefusion.typing import UiWorkflow+from facefusion.types import UiWorkflowfrom facefusion.uis import choices as uis_choicesfrom facefusion.uis.core import get_ui_component-from facefusion.uis.typing import JobRunnerAction+from facefusion.uis.types import JobRunnerActionfrom facefusion.uis.ui_helper import convert_str_noneJOB_RUNNER_WRAPPER : Optional[gradio.Column] = Nonediff --git a/facefusion/uis/components/lip_syncer_options.py b/facefusion/uis/components/lip_syncer_options.pyindex 16b0c0ff..ce2fa2f2 100755--- a/facefusion/uis/components/lip_syncer_options.py+++ b/facefusion/uis/components/lip_syncer_options.py@@ -5,7 +5,7 @@ import gradiofrom facefusion import state_manager, wordingfrom facefusion.processors import choices as processors_choicesfrom facefusion.processors.core import load_processor_module-from facefusion.processors.typing import LipSyncerModel+from facefusion.processors.types import LipSyncerModelfrom facefusion.uis.core import get_ui_component, register_ui_componentLIP_SYNCER_MODEL_DROPDOWN : Optional[gradio.Dropdown] = Nonediff --git a/facefusion/uis/components/memory.py b/facefusion/uis/components/memory.pyindex 1c461621..81c367a2 100644--- a/facefusion/uis/components/memory.py+++ b/facefusion/uis/components/memory.py@@ -5,7 +5,7 @@ import gradioimport facefusion.choicesfrom facefusion import state_manager, wordingfrom facefusion.common_helper import calc_int_step-from facefusion.typing import VideoMemoryStrategy+from facefusion.types import VideoMemoryStrategyVIDEO_MEMORY_STRATEGY_DROPDOWN : Optional[gradio.Dropdown] = NoneSYSTEM_MEMORY_LIMIT_SLIDER : Optional[gradio.Slider] = Nonediff --git a/facefusion/uis/components/output_options.py b/facefusion/uis/components/output_options.pyindex 62eda27b..46b875da 100644--- a/facefusion/uis/components/output_options.py+++ b/facefusion/uis/components/output_options.py@@ -7,7 +7,7 @@ from facefusion import state_manager, wordingfrom facefusion.common_helper import calc_int_stepfrom facefusion.ffmpeg import get_available_encoder_setfrom facefusion.filesystem import is_image, is_video-from facefusion.typing import AudioEncoder, Fps, VideoEncoder, VideoPreset+from facefusion.types import AudioEncoder, Fps, VideoEncoder, VideoPresetfrom facefusion.uis.core import get_ui_components, register_ui_componentfrom facefusion.vision import create_image_resolutions, create_video_resolutions, detect_image_resolution, detect_video_fps, detect_video_resolution, pack_resolutiondiff --git a/facefusion/uis/components/preview.py b/facefusion/uis/components/preview.pyindex 8b8cfc71..f1ad185a 100755--- a/facefusion/uis/components/preview.py+++ b/facefusion/uis/components/preview.py@@ -15,9 +15,9 @@ from facefusion.face_selector import sort_faces_by_orderfrom facefusion.face_store import clear_reference_faces, clear_static_faces, get_reference_facesfrom facefusion.filesystem import filter_audio_paths, is_image, is_videofrom facefusion.processors.core import get_processors_modules-from facefusion.typing import AudioFrame, Face, FaceSet, VisionFrame+from facefusion.types import AudioFrame, Face, FaceSet, VisionFramefrom facefusion.uis.core import get_ui_component, get_ui_components, register_ui_component-from facefusion.uis.typing import ComponentOptions+from facefusion.uis.types import ComponentOptionsfrom facefusion.vision import count_video_frame_total, detect_frame_orientation, normalize_frame_color, read_static_image, read_static_images, read_video_frame, restrict_framePREVIEW_IMAGE : Optional[gradio.Image] = Nonediff --git a/facefusion/uis/components/source.py b/facefusion/uis/components/source.pyindex 70e852a0..54ed2f5f 100644--- a/facefusion/uis/components/source.py+++ b/facefusion/uis/components/source.py@@ -6,7 +6,7 @@ from facefusion import state_manager, wordingfrom facefusion.common_helper import get_firstfrom facefusion.filesystem import filter_audio_paths, filter_image_paths, has_audio, has_imagefrom facefusion.uis.core import register_ui_component-from facefusion.uis.typing import File+from facefusion.uis.types import FileSOURCE_FILE : Optional[gradio.File] = NoneSOURCE_AUDIO : Optional[gradio.Audio] = Nonediff --git a/facefusion/uis/components/target.py b/facefusion/uis/components/target.pyindex bc0cc103..79e0f382 100644--- a/facefusion/uis/components/target.py+++ b/facefusion/uis/components/target.py@@ -6,7 +6,7 @@ from facefusion import state_manager, wordingfrom facefusion.face_store import clear_reference_faces, clear_static_facesfrom facefusion.filesystem import is_image, is_videofrom facefusion.uis.core import register_ui_component-from facefusion.uis.typing import ComponentOptions, File+from facefusion.uis.types import ComponentOptions, FileTARGET_FILE : Optional[gradio.File] = NoneTARGET_IMAGE : Optional[gradio.Image] = Nonediff --git a/facefusion/uis/components/temp_frame.py b/facefusion/uis/components/temp_frame.pyindex cba6b401..5d6d60f0 100644--- a/facefusion/uis/components/temp_frame.py+++ b/facefusion/uis/components/temp_frame.py@@ -5,7 +5,7 @@ import gradioimport facefusion.choicesfrom facefusion import state_manager, wordingfrom facefusion.filesystem import is_video-from facefusion.typing import TempFrameFormat+from facefusion.types import TempFrameFormatfrom facefusion.uis.core import get_ui_componentTEMP_FRAME_FORMAT_DROPDOWN : Optional[gradio.Dropdown] = Nonediff --git a/facefusion/uis/components/terminal.py b/facefusion/uis/components/terminal.pyindex 9557246d..d476446e 100644--- a/facefusion/uis/components/terminal.py+++ b/facefusion/uis/components/terminal.py@@ -9,7 +9,7 @@ from tqdm import tqdmimport facefusion.choicesfrom facefusion import logger, state_manager, wording-from facefusion.typing import LogLevel+from facefusion.types import LogLevelLOG_LEVEL_DROPDOWN : Optional[gradio.Dropdown] = NoneTERMINAL_TEXTBOX : Optional[gradio.Textbox] = Nonediff --git a/facefusion/uis/components/trim_frame.py b/facefusion/uis/components/trim_frame.pyindex d8fe6fed..4ac384cf 100644--- a/facefusion/uis/components/trim_frame.py+++ b/facefusion/uis/components/trim_frame.py@@ -6,7 +6,7 @@ from facefusion import state_manager, wordingfrom facefusion.face_store import clear_static_facesfrom facefusion.filesystem import is_videofrom facefusion.uis.core import get_ui_components-from facefusion.uis.typing import ComponentOptions+from facefusion.uis.types import ComponentOptionsfrom facefusion.vision import count_video_frame_totalTRIM_FRAME_RANGE_SLIDER : Optional[RangeSlider] = Nonediff --git a/facefusion/uis/components/webcam.py b/facefusion/uis/components/webcam.pyindex 11b1e686..9f43af48 100644--- a/facefusion/uis/components/webcam.py+++ b/facefusion/uis/components/webcam.py@@ -16,7 +16,7 @@ from facefusion.face_analyser import get_average_face, get_many_facesfrom facefusion.ffmpeg import open_ffmpegfrom facefusion.filesystem import filter_image_paths, is_directoryfrom facefusion.processors.core import get_processors_modules-from facefusion.typing import Face, Fps, StreamMode, VisionFrame, WebcamMode+from facefusion.types import Face, Fps, StreamMode, VisionFrame, WebcamModefrom facefusion.uis.core import get_ui_componentfrom facefusion.vision import normalize_frame_color, read_static_images, unpack_resolutiondiff --git a/facefusion/uis/core.py b/facefusion/uis/core.pyindex b8153f40..c01b6bab 100644--- a/facefusion/uis/core.py+++ b/facefusion/uis/core.py@@ -11,7 +11,7 @@ import facefusion.uis.overrides as uis_overridesfrom facefusion import logger, metadata, state_manager, wordingfrom facefusion.exit_helper import hard_exitfrom facefusion.filesystem import resolve_relative_path-from facefusion.uis.typing import Component, ComponentName+from facefusion.uis.types import Component, ComponentNameUI_COMPONENTS: Dict[ComponentName, Component] = {}UI_LAYOUT_MODULES : List[ModuleType] = []diff --git a/facefusion/uis/typing.py b/facefusion/uis/types.pysimilarity index 100%rename from facefusion/uis/typing.pyrename to facefusion/uis/types.pydiff --git a/facefusion/vision.py b/facefusion/vision.pyindex 5445b916..f0ec96c5 100644--- a/facefusion/vision.py+++ b/facefusion/vision.py@@ -8,7 +8,7 @@ from cv2.typing import Sizeimport facefusion.choicesfrom facefusion.common_helper import is_windowsfrom facefusion.filesystem import get_file_extension, is_image, is_video-from facefusion.typing import Duration, Fps, Orientation, Resolution, VisionFrame+from facefusion.types import Duration, Fps, Orientation, Resolution, VisionFrame@lru_cache()diff --git a/facefusion/voice_extractor.py b/facefusion/voice_extractor.pyindex c7c4e922..f1f4a0a6 100644--- a/facefusion/voice_extractor.py+++ b/facefusion/voice_extractor.py@@ -8,7 +8,7 @@ from facefusion import inference_managerfrom facefusion.download import conditional_download_hashes, conditional_download_sources, resolve_download_urlfrom facefusion.filesystem import resolve_relative_pathfrom facefusion.thread_helper import thread_semaphore-from facefusion.typing import Audio, AudioChunk, DownloadScope, InferencePool, ModelOptions, ModelSet+from facefusion.types import Audio, AudioChunk, DownloadScope, InferencePool, ModelOptions, ModelSet@lru_cache(maxsize = None)diff --git a/tests/helper.py b/tests/helper.pyindex 7f89c2c5..8902643c 100644--- a/tests/helper.py+++ b/tests/helper.py@@ -2,7 +2,7 @@ import osimport tempfilefrom facefusion.filesystem import create_directory, is_directory, is_file, remove_directory-from facefusion.typing import JobStatus+from facefusion.types import JobStatusdef is_test_job_file(file_path : str, job_status : JobStatus) -> bool:diff --git a/tests/test_face_analyser.py b/tests/test_face_analyser.pyindex 785faf0a..b15400e2 100644--- a/tests/test_face_analyser.py+++ b/tests/test_face_analyser.py@@ -5,7 +5,7 @@ import pytestfrom facefusion import face_classifier, face_detector, face_landmarker, face_recognizer, state_managerfrom facefusion.download import conditional_downloadfrom facefusion.face_analyser import get_many_faces, get_one_face-from facefusion.typing import Face+from facefusion.types import Facefrom facefusion.vision import read_static_imagefrom .helper import get_test_example_file, get_test_examples_directorydiff --git a/tests/test_job_runner.py b/tests/test_job_runner.pyindex 7c14207c..9236c823 100644--- a/tests/test_job_runner.py+++ b/tests/test_job_runner.py@@ -6,7 +6,7 @@ from facefusion.download import conditional_downloadfrom facefusion.filesystem import copy_filefrom facefusion.jobs.job_manager import add_step, clear_jobs, create_job, init_jobs, submit_job, submit_jobsfrom facefusion.jobs.job_runner import collect_output_set, finalize_steps, run_job, run_jobs, run_steps-from facefusion.typing import Args+from facefusion.types import Argsfrom .helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_file, is_test_output_file, prepare_test_output_directory