diff --git a/invokeai/app/invocations/latent.py b/invokeai/app/invocations/latent.py index 1f4c30b7f3..746490ed7a 100644 --- a/invokeai/app/invocations/latent.py +++ b/invokeai/app/invocations/latent.py @@ -32,12 +32,11 @@ from invokeai.app.invocations.primitives import ( LatentsOutput, build_latents_output, ) -from invokeai.app.invocations.t2i_adapter import T2IAdapterField, T2IAdapterModelField +from invokeai.app.invocations.t2i_adapter import T2IAdapterField from invokeai.app.util.controlnet_utils import prepare_control_image from invokeai.app.util.step_callback import stable_diffusion_step_callback from invokeai.backend.ip_adapter.ip_adapter import IPAdapter, IPAdapterPlus from invokeai.backend.model_management.models import ModelType, SilenceWarnings -from invokeai.backend.model_management.models.t2i_adapter import T2IAdapterModel from invokeai.backend.stable_diffusion.diffusion.conditioning_data import ConditioningData, IPAdapterConditioningInfo from ...backend.model_management.lora import ModelPatcher diff --git a/invokeai/backend/model_management/model_probe.py b/invokeai/backend/model_management/model_probe.py index 445c1166e0..87cc35d950 100644 --- a/invokeai/backend/model_management/model_probe.py +++ b/invokeai/backend/model_management/model_probe.py @@ -517,7 +517,9 @@ class ControlNetFolderProbe(FolderProbeBase): else ( BaseModelType.StableDiffusion2 if dimension == 1024 - else BaseModelType.StableDiffusionXL if dimension == 2048 else None + else BaseModelType.StableDiffusionXL + if dimension == 2048 + else None ) ) if not base_model: