InvokeAI 5.9.1__tar.gz → 5.10.0.dev2__tar.gz

{invokeai-5.9.1 → invokeai-5.10.0.dev2}/InvokeAI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: InvokeAI
-Version: 5.9.1
+Version: 5.10.0.dev2
 Summary: An implementation of Stable Diffusion which provides various new features and options to aid the image generation process
 Author-email: The InvokeAI Project <lincoln.stein@gmail.com>
 License:                                  Apache License
@@ -204,17 +204,17 @@ Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Server
 Classifier: Topic :: Multimedia :: Graphics
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: Scientific/Engineering :: Image Processing
-Requires-Python: <3.12,>=3.10
+Requires-Python: <3.13,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: LICENSE-SD1+SD2.txt
 License-File: LICENSE-SDXL.txt
-Requires-Dist: accelerate==1.0.1
-Requires-Dist: bitsandbytes==0.45.0; sys_platform != "darwin"
+Requires-Dist: accelerate
+Requires-Dist: bitsandbytes; sys_platform != "darwin"
 Requires-Dist: clip_anytorch==2.6.0
 Requires-Dist: compel==2.0.2
 Requires-Dist: controlnet-aux==0.0.7
-Requires-Dist: diffusers[torch]==0.31.0
+Requires-Dist: diffusers[torch]
 Requires-Dist: gguf==0.10.0
 Requires-Dist: invisible-watermark==0.2.0
 Requires-Dist: mediapipe==0.10.14
@@ -222,23 +222,24 @@ Requires-Dist: numpy<2.0.0
 Requires-Dist: onnx==1.16.1
 Requires-Dist: onnxruntime==1.19.2
 Requires-Dist: opencv-python==4.9.0.80
-Requires-Dist: pytorch-lightning==2.1.3
-Requires-Dist: safetensors==0.4.3
+Requires-Dist: pytorch-lightning
+Requires-Dist: safetensors
 Requires-Dist: sentencepiece==0.2.0
 Requires-Dist: spandrel==0.3.4
-Requires-Dist: timm==0.6.13
-Requires-Dist: torch<2.5.0
+Requires-Dist: timm~=1.0.0
+Requires-Dist: torch~=2.6.0
 Requires-Dist: torchmetrics
 Requires-Dist: torchsde
 Requires-Dist: torchvision
-Requires-Dist: transformers==4.46.3
-Requires-Dist: fastapi-events==0.11.1
-Requires-Dist: fastapi==0.111.0
-Requires-Dist: huggingface-hub==0.26.1
-Requires-Dist: pydantic-settings==2.2.1
-Requires-Dist: pydantic==2.7.2
-Requires-Dist: python-socketio==5.11.1
-Requires-Dist: uvicorn[standard]==0.28.0
+Requires-Dist: timm~=1.0.0
+Requires-Dist: transformers
+Requires-Dist: fastapi-events
+Requires-Dist: fastapi
+Requires-Dist: huggingface-hub
+Requires-Dist: pydantic-settings
+Requires-Dist: pydantic
+Requires-Dist: python-socketio
+Requires-Dist: uvicorn[standard]
 Requires-Dist: albumentations
 Requires-Dist: blake3
 Requires-Dist: click
@@ -260,11 +261,8 @@ Requires-Dist: pyperclip
 Requires-Dist: pyreadline3
 Requires-Dist: python-multipart
 Requires-Dist: requests
-Requires-Dist: rich~=13.3
 Requires-Dist: scikit-image
 Requires-Dist: semver~=3.0.1
-Requires-Dist: test-tube
-Requires-Dist: windows-curses; sys_platform == "win32"
 Requires-Dist: humanize==4.12.1
 Provides-Extra: xformers
 Requires-Dist: xformers>=0.0.28.post1; sys_platform != "darwin" and extra == "xformers"

{invokeai-5.9.1 → invokeai-5.10.0.dev2}/InvokeAI.egg-info/SOURCES.txt

@@ -408,6 +408,7 @@ invokeai/backend/model_manager/__init__.py
 invokeai/backend/model_manager/config.py
 invokeai/backend/model_manager/legacy_probe.py
 invokeai/backend/model_manager/merge.py
