From 44165eb0b78209400a01bc17c70894a77d2d4f5a Mon Sep 17 00:00:00 2001 From: henryruhs Date: Wed, 5 Feb 2025 23:19:16 +0100 Subject: [PATCH] Rename typing to types --- facefusion/app_context.py | 2 +- facefusion/args.py | 2 +- facefusion/audio.py | 2 +- facefusion/choices.py | 2 +- facefusion/cli_helper.py | 2 +- facefusion/content_analyser.py | 2 +- facefusion/core.py | 2 +- facefusion/curl_builder.py | 2 +- facefusion/download.py | 2 +- facefusion/execution.py | 2 +- facefusion/exit_helper.py | 2 +- facefusion/face_analyser.py | 2 +- facefusion/face_classifier.py | 2 +- facefusion/face_detector.py | 2 +- facefusion/face_helper.py | 2 +- facefusion/face_landmarker.py | 2 +- facefusion/face_masker.py | 2 +- facefusion/face_recognizer.py | 2 +- facefusion/face_selector.py | 2 +- facefusion/face_store.py | 2 +- facefusion/ffmpeg.py | 2 +- facefusion/ffmpeg_builder.py | 2 +- facefusion/inference_manager.py | 2 +- facefusion/jobs/job_list.py | 2 +- facefusion/jobs/job_manager.py | 2 +- facefusion/jobs/job_runner.py | 2 +- facefusion/jobs/job_store.py | 2 +- facefusion/json.py | 2 +- facefusion/logger.py | 2 +- facefusion/model_helper.py | 2 +- facefusion/normalizer.py | 2 +- facefusion/process_manager.py | 2 +- facefusion/processors/choices.py | 2 +- facefusion/processors/core.py | 2 +- facefusion/processors/live_portrait.py | 2 +- facefusion/processors/modules/age_modifier.py | 6 +++--- facefusion/processors/modules/deep_swapper.py | 4 ++-- facefusion/processors/modules/expression_restorer.py | 4 ++-- facefusion/processors/modules/face_debugger.py | 4 ++-- facefusion/processors/modules/face_editor.py | 4 ++-- facefusion/processors/modules/face_enhancer.py | 4 ++-- facefusion/processors/modules/face_swapper.py | 4 ++-- facefusion/processors/modules/frame_colorizer.py | 4 ++-- facefusion/processors/modules/frame_enhancer.py | 4 ++-- facefusion/processors/modules/lip_syncer.py | 4 ++-- facefusion/processors/pixel_boost.py | 2 +- facefusion/processors/{typing.py => types.py} | 2 +- facefusion/state_manager.py | 4 ++-- facefusion/statistics.py | 2 +- facefusion/{typing.py => types.py} | 0 facefusion/uis/choices.py | 2 +- facefusion/uis/components/age_modifier_options.py | 2 +- facefusion/uis/components/deep_swapper_options.py | 2 +- facefusion/uis/components/download.py | 2 +- facefusion/uis/components/execution.py | 2 +- facefusion/uis/components/expression_restorer_options.py | 2 +- facefusion/uis/components/face_debugger_options.py | 2 +- facefusion/uis/components/face_detector.py | 4 ++-- facefusion/uis/components/face_editor_options.py | 2 +- facefusion/uis/components/face_enhancer_options.py | 2 +- facefusion/uis/components/face_landmarker.py | 2 +- facefusion/uis/components/face_masker.py | 2 +- facefusion/uis/components/face_selector.py | 4 ++-- facefusion/uis/components/face_swapper_options.py | 2 +- facefusion/uis/components/frame_colorizer_options.py | 2 +- facefusion/uis/components/frame_enhancer_options.py | 2 +- facefusion/uis/components/instant_runner.py | 2 +- facefusion/uis/components/job_list.py | 2 +- facefusion/uis/components/job_list_options.py | 2 +- facefusion/uis/components/job_manager.py | 4 ++-- facefusion/uis/components/job_runner.py | 4 ++-- facefusion/uis/components/lip_syncer_options.py | 2 +- facefusion/uis/components/memory.py | 2 +- facefusion/uis/components/output_options.py | 2 +- facefusion/uis/components/preview.py | 4 ++-- facefusion/uis/components/source.py | 2 +- facefusion/uis/components/target.py | 2 +- facefusion/uis/components/temp_frame.py | 2 +- facefusion/uis/components/terminal.py | 2 +- facefusion/uis/components/trim_frame.py | 2 +- facefusion/uis/components/webcam.py | 2 +- facefusion/uis/core.py | 2 +- facefusion/uis/{typing.py => types.py} | 0 facefusion/vision.py | 2 +- facefusion/voice_extractor.py | 2 +- tests/helper.py | 2 +- tests/test_face_analyser.py | 2 +- tests/test_job_runner.py | 2 +- 88 files changed, 103 insertions(+), 103 deletions(-) rename facefusion/processors/{typing.py => types.py} (98%) rename facefusion/{typing.py => types.py} (100%) rename facefusion/uis/{typing.py => types.py} (100%) diff --git a/facefusion/app_context.py b/facefusion/app_context.py index f1a273a..d54f961 100644 --- a/facefusion/app_context.py +++ b/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: diff --git a/facefusion/args.py b/facefusion/args.py index 7cccdaf..71ca179 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_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 diff --git a/facefusion/audio.py b/facefusion/audio.py index bf5418a..300c394 100644 --- a/facefusion/audio.py +++ b/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 diff --git a/facefusion/choices.py b/facefusion/choices.py index e5a7770..b95f4b2 100755 --- a/facefusion/choices.py +++ b/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 =\ { diff --git a/facefusion/cli_helper.py b/facefusion/cli_helper.py index 189e642..6bb3d26 100644 --- a/facefusion/cli_helper.py +++ b/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: diff --git a/facefusion/content_analyser.py b/facefusion/content_analyser.py index 7e2bbf8..8b5de1b 100644 --- a/facefusion/content_analyser.py +++ b/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 diff --git a/facefusion/core.py b/facefusion/core.py index 51ab606..9fb216e 100755 --- a/facefusion/core.py +++ b/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 diff --git a/facefusion/curl_builder.py b/facefusion/curl_builder.py index 7b60dc4..a720353 100644 --- a/facefusion/curl_builder.py +++ b/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: diff --git a/facefusion/download.py b/facefusion/download.py index f56f515..cafd6bc 100644 --- a/facefusion/download.py +++ b/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]: diff --git a/facefusion/execution.py b/facefusion/execution.py index 4d54bd1..f2a2f35 100644 --- a/facefusion/execution.py +++ b/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) diff --git a/facefusion/exit_helper.py b/facefusion/exit_helper.py index 5c30aca..26b936a 100644 --- a/facefusion/exit_helper.py +++ b/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: diff --git a/facefusion/face_analyser.py b/facefusion/face_analyser.py index 8e870d6..a80384b 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, 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]: diff --git a/facefusion/face_classifier.py b/facefusion/face_classifier.py index ce093cf..dcae123 100644 --- a/facefusion/face_classifier.py +++ b/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) diff --git a/facefusion/face_detector.py b/facefusion/face_detector.py index c5d29d2..590bc3f 100644 --- a/facefusion/face_detector.py +++ b/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 diff --git a/facefusion/face_helper.py b/facefusion/face_helper.py index 970d328..846d481 100644 --- a/facefusion/face_helper.py +++ b/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 =\ { diff --git a/facefusion/face_landmarker.py b/facefusion/face_landmarker.py index eb5d5fd..e2453f5 100644 --- a/facefusion/face_landmarker.py +++ b/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) diff --git a/facefusion/face_masker.py b/facefusion/face_masker.py index 362e253..cd1fc51 100755 --- a/facefusion/face_masker.py +++ b/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) diff --git a/facefusion/face_recognizer.py b/facefusion/face_recognizer.py index 9bcd703..af95a07 100644 --- a/facefusion/face_recognizer.py +++ b/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) diff --git a/facefusion/face_selector.py b/facefusion/face_selector.py index 3b5131a..e87711d 100644 --- a/facefusion/face_selector.py +++ b/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]: diff --git a/facefusion/face_store.py b/facefusion/face_store.py index 7957c50..eb576a1 100644 --- a/facefusion/face_store.py +++ b/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 =\ { diff --git a/facefusion/ffmpeg.py b/facefusion/ffmpeg.py index 1638745..dc9f21e 100644 --- a/facefusion/ffmpeg.py +++ b/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 diff --git a/facefusion/ffmpeg_builder.py b/facefusion/ffmpeg_builder.py index b2ac2f2..cc7e1e6 100644 --- a/facefusion/ffmpeg_builder.py +++ b/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: diff --git a/facefusion/inference_manager.py b/facefusion/inference_manager.py index 4560801..0ae8103 100644 --- a/facefusion/inference_manager.py +++ b/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 =\ { diff --git a/facefusion/jobs/job_list.py b/facefusion/jobs/job_list.py index a7b6e84..2003b96 100644 --- a/facefusion/jobs/job_list.py +++ b/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]: diff --git a/facefusion/jobs/job_manager.py b/facefusion/jobs/job_manager.py index a503c86..1a45a49 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_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 diff --git a/facefusion/jobs/job_runner.py b/facefusion/jobs/job_runner.py index ab6f92a..30ad14b 100644 --- a/facefusion/jobs/job_runner.py +++ b/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: diff --git a/facefusion/jobs/job_store.py b/facefusion/jobs/job_store.py index 9d330d0..5a13ef1 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 JobStore JOB_STORE : JobStore =\ { diff --git a/facefusion/json.py b/facefusion/json.py index e1ba2ae..d688683 100644 --- a/facefusion/json.py +++ b/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]: diff --git a/facefusion/logger.py b/facefusion/logger.py index 621aa45..66ecb65 100644 --- a/facefusion/logger.py +++ b/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: diff --git a/facefusion/model_helper.py b/facefusion/model_helper.py index f5bbfad..0646cda 100644 --- a/facefusion/model_helper.py +++ b/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) diff --git a/facefusion/normalizer.py b/facefusion/normalizer.py index 560dc5f..2c03dc9 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, Padding def normalize_padding(padding : Optional[List[int]]) -> Optional[Padding]: diff --git a/facefusion/process_manager.py b/facefusion/process_manager.py index 6ba526a..ce15014 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, QueuePayload PROCESS_STATE : ProcessState = 'pending' diff --git a/facefusion/processors/choices.py b/facefusion/processors/choices.py index f6e5da1..f6b5c36 100755 --- a/facefusion/processors/choices.py +++ b/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] =\ diff --git a/facefusion/processors/core.py b/facefusion/processors/core.py index af65b21..545370f 100644 --- a/facefusion/processors/core.py +++ b/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 =\ [ diff --git a/facefusion/processors/live_portrait.py b/facefusion/processors/live_portrait.py index 06ac82e..5805bc5 100644 --- a/facefusion/processors/live_portrait.py +++ b/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( [ diff --git a/facefusion/processors/modules/age_modifier.py b/facefusion/processors/modules/age_modifier.py index 783bd1c..79903bf 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_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 @@ -145,7 +145,7 @@ def modify_age(target_face : Face, temp_vision_frame : VisionFrame) -> VisionFra crop_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.py index 7f5a3e2..786a4fc 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_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 diff --git a/facefusion/processors/modules/expression_restorer.py b/facefusion/processors/modules/expression_restorer.py index 9ac4880..68a9c78 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_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 diff --git a/facefusion/processors/modules/face_debugger.py b/facefusion/processors/modules/face_debugger.py index dd0c142..c3e4f26 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_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 diff --git a/facefusion/processors/modules/face_editor.py b/facefusion/processors/modules/face_editor.py index 0759a2b..4d33cfe 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_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 diff --git a/facefusion/processors/modules/face_enhancer.py b/facefusion/processors/modules/face_enhancer.py index 48a896a..f722e7b 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_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 diff --git a/facefusion/processors/modules/face_swapper.py b/facefusion/processors/modules/face_swapper.py index 16f5932..d432bf8 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, 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 diff --git a/facefusion/processors/modules/frame_colorizer.py b/facefusion/processors/modules/frame_colorizer.py index 789cb11..9fef9c1 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_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 diff --git a/facefusion/processors/modules/frame_enhancer.py b/facefusion/processors/modules/frame_enhancer.py index 1c84db8..d360e35 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_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 diff --git a/facefusion/processors/modules/lip_syncer.py b/facefusion/processors/modules/lip_syncer.py index a92ed49..ad49771 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_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 diff --git a/facefusion/processors/pixel_boost.py b/facefusion/processors/pixel_boost.py index 8282f35..3b857d1 100644 --- a/facefusion/processors/pixel_boost.py +++ b/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: diff --git a/facefusion/processors/typing.py b/facefusion/processors/types.py similarity index 98% rename from facefusion/processors/typing.py rename to facefusion/processors/types.py index 0e0236d..9a2f963 100644 --- a/facefusion/processors/typing.py +++ b/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 diff --git a/facefusion/state_manager.py b/facefusion/state_manager.py index d0e5f1a..23ba08a 100644 --- a/facefusion/state_manager.py +++ b/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.typing import State, StateKey, StateSet +from facefusion.processors.types import ProcessorState, ProcessorStateKey +from facefusion.types import State, StateKey, StateSet STATES : Union[StateSet, ProcessorState] =\ { diff --git a/facefusion/statistics.py b/facefusion/statistics.py index 5f500a0..2e6b518 100644 --- a/facefusion/statistics.py +++ b/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]: diff --git a/facefusion/typing.py b/facefusion/types.py similarity index 100% rename from facefusion/typing.py rename to facefusion/types.py diff --git a/facefusion/uis/choices.py b/facefusion/uis/choices.py index 4d36dc4..228a67b 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, 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' ] diff --git a/facefusion/uis/components/age_modifier_options.py b/facefusion/uis/components/age_modifier_options.py index ef80b78..e42065e 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, 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 diff --git a/facefusion/uis/components/deep_swapper_options.py b/facefusion/uis/components/deep_swapper_options.py index 590d424..210193d 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, 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 diff --git a/facefusion/uis/components/download.py b/facefusion/uis/components/download.py index 8943c7b..547e2ba 100644 --- a/facefusion/uis/components/download.py +++ b/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 diff --git a/facefusion/uis/components/execution.py b/facefusion/uis/components/execution.py index 841f420..4be6eaf 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_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 diff --git a/facefusion/uis/components/expression_restorer_options.py b/facefusion/uis/components/expression_restorer_options.py index 06bc3fa..bf5eec4 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, 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 diff --git a/facefusion/uis/components/face_debugger_options.py b/facefusion/uis/components/face_debugger_options.py index 4133638..032eb24 100755 --- a/facefusion/uis/components/face_debugger_options.py +++ b/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 diff --git a/facefusion/uis/components/face_detector.py b/facefusion/uis/components/face_detector.py index 1b1c30d..756154d 100644 --- a/facefusion/uis/components/face_detector.py +++ b/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 diff --git a/facefusion/uis/components/face_editor_options.py b/facefusion/uis/components/face_editor_options.py index ef846aa..486f30d 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, 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 diff --git a/facefusion/uis/components/face_enhancer_options.py b/facefusion/uis/components/face_enhancer_options.py index 65d20af..0e02d86 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, 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 diff --git a/facefusion/uis/components/face_landmarker.py b/facefusion/uis/components/face_landmarker.py index f6a179d..7fab429 100644 --- a/facefusion/uis/components/face_landmarker.py +++ b/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 diff --git a/facefusion/uis/components/face_masker.py b/facefusion/uis/components/face_masker.py index fcb830a..6856c34 100755 --- a/facefusion/uis/components/face_masker.py +++ b/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 diff --git a/facefusion/uis/components/face_selector.py b/facefusion/uis/components/face_selector.py index 69b0e06..58f21c8 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_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 diff --git a/facefusion/uis/components/face_swapper_options.py b/facefusion/uis/components/face_swapper_options.py index 049cf16..92f08dc 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, 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 diff --git a/facefusion/uis/components/frame_colorizer_options.py b/facefusion/uis/components/frame_colorizer_options.py index 5d7ed80..1ef4a47 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, 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 diff --git a/facefusion/uis/components/frame_enhancer_options.py b/facefusion/uis/components/frame_enhancer_options.py index 99547ed..db0df53 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, 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 diff --git a/facefusion/uis/components/instant_runner.py b/facefusion/uis/components/instant_runner.py index 1d3ab13..fce29bd 100644 --- a/facefusion/uis/components/instant_runner.py +++ b/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 diff --git a/facefusion/uis/components/job_list.py b/facefusion/uis/components/job_list.py index ae80888..bb954cf 100644 --- a/facefusion/uis/components/job_list.py +++ b/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 diff --git a/facefusion/uis/components/job_list_options.py b/facefusion/uis/components/job_list_options.py index 8763626..eae763e 100644 --- a/facefusion/uis/components/job_list_options.py +++ b/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 diff --git a/facefusion/uis/components/job_manager.py b/facefusion/uis/components/job_manager.py index 727aaf9..618af95 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_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 diff --git a/facefusion/uis/components/job_runner.py b/facefusion/uis/components/job_runner.py index 90bccb2..55a53b9 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, 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 diff --git a/facefusion/uis/components/lip_syncer_options.py b/facefusion/uis/components/lip_syncer_options.py index 16b0c0f..ce2fa2f 100755 --- a/facefusion/uis/components/lip_syncer_options.py +++ b/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 diff --git a/facefusion/uis/components/memory.py b/facefusion/uis/components/memory.py index 1c46162..81c367a 100644 --- a/facefusion/uis/components/memory.py +++ b/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 diff --git a/facefusion/uis/components/output_options.py b/facefusion/uis/components/output_options.py index 62eda27..46b875d 100644 --- a/facefusion/uis/components/output_options.py +++ b/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 diff --git a/facefusion/uis/components/preview.py b/facefusion/uis/components/preview.py index 8b8cfc7..f1ad185 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_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 diff --git a/facefusion/uis/components/source.py b/facefusion/uis/components/source.py index 70e852a..54ed2f5 100644 --- a/facefusion/uis/components/source.py +++ b/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 diff --git a/facefusion/uis/components/target.py b/facefusion/uis/components/target.py index bc0cc10..79e0f38 100644 --- a/facefusion/uis/components/target.py +++ b/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 diff --git a/facefusion/uis/components/temp_frame.py b/facefusion/uis/components/temp_frame.py index cba6b40..5d6d60f 100644 --- a/facefusion/uis/components/temp_frame.py +++ b/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 diff --git a/facefusion/uis/components/terminal.py b/facefusion/uis/components/terminal.py index 9557246..d476446 100644 --- a/facefusion/uis/components/terminal.py +++ b/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 diff --git a/facefusion/uis/components/trim_frame.py b/facefusion/uis/components/trim_frame.py index d8fe6fe..4ac384c 100644 --- a/facefusion/uis/components/trim_frame.py +++ b/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 diff --git a/facefusion/uis/components/webcam.py b/facefusion/uis/components/webcam.py index 11b1e68..9f43af4 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_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 diff --git a/facefusion/uis/core.py b/facefusion/uis/core.py index b8153f4..c01b6ba 100644 --- a/facefusion/uis/core.py +++ b/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] = [] diff --git a/facefusion/uis/typing.py b/facefusion/uis/types.py similarity index 100% rename from facefusion/uis/typing.py rename to facefusion/uis/types.py diff --git a/facefusion/vision.py b/facefusion/vision.py index 5445b91..f0ec96c 100644 --- a/facefusion/vision.py +++ b/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() diff --git a/facefusion/voice_extractor.py b/facefusion/voice_extractor.py index c7c4e92..f1f4a0a 100644 --- a/facefusion/voice_extractor.py +++ b/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) diff --git a/tests/helper.py b/tests/helper.py index 7f89c2c..8902643 100644 --- a/tests/helper.py +++ b/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: diff --git a/tests/test_face_analyser.py b/tests/test_face_analyser.py index 785faf0..b15400e 100644 --- a/tests/test_face_analyser.py +++ b/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 diff --git a/tests/test_job_runner.py b/tests/test_job_runner.py index 7c14207..9236c82 100644 --- a/tests/test_job_runner.py +++ b/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