Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Remove types on adapter nodes. Superseded by the decorator

Browse Source
This commit is contained in:
blessedcoolant 2023-09-05 12:12:19 +12:00
parent 3ac68cde66
commit b0f91f2e75
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
invokeai/app/invocations/control_adapter.py
View File

@ -42,7 +42,7 @@ class ControlField(BaseModel):
image: ImageField = Field(description="The control image") image: ImageField = Field(description="The control image")
# control_model and ip_adapter_models are both optional # control_model and ip_adapter_models are both optional
# but must be on the two present # 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 # if control_type == "IP-Adapter", then must be ip_adapter_model
control_model: Optional[ControlNetModelField] = Field(description="The ControlNet model to use") control_model: Optional[ControlNetModelField] = Field(description="The ControlNet model to use")
ip_adapter_model: Optional[str] = Field(description="The IP-Adapter 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): class ControlOutput(BaseInvocationOutput):
"""node output for ControlNet info""" """node output for ControlNet info"""
type: Literal["control_output"] = "control_output"
# Outputs # Outputs
control: ControlField = OutputField(description=FieldDescriptions.control) control: ControlField = OutputField(description=FieldDescriptions.control)
@ -84,8 +82,6 @@ class ControlOutput(BaseInvocationOutput):
class ControlNetInvocation(BaseInvocation): class ControlNetInvocation(BaseInvocation):
"""Collects ControlNet info to pass to other nodes""" """Collects ControlNet info to pass to other nodes"""
type: Literal["controlnet"] = "controlnet"
# Inputs # Inputs
image: ImageField = InputField(description="The control image") image: ImageField = InputField(description="The control image")
control_model: ControlNetModelField = InputField( control_model: ControlNetModelField = InputField(
@ -137,8 +133,6 @@ IP_ADAPTER_IMAGE_ENCODER_MODELS = Literal[
class IPAdapterInvocation(BaseInvocation): class IPAdapterInvocation(BaseInvocation):
"""Collects IP-Adapter info to pass to other nodes""" """Collects IP-Adapter info to pass to other nodes"""
type: Literal["ipadapter"] = "ipadapter"
# Inputs # Inputs
image: ImageField = InputField(description="The control image") image: ImageField = InputField(description="The control image")
# control_model: ControlNetModelField = InputField( # control_model: ControlNetModelField = InputField(