Rename typing to types

facefusion/app_context.py

@@ -1,7 +1,7 @@
 import os
 import sys
 
-from facefusion.typing import AppContext
+from facefusion.types import AppContext
 
 
 def detect_app_context() -> AppContext:

facefusion/args.py

@@ -3,7 +3,7 @@ from facefusion.filesystem import get_file_name, is_image, is_video, resolve_fil
 from facefusion.jobs import job_store
 from facefusion.normalizer import normalize_fps, normalize_padding
 from facefusion.processors.core import get_processors_modules
-from facefusion.typing import ApplyStateItem, Args
+from facefusion.types import ApplyStateItem, Args
 from facefusion.vision import create_image_resolutions, create_video_resolutions, detect_image_resolution, detect_video_fps, detect_video_resolution, pack_resolution
 
 

facefusion/audio.py

@@ -7,7 +7,7 @@ from numpy.typing import NDArray
 
 from facefusion.ffmpeg import read_audio_buffer
 from facefusion.filesystem import is_audio
-from facefusion.typing import Audio, AudioFrame, Fps, Mel, MelFilterBank, Spectrogram
+from facefusion.types import Audio, AudioFrame, Fps, Mel, MelFilterBank, Spectrogram
 from facefusion.voice_extractor import batch_extract_voice
 
 

facefusion/choices.py

@@ -2,7 +2,7 @@ import logging
 from typing import List, Sequence
 
 from 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, WebcamMode
 
 face_detector_set : FaceDetectorSet =\
 {

facefusion/cli_helper.py

@@ -1,7 +1,7 @@
 from typing import Tuple
 
 from facefusion.logger import get_package_logger
-from facefusion.typing import TableContents, TableHeaders
+from facefusion.types import TableContents, TableHeaders
 
 
 def render_table(headers : TableHeaders, contents : TableContents) -> None:

facefusion/content_analyser.py

@@ -8,7 +8,7 @@ from facefusion import inference_manager, state_manager, wording
 from facefusion.download import conditional_download_hashes, conditional_download_sources, resolve_download_url
 from facefusion.filesystem import resolve_relative_path
 from 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, VisionFrame
 from facefusion.vision import detect_video_fps, fit_frame, read_image, read_video_frame
 
 STREAM_COUNTER = 0

facefusion/core.py

@@ -25,7 +25,7 @@ from facefusion.program import create_program
 from facefusion.program_helper import validate_args
 from facefusion.statistics import conditional_log_statistics
 from 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, ErrorCode
 from 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_resolution
 
 

facefusion/curl_builder.py

@@ -2,7 +2,7 @@ import itertools
 import shutil
 
 from facefusion import metadata
-from facefusion.typing import Commands
+from facefusion.types import Commands
 
 
 def run(commands : Commands) -> Commands:

facefusion/download.py

@@ -10,7 +10,7 @@ import facefusion.choices
 from facefusion import curl_builder, logger, process_manager, state_manager, wording
 from facefusion.filesystem import get_file_name, get_file_size, is_file, remove_file
 from facefusion.hash_helper import validate_hash
-from facefusion.typing import Commands, DownloadProvider, DownloadSet
+from facefusion.types import Commands, DownloadProvider, DownloadSet
 
 
 def open_curl(commands : Commands) -> subprocess.Popen[bytes]:

facefusion/execution.py

@@ -8,7 +8,7 @@ from onnxruntime import get_available_providers, set_default_logger_severity
 
 import facefusion.choices
 from facefusion.common_helper import get_last
-from facefusion.typing import ExecutionDevice, ExecutionProvider, InferenceSessionProvider, ValueAndUnit
+from facefusion.types import ExecutionDevice, ExecutionProvider, InferenceSessionProvider, ValueAndUnit
 
 set_default_logger_severity(3)
 

facefusion/exit_helper.py

@@ -4,7 +4,7 @@ from time import sleep
 
 from facefusion import process_manager, state_manager
 from facefusion.temp_helper import clear_temp_directory
-from facefusion.typing import ErrorCode
+from facefusion.types import ErrorCode
 
 
 def hard_exit(error_code : ErrorCode) -> None:

facefusion/face_analyser.py

@@ -10,7 +10,7 @@ from facefusion.face_helper import apply_nms, convert_to_face_landmark_5, estima
 from facefusion.face_landmarker import detect_face_landmarks, estimate_face_landmark_68_5
 from facefusion.face_recognizer import calc_embedding
 from 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, VisionFrame
 
 
 def create_faces(vision_frame : VisionFrame, bounding_boxes : List[BoundingBox], face_scores : List[Score], face_landmarks_5 : List[FaceLandmark5]) -> List[Face]:

facefusion/face_classifier.py

@@ -8,7 +8,7 @@ from facefusion.download import conditional_download_hashes, conditional_downloa
 from facefusion.face_helper import warp_face_by_face_landmark_5
 from facefusion.filesystem import resolve_relative_path
 from 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)

