The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
comfy_api: remove usage of "Type","List" and "Dict" types (#11238)
Alexander Piskun43e0d4e3ccfe
diff --git a/comfy_api/feature_flags.py b/comfy_api/feature_flags.pyindex bfb77eb5f..de167f037 100644--- a/comfy_api/feature_flags.py+++ b/comfy_api/feature_flags.py@@ -5,12 +5,12 @@ This module handles capability negotiation between frontend and backend,allowing graceful protocol evolution while maintaining backward compatibility."""-from typing import Any, Dict+from typing import Anyfrom comfy.cli_args import args# Default server capabilities-SERVER_FEATURE_FLAGS: Dict[str, Any] = {+SERVER_FEATURE_FLAGS: dict[str, Any] = {"supports_preview_metadata": True,"max_upload_size": args.max_upload_size * 1024 * 1024, # Convert MB to bytes"extension": {"manager": {"supports_v4": True}},@@ -18,7 +18,7 @@ SERVER_FEATURE_FLAGS: Dict[str, Any] = {def get_connection_feature(- sockets_metadata: Dict[str, Dict[str, Any]],+ sockets_metadata: dict[str, dict[str, Any]],sid: str,feature_name: str,default: Any = False@@ -42,7 +42,7 @@ def get_connection_feature(def supports_feature(- sockets_metadata: Dict[str, Dict[str, Any]],+ sockets_metadata: dict[str, dict[str, Any]],sid: str,feature_name: str) -> bool:@@ -60,7 +60,7 @@ def supports_feature(return get_connection_feature(sockets_metadata, sid, feature_name, False) is True-def get_server_features() -> Dict[str, Any]:+def get_server_features() -> dict[str, Any]:"""Get the server's feature flags.diff --git a/comfy_api/internal/api_registry.py b/comfy_api/internal/api_registry.pyindex 7e3375cf6..2b1cb016a 100644--- a/comfy_api/internal/api_registry.py+++ b/comfy_api/internal/api_registry.py@@ -1,4 +1,4 @@-from typing import Type, List, NamedTuple+from typing import NamedTuplefrom comfy_api.internal.singleton import ProxiedSingletonfrom packaging import version as packaging_version@@ -10,7 +10,7 @@ class ComfyAPIBase(ProxiedSingleton):class ComfyAPIWithVersion(NamedTuple):version: str- api_class: Type[ComfyAPIBase]+ api_class: type[ComfyAPIBase]def parse_version(version_str: str) -> packaging_version.Version:@@ -23,16 +23,16 @@ def parse_version(version_str: str) -> packaging_version.Version:return packaging_version.parse(version_str)-registered_versions: List[ComfyAPIWithVersion] = []+registered_versions: list[ComfyAPIWithVersion] = []-def register_versions(versions: List[ComfyAPIWithVersion]):+def register_versions(versions: list[ComfyAPIWithVersion]):versions.sort(key=lambda x: parse_version(x.version))global registered_versionsregistered_versions = versions-def get_all_versions() -> List[ComfyAPIWithVersion]:+def get_all_versions() -> list[ComfyAPIWithVersion]:"""Returns a list of all registered ComfyAPI versions."""diff --git a/comfy_api/internal/async_to_sync.py b/comfy_api/internal/async_to_sync.pyindex 257ade82e..c9b0576e1 100644--- a/comfy_api/internal/async_to_sync.py+++ b/comfy_api/internal/async_to_sync.py@@ -8,7 +8,7 @@ import osimport textwrapimport threadingfrom enum import Enum-from typing import Optional, Type, get_origin, get_args, get_type_hints+from typing import Optional, get_origin, get_args, get_type_hintsclass TypeTracker:@@ -193,7 +193,7 @@ class AsyncToSyncConverter:return result_container["result"]@classmethod- def create_sync_class(cls, async_class: Type, thread_pool_size=10) -> Type:+ def create_sync_class(cls, async_class: type, thread_pool_size=10) -> type:"""Creates a new class with synchronous versions of all async methods.@@ -563,7 +563,7 @@ class AsyncToSyncConverter:@classmethoddef _generate_imports(- cls, async_class: Type, type_tracker: TypeTracker+ cls, async_class: type, type_tracker: TypeTracker) -> list[str]:"""Generate import statements for the stub file."""imports = []@@ -628,7 +628,7 @@ class AsyncToSyncConverter:return imports@classmethod- def _get_class_attributes(cls, async_class: Type) -> list[tuple[str, Type]]:+ def _get_class_attributes(cls, async_class: type) -> list[tuple[str, type]]:"""Extract class attributes that are classes themselves."""class_attributes = []@@ -654,7 +654,7 @@ class AsyncToSyncConverter:def _generate_inner_class_stub(cls,name: str,- attr: Type,+ attr: type,indent: str = " ",type_tracker: Optional[TypeTracker] = None,) -> list[str]:@@ -782,7 +782,7 @@ class AsyncToSyncConverter:return processed@classmethod- def generate_stub_file(cls, async_class: Type, sync_class: Type) -> None:+ def generate_stub_file(cls, async_class: type, sync_class: type) -> None:"""Generate a .pyi stub file for the sync class to help IDEs with type checking."""@@ -988,7 +988,7 @@ class AsyncToSyncConverter:logging.error(traceback.format_exc())-def create_sync_class(async_class: Type, thread_pool_size=10) -> Type:+def create_sync_class(async_class: type, thread_pool_size=10) -> type:"""Creates a sync version of an async classdiff --git a/comfy_api/internal/singleton.py b/comfy_api/internal/singleton.pyindex 75f16f98e..d89380262 100644--- a/comfy_api/internal/singleton.py+++ b/comfy_api/internal/singleton.py@@ -1,4 +1,4 @@-from typing import Type, TypeVar+from typing import TypeVarclass SingletonMetaclass(type):T = TypeVar("T", bound="SingletonMetaclass")@@ -11,13 +11,13 @@ class SingletonMetaclass(type):)return cls._instances[cls]- def inject_instance(cls: Type[T], instance: T) -> None:+ def inject_instance(cls: type[T], instance: T) -> None:assert cls not in SingletonMetaclass._instances, ("Cannot inject instance after first instantiation")SingletonMetaclass._instances[cls] = instance- def get_instance(cls: Type[T], *args, **kwargs) -> T:+ def get_instance(cls: type[T], *args, **kwargs) -> T:"""Gets the singleton instance of the class, creating it if it doesn't exist."""diff --git a/comfy_api/latest/__init__.py b/comfy_api/latest/__init__.pyindex 35e1ac853..fab63c7df 100644--- a/comfy_api/latest/__init__.py+++ b/comfy_api/latest/__init__.py@@ -1,7 +1,7 @@from __future__ import annotationsfrom abc import ABC, abstractmethod-from typing import Type, TYPE_CHECKING+from typing import TYPE_CHECKINGfrom comfy_api.internal import ComfyAPIBasefrom comfy_api.internal.singleton import ProxiedSingletonfrom comfy_api.internal.async_to_sync import create_sync_class@@ -113,7 +113,7 @@ ComfyAPI = ComfyAPI_latestif TYPE_CHECKING:import comfy_api.latest.generated.ComfyAPISyncStub # type: ignore- ComfyAPISync: Type[comfy_api.latest.generated.ComfyAPISyncStub.ComfyAPISyncStub]+ ComfyAPISync: type[comfy_api.latest.generated.ComfyAPISyncStub.ComfyAPISyncStub]ComfyAPISync = create_sync_class(ComfyAPI_latest)# create new aliases for io and uidiff --git a/comfy_api/latest/_input/basic_types.py b/comfy_api/latest/_input/basic_types.pyindex 245c6cbb1..d73deabd2 100644--- a/comfy_api/latest/_input/basic_types.py+++ b/comfy_api/latest/_input/basic_types.py@@ -1,5 +1,5 @@import torch-from typing import TypedDict, List, Optional+from typing import TypedDict, OptionalImageInput = torch.Tensor"""@@ -39,4 +39,4 @@ class LatentInput(TypedDict):Optional noise mask tensor in the same format as samples."""- batch_index: Optional[List[int]]+ batch_index: Optional[list[int]]diff --git a/comfy_api/latest/_ui.py b/comfy_api/latest/_ui.pyindex 2babe209a..e238cdf3c 100644--- a/comfy_api/latest/_ui.py+++ b/comfy_api/latest/_ui.py@@ -5,7 +5,6 @@ import osimport randomimport uuidfrom io import BytesIO-from typing import Typeimport avimport numpy as np@@ -83,7 +82,7 @@ class ImageSaveHelper:return PILImage.fromarray(np.clip(255.0 * image_tensor.cpu().numpy(), 0, 255).astype(np.uint8))@staticmethod- def _create_png_metadata(cls: Type[ComfyNode] | None) -> PngInfo | None:+ def _create_png_metadata(cls: type[ComfyNode] | None) -> PngInfo | None:"""Creates a PngInfo object with prompt and extra_pnginfo."""if args.disable_metadata or cls is None or not cls.hidden:return None@@ -96,7 +95,7 @@ class ImageSaveHelper:return metadata@staticmethod- def _create_animated_png_metadata(cls: Type[ComfyNode] | None) -> PngInfo | None:+ def _create_animated_png_metadata(cls: type[ComfyNode] | None) -> PngInfo | None:"""Creates a PngInfo object with prompt and extra_pnginfo for animated PNGs (APNG)."""if args.disable_metadata or cls is None or not cls.hidden:return None@@ -121,7 +120,7 @@ class ImageSaveHelper:return metadata@staticmethod- def _create_webp_metadata(pil_image: PILImage.Image, cls: Type[ComfyNode] | None) -> PILImage.Exif:+ def _create_webp_metadata(pil_image: PILImage.Image, cls: type[ComfyNode] | None) -> PILImage.Exif:"""Creates EXIF metadata bytes for WebP images."""exif_data = pil_image.getexif()if args.disable_metadata or cls is None or cls.hidden is None:@@ -137,7 +136,7 @@ class ImageSaveHelper:@staticmethoddef save_images(- images, filename_prefix: str, folder_type: FolderType, cls: Type[ComfyNode] | None, compress_level = 4,+ images, filename_prefix: str, folder_type: FolderType, cls: type[ComfyNode] | None, compress_level = 4,) -> list[SavedResult]:"""Saves a batch of images as individual PNG files."""full_output_folder, filename, counter, subfolder, _ = folder_paths.get_save_image_path(@@ -155,7 +154,7 @@ class ImageSaveHelper:return results@staticmethod- def get_save_images_ui(images, filename_prefix: str, cls: Type[ComfyNode] | None, compress_level=4) -> SavedImages:+ def get_save_images_ui(images, filename_prefix: str, cls: type[ComfyNode] | None, compress_level=4) -> SavedImages:"""Saves a batch of images and returns a UI object for the node output."""return SavedImages(ImageSaveHelper.save_images(@@ -169,7 +168,7 @@ class ImageSaveHelper:@staticmethoddef save_animated_png(- images, filename_prefix: str, folder_type: FolderType, cls: Type[ComfyNode] | None, fps: float, compress_level: int+ images, filename_prefix: str, folder_type: FolderType, cls: type[ComfyNode] | None, fps: float, compress_level: int) -> SavedResult:"""Saves a batch of images as a single animated PNG."""full_output_folder, filename, counter, subfolder, _ = folder_paths.get_save_image_path(@@ -191,7 +190,7 @@ class ImageSaveHelper:@staticmethoddef get_save_animated_png_ui(- images, filename_prefix: str, cls: Type[ComfyNode] | None, fps: float, compress_level: int+ images, filename_prefix: str, cls: type[ComfyNode] | None, fps: float, compress_level: int) -> SavedImages:"""Saves an animated PNG and returns a UI object for the node output."""result = ImageSaveHelper.save_animated_png(@@ -209,7 +208,7 @@ class ImageSaveHelper:images,filename_prefix: str,folder_type: FolderType,- cls: Type[ComfyNode] | None,+ cls: type[ComfyNode] | None,fps: float,lossless: bool,quality: int,@@ -238,7 +237,7 @@ class ImageSaveHelper:def get_save_animated_webp_ui(images,filename_prefix: str,- cls: Type[ComfyNode] | None,+ cls: type[ComfyNode] | None,fps: float,lossless: bool,quality: int,@@ -267,7 +266,7 @@ class AudioSaveHelper:audio: dict,filename_prefix: str,folder_type: FolderType,- cls: Type[ComfyNode] | None,+ cls: type[ComfyNode] | None,format: str = "flac",quality: str = "128k",) -> list[SavedResult]:@@ -372,7 +371,7 @@ class AudioSaveHelper:@staticmethoddef get_save_audio_ui(- audio, filename_prefix: str, cls: Type[ComfyNode] | None, format: str = "flac", quality: str = "128k",+ audio, filename_prefix: str, cls: type[ComfyNode] | None, format: str = "flac", quality: str = "128k",) -> SavedAudios:"""Save and instantly wrap for UI."""return SavedAudios(@@ -388,7 +387,7 @@ class AudioSaveHelper:class PreviewImage(_UIOutput):- def __init__(self, image: Image.Type, animated: bool = False, cls: Type[ComfyNode] = None, **kwargs):+ def __init__(self, image: Image.Type, animated: bool = False, cls: type[ComfyNode] = None, **kwargs):self.values = ImageSaveHelper.save_images(image,filename_prefix="ComfyUI_temp_" + ''.join(random.choice("abcdefghijklmnopqrstupvxyz") for _ in range(5)),@@ -412,7 +411,7 @@ class PreviewMask(PreviewImage):class PreviewAudio(_UIOutput):- def __init__(self, audio: dict, cls: Type[ComfyNode] = None, **kwargs):+ def __init__(self, audio: dict, cls: type[ComfyNode] = None, **kwargs):self.values = AudioSaveHelper.save_audio(audio,filename_prefix="ComfyUI_temp_" + "".join(random.choice("abcdefghijklmnopqrstuvwxyz") for _ in range(5)),diff --git a/comfy_api/version_list.py b/comfy_api/version_list.pyindex 7cb1871d5..be6e1db66 100644--- a/comfy_api/version_list.py+++ b/comfy_api/version_list.py@@ -2,9 +2,8 @@ from comfy_api.latest import ComfyAPI_latestfrom comfy_api.v0_0_2 import ComfyAPIAdapter_v0_0_2from comfy_api.v0_0_1 import ComfyAPIAdapter_v0_0_1from comfy_api.internal import ComfyAPIBase-from typing import List, Type-supported_versions: List[Type[ComfyAPIBase]] = [+supported_versions: list[type[ComfyAPIBase]] = [ComfyAPI_latest,ComfyAPIAdapter_v0_0_2,ComfyAPIAdapter_v0_0_1,