From b0f91f2e755286b6306d9e03f6dc90df9c342822 Mon Sep 17 00:00:00 2001 From: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com> Date: Tue, 5 Sep 2023 12:12:19 +1200 Subject: [PATCH] fix: Remove types on adapter nodes. Superseded by the decorator --- invokeai/app/invocations/control_adapter.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/invokeai/app/invocations/control_adapter.py b/invokeai/app/invocations/control_adapter.py index 3a2a46c060..b66a93ea5e 100644 --- a/invokeai/app/invocations/control_adapter.py +++ b/invokeai/app/invocations/control_adapter.py @@ -42,7 +42,7 @@ class ControlField(BaseModel): image: ImageField = Field(description="The control image") # control_model and ip_adapter_models are both optional # but must be on the two present - # if control_type == "ControlNet", then mus be control_model + # if control_type == "ControlNet", then must be control_model # if control_type == "IP-Adapter", then must be ip_adapter_model control_model: Optional[ControlNetModelField] = Field(description="The ControlNet model to use") ip_adapter_model: Optional[str] = Field(description="The IP-Adapter model to use") @@ -74,8 +74,6 @@ class ControlField(BaseModel): class ControlOutput(BaseInvocationOutput): """node output for ControlNet info""" - type: Literal["control_output"] = "control_output" - # Outputs control: ControlField = OutputField(description=FieldDescriptions.control) @@ -84,8 +82,6 @@ class ControlOutput(BaseInvocationOutput): class ControlNetInvocation(BaseInvocation): """Collects ControlNet info to pass to other nodes""" - type: Literal["controlnet"] = "controlnet" - # Inputs image: ImageField = InputField(description="The control image") control_model: ControlNetModelField = InputField( @@ -137,8 +133,6 @@ IP_ADAPTER_IMAGE_ENCODER_MODELS = Literal[ class IPAdapterInvocation(BaseInvocation): """Collects IP-Adapter info to pass to other nodes""" - type: Literal["ipadapter"] = "ipadapter" - # Inputs image: ImageField = InputField(description="The control image") # control_model: ControlNetModelField = InputField(