facefusion/face_detector.py

@@ -9,7 +9,7 @@ from facefusion.download import conditional_download_hashes, conditional_downloa
 from 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_points
 from facefusion.filesystem import resolve_relative_path
 from 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, VisionFrame
 from facefusion.vision import restrict_frame, unpack_resolution
 
 

facefusion/face_helper.py

@@ -5,7 +5,7 @@ import cv2
 import numpy
 from 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, WarpTemplateSet
 
 WARP_TEMPLATES : WarpTemplateSet =\
 {

facefusion/face_landmarker.py

@@ -9,7 +9,7 @@ from facefusion.download import conditional_download_hashes, conditional_downloa
 from facefusion.face_helper import create_rotated_matrix_and_size, estimate_matrix_by_face_landmark_5, transform_points, warp_face_by_translation
 from facefusion.filesystem import resolve_relative_path
 from 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)

facefusion/face_masker.py

@@ -10,7 +10,7 @@ from facefusion import inference_manager, state_manager
 from facefusion.download import conditional_download_hashes, conditional_download_sources, resolve_download_url
 from facefusion.filesystem import resolve_relative_path
 from 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)

facefusion/face_recognizer.py

@@ -8,7 +8,7 @@ from facefusion.download import conditional_download_hashes, conditional_downloa
 from facefusion.face_helper import warp_face_by_face_landmark_5
 from facefusion.filesystem import resolve_relative_path
 from 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)

facefusion/face_selector.py

@@ -3,7 +3,7 @@ from typing import List
 import numpy
 
 from facefusion import state_manager
-from facefusion.typing import Face, FaceSelectorOrder, FaceSet, Gender, Race
+from facefusion.types import Face, FaceSelectorOrder, FaceSet, Gender, Race
 
 
 def find_similar_faces(faces : List[Face], reference_faces : FaceSet, face_distance : float) -> List[Face]:

facefusion/face_store.py

@@ -3,7 +3,7 @@ from typing import List, Optional
 
 import numpy
 
