From 6ef2168b675b8f8b106f105d1ea4d279da396051 Mon Sep 17 00:00:00 2001 From: user1 Date: Thu, 4 May 2023 17:06:49 -0700 Subject: [PATCH] changes to base class for controlnet nodes --- invokeai/app/invocations/controlnet_image_processors.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/invokeai/app/invocations/controlnet_image_processors.py b/invokeai/app/invocations/controlnet_image_processors.py index e94970827f..3c8439608c 100644 --- a/invokeai/app/invocations/controlnet_image_processors.py +++ b/invokeai/app/invocations/controlnet_image_processors.py @@ -113,10 +113,10 @@ class ControlOutput(BaseInvocationOutput): control: ControlField = Field(default=None, description="The control info dict") # fmt: on -class PreprocessedControlInvocation(BaseInvocation, PILInvocationConfig): - """Base class for invocations that preprocess images for ControlNet""" -<<<<<<< HEAD +class PreprocessedControlInvocation(BaseInvocation, PILInvocationConfig): + """Base class for invocations that preprocess images for ControlNet""" + class ControlNetInvocation(BaseInvocation): """Collects ControlNet info to pass to other nodes""" # fmt: off