+invokeai/backend/model_manager/model_on_disk.py
 invokeai/backend/model_manager/search.py
 invokeai/backend/model_manager/starter_models.py
 invokeai/backend/model_manager/taxonomy.py
@@ -488,6 +489,7 @@ invokeai/backend/patches/lora_conversions/flux_diffusers_lora_conversion_utils.p
 invokeai/backend/patches/lora_conversions/flux_kohya_lora_conversion_utils.py
 invokeai/backend/patches/lora_conversions/flux_lora_constants.py
 invokeai/backend/patches/lora_conversions/flux_onetrainer_lora_conversion_utils.py
+invokeai/backend/patches/lora_conversions/formats.py
 invokeai/backend/patches/lora_conversions/kohya_key_utils.py
 invokeai/backend/patches/lora_conversions/sd_lora_conversion_utils.py
 invokeai/backend/patches/lora_conversions/sdxl_lora_conversion_utils.py
@@ -573,12 +575,12 @@ invokeai/frontend/install/__init__.py
 invokeai/frontend/install/import_images.py
 invokeai/frontend/web/__init__.py
 invokeai/frontend/web/dist/index.html
-invokeai/frontend/web/dist/assets/App-BMgpnKMc.js
-invokeai/frontend/web/dist/assets/ThemeLocaleProvider-BP9YFOT0.js
-invokeai/frontend/web/dist/assets/ThemeLocaleProvider-Dej1epe9.css
+invokeai/frontend/web/dist/assets/App-BRowKuQ_.js
+invokeai/frontend/web/dist/assets/ThemeLocaleProvider-Bpzh-kaZ.js
+invokeai/frontend/web/dist/assets/ThemeLocaleProvider-DMkJ1hTD.css
 invokeai/frontend/web/dist/assets/commercial-license-bg-C_dHp7on.png
 invokeai/frontend/web/dist/assets/denoising-strength-4mznP2tj.png
-invokeai/frontend/web/dist/assets/index-C432-pld.js
+invokeai/frontend/web/dist/assets/index-DI5t0zMv.js
 invokeai/frontend/web/dist/assets/inter-cyrillic-ext-wght-normal-B2xhLi22.woff2
 invokeai/frontend/web/dist/assets/inter-cyrillic-wght-normal-CMZtQduZ.woff2
 invokeai/frontend/web/dist/assets/inter-greek-ext-wght-normal-CGAr0uHJ.woff2

{invokeai-5.9.1 → invokeai-5.10.0.dev2}/InvokeAI.egg-info/requires.txt

@@ -1,8 +1,8 @@
-accelerate==1.0.1
+accelerate
 clip_anytorch==2.6.0
 compel==2.0.2
 controlnet-aux==0.0.7
-diffusers[torch]==0.31.0
+diffusers[torch]
 gguf==0.10.0
 invisible-watermark==0.2.0
 mediapipe==0.10.14
@@ -10,23 +10,24 @@ numpy<2.0.0
 onnx==1.16.1
 onnxruntime==1.19.2
 opencv-python==4.9.0.80
-pytorch-lightning==2.1.3
-safetensors==0.4.3
+pytorch-lightning
+safetensors
 sentencepiece==0.2.0
 spandrel==0.3.4
-timm==0.6.13
-torch<2.5.0
+timm~=1.0.0
+torch~=2.6.0
 torchmetrics
 torchsde
 torchvision
-transformers==4.46.3
-fastapi-events==0.11.1
-fastapi==0.111.0
-huggingface-hub==0.26.1
-pydantic-settings==2.2.1
-pydantic==2.7.2
-python-socketio==5.11.1
-uvicorn[standard]==0.28.0
+timm~=1.0.0
+transformers
+fastapi-events
+fastapi
+huggingface-hub
+pydantic-settings
+pydantic
+python-socketio
+uvicorn[standard]
 albumentations
 blake3
 click
@@ -48,17 +49,12 @@ pyperclip
 pyreadline3
 python-multipart
 requests
