From 8923289b894802308605ffd7098cbc2e82105bea Mon Sep 17 00:00:00 2001 From: Ryan Dick Date: Fri, 8 Mar 2024 11:49:32 -0500 Subject: [PATCH] Rename ConditioningData -> TextConditioningData. --- invokeai/app/invocations/latent.py | 9 ++++++--- .../backend/stable_diffusion/diffusers_pipeline.py | 11 +++++++---- .../stable_diffusion/diffusion/conditioning_data.py | 2 +- .../diffusion/shared_invokeai_diffusion.py | 8 ++++---- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/invokeai/app/invocations/latent.py b/invokeai/app/invocations/latent.py index fba661671d..be5ed91581 100644 --- a/invokeai/app/invocations/latent.py +++ b/invokeai/app/invocations/latent.py @@ -57,7 +57,10 @@ from invokeai.backend.lora import LoRAModelRaw from invokeai.backend.model_manager import BaseModelType, LoadedModel from invokeai.backend.model_patcher import ModelPatcher from invokeai.backend.stable_diffusion import PipelineIntermediateState, set_seamless -from invokeai.backend.stable_diffusion.diffusion.conditioning_data import ConditioningData, IPAdapterConditioningInfo +from invokeai.backend.stable_diffusion.diffusion.conditioning_data import ( + IPAdapterConditioningInfo, + TextConditioningData, +) from invokeai.backend.util.silence_warnings import SilenceWarnings from ...backend.stable_diffusion.diffusers_pipeline import ( @@ -370,14 +373,14 @@ class DenoiseLatentsInvocation(BaseInvocation): self, context: InvocationContext, unet: UNet2DConditionModel, - ) -> ConditioningData: + ) -> TextConditioningData: positive_cond_data = context.conditioning.load(self.positive_conditioning.conditioning_name) c = positive_cond_data.conditionings[0].to(device=unet.device, dtype=unet.dtype) negative_cond_data = context.conditioning.load(self.negative_conditioning.conditioning_name) uc = negative_cond_data.conditionings[0].to(device=unet.device, dtype=unet.dtype) - conditioning_data = ConditioningData( + conditioning_data = TextConditioningData( unconditioned_embeddings=uc, text_embeddings=c, guidance_scale=self.cfg_scale, diff --git a/invokeai/backend/stable_diffusion/diffusers_pipeline.py b/invokeai/backend/stable_diffusion/diffusers_pipeline.py index 53b1ef5313..190cc9869f 100644 --- a/invokeai/backend/stable_diffusion/diffusers_pipeline.py +++ b/invokeai/backend/stable_diffusion/diffusers_pipeline.py @@ -23,7 +23,10 @@ from transformers import CLIPFeatureExtractor, CLIPTextModel, CLIPTokenizer from invokeai.app.services.config.config_default import get_config from invokeai.backend.ip_adapter.ip_adapter import IPAdapter from invokeai.backend.ip_adapter.unet_patcher import UNetPatcher -from invokeai.backend.stable_diffusion.diffusion.conditioning_data import ConditioningData, IPAdapterConditioningInfo +from invokeai.backend.stable_diffusion.diffusion.conditioning_data import ( + IPAdapterConditioningInfo, + TextConditioningData, +) from invokeai.backend.stable_diffusion.diffusion.shared_invokeai_diffusion import InvokeAIDiffuserComponent from invokeai.backend.util.attention import auto_detect_slice_size from invokeai.backend.util.devices import normalize_device @@ -297,7 +300,7 @@ class StableDiffusionGeneratorPipeline(StableDiffusionPipeline): latents: torch.Tensor, num_inference_steps: int, scheduler_step_kwargs: dict[str, Any], - conditioning_data: ConditioningData, + conditioning_data: TextConditioningData, *, noise: Optional[torch.Tensor], timesteps: torch.Tensor, @@ -383,7 +386,7 @@ class StableDiffusionGeneratorPipeline(StableDiffusionPipeline): self, latents: torch.Tensor, timesteps, - conditioning_data: ConditioningData, + conditioning_data: TextConditioningData, scheduler_step_kwargs: dict[str, Any], *, additional_guidance: List[Callable] = None, @@ -468,7 +471,7 @@ class StableDiffusionGeneratorPipeline(StableDiffusionPipeline): self, t: torch.Tensor, latents: torch.Tensor, - conditioning_data: ConditioningData, + conditioning_data: TextConditioningData, step_index: int, total_step_count: int, scheduler_step_kwargs: dict[str, Any], diff --git a/invokeai/backend/stable_diffusion/diffusion/conditioning_data.py b/invokeai/backend/stable_diffusion/diffusion/conditioning_data.py index b00c56120d..9ea8332db1 100644 --- a/invokeai/backend/stable_diffusion/diffusion/conditioning_data.py +++ b/invokeai/backend/stable_diffusion/diffusion/conditioning_data.py @@ -55,7 +55,7 @@ class IPAdapterConditioningInfo: @dataclass -class ConditioningData: +class TextConditioningData: unconditioned_embeddings: BasicConditioningInfo text_embeddings: BasicConditioningInfo """ diff --git a/invokeai/backend/stable_diffusion/diffusion/shared_invokeai_diffusion.py b/invokeai/backend/stable_diffusion/diffusion/shared_invokeai_diffusion.py index 657351e6c6..5108521982 100644 --- a/invokeai/backend/stable_diffusion/diffusion/shared_invokeai_diffusion.py +++ b/invokeai/backend/stable_diffusion/diffusion/shared_invokeai_diffusion.py @@ -10,10 +10,10 @@ from typing_extensions import TypeAlias from invokeai.app.services.config.config_default import get_config from invokeai.backend.stable_diffusion.diffusion.conditioning_data import ( - ConditioningData, ExtraConditioningInfo, IPAdapterConditioningInfo, SDXLConditioningInfo, + TextConditioningData, ) from .cross_attention_control import ( @@ -199,7 +199,7 @@ class InvokeAIDiffuserComponent: self, sample: torch.Tensor, timestep: torch.Tensor, - conditioning_data: ConditioningData, + conditioning_data: TextConditioningData, ip_adapter_conditioning: Optional[list[IPAdapterConditioningInfo]], step_index: int, total_step_count: int, @@ -300,7 +300,7 @@ class InvokeAIDiffuserComponent: self, x, sigma, - conditioning_data: ConditioningData, + conditioning_data: TextConditioningData, ip_adapter_conditioning: Optional[list[IPAdapterConditioningInfo]], down_block_additional_residuals: Optional[torch.Tensor] = None, # for ControlNet mid_block_additional_residual: Optional[torch.Tensor] = None, # for ControlNet @@ -365,7 +365,7 @@ class InvokeAIDiffuserComponent: self, x: torch.Tensor, sigma, - conditioning_data: ConditioningData, + conditioning_data: TextConditioningData, ip_adapter_conditioning: Optional[list[IPAdapterConditioningInfo]], cross_attention_control_types_to_do: list[CrossAttentionType], down_block_additional_residuals: Optional[torch.Tensor] = None, # for ControlNet