From 0c17f8604f7f26bbf6459b8764705b388702ffa0 Mon Sep 17 00:00:00 2001 From: user1 Date: Wed, 30 Aug 2023 17:35:31 -0700 Subject: [PATCH] Resolving rebase conflict, redirecting control imports to invocations/control_adapter --- invokeai/app/invocations/latent.py | 2 +- invokeai/app/invocations/metadata.py | 2 +- invokeai/app/invocations/onnx.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/invokeai/app/invocations/latent.py b/invokeai/app/invocations/latent.py index acf5c70984..ca400cd7b7 100644 --- a/invokeai/app/invocations/latent.py +++ b/invokeai/app/invocations/latent.py @@ -60,7 +60,7 @@ from .baseinvocation import ( invocation_output, ) from .compel import ConditioningField -from .controlnet_image_processors import ControlField +from .control_adapter import ControlField from .model import ModelInfo, UNetField, VaeField diff --git a/invokeai/app/invocations/metadata.py b/invokeai/app/invocations/metadata.py index 4a968ff3ac..29afaab1fe 100644 --- a/invokeai/app/invocations/metadata.py +++ b/invokeai/app/invocations/metadata.py @@ -11,7 +11,7 @@ from invokeai.app.invocations.baseinvocation import ( invocation, invocation_output, ) -from invokeai.app.invocations.controlnet_image_processors import ControlField +from invokeai.app.invocations.control_adapter import ControlField from invokeai.app.invocations.model import LoRAModelField, MainModelField, VAEModelField from invokeai.app.util.model_exclude_null import BaseModelExcludeNull diff --git a/invokeai/app/invocations/onnx.py b/invokeai/app/invocations/onnx.py index b61ea2da99..de4b217e4e 100644 --- a/invokeai/app/invocations/onnx.py +++ b/invokeai/app/invocations/onnx.py @@ -34,7 +34,7 @@ from .baseinvocation import ( invocation, invocation_output, ) -from .controlnet_image_processors import ControlField +from .control_adapter import ControlField from .latent import SAMPLER_NAME_VALUES, LatentsField, LatentsOutput, build_latents_output, get_scheduler from .model import ClipField, ModelInfo, UNetField, VaeField