InvokeAI 5.4.1rc2__tar.gz → 5.4.2__tar.gz

{invokeai-5.4.1rc2 → invokeai-5.4.2}/InvokeAI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: InvokeAI
-Version: 5.4.1rc2
+Version: 5.4.2
 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
@@ -246,7 +246,6 @@ Requires-Dist: datasets
 Requires-Dist: Deprecated
 Requires-Dist: dnspython
 Requires-Dist: dynamicprompts
-Requires-Dist: easing-functions
 Requires-Dist: einops
 Requires-Dist: facexlib
 Requires-Dist: matplotlib!=3.9.1

{invokeai-5.4.1rc2 → invokeai-5.4.2}/InvokeAI.egg-info/SOURCES.txt

@@ -33,6 +33,7 @@ invokeai/app/invocations/canny.py
 invokeai/app/invocations/collections.py
 invokeai/app/invocations/color_map.py
 invokeai/app/invocations/compel.py
+invokeai/app/invocations/composition-nodes.py
 invokeai/app/invocations/constants.py
 invokeai/app/invocations/content_shuffle.py
 invokeai/app/invocations/controlnet_image_processors.py
@@ -78,6 +79,7 @@ invokeai/app/invocations/prompt.py
 invokeai/app/invocations/resize_latents.py
 invokeai/app/invocations/scheduler.py
 invokeai/app/invocations/sd3_denoise.py
+invokeai/app/invocations/sd3_image_to_latents.py
 invokeai/app/invocations/sd3_latents_to_image.py
 invokeai/app/invocations/sd3_model_loader.py
 invokeai/app/invocations/sd3_text_encoder.py
@@ -300,6 +302,7 @@ invokeai/backend/flux/modules/conditioner.py
 invokeai/backend/flux/modules/layers.py
 invokeai/backend/image_util/__init__.py
 invokeai/backend/image_util/canny.py
+invokeai/backend/image_util/composition.py
 invokeai/backend/image_util/content_shuffle.py
 invokeai/backend/image_util/hed.py
 invokeai/backend/image_util/invisible_watermark.py
@@ -308,6 +311,7 @@ invokeai/backend/image_util/lineart_anime.py
 invokeai/backend/image_util/pngwriter.py
 invokeai/backend/image_util/safety_checker.py
 invokeai/backend/image_util/util.py
+invokeai/backend/image_util/assets/CIELab_to_UPLab.icc
 invokeai/backend/image_util/basicsr/__init__.py
 invokeai/backend/image_util/basicsr/arch_util.py
 invokeai/backend/image_util/basicsr/rrdbnet_arch.py
@@ -451,6 +455,9 @@ invokeai/backend/quantization/gguf/utils.py
 invokeai/backend/quantization/scripts/load_flux_model_bnb_llm_int8.py
 invokeai/backend/quantization/scripts/load_flux_model_bnb_nf4.py
 invokeai/backend/quantization/scripts/quantize_t5_xxl_bnb_llm_int8.py
+invokeai/backend/sd3/__init__.py
+invokeai/backend/sd3/extensions/__init__.py
+invokeai/backend/sd3/extensions/inpaint_extension.py
 invokeai/backend/stable_diffusion/__init__.py
 invokeai/backend/stable_diffusion/denoise_context.py
 invokeai/backend/stable_diffusion/diffusers_pipeline.py
@@ -519,13 +526,13 @@ 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-BDKmFSWG.js
+invokeai/frontend/web/dist/assets/App-CObZXgPX.js
 invokeai/frontend/web/dist/assets/App-DEu4J2pT.css
 invokeai/frontend/web/dist/assets/ThemeLocaleProvider-B2NxUfIp.css
-invokeai/frontend/web/dist/assets/ThemeLocaleProvider-CgCSlc3U.js
+invokeai/frontend/web/dist/assets/ThemeLocaleProvider-DOBIgoHN.js
 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-CIaYgE43.js
+invokeai/frontend/web/dist/assets/index-DbW4l0Z-.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
@@ -533,7 +540,7 @@ invokeai/frontend/web/dist/assets/inter-greek-wght-normal-CaVNZxsx.woff2
 invokeai/frontend/web/dist/assets/inter-latin-ext-wght-normal-CFHvXkgd.woff2
 invokeai/frontend/web/dist/assets/inter-latin-wght-normal-C2S99t-D.woff2
 invokeai/frontend/web/dist/assets/inter-vietnamese-wght-normal-CBcvBZtf.woff2