-from facefusion.typing import Face, FaceSet, FaceStore, VisionFrame
+from facefusion.types import Face, FaceSet, FaceStore, VisionFrame
 
 FACE_STORE : FaceStore =\
 {

facefusion/ffmpeg.py

@@ -9,7 +9,7 @@ import facefusion.choices
 from facefusion import ffmpeg_builder, logger, process_manager, state_manager, wording
 from facefusion.filesystem import get_file_format, remove_file
 from 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, UpdateProgress
 from facefusion.vision import count_trim_frame_total, detect_video_duration, detect_video_fps, restrict_video_fps
 
 

facefusion/ffmpeg_builder.py

@@ -5,7 +5,7 @@ from typing import Optional
 import numpy
 
 from 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, VideoPreset
 
 
 def run(commands : Commands) -> Commands:

facefusion/inference_manager.py

@@ -8,7 +8,7 @@ from facefusion import process_manager, state_manager
 from facefusion.app_context import detect_app_context
 from facefusion.execution import create_inference_session_providers
 from facefusion.filesystem import is_file
-from facefusion.typing import DownloadSet, ExecutionProvider, InferencePool, InferencePoolSet
+from facefusion.types import DownloadSet, ExecutionProvider, InferencePool, InferencePoolSet
 
 INFERENCE_POOLS : InferencePoolSet =\
 {

facefusion/jobs/job_list.py

@@ -3,7 +3,7 @@ from typing import Optional, Tuple
 
 from facefusion.date_helper import describe_time_ago
 from facefusion.jobs import job_manager
-from facefusion.typing import JobStatus, TableContents, TableHeaders
+from facefusion.types import JobStatus, TableContents, TableHeaders
 
 
 def compose_job_list(job_status : JobStatus) -> Tuple[TableHeaders, TableContents]:

facefusion/jobs/job_manager.py

@@ -7,7 +7,7 @@ from facefusion.date_helper import get_current_date_time
 from facefusion.filesystem import create_directory, get_file_name, is_directory, is_file, move_file, remove_directory, remove_file, resolve_file_pattern
 from facefusion.jobs.job_helper import get_step_output_path
 from 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, JobStepStatus
 
 JOBS_PATH : Optional[str] = None
 

facefusion/jobs/job_runner.py

@@ -1,7 +1,7 @@
 from facefusion.ffmpeg import concat_video
 from facefusion.filesystem import are_images, are_videos, move_file, remove_file
 from facefusion.jobs import job_helper, job_manager
-from facefusion.typing import JobOutputSet, JobStep, ProcessStep
+from facefusion.types import JobOutputSet, JobStep, ProcessStep
 
 
 def run_job(job_id : str, process_step : ProcessStep) -> bool:

facefusion/jobs/job_store.py

@@ -1,6 +1,6 @@
 from typing import List
 
-from facefusion.typing import JobStore
+from facefusion.types import JobStore
 
 JOB_STORE : JobStore =\
 {

facefusion/json.py

@@ -3,7 +3,7 @@ from json import JSONDecodeError
 from typing import Optional
 
 from facefusion.filesystem import is_file
-from facefusion.typing import Content
+from facefusion.types import Content
 
 
 def read_json(json_path : str) -> Optional[Content]:

facefusion/logger.py

@@ -2,7 +2,7 @@ from logging import Logger, basicConfig, getLogger
 
 import facefusion.choices
 from facefusion.common_helper import get_first, get_last
-from facefusion.typing import LogLevel
+from facefusion.types import LogLevel
 
 
 def init(log_level : LogLevel) -> None:

facefusion/model_helper.py

@@ -2,7 +2,7 @@ from functools import lru_cache
 
 import onnx
 
-from facefusion.typing import ModelInitializer
+from facefusion.types import ModelInitializer
 
 
 @lru_cache(maxsize = None)

facefusion/normalizer.py

@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-from facefusion.typing import Fps, Padding
+from facefusion.types import Fps, Padding
 
 
 def normalize_padding(padding : Optional[List[int]]) -> Optional[Padding]:

facefusion/process_manager.py

@@ -1,6 +1,6 @@
 from typing import Generator, List
 
-from facefusion.typing import ProcessState, QueuePayload
+from facefusion.types import ProcessState, QueuePayload
 
 PROCESS_STATE : ProcessState = 'pending'
 

facefusion/processors/choices.py

@@ -2,7 +2,7 @@ from typing import List, Sequence
 
 from facefusion.common_helper import create_float_range, create_int_range
 from 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, LipSyncerModel
 
 age_modifier_models : List[AgeModifierModel] = [ 'styleganex_age' ]
 deep_swapper_models : List[DeepSwapperModel] =\

facefusion/processors/core.py

@@ -9,7 +9,7 @@ from tqdm import tqdm
 
 from facefusion import logger, state_manager, wording
 from facefusion.exit_helper import hard_exit
-from facefusion.typing import ProcessFrames, QueuePayload
+from facefusion.types import ProcessFrames, QueuePayload
 
 PROCESSORS_METHODS =\
 [

facefusion/processors/live_portrait.py

@@ -3,7 +3,7 @@ from typing import Tuple
 import numpy
 import scipy
 
-from facefusion.processors.typing import LivePortraitExpression, LivePortraitPitch, LivePortraitRoll, LivePortraitRotation, LivePortraitYaw
+from facefusion.processors.types import LivePortraitExpression, LivePortraitPitch, LivePortraitRoll, LivePortraitRotation, LivePortraitYaw
 
 EXPRESSION_MIN = numpy.array(
 [

facefusion/processors/modules/age_modifier.py

@@ -20,10 +20,10 @@ from facefusion.face_selector import find_similar_faces, sort_and_filter_faces
 from facefusion.face_store import get_reference_faces
 from facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path, same_file_extension
 from facefusion.processors import choices as processors_choices
-from facefusion.processors.typing import AgeModifierDirection, AgeModifierInputs
+from facefusion.processors.types import AgeModifierDirection, AgeModifierInputs
 from facefusion.program_helper import find_argument_group
 from 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, VisionFrame
 from facefusion.vision import match_frame_color, read_image, read_static_image, write_image
 
 

facefusion/processors/modules/deep_swapper.py

@@ -19,10 +19,10 @@ from facefusion.face_selector import find_similar_faces, sort_and_filter_faces
 from facefusion.face_store import get_reference_faces
 from facefusion.filesystem import get_file_name, in_directory, is_image, is_video, resolve_file_paths, resolve_relative_path, same_file_extension
 from facefusion.processors import choices as processors_choices
-from facefusion.processors.typing import DeepSwapperInputs, DeepSwapperMorph
+from facefusion.processors.types import DeepSwapperInputs, DeepSwapperMorph
 from facefusion.program_helper import find_argument_group
 from 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, VisionFrame
 from facefusion.vision import conditional_match_frame_color, read_image, read_static_image, write_image
 
 

facefusion/processors/modules/expression_restorer.py

@@ -19,10 +19,10 @@ from facefusion.face_store import get_reference_faces
 from facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path, same_file_extension
 from facefusion.processors import choices as processors_choices
 from 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, LivePortraitYaw
 from facefusion.program_helper import find_argument_group
 from 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, VisionFrame
 from facefusion.vision import read_image, read_static_image, read_video_frame, write_image
 
 

facefusion/processors/modules/face_debugger.py

@@ -15,9 +15,9 @@ from facefusion.face_selector import find_similar_faces, sort_and_filter_faces
 from facefusion.face_store import get_reference_faces
 from facefusion.filesystem import in_directory, same_file_extension
 from facefusion.processors import choices as processors_choices
-from facefusion.processors.typing import FaceDebuggerInputs
+from facefusion.processors.types import FaceDebuggerInputs
 from 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, VisionFrame
 from facefusion.vision import read_image, read_static_image, write_image
 
 

facefusion/processors/modules/face_editor.py

@@ -19,10 +19,10 @@ from facefusion.face_store import get_reference_faces
 from facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path, same_file_extension
 from facefusion.processors import choices as processors_choices
 from 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, LivePortraitYaw
 from facefusion.program_helper import find_argument_group
 from 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, VisionFrame
 from facefusion.vision import read_image, read_static_image, write_image
 
 

facefusion/processors/modules/face_enhancer.py

@@ -18,10 +18,10 @@ from facefusion.face_selector import find_similar_faces, sort_and_filter_faces
 from facefusion.face_store import get_reference_faces
 from facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path, same_file_extension
 from facefusion.processors import choices as processors_choices
-from facefusion.processors.typing import FaceEnhancerInputs, FaceEnhancerWeight
+from facefusion.processors.types import FaceEnhancerInputs, FaceEnhancerWeight
 from facefusion.program_helper import find_argument_group
 from 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, VisionFrame
 from facefusion.vision import read_image, read_static_image, write_image
 
 

facefusion/processors/modules/face_swapper.py

@@ -21,10 +21,10 @@ from facefusion.filesystem import filter_image_paths, has_image, in_directory, i
 from facefusion.model_helper import get_static_model_initializer
 from facefusion.processors import choices as processors_choices
 from facefusion.processors.pixel_boost import explode_pixel_boost, implode_pixel_boost
-from facefusion.processors.typing import FaceSwapperInputs
+from facefusion.processors.types import FaceSwapperInputs
 from facefusion.program_helper import find_argument_group
 from 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, VisionFrame
 from facefusion.vision import read_image, read_static_image, read_static_images, unpack_resolution, write_image
 
 

facefusion/processors/modules/frame_colorizer.py

@@ -14,10 +14,10 @@ from facefusion.download import conditional_download_hashes, conditional_downloa
 from facefusion.execution import has_execution_provider
 from facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path, same_file_extension
 from facefusion.processors import choices as processors_choices
-from facefusion.processors.typing import FrameColorizerInputs
+from facefusion.processors.types import FrameColorizerInputs
 from facefusion.program_helper import find_argument_group
 from 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, VisionFrame
 from facefusion.vision import read_image, read_static_image, unpack_resolution, write_image
 
 

facefusion/processors/modules/frame_enhancer.py

@@ -14,10 +14,10 @@ from facefusion.download import conditional_download_hashes, conditional_downloa
 from facefusion.execution import has_execution_provider
 from facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path, same_file_extension
 from facefusion.processors import choices as processors_choices
-from facefusion.processors.typing import FrameEnhancerInputs
+from facefusion.processors.types import FrameEnhancerInputs
 from facefusion.program_helper import find_argument_group
 from 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, VisionFrame
 from facefusion.vision import create_tile_frames, merge_tile_frames, read_image, read_static_image, write_image
 
 

facefusion/processors/modules/lip_syncer.py

@@ -19,10 +19,10 @@ from facefusion.face_selector import find_similar_faces, sort_and_filter_faces
 from facefusion.face_store import get_reference_faces
 from facefusion.filesystem import filter_audio_paths, has_audio, in_directory, is_image, is_video, resolve_relative_path, same_file_extension
 from facefusion.processors import choices as processors_choices
-from facefusion.processors.typing import LipSyncerInputs
+from facefusion.processors.types import LipSyncerInputs
 from facefusion.program_helper import find_argument_group
 from 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, VisionFrame
 from facefusion.vision import read_image, read_static_image, restrict_video_fps, write_image
 
 

facefusion/processors/pixel_boost.py

@@ -3,7 +3,7 @@ from typing import List
 import numpy
 from cv2.typing import Size
 
-from facefusion.typing import VisionFrame
+from facefusion.types import VisionFrame
 
 
 def implode_pixel_boost(crop_vision_frame : VisionFrame, pixel_boost_total : int, model_size : Size) -> VisionFrame:

facefusion/processors/types.py

@@ -2,7 +2,7 @@ from typing import Any, Dict, List, Literal, TypedDict
 
 from numpy.typing import NDArray
 
-from facefusion.typing import AppContext, AudioFrame, Face, FaceSet, VisionFrame
+from facefusion.types import AppContext, AudioFrame, Face, FaceSet, VisionFrame
 
 AgeModifierModel = Literal['styleganex_age']
 DeepSwapperModel = str

facefusion/state_manager.py

@@ -1,8 +1,8 @@
 from typing import Any, Union
 
 from facefusion.app_context import detect_app_context
-from facefusion.processors.typing import ProcessorState, ProcessorStateKey
+from facefusion.processors.types import ProcessorState, ProcessorStateKey
-from facefusion.typing import State, StateKey, StateSet
+from facefusion.types import State, StateKey, StateSet
 
 STATES : Union[StateSet, ProcessorState] =\
 {

facefusion/statistics.py

@@ -4,7 +4,7 @@ import numpy
 
 from facefusion import logger, state_manager
 from facefusion.face_store import get_face_store
-from facefusion.typing import FaceSet
+from facefusion.types import FaceSet
 
 
 def create_statistics(static_faces : FaceSet) -> Dict[str, Any]:

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, JobRunnerAction
 
 job_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' ]

facefusion/uis/components/age_modifier_options.py

@@ -6,7 +6,7 @@ from facefusion import state_manager, wording
 from facefusion.common_helper import calc_float_step
 from facefusion.processors import choices as processors_choices
 from facefusion.processors.core import load_processor_module
-from facefusion.processors.typing import AgeModifierModel
+from facefusion.processors.types import AgeModifierModel
 from facefusion.uis.core import get_ui_component, register_ui_component
 
 AGE_MODIFIER_MODEL_DROPDOWN : Optional[gradio.Dropdown] = None

facefusion/uis/components/deep_swapper_options.py

@@ -6,7 +6,7 @@ from facefusion import state_manager, wording
 from facefusion.common_helper import calc_int_step
 from facefusion.processors import choices as processors_choices
 from facefusion.processors.core import load_processor_module
-from facefusion.processors.typing import DeepSwapperModel
+from facefusion.processors.types import DeepSwapperModel
 from facefusion.uis.core import get_ui_component, register_ui_component
 
 DEEP_SWAPPER_MODEL_DROPDOWN : Optional[gradio.Dropdown] = None

facefusion/uis/components/download.py

@@ -6,7 +6,7 @@ import facefusion.choices
 from facefusion import content_analyser, face_classifier, face_detector, face_landmarker, face_masker, face_recognizer, state_manager, voice_extractor, wording
 from facefusion.filesystem import get_file_name, resolve_file_paths
 from facefusion.processors.core import get_processors_modules
-from facefusion.typing import DownloadProvider
+from facefusion.types import DownloadProvider
 
 DOWNLOAD_PROVIDERS_CHECKBOX_GROUP : Optional[gradio.CheckboxGroup] = None
 

facefusion/uis/components/execution.py

@@ -6,7 +6,7 @@ from facefusion import content_analyser, face_classifier, face_detector, face_la
 from facefusion.execution import get_available_execution_providers
 from facefusion.filesystem import get_file_name, resolve_file_paths
 from facefusion.processors.core import get_processors_modules
-from facefusion.typing import ExecutionProvider
+from facefusion.types import ExecutionProvider
 
 EXECUTION_PROVIDERS_CHECKBOX_GROUP : Optional[gradio.CheckboxGroup] = None
 

facefusion/uis/components/expression_restorer_options.py

@@ -6,7 +6,7 @@ from facefusion import state_manager, wording
 from facefusion.common_helper import calc_float_step
 from facefusion.processors import choices as processors_choices
 from facefusion.processors.core import load_processor_module
-from facefusion.processors.typing import ExpressionRestorerModel
+from facefusion.processors.types import ExpressionRestorerModel
 from facefusion.uis.core import get_ui_component, register_ui_component
 
 EXPRESSION_RESTORER_MODEL_DROPDOWN : Optional[gradio.Dropdown] = None

facefusion/uis/components/face_debugger_options.py

@@ -4,7 +4,7 @@ import gradio
 
 from facefusion import state_manager, wording
 from facefusion.processors import choices as processors_choices
-from facefusion.processors.typing import FaceDebuggerItem
+from facefusion.processors.types import FaceDebuggerItem
 from facefusion.uis.core import get_ui_component, register_ui_component
 
 FACE_DEBUGGER_ITEMS_CHECKBOX_GROUP : Optional[gradio.CheckboxGroup] = None

facefusion/uis/components/face_detector.py

@@ -5,9 +5,9 @@ import gradio
 import facefusion.choices
 from facefusion import face_detector, state_manager, wording
 from facefusion.common_helper import calc_float_step, get_last
-from facefusion.typing import Angle, FaceDetectorModel, Score
+from facefusion.types import Angle, FaceDetectorModel, Score
 from facefusion.uis.core import register_ui_component
-from facefusion.uis.typing import ComponentOptions
+from facefusion.uis.types import ComponentOptions
 
 FACE_DETECTOR_MODEL_DROPDOWN : Optional[gradio.Dropdown] = None
 FACE_DETECTOR_SIZE_DROPDOWN : Optional[gradio.Dropdown] = None

facefusion/uis/components/face_editor_options.py

@@ -6,7 +6,7 @@ from facefusion import state_manager, wording
 from facefusion.common_helper import calc_float_step
 from facefusion.processors import choices as processors_choices
 from facefusion.processors.core import load_processor_module
-from facefusion.processors.typing import FaceEditorModel
+from facefusion.processors.types import FaceEditorModel
 from facefusion.uis.core import get_ui_component, register_ui_component
 
 FACE_EDITOR_MODEL_DROPDOWN : Optional[gradio.Dropdown] = None

facefusion/uis/components/face_enhancer_options.py

@@ -6,7 +6,7 @@ from facefusion import state_manager, wording
 from facefusion.common_helper import calc_float_step, calc_int_step
 from facefusion.processors import choices as processors_choices
 from facefusion.processors.core import load_processor_module
-from facefusion.processors.typing import FaceEnhancerModel
+from facefusion.processors.types import FaceEnhancerModel
 from facefusion.uis.core import get_ui_component, register_ui_component
 
 FACE_ENHANCER_MODEL_DROPDOWN : Optional[gradio.Dropdown] = None

facefusion/uis/components/face_landmarker.py

@@ -5,7 +5,7 @@ import gradio
 import facefusion.choices
 from facefusion import face_landmarker, state_manager, wording
 from facefusion.common_helper import calc_float_step
-from facefusion.typing import FaceLandmarkerModel, Score
+from facefusion.types import FaceLandmarkerModel, Score
 from facefusion.uis.core import register_ui_component
 
 FACE_LANDMARKER_MODEL_DROPDOWN : Optional[gradio.Dropdown] = None

facefusion/uis/components/face_masker.py

@@ -5,7 +5,7 @@ import gradio
 import facefusion.choices
 from facefusion import face_masker, state_manager, wording
 from 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, FaceParserModel
 from facefusion.uis.core import register_ui_component
 
 FACE_OCCLUDER_MODEL_DROPDOWN : Optional[gradio.Dropdown] = None

facefusion/uis/components/face_selector.py

@@ -10,9 +10,9 @@ from facefusion.face_analyser import get_many_faces
 from facefusion.face_selector import sort_and_filter_faces
 from facefusion.face_store import clear_reference_faces, clear_static_faces
 from facefusion.filesystem import is_image, is_video
-from facefusion.typing import FaceSelectorMode, FaceSelectorOrder, Gender, Race, VisionFrame
+from facefusion.types import FaceSelectorMode, FaceSelectorOrder, Gender, Race, VisionFrame
 from facefusion.uis.core import get_ui_component, get_ui_components, register_ui_component
-from facefusion.uis.typing import ComponentOptions
+from facefusion.uis.types import ComponentOptions
 from facefusion.uis.ui_helper import convert_str_none
 from facefusion.vision import normalize_frame_color, read_static_image, read_video_frame
 

facefusion/uis/components/face_swapper_options.py

@@ -6,7 +6,7 @@ from facefusion import state_manager, wording
 from facefusion.common_helper import get_first
 from facefusion.processors import choices as processors_choices
 from facefusion.processors.core import load_processor_module
-from facefusion.processors.typing import FaceSwapperModel
+from facefusion.processors.types import FaceSwapperModel
 from facefusion.uis.core import get_ui_component, register_ui_component
 
 FACE_SWAPPER_MODEL_DROPDOWN : Optional[gradio.Dropdown] = None

facefusion/uis/components/frame_colorizer_options.py

@@ -6,7 +6,7 @@ from facefusion import state_manager, wording
 from facefusion.common_helper import calc_int_step
 from facefusion.processors import choices as processors_choices
 from facefusion.processors.core import load_processor_module
-from facefusion.processors.typing import FrameColorizerModel
+from facefusion.processors.types import FrameColorizerModel
 from facefusion.uis.core import get_ui_component, register_ui_component
 
 FRAME_COLORIZER_MODEL_DROPDOWN : Optional[gradio.Dropdown] = None

facefusion/uis/components/frame_enhancer_options.py

@@ -6,7 +6,7 @@ from facefusion import state_manager, wording
 from facefusion.common_helper import calc_int_step
 from facefusion.processors import choices as processors_choices
 from facefusion.processors.core import load_processor_module
-from facefusion.processors.typing import FrameEnhancerModel
+from facefusion.processors.types import FrameEnhancerModel
 from facefusion.uis.core import get_ui_component, register_ui_component
 
 FRAME_ENHANCER_MODEL_DROPDOWN : Optional[gradio.Dropdown] = None

facefusion/uis/components/instant_runner.py

@@ -9,7 +9,7 @@ from facefusion.core import process_step
 from facefusion.filesystem import is_directory, is_image, is_video
 from facefusion.jobs import job_helper, job_manager, job_runner, job_store
 from facefusion.temp_helper import clear_temp_directory
-from facefusion.typing import Args, UiWorkflow
+from facefusion.types import Args, UiWorkflow
 from facefusion.uis.core import get_ui_component
 from facefusion.uis.ui_helper import suggest_output_path
 

facefusion/uis/components/job_list.py

@@ -6,7 +6,7 @@ import facefusion.choices
 from facefusion import state_manager, wording
 from facefusion.common_helper import get_first
 from facefusion.jobs import job_list, job_manager
-from facefusion.typing import JobStatus
+from facefusion.types import JobStatus
 from facefusion.uis.core import get_ui_component
 
 JOB_LIST_JOBS_DATAFRAME : Optional[gradio.Dataframe] = None

facefusion/uis/components/job_list_options.py

@@ -6,7 +6,7 @@ import facefusion.choices
 from facefusion import state_manager, wording
 from facefusion.common_helper import get_first
 from facefusion.jobs import job_manager
-from facefusion.typing import JobStatus
+from facefusion.types import JobStatus
 from facefusion.uis.core import register_ui_component
 
 JOB_LIST_JOB_STATUS_CHECKBOX_GROUP : Optional[gradio.CheckboxGroup] = None

facefusion/uis/components/job_manager.py

@@ -7,10 +7,10 @@ from facefusion.args import collect_step_args
 from facefusion.common_helper import get_first, get_last
 from facefusion.filesystem import is_directory
 from facefusion.jobs import job_manager
-from facefusion.typing import UiWorkflow
+from facefusion.types import UiWorkflow
 from facefusion.uis import choices as uis_choices
 from facefusion.uis.core import get_ui_component
-from facefusion.uis.typing import JobManagerAction
+from facefusion.uis.types import JobManagerAction
 from facefusion.uis.ui_helper import convert_int_none, convert_str_none, suggest_output_path
 
 JOB_MANAGER_WRAPPER : Optional[gradio.Column] = None

facefusion/uis/components/job_runner.py

@@ -7,10 +7,10 @@ from facefusion import logger, process_manager, state_manager, wording
 from facefusion.common_helper import get_first, get_last
 from facefusion.core import process_step
 from facefusion.jobs import job_manager, job_runner, job_store
-from facefusion.typing import UiWorkflow
+from facefusion.types import UiWorkflow
 from facefusion.uis import choices as uis_choices
 from facefusion.uis.core import get_ui_component
-from facefusion.uis.typing import JobRunnerAction
+from facefusion.uis.types import JobRunnerAction
 from facefusion.uis.ui_helper import convert_str_none
 
 JOB_RUNNER_WRAPPER : Optional[gradio.Column] = None

facefusion/uis/components/lip_syncer_options.py

@@ -5,7 +5,7 @@ import gradio
 from facefusion import state_manager, wording
 from facefusion.processors import choices as processors_choices
 from facefusion.processors.core import load_processor_module
-from facefusion.processors.typing import LipSyncerModel
+from facefusion.processors.types import LipSyncerModel
 from facefusion.uis.core import get_ui_component, register_ui_component
 
 LIP_SYNCER_MODEL_DROPDOWN : Optional[gradio.Dropdown] = None

facefusion/uis/components/memory.py

@@ -5,7 +5,7 @@ import gradio
 import facefusion.choices
 from facefusion import state_manager, wording
 from facefusion.common_helper import calc_int_step
-from facefusion.typing import VideoMemoryStrategy
+from facefusion.types import VideoMemoryStrategy
 
 VIDEO_MEMORY_STRATEGY_DROPDOWN : Optional[gradio.Dropdown] = None
 SYSTEM_MEMORY_LIMIT_SLIDER : Optional[gradio.Slider] = None

facefusion/uis/components/output_options.py

@@ -7,7 +7,7 @@ from facefusion import state_manager, wording
 from facefusion.common_helper import calc_int_step
 from facefusion.ffmpeg import get_available_encoder_set
 from facefusion.filesystem import is_image, is_video
-from facefusion.typing import AudioEncoder, Fps, VideoEncoder, VideoPreset
+from facefusion.types import AudioEncoder, Fps, VideoEncoder, VideoPreset
 from facefusion.uis.core import get_ui_components, register_ui_component
 from facefusion.vision import create_image_resolutions, create_video_resolutions, detect_image_resolution, detect_video_fps, detect_video_resolution, pack_resolution
 

facefusion/uis/components/preview.py

@@ -15,9 +15,9 @@ from facefusion.face_selector import sort_faces_by_order
 from facefusion.face_store import clear_reference_faces, clear_static_faces, get_reference_faces
 from facefusion.filesystem import filter_audio_paths, is_image, is_video
 from facefusion.processors.core import get_processors_modules
-from facefusion.typing import AudioFrame, Face, FaceSet, VisionFrame
+from facefusion.types import AudioFrame, Face, FaceSet, VisionFrame
 from facefusion.uis.core import get_ui_component, get_ui_components, register_ui_component
-from facefusion.uis.typing import ComponentOptions
+from facefusion.uis.types import ComponentOptions
 from facefusion.vision import count_video_frame_total, detect_frame_orientation, normalize_frame_color, read_static_image, read_static_images, read_video_frame, restrict_frame
 
 PREVIEW_IMAGE : Optional[gradio.Image] = None

facefusion/uis/components/source.py

@@ -6,7 +6,7 @@ from facefusion import state_manager, wording
 from facefusion.common_helper import get_first
 from facefusion.filesystem import filter_audio_paths, filter_image_paths, has_audio, has_image
 from facefusion.uis.core import register_ui_component
-from facefusion.uis.typing import File
+from facefusion.uis.types import File
 
 SOURCE_FILE : Optional[gradio.File] = None
 SOURCE_AUDIO : Optional[gradio.Audio] = None

facefusion/uis/components/target.py

@@ -6,7 +6,7 @@ from facefusion import state_manager, wording
 from facefusion.face_store import clear_reference_faces, clear_static_faces
 from facefusion.filesystem import is_image, is_video
 from facefusion.uis.core import register_ui_component
-from facefusion.uis.typing import ComponentOptions, File
+from facefusion.uis.types import ComponentOptions, File
 
 TARGET_FILE : Optional[gradio.File] = None
 TARGET_IMAGE : Optional[gradio.Image] = None

facefusion/uis/components/temp_frame.py

@@ -5,7 +5,7 @@ import gradio
 import facefusion.choices
 from facefusion import state_manager, wording
 from facefusion.filesystem import is_video
-from facefusion.typing import TempFrameFormat
+from facefusion.types import TempFrameFormat
 from facefusion.uis.core import get_ui_component
 
 TEMP_FRAME_FORMAT_DROPDOWN : Optional[gradio.Dropdown] = None

facefusion/uis/components/terminal.py

@@ -9,7 +9,7 @@ from tqdm import tqdm
 
 import facefusion.choices
 from facefusion import logger, state_manager, wording
-from facefusion.typing import LogLevel
+from facefusion.types import LogLevel
 
 LOG_LEVEL_DROPDOWN : Optional[gradio.Dropdown] = None
 TERMINAL_TEXTBOX : Optional[gradio.Textbox] = None

facefusion/uis/components/trim_frame.py

@@ -6,7 +6,7 @@ from facefusion import state_manager, wording
 from facefusion.face_store import clear_static_faces
 from facefusion.filesystem import is_video
 from facefusion.uis.core import get_ui_components
-from facefusion.uis.typing import ComponentOptions
+from facefusion.uis.types import ComponentOptions
 from facefusion.vision import count_video_frame_total
 
 TRIM_FRAME_RANGE_SLIDER : Optional[RangeSlider] = None

facefusion/uis/components/webcam.py

@@ -16,7 +16,7 @@ from facefusion.face_analyser import get_average_face, get_many_faces
 from facefusion.ffmpeg import open_ffmpeg
 from facefusion.filesystem import filter_image_paths, is_directory
 from facefusion.processors.core import get_processors_modules
-from facefusion.typing import Face, Fps, StreamMode, VisionFrame, WebcamMode
+from facefusion.types import Face, Fps, StreamMode, VisionFrame, WebcamMode
 from facefusion.uis.core import get_ui_component
 from facefusion.vision import normalize_frame_color, read_static_images, unpack_resolution
 

facefusion/uis/core.py

@@ -11,7 +11,7 @@ import facefusion.uis.overrides as uis_overrides
 from facefusion import logger, metadata, state_manager, wording
 from facefusion.exit_helper import hard_exit
 from facefusion.filesystem import resolve_relative_path
-from facefusion.uis.typing import Component, ComponentName
+from facefusion.uis.types import Component, ComponentName
 
 UI_COMPONENTS: Dict[ComponentName, Component] = {}
 UI_LAYOUT_MODULES : List[ModuleType] = []

facefusion/vision.py

@@ -8,7 +8,7 @@ from cv2.typing import Size
 import facefusion.choices
 from facefusion.common_helper import is_windows
 from 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()

facefusion/voice_extractor.py

@@ -8,7 +8,7 @@ from facefusion import inference_manager
 from facefusion.download import conditional_download_hashes, conditional_download_sources, resolve_download_url
 from facefusion.filesystem import resolve_relative_path
 from 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)

tests/helper.py

@@ -2,7 +2,7 @@ import os
 import tempfile
 
 from facefusion.filesystem import create_directory, is_directory, is_file, remove_directory
-from facefusion.typing import JobStatus
+from facefusion.types import JobStatus
 
 
 def is_test_job_file(file_path : str, job_status : JobStatus) -> bool:

tests/test_face_analyser.py

@@ -5,7 +5,7 @@ import pytest
 from facefusion import face_classifier, face_detector, face_landmarker, face_recognizer, state_manager
 from facefusion.download import conditional_download
 from facefusion.face_analyser import get_many_faces, get_one_face
-from facefusion.typing import Face
+from facefusion.types import Face
 from facefusion.vision import read_static_image
 from .helper import get_test_example_file, get_test_examples_directory
 

tests/test_job_runner.py

@@ -6,7 +6,7 @@ from facefusion.download import conditional_download
 from facefusion.filesystem import copy_file
 from facefusion.jobs.job_manager import add_step, clear_jobs, create_job, init_jobs, submit_job, submit_jobs
 from 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 Args
 from .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