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

feat(nodes): make primitive outputs not optional, fix primitive invocation defaults

Browse Source
This commit is contained in:
psychedelicious 2023-08-20 20:22:23 +10:00
parent cdc49456e8
commit bf04e913c2
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
invokeai/app/invocations/primitives.py
View File

@ -42,9 +42,7 @@ class BooleanCollectionOutput(BaseInvocationOutput):
type: Literal["boolean_collection_output"] = "boolean_collection_output" type: Literal["boolean_collection_output"] = "boolean_collection_output"
# Outputs # Outputs
collection: list[bool] = OutputField( collection: list[bool] = OutputField(description="The output boolean collection", ui_type=UIType.BooleanCollection)
default_factory=list, description="The output boolean collection", ui_type=UIType.BooleanCollection
)
@title("Boolean Primitive") @title("Boolean Primitive")
@ -70,7 +68,7 @@ class BooleanCollectionInvocation(BaseInvocation):
# Inputs # Inputs
collection: list[bool] = InputField( collection: list[bool] = InputField(
default=False, description="The collection of boolean values", ui_type=UIType.BooleanCollection default_factory=list, description="The collection of boolean values", ui_type=UIType.BooleanCollection
) )
def invoke(self, context: InvocationContext) -> BooleanCollectionOutput: def invoke(self, context: InvocationContext) -> BooleanCollectionOutput:
@ -95,9 +93,7 @@ class IntegerCollectionOutput(BaseInvocationOutput):
type: Literal["integer_collection_output"] = "integer_collection_output" type: Literal["integer_collection_output"] = "integer_collection_output"
# Outputs # Outputs
collection: list[int] = OutputField( collection: list[int] = OutputField(description="The int collection", ui_type=UIType.IntegerCollection)
default_factory=list, description="The int collection", ui_type=UIType.IntegerCollection
)
@title("Integer Primitive") @title("Integer Primitive")
@ -148,9 +144,7 @@ class FloatCollectionOutput(BaseInvocationOutput):
type: Literal["float_collection_output"] = "float_collection_output" type: Literal["float_collection_output"] = "float_collection_output"
# Outputs # Outputs
collection: list[float] = OutputField( collection: list[float] = OutputField(description="The float collection", ui_type=UIType.FloatCollection)
default_factory=list, description="The float collection", ui_type=UIType.FloatCollection
)
@title("Float Primitive") @title("Float Primitive")
@ -176,7 +170,7 @@ class FloatCollectionInvocation(BaseInvocation):
# Inputs # Inputs
collection: list[float] = InputField( collection: list[float] = InputField(
default=0, description="The collection of float values", ui_type=UIType.FloatCollection default_factory=list, description="The collection of float values", ui_type=UIType.FloatCollection
) )
def invoke(self, context: InvocationContext) -> FloatCollectionOutput: def invoke(self, context: InvocationContext) -> FloatCollectionOutput:
@ -201,9 +195,7 @@ class StringCollectionOutput(BaseInvocationOutput):
type: Literal["string_collection_output"] = "string_collection_output" type: Literal["string_collection_output"] = "string_collection_output"
# Outputs # Outputs
collection: list[str] = OutputField( collection: list[str] = OutputField(description="The output strings", ui_type=UIType.StringCollection)
default_factory=list, description="The output strings", ui_type=UIType.StringCollection
)
@title("String Primitive") @title("String Primitive")
@ -229,7 +221,7 @@ class StringCollectionInvocation(BaseInvocation):
# Inputs # Inputs
collection: list[str] = InputField( collection: list[str] = InputField(
default=0, description="The collection of string values", ui_type=UIType.StringCollection default_factory=list, description="The collection of string values", ui_type=UIType.StringCollection
) )
def invoke(self, context: InvocationContext) -> StringCollectionOutput: def invoke(self, context: InvocationContext) -> StringCollectionOutput:
@ -262,9 +254,7 @@ class ImageCollectionOutput(BaseInvocationOutput):
type: Literal["image_collection_output"] = "image_collection_output" type: Literal["image_collection_output"] = "image_collection_output"
# Outputs # Outputs
collection: list[ImageField] = OutputField( collection: list[ImageField] = OutputField(description="The output images", ui_type=UIType.ImageCollection)
default_factory=list, description="The output images", ui_type=UIType.ImageCollection
)
@title("Image Primitive") @title("Image Primitive")
@ -334,7 +324,6 @@ class LatentsCollectionOutput(BaseInvocationOutput):
type: Literal["latents_collection_output"] = "latents_collection_output" type: Literal["latents_collection_output"] = "latents_collection_output"
collection: list[LatentsField] = OutputField( collection: list[LatentsField] = OutputField(
default_factory=list,
description=FieldDescriptions.latents, description=FieldDescriptions.latents,
ui_type=UIType.LatentsCollection, ui_type=UIType.LatentsCollection,
) )
@ -365,7 +354,7 @@ class LatentsCollectionInvocation(BaseInvocation):
# Inputs # Inputs
collection: list[LatentsField] = InputField( collection: list[LatentsField] = InputField(
default=0, description="The collection of latents tensors", ui_type=UIType.LatentsCollection description="The collection of latents tensors", ui_type=UIType.LatentsCollection
) )
def invoke(self, context: InvocationContext) -> LatentsCollectionOutput: def invoke(self, context: InvocationContext) -> LatentsCollectionOutput:
@ -410,9 +399,7 @@ class ColorCollectionOutput(BaseInvocationOutput):
type: Literal["color_collection_output"] = "color_collection_output" type: Literal["color_collection_output"] = "color_collection_output"
# Outputs # Outputs
collection: list[ColorField] = OutputField( collection: list[ColorField] = OutputField(description="The output colors", ui_type=UIType.ColorCollection)
default_factory=list, description="The output colors", ui_type=UIType.ColorCollection
)
@title("Color Primitive") @title("Color Primitive")
@ -455,7 +442,6 @@ class ConditioningCollectionOutput(BaseInvocationOutput):
# Outputs # Outputs
collection: list[ConditioningField] = OutputField( collection: list[ConditioningField] = OutputField(
default_factory=list,
description="The output conditioning tensors", description="The output conditioning tensors",
ui_type=UIType.ConditioningCollection, ui_type=UIType.ConditioningCollection,
) )