-invokeai/frontend/web/dist/assets/useTranslation-isMniQ21.js
+invokeai/frontend/web/dist/assets/useTranslation-DY3UydoH.js
 invokeai/frontend/web/dist/assets/worker-Dywf1EVc.js
 invokeai/frontend/web/dist/assets/images/commercial-license-bg.png
 invokeai/frontend/web/dist/assets/images/denoising-strength.png

{invokeai-5.4.1rc2 → invokeai-5.4.2}/InvokeAI.egg-info/requires.txt

@@ -34,7 +34,6 @@ datasets
 Deprecated
 dnspython
 dynamicprompts
-easing-functions
 einops
 facexlib
 matplotlib!=3.9.1

{invokeai-5.4.1rc2 → invokeai-5.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: InvokeAI
-Version: 5.4.1rc2
+Version: 5.4.2
 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
@@ -246,7 +246,6 @@ Requires-Dist: datasets
 Requires-Dist: Deprecated
 Requires-Dist: dnspython
 Requires-Dist: dynamicprompts
-Requires-Dist: easing-functions
 Requires-Dist: einops
 Requires-Dist: facexlib
 Requires-Dist: matplotlib!=3.9.1

{invokeai-5.4.1rc2 → invokeai-5.4.2}/invokeai/app/invocations/baseinvocation.py

@@ -63,6 +63,7 @@ class Classification(str, Enum, metaclass=MetaEnum):
     - `Prototype`: The invocation is not yet stable and may be removed from the application at any time. Workflows built around this invocation may break, and we are *not* committed to supporting this invocation.
     - `Deprecated`: The invocation is deprecated and may be removed in a future version.
     - `Internal`: The invocation is not intended for use by end-users. It may be changed or removed at any time, but is exposed for users to play with.
+    - `Special`: The invocation is a special case and does not fit into any of the other classifications.
     """
 
     Stable = "stable"
@@ -70,6 +71,7 @@ class Classification(str, Enum, metaclass=MetaEnum):
     Prototype = "prototype"
     Deprecated = "deprecated"
     Internal = "internal"
+    Special = "special"
 
 
 class UIConfigBase(BaseModel):

invokeai-5.4.2/invokeai/app/invocations/blend_latents.py

@@ -0,0 +1,120 @@
+from typing import Optional, Union
+
+import numpy as np
+import torch
+import torchvision.transforms as T
+from PIL import Image
+from torchvision.transforms.functional import resize as tv_resize
+
+from invokeai.app.invocations.baseinvocation import BaseInvocation, invocation
+from invokeai.app.invocations.fields import FieldDescriptions, ImageField, Input, InputField, LatentsField
+from invokeai.app.invocations.primitives import LatentsOutput
+from invokeai.app.services.shared.invocation_context import InvocationContext
+from invokeai.backend.stable_diffusion.diffusers_pipeline import image_resized_to_grid_as_tensor
+from invokeai.backend.util.devices import TorchDevice
+
+
+def slerp(
+    t: Union[float, np.ndarray],
+    v0: Union[torch.Tensor, np.ndarray],
+    v1: Union[torch.Tensor, np.ndarray],
+    device: torch.device,
+    DOT_THRESHOLD: float = 0.9995,
+):
+    """
+    Spherical linear interpolation
+    Args:
+        t (float/np.ndarray): Float value between 0.0 and 1.0
+        v0 (np.ndarray): Starting vector
+        v1 (np.ndarray): Final vector
+        DOT_THRESHOLD (float): Threshold for considering the two vectors as
+                            colineal. Not recommended to alter this.
+    Returns:
+        v2 (np.ndarray): Interpolation vector between v0 and v1
+    """
+    inputs_are_torch = False
+    if not isinstance(v0, np.ndarray):
+        inputs_are_torch = True
+        v0 = v0.detach().cpu().numpy()
+    if not isinstance(v1, np.ndarray):
+        inputs_are_torch = True
+        v1 = v1.detach().cpu().numpy()
+
+    dot = np.sum(v0 * v1 / (np.linalg.norm(v0) * np.linalg.norm(v1)))
+    if np.abs(dot) > DOT_THRESHOLD:
+        v2 = (1 - t) * v0 + t * v1
+    else:
+        theta_0 = np.arccos(dot)
+        sin_theta_0 = np.sin(theta_0)
+        theta_t = theta_0 * t
+        sin_theta_t = np.sin(theta_t)
+        s0 = np.sin(theta_0 - theta_t) / sin_theta_0
+        s1 = sin_theta_t / sin_theta_0
+        v2 = s0 * v0 + s1 * v1
+
+    if inputs_are_torch:
+        v2 = torch.from_numpy(v2).to(device)
+
+    return v2
+
+
+@invocation(
+    "lblend",
+    title="Blend Latents",
+    tags=["latents", "blend", "mask"],
+    category="latents",
+    version="1.1.0",
+)
+class BlendLatentsInvocation(BaseInvocation):
+    """Blend two latents using a given alpha. If a mask is provided, the second latents will be masked before blending.
+    Latents must have same size. Masking functionality added by @dwringer."""
+
+    latents_a: LatentsField = InputField(description=FieldDescriptions.latents, input=Input.Connection)
+    latents_b: LatentsField = InputField(description=FieldDescriptions.latents, input=Input.Connection)
+    mask: Optional[ImageField] = InputField(default=None, description="Mask for blending in latents B")
+    alpha: float = InputField(ge=0, default=0.5, description=FieldDescriptions.blend_alpha)
+
+    def prep_mask_tensor(self, mask_image: Image.Image) -> torch.Tensor:
+        if mask_image.mode != "L":
+            mask_image = mask_image.convert("L")
+        mask_tensor = image_resized_to_grid_as_tensor(mask_image, normalize=False)
+        if mask_tensor.dim() == 3:
+            mask_tensor = mask_tensor.unsqueeze(0)
+        return mask_tensor
+
+    def replace_tensor_from_masked_tensor(
+        self, tensor: torch.Tensor, other_tensor: torch.Tensor, mask_tensor: torch.Tensor
+    ):
+        output = tensor.clone()
+        mask_tensor = mask_tensor.expand(output.shape)
+        if output.dtype != torch.float16:
+            output = torch.add(output, mask_tensor * torch.sub(other_tensor, tensor))
+        else:
+            output = torch.add(output, mask_tensor.half() * torch.sub(other_tensor, tensor))
+        return output
+
+    def invoke(self, context: InvocationContext) -> LatentsOutput:
+        latents_a = context.tensors.load(self.latents_a.latents_name)
+        latents_b = context.tensors.load(self.latents_b.latents_name)
+        if self.mask is None:
+            mask_tensor = torch.zeros(latents_a.shape[-2:])
+        else:
+            mask_tensor = self.prep_mask_tensor(context.images.get_pil(self.mask.image_name))
+            mask_tensor = tv_resize(mask_tensor, latents_a.shape[-2:], T.InterpolationMode.BILINEAR, antialias=False)
+
+        latents_b = self.replace_tensor_from_masked_tensor(latents_b, latents_a, mask_tensor)
+
+        if latents_a.shape != latents_b.shape:
+            raise ValueError("Latents to blend must be the same size.")
+
+        device = TorchDevice.choose_torch_device()
+
+        # blend
+        blended_latents = slerp(self.alpha, latents_a, latents_b, device)
+
+        # https://discuss.huggingface.co/t/memory-usage-by-later-pipeline-stages/23699
+        blended_latents = blended_latents.to("cpu")
+        torch.cuda.empty_cache()
+
+        name = context.tensors.save(tensor=blended_latents)
+        return LatentsOutput.build(latents_name=name, latents=blended_latents)

{invokeai-5.4.1rc2 → invokeai-5.4.2}/invokeai/app/invocations/compel.py

@@ -95,6 +95,7 @@ class CompelInvocation(BaseInvocation):
                 ti_manager,
             ),
         ):
+            context.util.signal_progress("Building conditioning")
             assert isinstance(text_encoder, CLIPTextModel)
             assert isinstance(tokenizer, CLIPTokenizer)
             compel = Compel(
@@ -191,6 +192,7 @@ class SDXLPromptInvocationBase:
                 ti_manager,
             ),
         ):
+            context.util.signal_progress("Building conditioning")
             assert isinstance(text_encoder, (CLIPTextModel, CLIPTextModelWithProjection))
             assert isinstance(tokenizer, CLIPTokenizer)