From be79d088c08c53fb862f9c458dbde20cb0883af4 Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Fri, 19 May 2023 16:10:39 +1000 Subject: [PATCH] fix(nodes): controlnet input accepts list or single controlnet --- invokeai/app/invocations/controlnet_image_processors.py | 2 +- invokeai/app/invocations/latent.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/invokeai/app/invocations/controlnet_image_processors.py b/invokeai/app/invocations/controlnet_image_processors.py index 1cb531c77d..1987381a7e 100644 --- a/invokeai/app/invocations/controlnet_image_processors.py +++ b/invokeai/app/invocations/controlnet_image_processors.py @@ -110,7 +110,7 @@ class ControlOutput(BaseInvocationOutput): """node output for ControlNet info""" # fmt: off type: Literal["control_output"] = "control_output" - control: Optional[ControlField] = Field(default=None, description="The control info dict") + control: ControlField = Field(default=None, description="The control info dict") # fmt: on diff --git a/invokeai/app/invocations/latent.py b/invokeai/app/invocations/latent.py index 894a832c60..98d56f575e 100644 --- a/invokeai/app/invocations/latent.py +++ b/invokeai/app/invocations/latent.py @@ -173,8 +173,7 @@ class TextToLatentsInvocation(BaseInvocation): seamless: bool = Field(default=False, description="Whether or not to generate an image that can tile without seams", ) seamless_axes: str = Field(default="", description="The axes to tile the image on, 'x' and/or 'y'") progress_images: bool = Field(default=False, description="Whether or not to produce progress images during generation", ) - control: list[ControlField] = Field(default=None, description="The controlnet(s) to use") - # control: ControlField | List[ControlField] = Field(default=None, description="The controlnet(s) to use") + control: Union[ControlField, List[ControlField]] = Field(default=None, description="The controlnet(s) to use") # fmt: on # Schema customisation