-rich~=13.3
 scikit-image
 semver~=3.0.1
-test-tube
 humanize==4.12.1
 
 [:sys_platform != "darwin"]
-bitsandbytes==0.45.0
-
-[:sys_platform == "win32"]
-windows-curses
+bitsandbytes
 
 [dev]
 jurigged

{invokeai-5.9.1 → invokeai-5.10.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: InvokeAI
-Version: 5.9.1
+Version: 5.10.0.dev2
 Summary: An implementation of Stable Diffusion which provides various new features and options to aid the image generation process
 Author-email: The InvokeAI Project <lincoln.stein@gmail.com>
 License:                                  Apache License
@@ -204,17 +204,17 @@ Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Server
 Classifier: Topic :: Multimedia :: Graphics
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: Scientific/Engineering :: Image Processing
-Requires-Python: <3.12,>=3.10
+Requires-Python: <3.13,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: LICENSE-SD1+SD2.txt
 License-File: LICENSE-SDXL.txt
-Requires-Dist: accelerate==1.0.1
-Requires-Dist: bitsandbytes==0.45.0; sys_platform != "darwin"
+Requires-Dist: accelerate
+Requires-Dist: bitsandbytes; sys_platform != "darwin"
 Requires-Dist: clip_anytorch==2.6.0
 Requires-Dist: compel==2.0.2
 Requires-Dist: controlnet-aux==0.0.7
-Requires-Dist: diffusers[torch]==0.31.0
+Requires-Dist: diffusers[torch]
 Requires-Dist: gguf==0.10.0
 Requires-Dist: invisible-watermark==0.2.0
 Requires-Dist: mediapipe==0.10.14
@@ -222,23 +222,24 @@ Requires-Dist: numpy<2.0.0
 Requires-Dist: onnx==1.16.1
 Requires-Dist: onnxruntime==1.19.2
 Requires-Dist: opencv-python==4.9.0.80
-Requires-Dist: pytorch-lightning==2.1.3
-Requires-Dist: safetensors==0.4.3
+Requires-Dist: pytorch-lightning
+Requires-Dist: safetensors
 Requires-Dist: sentencepiece==0.2.0
 Requires-Dist: spandrel==0.3.4
-Requires-Dist: timm==0.6.13
-Requires-Dist: torch<2.5.0
+Requires-Dist: timm~=1.0.0
+Requires-Dist: torch~=2.6.0
 Requires-Dist: torchmetrics
 Requires-Dist: torchsde
 Requires-Dist: torchvision
-Requires-Dist: transformers==4.46.3
-Requires-Dist: fastapi-events==0.11.1
-Requires-Dist: fastapi==0.111.0
-Requires-Dist: huggingface-hub==0.26.1
-Requires-Dist: pydantic-settings==2.2.1
-Requires-Dist: pydantic==2.7.2
-Requires-Dist: python-socketio==5.11.1
-Requires-Dist: uvicorn[standard]==0.28.0
+Requires-Dist: timm~=1.0.0
+Requires-Dist: transformers
+Requires-Dist: fastapi-events
+Requires-Dist: fastapi
+Requires-Dist: huggingface-hub
+Requires-Dist: pydantic-settings
+Requires-Dist: pydantic
+Requires-Dist: python-socketio
+Requires-Dist: uvicorn[standard]
 Requires-Dist: albumentations
 Requires-Dist: blake3
 Requires-Dist: click
@@ -260,11 +261,8 @@ Requires-Dist: pyperclip
 Requires-Dist: pyreadline3
 Requires-Dist: python-multipart
 Requires-Dist: requests
-Requires-Dist: rich~=13.3
 Requires-Dist: scikit-image
 Requires-Dist: semver~=3.0.1
-Requires-Dist: test-tube
-Requires-Dist: windows-curses; sys_platform == "win32"
 Requires-Dist: humanize==4.12.1
 Provides-Extra: xformers
 Requires-Dist: xformers>=0.0.28.post1; sys_platform != "darwin" and extra == "xformers"

{invokeai-5.9.1 → invokeai-5.10.0.dev2}/invokeai/app/api/dependencies.py

@@ -37,7 +37,13 @@ from invokeai.app.services.style_preset_records.style_preset_records_sqlite impo
 from invokeai.app.services.urls.urls_default import LocalUrlService
 from invokeai.app.services.workflow_records.workflow_records_sqlite import SqliteWorkflowRecordsStorage
 from invokeai.app.services.workflow_thumbnails.workflow_thumbnails_disk import WorkflowThumbnailFileStorageDisk
-from invokeai.backend.stable_diffusion.diffusion.conditioning_data import ConditioningFieldData
+from invokeai.backend.stable_diffusion.diffusion.conditioning_data import (
+    BasicConditioningInfo,
+    ConditioningFieldData,
+    FLUXConditioningInfo,
+    SD3ConditioningInfo,
+    SDXLConditioningInfo,
+)
 from invokeai.backend.util.logging import InvokeAILogger
 from invokeai.version.invokeai_version import __version__
 
@@ -101,10 +107,25 @@ class ApiDependencies:
         images = ImageService()
         invocation_cache = MemoryInvocationCache(max_cache_size=config.node_cache_size)
         tensors = ObjectSerializerForwardCache(
-            ObjectSerializerDisk[torch.Tensor](output_folder / "tensors", ephemeral=True)
+            ObjectSerializerDisk[torch.Tensor](
+                output_folder / "tensors",
+                safe_globals=[torch.Tensor],
+                ephemeral=True,
+            ),
+            max_cache_size=0,
         )
         conditioning = ObjectSerializerForwardCache(
-            ObjectSerializerDisk[ConditioningFieldData](output_folder / "conditioning", ephemeral=True)
+            ObjectSerializerDisk[ConditioningFieldData](
+                output_folder / "conditioning",
+                safe_globals=[
+                    ConditioningFieldData,
+                    BasicConditioningInfo,
+                    SDXLConditioningInfo,
+                    FLUXConditioningInfo,
+                    SD3ConditioningInfo,
+                ],
+                ephemeral=True,
+            ),
         )
         download_queue_service = DownloadQueueService(app_config=configuration, event_bus=events)
         model_images_service = ModelImageFileStorageDisk(model_images_folder / "model_images")

{invokeai-5.9.1 → invokeai-5.10.0.dev2}/invokeai/app/invocations/baseinvocation.py

@@ -8,6 +8,7 @@ import sys
 import warnings
 from abc import ABC, abstractmethod
 from enum import Enum
+from functools import lru_cache
 from inspect import signature
 from typing import (
     TYPE_CHECKING,
@@ -27,7 +28,6 @@ import semver
 from pydantic import BaseModel, ConfigDict, Field, TypeAdapter, create_model
 from pydantic.fields import FieldInfo
 from pydantic_core import PydanticUndefined
-from typing_extensions import TypeAliasType
 
 from invokeai.app.invocations.fields import (
     FieldKind,
@@ -100,37 +100,6 @@ class BaseInvocationOutput(BaseModel):
     All invocation outputs must use the `@invocation_output` decorator to provide their unique type.
     """
 
-    _output_classes: ClassVar[set[BaseInvocationOutput]] = set()
-    _typeadapter: ClassVar[Optional[TypeAdapter[Any]]] = None
-    _typeadapter_needs_update: ClassVar[bool] = False
-
-    @classmethod
-    def register_output(cls, output: BaseInvocationOutput) -> None:
-        """Registers an invocation output."""
-        cls._output_classes.add(output)
-        cls._typeadapter_needs_update = True
-
-    @classmethod
-    def get_outputs(cls) -> Iterable[BaseInvocationOutput]:
-        """Gets all invocation outputs."""
-        return cls._output_classes
-
-    @classmethod
-    def get_typeadapter(cls) -> TypeAdapter[Any]:
-        """Gets a pydantc TypeAdapter for the union of all invocation output types."""
-        if not cls._typeadapter or cls._typeadapter_needs_update:
-            AnyInvocationOutput = TypeAliasType(
-                "AnyInvocationOutput", Annotated[Union[tuple(cls._output_classes)], Field(discriminator="type")]
-            )
-            cls._typeadapter = TypeAdapter(AnyInvocationOutput)
-            cls._typeadapter_needs_update = False
-        return cls._typeadapter
-
-    @classmethod
-    def get_output_types(cls) -> Iterable[str]:
-        """Gets all invocation output types."""
-        return (i.get_type() for i in BaseInvocationOutput.get_outputs())
-
     @staticmethod
     def json_schema_extra(schema: dict[str, Any], model_class: Type[BaseInvocationOutput]) -> None:
         """Adds various UI-facing attributes to the invocation output's OpenAPI schema."""
@@ -173,76 +142,16 @@ class BaseInvocation(ABC, BaseModel):
     All invocations must use the `@invocation` decorator to provide their unique type.
     """
 
-    _invocation_classes: ClassVar[set[BaseInvocation]] = set()
-    _typeadapter: ClassVar[Optional[TypeAdapter[Any]]] = None
-    _typeadapter_needs_update: ClassVar[bool] = False
-
     @classmethod
     def get_type(cls) -> str:
         """Gets the invocation's type, as provided by the `@invocation` decorator."""
         return cls.model_fields["type"].default
 
-    @classmethod
-    def register_invocation(cls, invocation: BaseInvocation) -> None:
-        """Registers an invocation."""
-        cls._invocation_classes.add(invocation)
-        cls._typeadapter_needs_update = True
-
-    @classmethod
-    def get_typeadapter(cls) -> TypeAdapter[Any]:
-        """Gets a pydantc TypeAdapter for the union of all invocation types."""
-        if not cls._typeadapter or cls._typeadapter_needs_update:
-            AnyInvocation = TypeAliasType(
-                "AnyInvocation", Annotated[Union[tuple(cls.get_invocations())], Field(discriminator="type")]
-            )
-            cls._typeadapter = TypeAdapter(AnyInvocation)
-            cls._typeadapter_needs_update = False
-        return cls._typeadapter
-
-    @classmethod
-    def invalidate_typeadapter(cls) -> None:
-        """Invalidates the typeadapter, forcing it to be rebuilt on next access. If the invocation allowlist or
-        denylist is changed, this should be called to ensure the typeadapter is updated and validation respects
-        the updated allowlist and denylist."""
-        cls._typeadapter_needs_update = True
-
-    @classmethod
-    def get_invocations(cls) -> Iterable[BaseInvocation]:
-        """Gets all invocations, respecting the allowlist and denylist."""
-        app_config = get_config()
-        allowed_invocations: set[BaseInvocation] = set()
-        for sc in cls._invocation_classes:
-            invocation_type = sc.get_type()
-            is_in_allowlist = (
-                invocation_type in app_config.allow_nodes if isinstance(app_config.allow_nodes, list) else True
-            )
-            is_in_denylist = (
-                invocation_type in app_config.deny_nodes if isinstance(app_config.deny_nodes, list) else False
-            )
-            if is_in_allowlist and not is_in_denylist:
-                allowed_invocations.add(sc)
-        return allowed_invocations
-
-    @classmethod
-    def get_invocations_map(cls) -> dict[str, BaseInvocation]:
-        """Gets a map of all invocation types to their invocation classes."""
-        return {i.get_type(): i for i in BaseInvocation.get_invocations()}
-
-    @classmethod
-    def get_invocation_types(cls) -> Iterable[str]:
-        """Gets all invocation types."""
-        return (i.get_type() for i in BaseInvocation.get_invocations())
-
     @classmethod
     def get_output_annotation(cls) -> BaseInvocationOutput:
         """Gets the invocation's output annotation (i.e. the return annotation of its `invoke()` method)."""
         return signature(cls.invoke).return_annotation
 
-    @classmethod
-    def get_invocation_for_type(cls, invocation_type: str) -> BaseInvocation | None:
-        """Gets the invocation class for a given invocation type."""
-        return cls.get_invocations_map().get(invocation_type)
-
     @staticmethod
     def json_schema_extra(schema: dict[str, Any], model_class: Type[BaseInvocation]) -> None:
         """Adds various UI-facing attributes to the invocation's OpenAPI schema."""
@@ -340,6 +249,105 @@ class BaseInvocation(ABC, BaseModel):
 TBaseInvocation = TypeVar("TBaseInvocation", bound=BaseInvocation)
 
 
+class InvocationRegistry:
+    _invocation_classes: ClassVar[set[type[BaseInvocation]]] = set()
+    _output_classes: ClassVar[set[type[BaseInvocationOutput]]] = set()
+
+    @classmethod
+    def register_invocation(cls, invocation: type[BaseInvocation]) -> None:
+        """Registers an invocation."""
+        cls._invocation_classes.add(invocation)
+        cls.invalidate_invocation_typeadapter()
+
+    @classmethod
+    @lru_cache(maxsize=1)
+    def get_invocation_typeadapter(cls) -> TypeAdapter[Any]:
+        """Gets a pydantic TypeAdapter for the union of all invocation types.
+
+        This is used to parse serialized invocations into the correct invocation class.
+
+        This method is cached to avoid rebuilding the TypeAdapter on every access. If the invocation allowlist or
+        denylist is changed, the cache should be cleared to ensure the TypeAdapter is updated and validation respects
+        the updated allowlist and denylist.
+
+        @see https://docs.pydantic.dev/latest/concepts/type_adapter/
+        """
+        return TypeAdapter(Annotated[Union[tuple(cls.get_invocation_classes())], Field(discriminator="type")])
+
+    @classmethod
+    def invalidate_invocation_typeadapter(cls) -> None:
+        """Invalidates the cached invocation type adapter."""
+        cls.get_invocation_typeadapter.cache_clear()
+
+    @classmethod
+    def get_invocation_classes(cls) -> Iterable[type[BaseInvocation]]:
+        """Gets all invocations, respecting the allowlist and denylist."""
+        app_config = get_config()
+        allowed_invocations: set[type[BaseInvocation]] = set()
+        for sc in cls._invocation_classes:
+            invocation_type = sc.get_type()
+            is_in_allowlist = (
+                invocation_type in app_config.allow_nodes if isinstance(app_config.allow_nodes, list) else True
+            )
+            is_in_denylist = (
+                invocation_type in app_config.deny_nodes if isinstance(app_config.deny_nodes, list) else False
+            )
+            if is_in_allowlist and not is_in_denylist:
+                allowed_invocations.add(sc)
+        return allowed_invocations
+
+    @classmethod
+    def get_invocations_map(cls) -> dict[str, type[BaseInvocation]]:
+        """Gets a map of all invocation types to their invocation classes."""
+        return {i.get_type(): i for i in cls.get_invocation_classes()}
+
+    @classmethod
+    def get_invocation_types(cls) -> Iterable[str]:
+        """Gets all invocation types."""
+        return (i.get_type() for i in cls.get_invocation_classes())
+
+    @classmethod
+    def get_invocation_for_type(cls, invocation_type: str) -> type[BaseInvocation] | None:
+        """Gets the invocation class for a given invocation type."""
+        return cls.get_invocations_map().get(invocation_type)
+
+    @classmethod
+    def register_output(cls, output: "type[TBaseInvocationOutput]") -> None:
+        """Registers an invocation output."""
+        cls._output_classes.add(output)
+        cls.invalidate_output_typeadapter()
+
+    @classmethod
+    def get_output_classes(cls) -> Iterable[type[BaseInvocationOutput]]:
+        """Gets all invocation outputs."""
+        return cls._output_classes
+
+    @classmethod
+    @lru_cache(maxsize=1)
+    def get_output_typeadapter(cls) -> TypeAdapter[Any]:
+        """Gets a pydantic TypeAdapter for the union of all invocation output types.
+
+        This is used to parse serialized invocation outputs into the correct invocation output class.
+
+        This method is cached to avoid rebuilding the TypeAdapter on every access. If the invocation allowlist or
+        denylist is changed, the cache should be cleared to ensure the TypeAdapter is updated and validation respects
+        the updated allowlist and denylist.
+
+        @see https://docs.pydantic.dev/latest/concepts/type_adapter/
+        """
+        return TypeAdapter(Annotated[Union[tuple(cls._output_classes)], Field(discriminator="type")])
+
+    @classmethod
+    def invalidate_output_typeadapter(cls) -> None:
+        """Invalidates the cached invocation output type adapter."""
+        cls.get_output_typeadapter.cache_clear()
+
+    @classmethod
+    def get_output_types(cls) -> Iterable[str]:
+        """Gets all invocation output types."""
+        return (i.get_type() for i in cls.get_output_classes())
+
+
 RESERVED_NODE_ATTRIBUTE_FIELD_NAMES = {
     "id",
     "is_intermediate",
@@ -453,8 +461,8 @@ def invocation(
         node_pack = cls.__module__.split(".")[0]
 
         # Handle the case where an existing node is being clobbered by the one we are registering
-        if invocation_type in BaseInvocation.get_invocation_types():
-            clobbered_invocation = BaseInvocation.get_invocation_for_type(invocation_type)
+        if invocation_type in InvocationRegistry.get_invocation_types():
+            clobbered_invocation = InvocationRegistry.get_invocation_for_type(invocation_type)
             # This should always be true - we just checked if the invocation type was in the set
             assert clobbered_invocation is not None
 
@@ -539,8 +547,7 @@ def invocation(
         )
         cls.__doc__ = docstring
 
-        # TODO: how to type this correctly? it's typed as ModelMetaclass, a private class in pydantic
-        BaseInvocation.register_invocation(cls)  # type: ignore
+        InvocationRegistry.register_invocation(cls)
 
         return cls
 
@@ -565,7 +572,7 @@ def invocation_output(
         if re.compile(r"^\S+$").match(output_type) is None:
             raise ValueError(f'"output_type" must consist of non-whitespace characters, got "{output_type}"')
 
-        if output_type in BaseInvocationOutput.get_output_types():
+        if output_type in InvocationRegistry.get_output_types():
             raise ValueError(f'Invocation type "{output_type}" already exists')
 
         validate_fields(cls.model_fields, output_type)
@@ -586,7 +593,7 @@ def invocation_output(
         )
         cls.__doc__ = docstring
 
-        BaseInvocationOutput.register_output(cls)  # type: ignore # TODO: how to type this correctly?
+        InvocationRegistry.register_output(cls)
 
         return cls
 

{invokeai-5.9.1 → invokeai-5.10.0.dev2}/invokeai/app/services/object_serializer/object_serializer_disk.py

@@ -21,10 +21,16 @@ class ObjectSerializerDisk(ObjectSerializerBase[T]):
     """Disk-backed storage for arbitrary python objects. Serialization is handled by `torch.save` and `torch.load`.
 
     :param output_dir: The folder where the serialized objects will be stored
+    :param safe_globals: A list of types to be added to the safe globals for torch serialization
     :param ephemeral: If True, objects will be stored in a temporary directory inside the given output_dir and cleaned up on exit
     """
 
-    def __init__(self, output_dir: Path, ephemeral: bool = False):
+    def __init__(
+        self,
+        output_dir: Path,
+        safe_globals: list[type],
+        ephemeral: bool = False,
+    ) -> None:
         super().__init__()
         self._ephemeral = ephemeral
         self._base_output_dir = output_dir
@@ -42,6 +48,8 @@ class ObjectSerializerDisk(ObjectSerializerBase[T]):
         self._output_dir = Path(self._tempdir.name) if self._tempdir else self._base_output_dir
         self.__obj_class_name: Optional[str] = None
 
+        torch.serialization.add_safe_globals(safe_globals) if safe_globals else None
+
     def load(self, name: str) -> T:
         file_path = self._get_path(name)
         try:

{invokeai-5.9.1 → invokeai-5.10.0.dev2}/invokeai/app/services/shared/graph.py

@@ -21,6 +21,7 @@ from invokeai.app.invocations import *  # noqa: F401 F403
 from invokeai.app.invocations.baseinvocation import (
     BaseInvocation,
     BaseInvocationOutput,
+    InvocationRegistry,
     invocation,
     invocation_output,
 )
@@ -283,7 +284,7 @@ class AnyInvocation(BaseInvocation):
     @classmethod
     def __get_pydantic_core_schema__(cls, source_type: Any, handler: GetCoreSchemaHandler) -> core_schema.CoreSchema:
         def validate_invocation(v: Any) -> "AnyInvocation":
-            return BaseInvocation.get_typeadapter().validate_python(v)
+            return InvocationRegistry.get_invocation_typeadapter().validate_python(v)
 
         return core_schema.no_info_plain_validator_function(validate_invocation)
 
@@ -294,7 +295,7 @@ class AnyInvocation(BaseInvocation):
         # Nodes are too powerful, we have to make our own OpenAPI schema manually
         # No but really, because the schema is dynamic depending on loaded nodes, we need to generate it manually
         oneOf: list[dict[str, str]] = []
-        names = [i.__name__ for i in BaseInvocation.get_invocations()]
+        names = [i.__name__ for i in InvocationRegistry.get_invocation_classes()]
         for name in sorted(names):
             oneOf.append({"$ref": f"#/components/schemas/{name}"})
         return {"oneOf": oneOf}
@@ -304,7 +305,7 @@ class AnyInvocationOutput(BaseInvocationOutput):
     @classmethod
     def __get_pydantic_core_schema__(cls, source_type: Any, handler: GetCoreSchemaHandler):
         def validate_invocation_output(v: Any) -> "AnyInvocationOutput":
-            return BaseInvocationOutput.get_typeadapter().validate_python(v)
+            return InvocationRegistry.get_output_typeadapter().validate_python(v)
 
         return core_schema.no_info_plain_validator_function(validate_invocation_output)
 
@@ -316,7 +317,7 @@ class AnyInvocationOutput(BaseInvocationOutput):
         # No but really, because the schema is dynamic depending on loaded nodes, we need to generate it manually
 
         oneOf: list[dict[str, str]] = []
-        names = [i.__name__ for i in BaseInvocationOutput.get_outputs()]
+        names = [i.__name__ for i in InvocationRegistry.get_output_classes()]
         for name in sorted(names):
             oneOf.append({"$ref": f"#/components/schemas/{name}"})
         return {"oneOf": oneOf}

{invokeai-5.9.1 → invokeai-5.10.0.dev2}/invokeai/app/util/custom_openapi.py

@@ -4,7 +4,10 @@ from fastapi import FastAPI
 from fastapi.openapi.utils import get_openapi
 from pydantic.json_schema import models_json_schema
 
-from invokeai.app.invocations.baseinvocation import BaseInvocation, BaseInvocationOutput, UIConfigBase
+from invokeai.app.invocations.baseinvocation import (
+    InvocationRegistry,
+    UIConfigBase,
+)
 from invokeai.app.invocations.fields import InputFieldJSONSchemaExtra, OutputFieldJSONSchemaExtra
 from invokeai.app.invocations.model import ModelIdentifierField
 from invokeai.app.services.events.events_common import EventBase
@@ -56,14 +59,14 @@ def get_openapi_func(
         invocation_output_map_required: list[str] = []
 
         # We need to manually add all outputs to the schema - pydantic doesn't add them because they aren't used directly.
-        for output in BaseInvocationOutput.get_outputs():
+        for output in InvocationRegistry.get_output_classes():
             json_schema = output.model_json_schema(mode="serialization", ref_template="#/components/schemas/{model}")
             move_defs_to_top_level(openapi_schema, json_schema)
             openapi_schema["components"]["schemas"][output.__name__] = json_schema
 
         # Technically, invocations are added to the schema by pydantic, but we still need to manually set their output
         # property, so we'll just do it all manually.
-        for invocation in BaseInvocation.get_invocations():
+        for invocation in InvocationRegistry.get_invocation_classes():
             json_schema = invocation.model_json_schema(
                 mode="serialization", ref_template="#/components/schemas/{model}"
             )