diff --git a/invokeai/app/invocations/baseinvocation.py b/invokeai/app/invocations/baseinvocation.py
index 87c1d65113..ccc2b4d05f 100644
--- a/invokeai/app/invocations/baseinvocation.py
+++ b/invokeai/app/invocations/baseinvocation.py
@@ -105,24 +105,39 @@ class UIType(str, Enum):
"""
# region Primitives
- Integer = "integer"
- Float = "float"
Boolean = "boolean"
- String = "string"
- Array = "array"
- Image = "ImageField"
- Latents = "LatentsField"
+ Color = "ColorField"
Conditioning = "ConditioningField"
Control = "ControlField"
- Color = "ColorField"
- ImageCollection = "ImageCollection"
- ConditioningCollection = "ConditioningCollection"
- ColorCollection = "ColorCollection"
- LatentsCollection = "LatentsCollection"
- IntegerCollection = "IntegerCollection"
- FloatCollection = "FloatCollection"
- StringCollection = "StringCollection"
+ Float = "float"
+ Image = "ImageField"
+ Integer = "integer"
+ Latents = "LatentsField"
+ String = "string"
+ # endregion
+
+ # region Collection Primitives
BooleanCollection = "BooleanCollection"
+ ColorCollection = "ColorCollection"
+ ConditioningCollection = "ConditioningCollection"
+ ControlCollection = "ControlCollection"
+ FloatCollection = "FloatCollection"
+ ImageCollection = "ImageCollection"
+ IntegerCollection = "IntegerCollection"
+ LatentsCollection = "LatentsCollection"
+ StringCollection = "StringCollection"
+ # endregion
+
+ # region Polymorphic Primitives
+ BooleanPolymorphic = "BooleanPolymorphic"
+ ColorPolymorphic = "ColorPolymorphic"
+ ConditioningPolymorphic = "ConditioningPolymorphic"
+ ControlPolymorphic = "ControlPolymorphic"
+ FloatPolymorphic = "FloatPolymorphic"
+ ImagePolymorphic = "ImagePolymorphic"
+ IntegerPolymorphic = "IntegerPolymorphic"
+ LatentsPolymorphic = "LatentsPolymorphic"
+ StringPolymorphic = "StringPolymorphic"
# endregion
# region Models
@@ -176,6 +191,7 @@ class _InputField(BaseModel):
ui_type: Optional[UIType]
ui_component: Optional[UIComponent]
ui_order: Optional[int]
+ item_default: Optional[Any]
class _OutputField(BaseModel):
@@ -223,6 +239,7 @@ def InputField(
ui_component: Optional[UIComponent] = None,
ui_hidden: bool = False,
ui_order: Optional[int] = None,
+ item_default: Optional[Any] = None,
**kwargs: Any,
) -> Any:
"""
@@ -249,6 +266,11 @@ def InputField(
For this case, you could provide `UIComponent.Textarea`.
: param bool ui_hidden: [False] Specifies whether or not this field should be hidden in the UI.
+
+ : param int ui_order: [None] Specifies the order in which this field should be rendered in the UI. \
+
+ : param bool item_default: [None] Specifies the default item value, if this is a collection input. \
+ Ignored for non-collection fields..
"""
return Field(
*args,
@@ -282,6 +304,7 @@ def InputField(
ui_component=ui_component,
ui_hidden=ui_hidden,
ui_order=ui_order,
+ item_default=item_default,
**kwargs,
)
@@ -332,6 +355,8 @@ def OutputField(
`UIType.SDXLMainModelField` to indicate that the field is an SDXL main model field.
: param bool ui_hidden: [False] Specifies whether or not this field should be hidden in the UI. \
+
+ : param int ui_order: [None] Specifies the order in which this field should be rendered in the UI. \
"""
return Field(
*args,
diff --git a/invokeai/app/invocations/controlnet_image_processors.py b/invokeai/app/invocations/controlnet_image_processors.py
index a666c5d6f4..272afb3a4c 100644
--- a/invokeai/app/invocations/controlnet_image_processors.py
+++ b/invokeai/app/invocations/controlnet_image_processors.py
@@ -100,9 +100,7 @@ class ControlNetInvocation(BaseInvocation):
"""Collects ControlNet info to pass to other nodes"""
image: ImageField = InputField(description="The control image")
- control_model: ControlNetModelField = InputField(
- default="lllyasviel/sd-controlnet-canny", description=FieldDescriptions.controlnet_model, input=Input.Direct
- )
+ control_model: ControlNetModelField = InputField(description=FieldDescriptions.controlnet_model, input=Input.Direct)
control_weight: Union[float, List[float]] = InputField(
default=1.0, description="The weight given to the ControlNet", ui_type=UIType.Float
)
diff --git a/invokeai/app/invocations/latent.py b/invokeai/app/invocations/latent.py
index 6357c1ac7b..c0e53e4e12 100644
--- a/invokeai/app/invocations/latent.py
+++ b/invokeai/app/invocations/latent.py
@@ -208,12 +208,14 @@ class DenoiseLatentsInvocation(BaseInvocation):
)
unet: UNetField = InputField(description=FieldDescriptions.unet, input=Input.Connection, title="UNet", ui_order=2)
control: Union[ControlField, list[ControlField]] = InputField(
- default=None, description=FieldDescriptions.control, input=Input.Connection, ui_order=5
+ default=None,
+ description=FieldDescriptions.control,
+ input=Input.Connection,
+ ui_order=5,
)
latents: Optional[LatentsField] = InputField(description=FieldDescriptions.latents, input=Input.Connection)
denoise_mask: Optional[DenoiseMaskField] = InputField(
- default=None,
- description=FieldDescriptions.mask,
+ default=None, description=FieldDescriptions.mask, input=Input.Connection, ui_order=6
)
@validator("cfg_scale")
@@ -317,7 +319,7 @@ class DenoiseLatentsInvocation(BaseInvocation):
context: InvocationContext,
# really only need model for dtype and device
model: StableDiffusionGeneratorPipeline,
- control_input: List[ControlField],
+ control_input: Union[ControlField, List[ControlField]],
latents_shape: List[int],
exit_stack: ExitStack,
do_classifier_free_guidance: bool = True,
diff --git a/invokeai/app/invocations/primitives.py b/invokeai/app/invocations/primitives.py
index d002ba8ddc..fdadc4b31b 100644
--- a/invokeai/app/invocations/primitives.py
+++ b/invokeai/app/invocations/primitives.py
@@ -14,7 +14,6 @@ from .baseinvocation import (
InvocationContext,
OutputField,
UIComponent,
- UIType,
invocation,
invocation_output,
)
@@ -40,7 +39,9 @@ class BooleanOutput(BaseInvocationOutput):
class BooleanCollectionOutput(BaseInvocationOutput):
"""Base class for nodes that output a collection of booleans"""
- collection: list[bool] = OutputField(description="The output boolean collection", ui_type=UIType.BooleanCollection)
+ collection: list[bool] = OutputField(
+ description="The output boolean collection",
+ )
@invocation("boolean", title="Boolean Primitive", tags=["primitives", "boolean"], category="primitives")
@@ -62,9 +63,7 @@ class BooleanInvocation(BaseInvocation):
class BooleanCollectionInvocation(BaseInvocation):
"""A collection of boolean primitive values"""
- collection: list[bool] = InputField(
- default_factory=list, description="The collection of boolean values", ui_type=UIType.BooleanCollection
- )
+ collection: list[bool] = InputField(default_factory=list, description="The collection of boolean values")
def invoke(self, context: InvocationContext) -> BooleanCollectionOutput:
return BooleanCollectionOutput(collection=self.collection)
@@ -86,7 +85,9 @@ class IntegerOutput(BaseInvocationOutput):
class IntegerCollectionOutput(BaseInvocationOutput):
"""Base class for nodes that output a collection of integers"""
- collection: list[int] = OutputField(description="The int collection", ui_type=UIType.IntegerCollection)
+ collection: list[int] = OutputField(
+ description="The int collection",
+ )
@invocation("integer", title="Integer Primitive", tags=["primitives", "integer"], category="primitives")
@@ -108,9 +109,7 @@ class IntegerInvocation(BaseInvocation):
class IntegerCollectionInvocation(BaseInvocation):
"""A collection of integer primitive values"""
- collection: list[int] = InputField(
- default_factory=list, description="The collection of integer values", ui_type=UIType.IntegerCollection
- )
+ collection: list[int] = InputField(default_factory=list, description="The collection of integer values")
def invoke(self, context: InvocationContext) -> IntegerCollectionOutput:
return IntegerCollectionOutput(collection=self.collection)
@@ -132,7 +131,9 @@ class FloatOutput(BaseInvocationOutput):
class FloatCollectionOutput(BaseInvocationOutput):
"""Base class for nodes that output a collection of floats"""
- collection: list[float] = OutputField(description="The float collection", ui_type=UIType.FloatCollection)
+ collection: list[float] = OutputField(
+ description="The float collection",
+ )
@invocation("float", title="Float Primitive", tags=["primitives", "float"], category="primitives")
@@ -154,9 +155,7 @@ class FloatInvocation(BaseInvocation):
class FloatCollectionInvocation(BaseInvocation):
"""A collection of float primitive values"""
- collection: list[float] = InputField(
- default_factory=list, description="The collection of float values", ui_type=UIType.FloatCollection
- )
+ collection: list[float] = InputField(default_factory=list, description="The collection of float values")
def invoke(self, context: InvocationContext) -> FloatCollectionOutput:
return FloatCollectionOutput(collection=self.collection)
@@ -178,7 +177,9 @@ class StringOutput(BaseInvocationOutput):
class StringCollectionOutput(BaseInvocationOutput):
"""Base class for nodes that output a collection of strings"""
- collection: list[str] = OutputField(description="The output strings", ui_type=UIType.StringCollection)
+ collection: list[str] = OutputField(
+ description="The output strings",
+ )
@invocation("string", title="String Primitive", tags=["primitives", "string"], category="primitives")
@@ -200,9 +201,7 @@ class StringInvocation(BaseInvocation):
class StringCollectionInvocation(BaseInvocation):
"""A collection of string primitive values"""
- collection: list[str] = InputField(
- default_factory=list, description="The collection of string values", ui_type=UIType.StringCollection
- )
+ collection: list[str] = InputField(default_factory=list, description="The collection of string values")
def invoke(self, context: InvocationContext) -> StringCollectionOutput:
return StringCollectionOutput(collection=self.collection)
@@ -232,7 +231,9 @@ class ImageOutput(BaseInvocationOutput):
class ImageCollectionOutput(BaseInvocationOutput):
"""Base class for nodes that output a collection of images"""
- collection: list[ImageField] = OutputField(description="The output images", ui_type=UIType.ImageCollection)
+ collection: list[ImageField] = OutputField(
+ description="The output images",
+ )
@invocation("image", title="Image Primitive", tags=["primitives", "image"], category="primitives")
@@ -260,9 +261,7 @@ class ImageInvocation(BaseInvocation):
class ImageCollectionInvocation(BaseInvocation):
"""A collection of image primitive values"""
- collection: list[ImageField] = InputField(
- default_factory=list, description="The collection of image values", ui_type=UIType.ImageCollection
- )
+ collection: list[ImageField] = InputField(description="The collection of image values")
def invoke(self, context: InvocationContext) -> ImageCollectionOutput:
return ImageCollectionOutput(collection=self.collection)
@@ -316,7 +315,6 @@ class LatentsCollectionOutput(BaseInvocationOutput):
collection: list[LatentsField] = OutputField(
description=FieldDescriptions.latents,
- ui_type=UIType.LatentsCollection,
)
@@ -342,7 +340,7 @@ class LatentsCollectionInvocation(BaseInvocation):
"""A collection of latents tensor primitive values"""
collection: list[LatentsField] = InputField(
- description="The collection of latents tensors", ui_type=UIType.LatentsCollection
+ description="The collection of latents tensors",
)
def invoke(self, context: InvocationContext) -> LatentsCollectionOutput:
@@ -385,7 +383,9 @@ class ColorOutput(BaseInvocationOutput):
class ColorCollectionOutput(BaseInvocationOutput):
"""Base class for nodes that output a collection of colors"""
- collection: list[ColorField] = OutputField(description="The output colors", ui_type=UIType.ColorCollection)
+ collection: list[ColorField] = OutputField(
+ description="The output colors",
+ )
@invocation("color", title="Color Primitive", tags=["primitives", "color"], category="primitives")
@@ -422,7 +422,6 @@ class ConditioningCollectionOutput(BaseInvocationOutput):
collection: list[ConditioningField] = OutputField(
description="The output conditioning tensors",
- ui_type=UIType.ConditioningCollection,
)
@@ -453,7 +452,6 @@ class ConditioningCollectionInvocation(BaseInvocation):
collection: list[ConditioningField] = InputField(
default_factory=list,
description="The collection of conditioning tensors",
- ui_type=UIType.ConditioningCollection,
)
def invoke(self, context: InvocationContext) -> ConditioningCollectionOutput:
diff --git a/invokeai/app/services/graph.py b/invokeai/app/services/graph.py
index 18c99fafc1..0e40636280 100644
--- a/invokeai/app/services/graph.py
+++ b/invokeai/app/services/graph.py
@@ -112,6 +112,10 @@ def are_connection_types_compatible(from_type: Any, to_type: Any) -> bool:
if to_type in get_args(from_type):
return True
+ # allow int -> float, pydantic will cast for us
+ if from_type is int and to_type is float:
+ return True
+
# if not issubclass(from_type, to_type):
if not is_union_subtype(from_type, to_type):
return False
diff --git a/invokeai/frontend/web/src/common/hooks/useIsReadyToInvoke.ts b/invokeai/frontend/web/src/common/hooks/useIsReadyToInvoke.ts
index e06a1106c1..3820b07daf 100644
--- a/invokeai/frontend/web/src/common/hooks/useIsReadyToInvoke.ts
+++ b/invokeai/frontend/web/src/common/hooks/useIsReadyToInvoke.ts
@@ -63,7 +63,11 @@ const selector = createSelector(
return;
}
- if (fieldTemplate.required && !field.value && !hasConnection) {
+ if (
+ fieldTemplate.required &&
+ field.value === undefined &&
+ !hasConnection
+ ) {
reasons.push(
`${node.data.label || nodeTemplate.title} -> ${
field.label || fieldTemplate.title
diff --git a/invokeai/frontend/web/src/common/util/colorTokenToCssVar.ts b/invokeai/frontend/web/src/common/util/colorTokenToCssVar.ts
index e29005186f..87724d9c9b 100644
--- a/invokeai/frontend/web/src/common/util/colorTokenToCssVar.ts
+++ b/invokeai/frontend/web/src/common/util/colorTokenToCssVar.ts
@@ -1,2 +1,2 @@
export const colorTokenToCssVar = (colorToken: string) =>
- `var(--invokeai-colors-${colorToken.split('.').join('-')}`;
+ `var(--invokeai-colors-${colorToken.split('.').join('-')})`;
diff --git a/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/FieldHandle.tsx b/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/FieldHandle.tsx
index 14924a16fe..3166590254 100644
--- a/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/FieldHandle.tsx
+++ b/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/FieldHandle.tsx
@@ -1,8 +1,11 @@
import { Tooltip } from '@chakra-ui/react';
import { colorTokenToCssVar } from 'common/util/colorTokenToCssVar';
import {
+ COLLECTION_TYPES,
FIELDS,
HANDLE_TOOLTIP_OPEN_DELAY,
+ MODEL_TYPES,
+ POLYMORPHIC_TYPES,
} from 'features/nodes/types/constants';
import {
InputFieldTemplate,
@@ -18,6 +21,7 @@ export const handleBaseStyles: CSSProperties = {
borderWidth: 0,
zIndex: 1,
};
+``;
export const inputHandleStyles: CSSProperties = {
left: '-1rem',
@@ -44,15 +48,25 @@ const FieldHandle = (props: FieldHandleProps) => {
connectionError,
} = props;
const { name, type } = fieldTemplate;
- const { color, title } = FIELDS[type];
+ const { color: typeColor, title } = FIELDS[type];
const styles: CSSProperties = useMemo(() => {
+ const isCollectionType = COLLECTION_TYPES.includes(type);
+ const isPolymorphicType = POLYMORPHIC_TYPES.includes(type);
+ const isModelType = MODEL_TYPES.includes(type);
+ const color = colorTokenToCssVar(typeColor);
const s: CSSProperties = {
- backgroundColor: colorTokenToCssVar(color),
+ backgroundColor:
+ isCollectionType || isPolymorphicType
+ ? 'var(--invokeai-colors-base-900)'
+ : color,
position: 'absolute',
width: '1rem',
height: '1rem',
- borderWidth: 0,
+ borderWidth: isCollectionType || isPolymorphicType ? 4 : 0,
+ borderStyle: 'solid',
+ borderColor: color,
+ borderRadius: isModelType ? 4 : '100%',
zIndex: 1,
};
@@ -78,11 +92,12 @@ const FieldHandle = (props: FieldHandleProps) => {
return s;
}, [
- color,
connectionError,
handleType,
isConnectionInProgress,
isConnectionStartField,
+ type,
+ typeColor,
]);
const tooltip = useMemo(() => {
diff --git a/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/InputField.tsx b/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/InputField.tsx
index 6ad8e14bc2..bee5264e00 100644
--- a/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/InputField.tsx
+++ b/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/InputField.tsx
@@ -75,6 +75,7 @@ const InputField = ({ nodeId, fieldName }: Props) => {
sx={{
display: 'flex',
alignItems: 'center',
+ h: 'full',
mb: 0,
px: 1,
gap: 2,
diff --git a/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/InputFieldRenderer.tsx b/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/InputFieldRenderer.tsx
index bb9637cd73..fa5c4533c2 100644
--- a/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/InputFieldRenderer.tsx
+++ b/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/InputFieldRenderer.tsx
@@ -3,18 +3,10 @@ import { useFieldData } from 'features/nodes/hooks/useFieldData';
import { useFieldTemplate } from 'features/nodes/hooks/useFieldTemplate';
import { memo } from 'react';
import BooleanInputField from './inputs/BooleanInputField';
-import ClipInputField from './inputs/ClipInputField';
-import CollectionInputField from './inputs/CollectionInputField';
-import CollectionItemInputField from './inputs/CollectionItemInputField';
import ColorInputField from './inputs/ColorInputField';
-import ConditioningInputField from './inputs/ConditioningInputField';
-import ControlInputField from './inputs/ControlInputField';
import ControlNetModelInputField from './inputs/ControlNetModelInputField';
-import DenoiseMaskInputField from './inputs/DenoiseMaskInputField';
import EnumInputField from './inputs/EnumInputField';
-import ImageCollectionInputField from './inputs/ImageCollectionInputField';
import ImageInputField from './inputs/ImageInputField';
-import LatentsInputField from './inputs/LatentsInputField';
import LoRAModelInputField from './inputs/LoRAModelInputField';
import MainModelInputField from './inputs/MainModelInputField';
import NumberInputField from './inputs/NumberInputField';
@@ -22,8 +14,6 @@ import RefinerModelInputField from './inputs/RefinerModelInputField';
import SDXLMainModelInputField from './inputs/SDXLMainModelInputField';
import SchedulerInputField from './inputs/SchedulerInputField';
import StringInputField from './inputs/StringInputField';
-import UnetInputField from './inputs/UnetInputField';
-import VaeInputField from './inputs/VaeInputField';
import VaeModelInputField from './inputs/VaeModelInputField';
type InputFieldProps = {
@@ -31,7 +21,6 @@ type InputFieldProps = {
fieldName: string;
};
-// build an individual input element based on the schema
const InputFieldRenderer = ({ nodeId, fieldName }: InputFieldProps) => {
const field = useFieldData(nodeId, fieldName);
const fieldTemplate = useFieldTemplate(nodeId, fieldName, 'input');
@@ -93,88 +82,6 @@ const InputFieldRenderer = ({ nodeId, fieldName }: InputFieldProps) => {
);
}
- if (
- field?.type === 'LatentsField' &&
- fieldTemplate?.type === 'LatentsField'
- ) {
- return (
-
- );
- }
-
- if (
- field?.type === 'DenoiseMaskField' &&
- fieldTemplate?.type === 'DenoiseMaskField'
- ) {
- return (
-
- );
- }
-
- if (
- field?.type === 'ConditioningField' &&
- fieldTemplate?.type === 'ConditioningField'
- ) {
- return (
-
- );
- }
-
- if (field?.type === 'UNetField' && fieldTemplate?.type === 'UNetField') {
- return (
-
- );
- }
-
- if (field?.type === 'ClipField' && fieldTemplate?.type === 'ClipField') {
- return (
-
- );
- }
-
- if (field?.type === 'VaeField' && fieldTemplate?.type === 'VaeField') {
- return (
-
- );
- }
-
- if (
- field?.type === 'ControlField' &&
- fieldTemplate?.type === 'ControlField'
- ) {
- return (
-
- );
- }
-
if (
field?.type === 'MainModelField' &&
fieldTemplate?.type === 'MainModelField'
@@ -240,29 +147,6 @@ const InputFieldRenderer = ({ nodeId, fieldName }: InputFieldProps) => {
);
}
- if (field?.type === 'Collection' && fieldTemplate?.type === 'Collection') {
- return (
-
- );
- }
-
- if (
- field?.type === 'CollectionItem' &&
- fieldTemplate?.type === 'CollectionItem'
- ) {
- return (
-
- );
- }
-
if (field?.type === 'ColorField' && fieldTemplate?.type === 'ColorField') {
return (
{
);
}
- if (
- field?.type === 'ImageCollection' &&
- fieldTemplate?.type === 'ImageCollection'
- ) {
- return (
-
- );
- }
-
if (
field?.type === 'SDXLMainModelField' &&
fieldTemplate?.type === 'SDXLMainModelField'
@@ -309,6 +180,11 @@ const InputFieldRenderer = ({ nodeId, fieldName }: InputFieldProps) => {
);
}
+ if (field && fieldTemplate) {
+ // Fallback for when there is no component for the type
+ return null;
+ }
+
return (
+ _props: FieldComponentProps<
+ ControlInputFieldValue | ControlPolymorphicInputFieldValue,
+ ControlInputFieldTemplate | ControlPolymorphicInputFieldTemplate
+ >
) => {
return null;
};
diff --git a/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/inputs/ImageInputField.tsx b/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/inputs/ImageInputField.tsx
index e04d0d1edc..7f96675792 100644
--- a/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/inputs/ImageInputField.tsx
+++ b/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/inputs/ImageInputField.tsx
@@ -9,9 +9,9 @@ import {
} from 'features/dnd/types';
import { fieldImageValueChanged } from 'features/nodes/store/nodesSlice';
import {
+ FieldComponentProps,
ImageInputFieldTemplate,
ImageInputFieldValue,
- FieldComponentProps,
} from 'features/nodes/types/types';
import { memo, useCallback, useMemo } from 'react';
import { FaUndo } from 'react-icons/fa';
diff --git a/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/inputs/LatentsInputField.tsx b/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/inputs/LatentsInputField.tsx
index 099314654f..a5065be0ee 100644
--- a/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/inputs/LatentsInputField.tsx
+++ b/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/inputs/LatentsInputField.tsx
@@ -2,11 +2,16 @@ import {
LatentsInputFieldTemplate,
LatentsInputFieldValue,
FieldComponentProps,
+ LatentsPolymorphicInputFieldValue,
+ LatentsPolymorphicInputFieldTemplate,
} from 'features/nodes/types/types';
import { memo } from 'react';
const LatentsInputFieldComponent = (
- _props: FieldComponentProps
+ _props: FieldComponentProps<
+ LatentsInputFieldValue | LatentsPolymorphicInputFieldValue,
+ LatentsInputFieldTemplate | LatentsPolymorphicInputFieldTemplate
+ >
) => {
return null;
};
diff --git a/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/inputs/NumberInputField.tsx b/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/inputs/NumberInputField.tsx
index 1e569d5005..61387d751b 100644
--- a/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/inputs/NumberInputField.tsx
+++ b/invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/inputs/NumberInputField.tsx
@@ -9,11 +9,11 @@ import { useAppDispatch } from 'app/store/storeHooks';
import { numberStringRegex } from 'common/components/IAINumberInput';
import { fieldNumberValueChanged } from 'features/nodes/store/nodesSlice';
import {
+ FieldComponentProps,
FloatInputFieldTemplate,
FloatInputFieldValue,
IntegerInputFieldTemplate,
IntegerInputFieldValue,
- FieldComponentProps,
} from 'features/nodes/types/types';
import { memo, useEffect, useMemo, useState } from 'react';
diff --git a/invokeai/frontend/web/src/features/nodes/hooks/useDoesInputHaveValue.ts b/invokeai/frontend/web/src/features/nodes/hooks/useDoesInputHaveValue.ts
index f56099ed2b..83bf6b8af0 100644
--- a/invokeai/frontend/web/src/features/nodes/hooks/useDoesInputHaveValue.ts
+++ b/invokeai/frontend/web/src/features/nodes/hooks/useDoesInputHaveValue.ts
@@ -15,7 +15,7 @@ export const useDoesInputHaveValue = (nodeId: string, fieldName: string) => {
if (!isInvocationNode(node)) {
return;
}
- return Boolean(node?.data.inputs[fieldName]?.value);
+ return node?.data.inputs[fieldName]?.value !== undefined;
},
defaultSelectorOptions
),
diff --git a/invokeai/frontend/web/src/features/nodes/hooks/useIsValidConnection.ts b/invokeai/frontend/web/src/features/nodes/hooks/useIsValidConnection.ts
index 3a63d75bb0..d1d10bb7e7 100644
--- a/invokeai/frontend/web/src/features/nodes/hooks/useIsValidConnection.ts
+++ b/invokeai/frontend/web/src/features/nodes/hooks/useIsValidConnection.ts
@@ -3,9 +3,19 @@ import graphlib from '@dagrejs/graphlib';
import { useAppSelector } from 'app/store/storeHooks';
import { useCallback } from 'react';
import { Connection, Edge, Node, useReactFlow } from 'reactflow';
-import { COLLECTION_TYPES } from '../types/constants';
+import {
+ COLLECTION_MAP,
+ COLLECTION_TYPES,
+ POLYMORPHIC_TO_SINGLE_MAP,
+ POLYMORPHIC_TYPES,
+} from '../types/constants';
import { InvocationNodeData } from '../types/types';
+/**
+ * NOTE: The logic here must be duplicated in `invokeai/frontend/web/src/features/nodes/store/util/makeIsConnectionValidSelector.ts`
+ * TODO: Figure out how to do this without duplicating all the logic
+ */
+
export const useIsValidConnection = () => {
const flow = useReactFlow();
const shouldValidateGraph = useAppSelector(
@@ -42,6 +52,19 @@ export const useIsValidConnection = () => {
return false;
}
+ if (
+ edges
+ .filter((edge) => {
+ return edge.target === target && edge.targetHandle === targetHandle;
+ })
+ .find((edge) => {
+ edge.source === source && edge.sourceHandle === sourceHandle;
+ })
+ ) {
+ // We already have a connection from this source to this target
+ return false;
+ }
+
// Connection is invalid if target already has a connection
if (
edges.find((edge) => {
@@ -53,21 +76,62 @@ export const useIsValidConnection = () => {
return false;
}
- // Connection types must be the same for a connection
- if (
- sourceType !== targetType &&
- sourceType !== 'CollectionItem' &&
- targetType !== 'CollectionItem'
- ) {
- if (
- !(
- COLLECTION_TYPES.includes(targetType) &&
- COLLECTION_TYPES.includes(sourceType)
- )
- ) {
- return false;
- }
+ /**
+ * Connection types must be the same for a connection, with exceptions:
+ * - CollectionItem can connect to any non-Collection
+ * - Non-Collections can connect to CollectionItem
+ * - Anything (non-Collections, Collections, Polymorphics) can connect to Polymorphics of the same base type
+ * - Generic Collection can connect to any other Collection or Polymorphic
+ * - Any Collection can connect to a Generic Collection
+ */
+
+ if (sourceType !== targetType) {
+ const isCollectionItemToNonCollection =
+ sourceType === 'CollectionItem' &&
+ !COLLECTION_TYPES.includes(targetType);
+
+ const isNonCollectionToCollectionItem =
+ targetType === 'CollectionItem' &&
+ !COLLECTION_TYPES.includes(sourceType) &&
+ !POLYMORPHIC_TYPES.includes(sourceType);
+
+ const isAnythingToPolymorphicOfSameBaseType =
+ POLYMORPHIC_TYPES.includes(targetType) &&
+ (() => {
+ if (!POLYMORPHIC_TYPES.includes(targetType)) {
+ return false;
+ }
+ const baseType =
+ POLYMORPHIC_TO_SINGLE_MAP[
+ targetType as keyof typeof POLYMORPHIC_TO_SINGLE_MAP
+ ];
+
+ const collectionType =
+ COLLECTION_MAP[baseType as keyof typeof COLLECTION_MAP];
+
+ return sourceType === baseType || sourceType === collectionType;
+ })();
+
+ const isGenericCollectionToAnyCollectionOrPolymorphic =
+ sourceType === 'Collection' &&
+ (COLLECTION_TYPES.includes(targetType) ||
+ POLYMORPHIC_TYPES.includes(targetType));
+
+ const isCollectionToGenericCollection =
+ targetType === 'Collection' && COLLECTION_TYPES.includes(sourceType);
+
+ const isIntToFloat = sourceType === 'integer' && targetType === 'float';
+
+ return (
+ isCollectionItemToNonCollection ||
+ isNonCollectionToCollectionItem ||
+ isAnythingToPolymorphicOfSameBaseType ||
+ isGenericCollectionToAnyCollectionOrPolymorphic ||
+ isCollectionToGenericCollection ||
+ isIntToFloat
+ );
}
+
// Graphs much be acyclic (no loops!)
return getIsGraphAcyclic(source, target, nodes, edges);
},
diff --git a/invokeai/frontend/web/src/features/nodes/store/util/makeIsConnectionValidSelector.ts b/invokeai/frontend/web/src/features/nodes/store/util/makeIsConnectionValidSelector.ts
index 29603036ab..5cb6d557e8 100644
--- a/invokeai/frontend/web/src/features/nodes/store/util/makeIsConnectionValidSelector.ts
+++ b/invokeai/frontend/web/src/features/nodes/store/util/makeIsConnectionValidSelector.ts
@@ -1,10 +1,20 @@
import { createSelector } from '@reduxjs/toolkit';
import { stateSelector } from 'app/store/store';
import { getIsGraphAcyclic } from 'features/nodes/hooks/useIsValidConnection';
-import { COLLECTION_TYPES } from 'features/nodes/types/constants';
+import {
+ COLLECTION_MAP,
+ COLLECTION_TYPES,
+ POLYMORPHIC_TO_SINGLE_MAP,
+ POLYMORPHIC_TYPES,
+} from 'features/nodes/types/constants';
import { FieldType } from 'features/nodes/types/types';
import { HandleType } from 'reactflow';
+/**
+ * NOTE: The logic here must be duplicated in `invokeai/frontend/web/src/features/nodes/hooks/useIsValidConnection.ts`
+ * TODO: Figure out how to do this without duplicating all the logic
+ */
+
export const makeConnectionErrorSelector = (
nodeId: string,
fieldName: string,
@@ -19,11 +29,6 @@ export const makeConnectionErrorSelector = (
const { currentConnectionFieldType, connectionStartParams, nodes, edges } =
state.nodes;
- if (!state.nodes.shouldValidateGraph) {
- // manual override!
- return null;
- }
-
if (!connectionStartParams || !currentConnectionFieldType) {
return 'No connection in progress';
}
@@ -38,9 +43,9 @@ export const makeConnectionErrorSelector = (
return 'No connection data';
}
- const targetFieldType =
+ const targetType =
handleType === 'target' ? fieldType : currentConnectionFieldType;
- const sourceFieldType =
+ const sourceType =
handleType === 'source' ? fieldType : currentConnectionFieldType;
if (nodeId === connectionNodeId) {
@@ -55,30 +60,73 @@ export const makeConnectionErrorSelector = (
}
if (
- fieldType !== currentConnectionFieldType &&
- fieldType !== 'CollectionItem' &&
- currentConnectionFieldType !== 'CollectionItem'
- ) {
- if (
- !(
- COLLECTION_TYPES.includes(targetFieldType) &&
- COLLECTION_TYPES.includes(sourceFieldType)
- )
- ) {
- // except for collection items, field types must match
- return 'Field types must match';
- }
- }
-
- if (
- handleType === 'target' &&
edges.find((edge) => {
return edge.target === nodeId && edge.targetHandle === fieldName;
}) &&
// except CollectionItem inputs can have multiples
- targetFieldType !== 'CollectionItem'
+ targetType !== 'CollectionItem'
) {
- return 'Inputs may only have one connection';
+ return 'Input may only have one connection';
+ }
+
+ /**
+ * Connection types must be the same for a connection, with exceptions:
+ * - CollectionItem can connect to any non-Collection
+ * - Non-Collections can connect to CollectionItem
+ * - Anything (non-Collections, Collections, Polymorphics) can connect to Polymorphics of the same base type
+ * - Generic Collection can connect to any other Collection or Polymorphic
+ * - Any Collection can connect to a Generic Collection
+ */
+
+ if (sourceType !== targetType) {
+ const isCollectionItemToNonCollection =
+ sourceType === 'CollectionItem' &&
+ !COLLECTION_TYPES.includes(targetType);
+
+ const isNonCollectionToCollectionItem =
+ targetType === 'CollectionItem' &&
+ !COLLECTION_TYPES.includes(sourceType) &&
+ !POLYMORPHIC_TYPES.includes(sourceType);
+
+ const isAnythingToPolymorphicOfSameBaseType =
+ POLYMORPHIC_TYPES.includes(targetType) &&
+ (() => {
+ if (!POLYMORPHIC_TYPES.includes(targetType)) {
+ return false;
+ }
+ const baseType =
+ POLYMORPHIC_TO_SINGLE_MAP[
+ targetType as keyof typeof POLYMORPHIC_TO_SINGLE_MAP
+ ];
+
+ const collectionType =
+ COLLECTION_MAP[baseType as keyof typeof COLLECTION_MAP];
+
+ return sourceType === baseType || sourceType === collectionType;
+ })();
+
+ const isGenericCollectionToAnyCollectionOrPolymorphic =
+ sourceType === 'Collection' &&
+ (COLLECTION_TYPES.includes(targetType) ||
+ POLYMORPHIC_TYPES.includes(targetType));
+
+ const isCollectionToGenericCollection =
+ targetType === 'Collection' && COLLECTION_TYPES.includes(sourceType);
+
+ const isIntToFloat = sourceType === 'integer' && targetType === 'float';
+
+ if (
+ !(
+ isCollectionItemToNonCollection ||
+ isNonCollectionToCollectionItem ||
+ isAnythingToPolymorphicOfSameBaseType ||
+ isGenericCollectionToAnyCollectionOrPolymorphic ||
+ isCollectionToGenericCollection ||
+ isIntToFloat
+ )
+ ) {
+ return 'Field types must match';
+ }
}
const isGraphAcyclic = getIsGraphAcyclic(
diff --git a/invokeai/frontend/web/src/features/nodes/types/constants.ts b/invokeai/frontend/web/src/features/nodes/types/constants.ts
index c611ca9976..a12c1fbddc 100644
--- a/invokeai/frontend/web/src/features/nodes/types/constants.ts
+++ b/invokeai/frontend/web/src/features/nodes/types/constants.ts
@@ -17,176 +17,297 @@ export const KIND_MAP = {
export const COLLECTION_TYPES: FieldType[] = [
'Collection',
'IntegerCollection',
+ 'BooleanCollection',
'FloatCollection',
'StringCollection',
- 'BooleanCollection',
'ImageCollection',
+ 'LatentsCollection',
+ 'ConditioningCollection',
+ 'ControlCollection',
+ 'ColorCollection',
];
+export const POLYMORPHIC_TYPES = [
+ 'IntegerPolymorphic',
+ 'BooleanPolymorphic',
+ 'FloatPolymorphic',
+ 'StringPolymorphic',
+ 'ImagePolymorphic',
+ 'LatentsPolymorphic',
+ 'ConditioningPolymorphic',
+ 'ControlPolymorphic',
+ 'ColorPolymorphic',
+];
+
+export const MODEL_TYPES = [
+ 'ControlNetModelField',
+ 'LoRAModelField',
+ 'MainModelField',
+ 'ONNXModelField',
+ 'SDXLMainModelField',
+ 'SDXLRefinerModelField',
+ 'VaeModelField',
+ 'UNetField',
+ 'VaeField',
+ 'ClipField',
+];
+
+export const COLLECTION_MAP = {
+ integer: 'IntegerCollection',
+ boolean: 'BooleanCollection',
+ number: 'FloatCollection',
+ float: 'FloatCollection',
+ string: 'StringCollection',
+ ImageField: 'ImageCollection',
+ LatentsField: 'LatentsCollection',
+ ConditioningField: 'ConditioningCollection',
+ ControlField: 'ControlCollection',
+ ColorField: 'ColorCollection',
+};
+export const isCollectionItemType = (
+ itemType: string | undefined
+): itemType is keyof typeof COLLECTION_MAP =>
+ Boolean(itemType && itemType in COLLECTION_MAP);
+
+export const SINGLE_TO_POLYMORPHIC_MAP = {
+ integer: 'IntegerPolymorphic',
+ boolean: 'BooleanPolymorphic',
+ number: 'FloatPolymorphic',
+ float: 'FloatPolymorphic',
+ string: 'StringPolymorphic',
+ ImageField: 'ImagePolymorphic',
+ LatentsField: 'LatentsPolymorphic',
+ ConditioningField: 'ConditioningPolymorphic',
+ ControlField: 'ControlPolymorphic',
+ ColorField: 'ColorPolymorphic',
+};
+
+export const POLYMORPHIC_TO_SINGLE_MAP = {
+ IntegerPolymorphic: 'integer',
+ BooleanPolymorphic: 'boolean',
+ FloatPolymorphic: 'float',
+ StringPolymorphic: 'string',
+ ImagePolymorphic: 'ImageField',
+ LatentsPolymorphic: 'LatentsField',
+ ConditioningPolymorphic: 'ConditioningField',
+ ControlPolymorphic: 'ControlField',
+ ColorPolymorphic: 'ColorField',
+};
+
+export const isPolymorphicItemType = (
+ itemType: string | undefined
+): itemType is keyof typeof SINGLE_TO_POLYMORPHIC_MAP =>
+ Boolean(itemType && itemType in SINGLE_TO_POLYMORPHIC_MAP);
+
export const FIELDS: Record = {
- integer: {
- title: 'Integer',
- description: 'Integers are whole numbers, without a decimal point.',
- color: 'red.500',
- },
- float: {
- title: 'Float',
- description: 'Floats are numbers with a decimal point.',
- color: 'orange.500',
- },
- string: {
- title: 'String',
- description: 'Strings are text.',
- color: 'yellow.500',
- },
boolean: {
- title: 'Boolean',
color: 'green.500',
description: 'Booleans are true or false.',
+ title: 'Boolean',
},
- enum: {
- title: 'Enum',
- description: 'Enums are values that may be one of a number of options.',
- color: 'blue.500',
+ BooleanCollection: {
+ color: 'green.500',
+ description: 'A collection of booleans.',
+ title: 'Boolean Collection',
},
- array: {
- title: 'Array',
- description: 'Enums are values that may be one of a number of options.',
- color: 'base.500',
- },
- ImageField: {
- title: 'Image',
- description: 'Images may be passed between nodes.',
- color: 'purple.500',
- },
- DenoiseMaskField: {
- title: 'Denoise Mask',
- description: 'Denoise Mask may be passed between nodes',
- color: 'base.500',
- },
- LatentsField: {
- title: 'Latents',
- description: 'Latents may be passed between nodes.',
- color: 'pink.500',
- },
- LatentsCollection: {
- title: 'Latents Collection',
- description: 'Latents may be passed between nodes.',
- color: 'pink.500',
- },
- ConditioningField: {
- color: 'cyan.500',
- title: 'Conditioning',
- description: 'Conditioning may be passed between nodes.',
- },
- ConditioningCollection: {
- color: 'cyan.500',
- title: 'Conditioning Collection',
- description: 'Conditioning may be passed between nodes.',
- },
- ImageCollection: {
- title: 'Image Collection',
- description: 'A collection of images.',
- color: 'base.300',
- },
- UNetField: {
- color: 'red.500',
- title: 'UNet',
- description: 'UNet submodel.',
+ BooleanPolymorphic: {
+ color: 'green.500',
+ description: 'A collection of booleans.',
+ title: 'Boolean Polymorphic',
},
ClipField: {
color: 'green.500',
- title: 'Clip',
description: 'Tokenizer and text_encoder submodels.',
- },
- VaeField: {
- color: 'blue.500',
- title: 'Vae',
- description: 'Vae submodel.',
- },
- ControlField: {
- color: 'cyan.500',
- title: 'Control',
- description: 'Control info passed between nodes.',
- },
- MainModelField: {
- color: 'teal.500',
- title: 'Model',
- description: 'TODO',
- },
- SDXLRefinerModelField: {
- color: 'teal.500',
- title: 'Refiner Model',
- description: 'TODO',
- },
- VaeModelField: {
- color: 'teal.500',
- title: 'VAE',
- description: 'TODO',
- },
- LoRAModelField: {
- color: 'teal.500',
- title: 'LoRA',
- description: 'TODO',
- },
- ControlNetModelField: {
- color: 'teal.500',
- title: 'ControlNet',
- description: 'TODO',
- },
- Scheduler: {
- color: 'base.500',
- title: 'Scheduler',
- description: 'TODO',
+ title: 'Clip',
},
Collection: {
color: 'base.500',
- title: 'Collection',
description: 'TODO',
+ title: 'Collection',
},
CollectionItem: {
color: 'base.500',
- title: 'Collection Item',
description: 'TODO',
+ title: 'Collection Item',
+ },
+ ColorCollection: {
+ color: 'pink.300',
+ description: 'A collection of colors.',
+ title: 'Color Collection',
},
ColorField: {
- title: 'Color',
+ color: 'pink.300',
description: 'A RGBA color.',
- color: 'base.500',
+ title: 'Color',
},
- BooleanCollection: {
- title: 'Boolean Collection',
- description: 'A collection of booleans.',
- color: 'green.500',
+ ColorPolymorphic: {
+ color: 'pink.300',
+ description: 'A collection of colors.',
+ title: 'Color Polymorphic',
},
- IntegerCollection: {
- title: 'Integer Collection',
- description: 'A collection of integers.',
- color: 'red.500',
+ ConditioningCollection: {
+ color: 'cyan.500',
+ description: 'Conditioning may be passed between nodes.',
+ title: 'Conditioning Collection',
+ },
+ ConditioningField: {
+ color: 'cyan.500',
+ description: 'Conditioning may be passed between nodes.',
+ title: 'Conditioning',
+ },
+ ConditioningPolymorphic: {
+ color: 'cyan.500',
+ description: 'Conditioning may be passed between nodes.',
+ title: 'Conditioning Polymorphic',
+ },
+ ControlCollection: {
+ color: 'teal.500',
+ description: 'Control info passed between nodes.',
+ title: 'Control Collection',
+ },
+ ControlField: {
+ color: 'teal.500',
+ description: 'Control info passed between nodes.',
+ title: 'Control',
+ },
+ ControlNetModelField: {
+ color: 'teal.500',
+ description: 'TODO',
+ title: 'ControlNet',
+ },
+ ControlPolymorphic: {
+ color: 'teal.500',
+ description: 'Control info passed between nodes.',
+ title: 'Control Polymorphic',
+ },
+ DenoiseMaskField: {
+ color: 'blue.300',
+ description: 'Denoise Mask may be passed between nodes',
+ title: 'Denoise Mask',
+ },
+ enum: {
+ color: 'blue.500',
+ description: 'Enums are values that may be one of a number of options.',
+ title: 'Enum',
+ },
+ float: {
+ color: 'orange.500',
+ description: 'Floats are numbers with a decimal point.',
+ title: 'Float',
},
FloatCollection: {
color: 'orange.500',
- title: 'Float Collection',
description: 'A collection of floats.',
+ title: 'Float Collection',
},
- ColorCollection: {
- color: 'base.500',
- title: 'Color Collection',
- description: 'A collection of colors.',
+ FloatPolymorphic: {
+ color: 'orange.500',
+ description: 'A collection of floats.',
+ title: 'Float Polymorphic',
+ },
+ ImageCollection: {
+ color: 'purple.500',
+ description: 'A collection of images.',
+ title: 'Image Collection',
+ },
+ ImageField: {
+ color: 'purple.500',
+ description: 'Images may be passed between nodes.',
+ title: 'Image',
+ },
+ ImagePolymorphic: {
+ color: 'purple.500',
+ description: 'A collection of images.',
+ title: 'Image Polymorphic',
+ },
+ integer: {
+ color: 'red.500',
+ description: 'Integers are whole numbers, without a decimal point.',
+ title: 'Integer',
+ },
+ IntegerCollection: {
+ color: 'red.500',
+ description: 'A collection of integers.',
+ title: 'Integer Collection',
+ },
+ IntegerPolymorphic: {
+ color: 'red.500',
+ description: 'A collection of integers.',
+ title: 'Integer Polymorphic',
+ },
+ LatentsCollection: {
+ color: 'pink.500',
+ description: 'Latents may be passed between nodes.',
+ title: 'Latents Collection',
+ },
+ LatentsField: {
+ color: 'pink.500',
+ description: 'Latents may be passed between nodes.',
+ title: 'Latents',
+ },
+ LatentsPolymorphic: {
+ color: 'pink.500',
+ description: 'Latents may be passed between nodes.',
+ title: 'Latents Polymorphic',
+ },
+ LoRAModelField: {
+ color: 'teal.500',
+ description: 'TODO',
+ title: 'LoRA',
+ },
+ MainModelField: {
+ color: 'teal.500',
+ description: 'TODO',
+ title: 'Model',
},
ONNXModelField: {
- color: 'base.500',
- title: 'ONNX Model',
+ color: 'teal.500',
description: 'ONNX model field.',
+ title: 'ONNX Model',
+ },
+ Scheduler: {
+ color: 'base.500',
+ description: 'TODO',
+ title: 'Scheduler',
},
SDXLMainModelField: {
- color: 'base.500',
- title: 'SDXL Model',
+ color: 'teal.500',
description: 'SDXL model field.',
+ title: 'SDXL Model',
+ },
+ SDXLRefinerModelField: {
+ color: 'teal.500',
+ description: 'TODO',
+ title: 'Refiner Model',
+ },
+ string: {
+ color: 'yellow.500',
+ description: 'Strings are text.',
+ title: 'String',
},
StringCollection: {
color: 'yellow.500',
- title: 'String Collection',
description: 'A collection of strings.',
+ title: 'String Collection',
+ },
+ StringPolymorphic: {
+ color: 'yellow.500',
+ description: 'A collection of strings.',
+ title: 'String Polymorphic',
+ },
+ UNetField: {
+ color: 'red.500',
+ description: 'UNet submodel.',
+ title: 'UNet',
+ },
+ VaeField: {
+ color: 'blue.500',
+ description: 'Vae submodel.',
+ title: 'Vae',
+ },
+ VaeModelField: {
+ color: 'teal.500',
+ description: 'TODO',
+ title: 'VAE',
},
};
diff --git a/invokeai/frontend/web/src/features/nodes/types/types.ts b/invokeai/frontend/web/src/features/nodes/types/types.ts
index aee5c69705..f7986a5028 100644
--- a/invokeai/frontend/web/src/features/nodes/types/types.ts
+++ b/invokeai/frontend/web/src/features/nodes/types/types.ts
@@ -11,7 +11,7 @@ import { keyBy } from 'lodash-es';
import { OpenAPIV3 } from 'openapi-types';
import { RgbaColor } from 'react-colorful';
import { Node } from 'reactflow';
-import { Graph, ImageDTO, _InputField, _OutputField } from 'services/api/types';
+import { Graph, _InputField, _OutputField } from 'services/api/types';
import {
AnyInvocationType,
AnyResult,
@@ -62,50 +62,48 @@ export type FieldUIConfig = {
// TODO: Get this from the OpenAPI schema? may be tricky...
export const zFieldType = z.enum([
- // region Primitives
- 'integer',
- 'float',
'boolean',
- 'string',
- 'array',
- 'ImageField',
- 'DenoiseMaskField',
- 'LatentsField',
- 'ConditioningField',
- 'ControlField',
- 'ColorField',
- 'ImageCollection',
- 'ConditioningCollection',
- 'ColorCollection',
- 'LatentsCollection',
- 'IntegerCollection',
- 'FloatCollection',
- 'StringCollection',
'BooleanCollection',
- // endregion
-
- // region Models
- 'MainModelField',
- 'SDXLMainModelField',
- 'SDXLRefinerModelField',
- 'ONNXModelField',
- 'VaeModelField',
- 'LoRAModelField',
- 'ControlNetModelField',
- 'UNetField',
- 'VaeField',
+ 'BooleanPolymorphic',
'ClipField',
- // endregion
-
- // region Iterate/Collect
'Collection',
'CollectionItem',
- // endregion
-
- // region Misc
+ 'ColorCollection',
+ 'ColorField',
+ 'ColorPolymorphic',
+ 'ConditioningCollection',
+ 'ConditioningField',
+ 'ConditioningPolymorphic',
+ 'ControlCollection',
+ 'ControlField',
+ 'ControlNetModelField',
+ 'ControlPolymorphic',
+ 'DenoiseMaskField',
'enum',
+ 'float',
+ 'FloatCollection',
+ 'FloatPolymorphic',
+ 'ImageCollection',
+ 'ImageField',
+ 'ImagePolymorphic',
+ 'integer',
+ 'IntegerCollection',
+ 'IntegerPolymorphic',
+ 'LatentsCollection',
+ 'LatentsField',
+ 'LatentsPolymorphic',
+ 'LoRAModelField',
+ 'MainModelField',
+ 'ONNXModelField',
'Scheduler',
- // endregion
+ 'SDXLMainModelField',
+ 'SDXLRefinerModelField',
+ 'string',
+ 'StringCollection',
+ 'StringPolymorphic',
+ 'UNetField',
+ 'VaeField',
+ 'VaeModelField',
]);
export type FieldType = z.infer;
@@ -122,38 +120,6 @@ export const isFieldType = (value: unknown): value is FieldType =>
zFieldType.safeParse(value).success ||
zReservedFieldType.safeParse(value).success;
-/**
- * An input field template is generated on each page load from the OpenAPI schema.
- *
- * The template provides the field type and other field metadata (e.g. title, description,
- * maximum length, pattern to match, etc).
- */
-export type InputFieldTemplate =
- | IntegerInputFieldTemplate
- | FloatInputFieldTemplate
- | StringInputFieldTemplate
- | BooleanInputFieldTemplate
- | ImageInputFieldTemplate
- | DenoiseMaskInputFieldTemplate
- | LatentsInputFieldTemplate
- | ConditioningInputFieldTemplate
- | UNetInputFieldTemplate
- | ClipInputFieldTemplate
- | VaeInputFieldTemplate
- | ControlInputFieldTemplate
- | EnumInputFieldTemplate
- | MainModelInputFieldTemplate
- | SDXLMainModelInputFieldTemplate
- | SDXLRefinerModelInputFieldTemplate
- | VaeModelInputFieldTemplate
- | LoRAModelInputFieldTemplate
- | ControlNetModelInputFieldTemplate
- | CollectionInputFieldTemplate
- | CollectionItemInputFieldTemplate
- | ColorInputFieldTemplate
- | ImageCollectionInputFieldTemplate
- | SchedulerInputFieldTemplate;
-
/**
* Indicates the kind of input(s) this field may have.
*/
@@ -232,24 +198,88 @@ export const zIntegerInputFieldValue = zInputFieldValueBase.extend({
});
export type IntegerInputFieldValue = z.infer;
+export const zIntegerCollectionInputFieldValue = zInputFieldValueBase.extend({
+ type: z.literal('IntegerCollection'),
+ value: z.array(z.number().int()).optional(),
+});
+export type IntegerCollectionInputFieldValue = z.infer<
+ typeof zIntegerCollectionInputFieldValue
+>;
+
+export const zIntegerPolymorphicInputFieldValue = zInputFieldValueBase.extend({
+ type: z.literal('IntegerPolymorphic'),
+ value: z.union([z.number().int(), z.array(z.number().int())]).optional(),
+});
+export type IntegerPolymorphicInputFieldValue = z.infer<
+ typeof zIntegerPolymorphicInputFieldValue
+>;
+
export const zFloatInputFieldValue = zInputFieldValueBase.extend({
type: z.literal('float'),
value: z.number().optional(),
});
export type FloatInputFieldValue = z.infer;
+export const zFloatCollectionInputFieldValue = zInputFieldValueBase.extend({
+ type: z.literal('FloatCollection'),
+ value: z.array(z.number()).optional(),
+});
+export type FloatCollectionInputFieldValue = z.infer<
+ typeof zFloatCollectionInputFieldValue
+>;
+
+export const zFloatPolymorphicInputFieldValue = zInputFieldValueBase.extend({
+ type: z.literal('FloatPolymorphic'),
+ value: z.union([z.number(), z.array(z.number())]).optional(),
+});
+export type FloatPolymorphicInputFieldValue = z.infer<
+ typeof zFloatPolymorphicInputFieldValue
+>;
+
export const zStringInputFieldValue = zInputFieldValueBase.extend({
type: z.literal('string'),
value: z.string().optional(),
});
export type StringInputFieldValue = z.infer;
+export const zStringCollectionInputFieldValue = zInputFieldValueBase.extend({
+ type: z.literal('StringCollection'),
+ value: z.array(z.string()).optional(),
+});
+export type StringCollectionInputFieldValue = z.infer<
+ typeof zStringCollectionInputFieldValue
+>;
+
+export const zStringPolymorphicInputFieldValue = zInputFieldValueBase.extend({
+ type: z.literal('StringPolymorphic'),
+ value: z.union([z.string(), z.array(z.string())]).optional(),
+});
+export type StringPolymorphicInputFieldValue = z.infer<
+ typeof zStringPolymorphicInputFieldValue
+>;
+
export const zBooleanInputFieldValue = zInputFieldValueBase.extend({
type: z.literal('boolean'),
value: z.boolean().optional(),
});
export type BooleanInputFieldValue = z.infer;
+export const zBooleanCollectionInputFieldValue = zInputFieldValueBase.extend({
+ type: z.literal('BooleanCollection'),
+ value: z.array(z.boolean()).optional(),
+});
+export type BooleanCollectionInputFieldValue = z.infer<
+ typeof zBooleanCollectionInputFieldValue
+>;
+
+export const zBooleanPolymorphicInputFieldValue = zInputFieldValueBase.extend({
+ type: z.literal('BooleanPolymorphic'),
+ value: z.union([z.boolean(), z.array(z.boolean())]).optional(),
+});
+export type BooleanPolymorphicInputFieldValue = z.infer<
+ typeof zBooleanPolymorphicInputFieldValue
+>;
+
export const zEnumInputFieldValue = zInputFieldValueBase.extend({
type: z.literal('enum'),
value: z.union([z.string(), z.number()]).optional(),
@@ -262,6 +292,22 @@ export const zLatentsInputFieldValue = zInputFieldValueBase.extend({
});
export type LatentsInputFieldValue = z.infer;
+export const zLatentsCollectionInputFieldValue = zInputFieldValueBase.extend({
+ type: z.literal('LatentsCollection'),
+ value: z.array(zLatentsField).optional(),
+});
+export type LatentsCollectionInputFieldValue = z.infer<
+ typeof zLatentsCollectionInputFieldValue
+>;
+
+export const zLatentsPolymorphicInputFieldValue = zInputFieldValueBase.extend({
+ type: z.literal('LatentsPolymorphic'),
+ value: z.union([zLatentsField, z.array(zLatentsField)]).optional(),
+});
+export type LatentsPolymorphicInputFieldValue = z.infer<
+ typeof zLatentsPolymorphicInputFieldValue
+>;
+
export const zDenoiseMaskInputFieldValue = zInputFieldValueBase.extend({
type: z.literal('DenoiseMaskField'),
value: zDenoiseMaskField.optional(),
@@ -278,6 +324,26 @@ export type ConditioningInputFieldValue = z.infer<
typeof zConditioningInputFieldValue
>;
+export const zConditioningCollectionInputFieldValue =
+ zInputFieldValueBase.extend({
+ type: z.literal('ConditioningCollection'),
+ value: z.array(zConditioningField).optional(),
+ });
+export type ConditioningCollectionInputFieldValue = z.infer<
+ typeof zConditioningCollectionInputFieldValue
+>;
+
+export const zConditioningPolymorphicInputFieldValue =
+ zInputFieldValueBase.extend({
+ type: z.literal('ConditioningPolymorphic'),
+ value: z
+ .union([zConditioningField, z.array(zConditioningField)])
+ .optional(),
+ });
+export type ConditioningPolymorphicInputFieldValue = z.infer<
+ typeof zConditioningPolymorphicInputFieldValue
+>;
+
export const zControlNetModel = zModelIdentifier;
export type ControlNetModel = z.infer;
@@ -302,6 +368,22 @@ export const zControlInputFieldValue = zInputFieldValueBase.extend({
});
export type ControlInputFieldValue = z.infer;
+export const zControlPolymorphicInputFieldValue = zInputFieldValueBase.extend({
+ type: z.literal('ControlPolymorphic'),
+ value: z.union([zControlField, z.array(zControlField)]).optional(),
+});
+export type ControlPolymorphicInputFieldValue = z.infer<
+ typeof zControlPolymorphicInputFieldValue
+>;
+
+export const zControlCollectionInputFieldValue = zInputFieldValueBase.extend({
+ type: z.literal('ControlCollection'),
+ value: z.array(zControlField).optional(),
+});
+export type ControlCollectionInputFieldValue = z.infer<
+ typeof zControlCollectionInputFieldValue
+>;
+
export const zModelType = z.enum([
'onnx',
'main',
@@ -381,6 +463,14 @@ export const zImageInputFieldValue = zInputFieldValueBase.extend({
});
export type ImageInputFieldValue = z.infer;
+export const zImagePolymorphicInputFieldValue = zInputFieldValueBase.extend({
+ type: z.literal('ImagePolymorphic'),
+ value: z.union([zImageField, z.array(zImageField)]).optional(),
+});
+export type ImagePolymorphicInputFieldValue = z.infer<
+ typeof zImagePolymorphicInputFieldValue
+>;
+
export const zImageCollectionInputFieldValue = zInputFieldValueBase.extend({
type: z.literal('ImageCollection'),
value: z.array(zImageField).optional(),
@@ -473,6 +563,22 @@ export const zColorInputFieldValue = zInputFieldValueBase.extend({
});
export type ColorInputFieldValue = z.infer;
+export const zColorCollectionInputFieldValue = zInputFieldValueBase.extend({
+ type: z.literal('ColorCollection'),
+ value: z.array(zColorField).optional(),
+});
+export type ColorCollectionInputFieldValue = z.infer<
+ typeof zColorCollectionInputFieldValue
+>;
+
+export const zColorPolymorphicInputFieldValue = zInputFieldValueBase.extend({
+ type: z.literal('ColorPolymorphic'),
+ value: z.union([zColorField, z.array(zColorField)]).optional(),
+});
+export type ColorPolymorphicInputFieldValue = z.infer<
+ typeof zColorPolymorphicInputFieldValue
+>;
+
export const zSchedulerInputFieldValue = zInputFieldValueBase.extend({
type: z.literal('Scheduler'),
value: zScheduler.optional(),
@@ -482,30 +588,47 @@ export type SchedulerInputFieldValue = z.infer<
>;
export const zInputFieldValue = z.discriminatedUnion('type', [
- zIntegerInputFieldValue,
- zFloatInputFieldValue,
- zStringInputFieldValue,
+ zBooleanCollectionInputFieldValue,
zBooleanInputFieldValue,
- zImageInputFieldValue,
- zLatentsInputFieldValue,
- zDenoiseMaskInputFieldValue,
- zConditioningInputFieldValue,
- zUNetInputFieldValue,
+ zBooleanPolymorphicInputFieldValue,
zClipInputFieldValue,
- zVaeInputFieldValue,
- zControlInputFieldValue,
- zEnumInputFieldValue,
- zMainModelInputFieldValue,
- zSDXLMainModelInputFieldValue,
- zSDXLRefinerModelInputFieldValue,
- zVaeModelInputFieldValue,
- zLoRAModelInputFieldValue,
- zControlNetModelInputFieldValue,
zCollectionInputFieldValue,
zCollectionItemInputFieldValue,
zColorInputFieldValue,
+ zColorCollectionInputFieldValue,
+ zColorPolymorphicInputFieldValue,
+ zConditioningInputFieldValue,
+ zConditioningCollectionInputFieldValue,
+ zConditioningPolymorphicInputFieldValue,
+ zControlInputFieldValue,
+ zControlNetModelInputFieldValue,
+ zControlCollectionInputFieldValue,
+ zControlPolymorphicInputFieldValue,
+ zDenoiseMaskInputFieldValue,
+ zEnumInputFieldValue,
+ zFloatCollectionInputFieldValue,
+ zFloatInputFieldValue,
+ zFloatPolymorphicInputFieldValue,
zImageCollectionInputFieldValue,
+ zImagePolymorphicInputFieldValue,
+ zImageInputFieldValue,
+ zIntegerCollectionInputFieldValue,
+ zIntegerPolymorphicInputFieldValue,
+ zIntegerInputFieldValue,
+ zLatentsInputFieldValue,
+ zLatentsCollectionInputFieldValue,
+ zLatentsPolymorphicInputFieldValue,
+ zLoRAModelInputFieldValue,
+ zMainModelInputFieldValue,
zSchedulerInputFieldValue,
+ zSDXLMainModelInputFieldValue,
+ zSDXLRefinerModelInputFieldValue,
+ zStringCollectionInputFieldValue,
+ zStringPolymorphicInputFieldValue,
+ zStringInputFieldValue,
+ zUNetInputFieldValue,
+ zVaeInputFieldValue,
+ zVaeModelInputFieldValue,
]);
export type InputFieldValue = z.infer;
@@ -514,7 +637,6 @@ export type InputFieldTemplateBase = {
name: string;
title: string;
description: string;
- type: FieldType;
required: boolean;
fieldKind: 'input';
} & _InputField;
@@ -529,6 +651,19 @@ export type IntegerInputFieldTemplate = InputFieldTemplateBase & {
exclusiveMinimum?: boolean;
};
+export type IntegerCollectionInputFieldTemplate = InputFieldTemplateBase & {
+ type: 'IntegerCollection';
+ default: number[];
+ item_default?: number;
+};
+
+export type IntegerPolymorphicInputFieldTemplate = Omit<
+ IntegerInputFieldTemplate,
+ 'type'
+> & {
+ type: 'IntegerPolymorphic';
+};
+
export type FloatInputFieldTemplate = InputFieldTemplateBase & {
type: 'float';
default: number;
@@ -539,6 +674,19 @@ export type FloatInputFieldTemplate = InputFieldTemplateBase & {
exclusiveMinimum?: boolean;
};
+export type FloatCollectionInputFieldTemplate = InputFieldTemplateBase & {
+ type: 'FloatCollection';
+ default: number[];
+ item_default?: number;
+};
+
+export type FloatPolymorphicInputFieldTemplate = Omit<
+ FloatInputFieldTemplate,
+ 'type'
+> & {
+ type: 'FloatPolymorphic';
+};
+
export type StringInputFieldTemplate = InputFieldTemplateBase & {
type: 'string';
default: string;
@@ -547,19 +695,53 @@ export type StringInputFieldTemplate = InputFieldTemplateBase & {
pattern?: string;
};
+export type StringCollectionInputFieldTemplate = InputFieldTemplateBase & {
+ type: 'StringCollection';
+ default: string[];
+ item_default?: string;
+};
+
+export type StringPolymorphicInputFieldTemplate = Omit<
+ StringInputFieldTemplate,
+ 'type'
+> & {
+ type: 'StringPolymorphic';
+};
+
export type BooleanInputFieldTemplate = InputFieldTemplateBase & {
default: boolean;
type: 'boolean';
};
+export type BooleanCollectionInputFieldTemplate = InputFieldTemplateBase & {
+ type: 'BooleanCollection';
+ default: boolean[];
+ item_default?: boolean;
+};
+
+export type BooleanPolymorphicInputFieldTemplate = Omit<
+ BooleanInputFieldTemplate,
+ 'type'
+> & {
+ type: 'BooleanPolymorphic';
+};
+
export type ImageInputFieldTemplate = InputFieldTemplateBase & {
- default: ImageDTO;
+ default: ImageField;
type: 'ImageField';
};
export type ImageCollectionInputFieldTemplate = InputFieldTemplateBase & {
default: ImageField[];
type: 'ImageCollection';
+ item_default?: ImageField;
+};
+
+export type ImagePolymorphicInputFieldTemplate = Omit<
+ ImageInputFieldTemplate,
+ 'type'
+> & {
+ type: 'ImagePolymorphic';
};
export type DenoiseMaskInputFieldTemplate = InputFieldTemplateBase & {
@@ -568,15 +750,40 @@ export type DenoiseMaskInputFieldTemplate = InputFieldTemplateBase & {
};
export type LatentsInputFieldTemplate = InputFieldTemplateBase & {
- default: string;
+ default: LatentsField;
type: 'LatentsField';
};
+export type LatentsCollectionInputFieldTemplate = InputFieldTemplateBase & {
+ default: LatentsField[];
+ type: 'LatentsCollection';
+ item_default?: LatentsField;
+};
+
+export type LatentsPolymorphicInputFieldTemplate = InputFieldTemplateBase & {
+ default: LatentsField;
+ type: 'LatentsPolymorphic';
+};
+
export type ConditioningInputFieldTemplate = InputFieldTemplateBase & {
default: undefined;
type: 'ConditioningField';
};
+export type ConditioningCollectionInputFieldTemplate =
+ InputFieldTemplateBase & {
+ default: ConditioningField[];
+ type: 'ConditioningCollection';
+ item_default?: ConditioningField;
+ };
+
+export type ConditioningPolymorphicInputFieldTemplate = Omit<
+ ConditioningInputFieldTemplate,
+ 'type'
+> & {
+ type: 'ConditioningPolymorphic';
+};
+
export type UNetInputFieldTemplate = InputFieldTemplateBase & {
default: undefined;
type: 'UNetField';
@@ -597,6 +804,19 @@ export type ControlInputFieldTemplate = InputFieldTemplateBase & {
type: 'ControlField';
};
+export type ControlCollectionInputFieldTemplate = InputFieldTemplateBase & {
+ default: undefined;
+ type: 'ControlCollection';
+ item_default?: ControlField;
+};
+
+export type ControlPolymorphicInputFieldTemplate = Omit<
+ ControlInputFieldTemplate,
+ 'type'
+> & {
+ type: 'ControlPolymorphic';
+};
+
export type EnumInputFieldTemplate = InputFieldTemplateBase & {
default: string | number;
type: 'enum';
@@ -649,6 +869,18 @@ export type ColorInputFieldTemplate = InputFieldTemplateBase & {
type: 'ColorField';
};
+export type ColorPolymorphicInputFieldTemplate = Omit<
+ ColorInputFieldTemplate,
+ 'type'
+> & {
+ type: 'ColorPolymorphic';
+};
+
+export type ColorCollectionInputFieldTemplate = InputFieldTemplateBase & {
+ default: [];
+ type: 'ColorCollection';
+};
+
export type SchedulerInputFieldTemplate = InputFieldTemplateBase & {
default: SchedulerParam;
type: 'Scheduler';
@@ -659,6 +891,55 @@ export type WorkflowInputFieldTemplate = InputFieldTemplateBase & {
type: 'WorkflowField';
};
+/**
+ * An input field template is generated on each page load from the OpenAPI schema.
+ *
+ * The template provides the field type and other field metadata (e.g. title, description,
+ * maximum length, pattern to match, etc).
+ */
+export type InputFieldTemplate =
+ | BooleanCollectionInputFieldTemplate
+ | BooleanPolymorphicInputFieldTemplate
+ | BooleanInputFieldTemplate
+ | ClipInputFieldTemplate
+ | CollectionInputFieldTemplate
+ | CollectionItemInputFieldTemplate
+ | ColorInputFieldTemplate
+ | ColorCollectionInputFieldTemplate
+ | ColorPolymorphicInputFieldTemplate
+ | ConditioningInputFieldTemplate
+ | ConditioningCollectionInputFieldTemplate
+ | ConditioningPolymorphicInputFieldTemplate
+ | ControlInputFieldTemplate
+ | ControlCollectionInputFieldTemplate
+ | ControlNetModelInputFieldTemplate
+ | ControlPolymorphicInputFieldTemplate
+ | DenoiseMaskInputFieldTemplate
+ | EnumInputFieldTemplate
+ | FloatCollectionInputFieldTemplate
+ | FloatInputFieldTemplate
+ | FloatPolymorphicInputFieldTemplate
+ | ImageCollectionInputFieldTemplate
+ | ImagePolymorphicInputFieldTemplate
+ | ImageInputFieldTemplate
+ | IntegerCollectionInputFieldTemplate
+ | IntegerPolymorphicInputFieldTemplate
+ | IntegerInputFieldTemplate
+ | LatentsInputFieldTemplate
+ | LatentsCollectionInputFieldTemplate
+ | LatentsPolymorphicInputFieldTemplate
+ | LoRAModelInputFieldTemplate
+ | MainModelInputFieldTemplate
+ | SchedulerInputFieldTemplate
+ | SDXLMainModelInputFieldTemplate
+ | SDXLRefinerModelInputFieldTemplate
+ | StringCollectionInputFieldTemplate
+ | StringPolymorphicInputFieldTemplate
+ | StringInputFieldTemplate
+ | UNetInputFieldTemplate
+ | VaeInputFieldTemplate
+ | VaeModelInputFieldTemplate;
+
export const isInputFieldValue = (
field?: InputFieldValue | OutputFieldValue
): field is InputFieldValue => Boolean(field && field.fieldKind === 'input');
@@ -731,8 +1012,22 @@ export type InvocationSchemaObject = (
) & { class: 'invocation' };
export const isSchemaObject = (
- obj: OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject
-): obj is OpenAPIV3.SchemaObject => !('$ref' in obj);
+ obj: OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject | undefined
+): obj is OpenAPIV3.SchemaObject => Boolean(obj && !('$ref' in obj));
+
+export const isArraySchemaObject = (
+ obj: OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject | undefined
+): obj is OpenAPIV3.ArraySchemaObject =>
+ Boolean(obj && !('$ref' in obj) && obj.type === 'array');
+
+export const isNonArraySchemaObject = (
+ obj: OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject | undefined
+): obj is OpenAPIV3.NonArraySchemaObject =>
+ Boolean(obj && !('$ref' in obj) && obj.type !== 'array');
+
+export const isRefObject = (
+ obj: OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject | undefined
+): obj is OpenAPIV3.ReferenceObject => Boolean(obj && '$ref' in obj);
export const isInvocationSchemaObject = (
obj:
diff --git a/invokeai/frontend/web/src/features/nodes/util/fieldTemplateBuilders.ts b/invokeai/frontend/web/src/features/nodes/util/fieldTemplateBuilders.ts
index 3c4ec7e089..20463f37f6 100644
--- a/invokeai/frontend/web/src/features/nodes/util/fieldTemplateBuilders.ts
+++ b/invokeai/frontend/web/src/features/nodes/util/fieldTemplateBuilders.ts
@@ -1,5 +1,14 @@
+import { isBoolean, isInteger, isNumber, isString } from 'lodash-es';
import { OpenAPIV3 } from 'openapi-types';
import {
+ COLLECTION_MAP,
+ POLYMORPHIC_TYPES,
+ SINGLE_TO_POLYMORPHIC_MAP,
+ isCollectionItemType,
+ isPolymorphicItemType,
+} from '../types/constants';
+import {
+ BooleanCollectionInputFieldTemplate,
BooleanInputFieldTemplate,
ClipInputFieldTemplate,
CollectionInputFieldTemplate,
@@ -11,10 +20,13 @@ import {
DenoiseMaskInputFieldTemplate,
EnumInputFieldTemplate,
FieldType,
+ FloatCollectionInputFieldTemplate,
+ FloatPolymorphicInputFieldTemplate,
FloatInputFieldTemplate,
ImageCollectionInputFieldTemplate,
ImageInputFieldTemplate,
InputFieldTemplateBase,
+ IntegerCollectionInputFieldTemplate,
IntegerInputFieldTemplate,
InvocationFieldSchema,
InvocationSchemaObject,
@@ -24,11 +36,32 @@ import {
SDXLMainModelInputFieldTemplate,
SDXLRefinerModelInputFieldTemplate,
SchedulerInputFieldTemplate,
+ StringCollectionInputFieldTemplate,
StringInputFieldTemplate,
UNetInputFieldTemplate,
VaeInputFieldTemplate,
VaeModelInputFieldTemplate,
+ isArraySchemaObject,
+ isNonArraySchemaObject,
+ isRefObject,
+ isSchemaObject,
+ ControlPolymorphicInputFieldTemplate,
+ ColorPolymorphicInputFieldTemplate,
+ ColorCollectionInputFieldTemplate,
+ IntegerPolymorphicInputFieldTemplate,
+ StringPolymorphicInputFieldTemplate,
+ BooleanPolymorphicInputFieldTemplate,
+ ImagePolymorphicInputFieldTemplate,
+ LatentsPolymorphicInputFieldTemplate,
+ LatentsCollectionInputFieldTemplate,
+ ConditioningPolymorphicInputFieldTemplate,
+ ConditioningCollectionInputFieldTemplate,
+ ControlCollectionInputFieldTemplate,
+ ImageField,
+ LatentsField,
+ ConditioningField,
} from '../types/types';
+import { ControlField } from 'services/api/types';
export type BaseFieldProperties = 'name' | 'title' | 'description';
@@ -45,15 +78,8 @@ export type BuildInputFieldArg = {
* @example
* refObjectToFieldType({ "$ref": "#/components/schemas/ImageField" }) --> 'ImageField'
*/
-export const refObjectToFieldType = (
- refObject: OpenAPIV3.ReferenceObject
-): FieldType => {
- const name = refObject.$ref.split('/').slice(-1)[0];
- if (!name) {
- throw `Unknown field type: ${name}`;
- }
- return name as FieldType;
-};
+export const refObjectToSchemaName = (refObject: OpenAPIV3.ReferenceObject) =>
+ refObject.$ref.split('/').slice(-1)[0];
const buildIntegerInputFieldTemplate = ({
schemaObject,
@@ -88,6 +114,57 @@ const buildIntegerInputFieldTemplate = ({
return template;
};
+const buildIntegerPolymorphicInputFieldTemplate = ({
+ schemaObject,
+ baseField,
+}: BuildInputFieldArg): IntegerPolymorphicInputFieldTemplate => {
+ const template: IntegerPolymorphicInputFieldTemplate = {
+ ...baseField,
+ type: 'IntegerPolymorphic',
+ default: schemaObject.default ?? 0,
+ };
+
+ if (schemaObject.multipleOf !== undefined) {
+ template.multipleOf = schemaObject.multipleOf;
+ }
+
+ if (schemaObject.maximum !== undefined) {
+ template.maximum = schemaObject.maximum;
+ }
+
+ if (schemaObject.exclusiveMaximum !== undefined) {
+ template.exclusiveMaximum = schemaObject.exclusiveMaximum;
+ }
+
+ if (schemaObject.minimum !== undefined) {
+ template.minimum = schemaObject.minimum;
+ }
+
+ if (schemaObject.exclusiveMinimum !== undefined) {
+ template.exclusiveMinimum = schemaObject.exclusiveMinimum;
+ }
+
+ return template;
+};
+
+const buildIntegerCollectionInputFieldTemplate = ({
+ schemaObject,
+ baseField,
+}: BuildInputFieldArg): IntegerCollectionInputFieldTemplate => {
+ const item_default =
+ isNumber(schemaObject.item_default) && isInteger(schemaObject.item_default)
+ ? schemaObject.item_default
+ : 0;
+ const template: IntegerCollectionInputFieldTemplate = {
+ ...baseField,
+ type: 'IntegerCollection',
+ default: schemaObject.default ?? [],
+ item_default,
+ };
+
+ return template;
+};
+
const buildFloatInputFieldTemplate = ({
schemaObject,
baseField,
@@ -121,6 +198,54 @@ const buildFloatInputFieldTemplate = ({
return template;
};
+const buildFloatPolymorphicInputFieldTemplate = ({
+ schemaObject,
+ baseField,
+}: BuildInputFieldArg): FloatPolymorphicInputFieldTemplate => {
+ const template: FloatPolymorphicInputFieldTemplate = {
+ ...baseField,
+ type: 'FloatPolymorphic',
+ default: schemaObject.default ?? 0,
+ };
+ if (schemaObject.multipleOf !== undefined) {
+ template.multipleOf = schemaObject.multipleOf;
+ }
+
+ if (schemaObject.maximum !== undefined) {
+ template.maximum = schemaObject.maximum;
+ }
+
+ if (schemaObject.exclusiveMaximum !== undefined) {
+ template.exclusiveMaximum = schemaObject.exclusiveMaximum;
+ }
+
+ if (schemaObject.minimum !== undefined) {
+ template.minimum = schemaObject.minimum;
+ }
+
+ if (schemaObject.exclusiveMinimum !== undefined) {
+ template.exclusiveMinimum = schemaObject.exclusiveMinimum;
+ }
+ return template;
+};
+
+const buildFloatCollectionInputFieldTemplate = ({
+ schemaObject,
+ baseField,
+}: BuildInputFieldArg): FloatCollectionInputFieldTemplate => {
+ const item_default = isNumber(schemaObject.item_default)
+ ? schemaObject.item_default
+ : 0;
+ const template: FloatCollectionInputFieldTemplate = {
+ ...baseField,
+ type: 'FloatCollection',
+ default: schemaObject.default ?? [],
+ item_default,
+ };
+
+ return template;
+};
+
const buildStringInputFieldTemplate = ({
schemaObject,
baseField,
@@ -146,6 +271,48 @@ const buildStringInputFieldTemplate = ({
return template;
};
+const buildStringPolymorphicInputFieldTemplate = ({
+ schemaObject,
+ baseField,
+}: BuildInputFieldArg): StringPolymorphicInputFieldTemplate => {
+ const template: StringPolymorphicInputFieldTemplate = {
+ ...baseField,
+ type: 'StringPolymorphic',
+ default: schemaObject.default ?? '',
+ };
+
+ if (schemaObject.minLength !== undefined) {
+ template.minLength = schemaObject.minLength;
+ }
+
+ if (schemaObject.maxLength !== undefined) {
+ template.maxLength = schemaObject.maxLength;
+ }
+
+ if (schemaObject.pattern !== undefined) {
+ template.pattern = schemaObject.pattern;
+ }
+
+ return template;
+};
+
+const buildStringCollectionInputFieldTemplate = ({
+ schemaObject,
+ baseField,
+}: BuildInputFieldArg): StringCollectionInputFieldTemplate => {
+ const item_default = isString(schemaObject.item_default)
+ ? schemaObject.item_default
+ : '';
+ const template: StringCollectionInputFieldTemplate = {
+ ...baseField,
+ type: 'StringCollection',
+ default: schemaObject.default ?? [],
+ item_default,
+ };
+
+ return template;
+};
+
const buildBooleanInputFieldTemplate = ({
schemaObject,
baseField,
@@ -159,6 +326,37 @@ const buildBooleanInputFieldTemplate = ({
return template;
};
+const buildBooleanPolymorphicInputFieldTemplate = ({
+ schemaObject,
+ baseField,
+}: BuildInputFieldArg): BooleanPolymorphicInputFieldTemplate => {
+ const template: BooleanPolymorphicInputFieldTemplate = {
+ ...baseField,
+ type: 'BooleanPolymorphic',
+ default: schemaObject.default ?? false,
+ };
+
+ return template;
+};
+
+const buildBooleanCollectionInputFieldTemplate = ({
+ schemaObject,
+ baseField,
+}: BuildInputFieldArg): BooleanCollectionInputFieldTemplate => {
+ const item_default =
+ schemaObject.item_default && isBoolean(schemaObject.item_default)
+ ? schemaObject.item_default
+ : false;
+ const template: BooleanCollectionInputFieldTemplate = {
+ ...baseField,
+ type: 'BooleanCollection',
+ default: schemaObject.default ?? [],
+ item_default,
+ };
+
+ return template;
+};
+
const buildMainModelInputFieldTemplate = ({
schemaObject,
baseField,
@@ -250,6 +448,19 @@ const buildImageInputFieldTemplate = ({
return template;
};
+const buildImagePolymorphicInputFieldTemplate = ({
+ schemaObject,
+ baseField,
+}: BuildInputFieldArg): ImagePolymorphicInputFieldTemplate => {
+ const template: ImagePolymorphicInputFieldTemplate = {
+ ...baseField,
+ type: 'ImagePolymorphic',
+ default: schemaObject.default ?? undefined,
+ };
+
+ return template;
+};
+
const buildImageCollectionInputFieldTemplate = ({
schemaObject,
baseField,
@@ -257,7 +468,8 @@ const buildImageCollectionInputFieldTemplate = ({
const template: ImageCollectionInputFieldTemplate = {
...baseField,
type: 'ImageCollection',
- default: schemaObject.default ?? undefined,
+ default: schemaObject.default ?? [],
+ item_default: (schemaObject.item_default as ImageField) ?? undefined,
};
return template;
@@ -289,6 +501,33 @@ const buildLatentsInputFieldTemplate = ({
return template;
};
+const buildLatentsPolymorphicInputFieldTemplate = ({
+ schemaObject,
+ baseField,
+}: BuildInputFieldArg): LatentsPolymorphicInputFieldTemplate => {
+ const template: LatentsPolymorphicInputFieldTemplate = {
+ ...baseField,
+ type: 'LatentsPolymorphic',
+ default: schemaObject.default ?? undefined,
+ };
+
+ return template;
+};
+
+const buildLatentsCollectionInputFieldTemplate = ({
+ schemaObject,
+ baseField,
+}: BuildInputFieldArg): LatentsCollectionInputFieldTemplate => {
+ const template: LatentsCollectionInputFieldTemplate = {
+ ...baseField,
+ type: 'LatentsCollection',
+ default: schemaObject.default ?? [],
+ item_default: (schemaObject.item_default as LatentsField) ?? undefined,
+ };
+
+ return template;
+};
+
const buildConditioningInputFieldTemplate = ({
schemaObject,
baseField,
@@ -302,6 +541,33 @@ const buildConditioningInputFieldTemplate = ({
return template;
};
+const buildConditioningPolymorphicInputFieldTemplate = ({
+ schemaObject,
+ baseField,
+}: BuildInputFieldArg): ConditioningPolymorphicInputFieldTemplate => {
+ const template: ConditioningPolymorphicInputFieldTemplate = {
+ ...baseField,
+ type: 'ConditioningPolymorphic',
+ default: schemaObject.default ?? undefined,
+ };
+
+ return template;
+};
+
+const buildConditioningCollectionInputFieldTemplate = ({
+ schemaObject,
+ baseField,
+}: BuildInputFieldArg): ConditioningCollectionInputFieldTemplate => {
+ const template: ConditioningCollectionInputFieldTemplate = {
+ ...baseField,
+ type: 'ConditioningCollection',
+ default: schemaObject.default ?? [],
+ item_default: (schemaObject.item_default as ConditioningField) ?? undefined,
+ };
+
+ return template;
+};
+
const buildUNetInputFieldTemplate = ({
schemaObject,
baseField,
@@ -355,6 +621,33 @@ const buildControlInputFieldTemplate = ({
return template;
};
+const buildControlPolymorphicInputFieldTemplate = ({
+ schemaObject,
+ baseField,
+}: BuildInputFieldArg): ControlPolymorphicInputFieldTemplate => {
+ const template: ControlPolymorphicInputFieldTemplate = {
+ ...baseField,
+ type: 'ControlPolymorphic',
+ default: schemaObject.default ?? undefined,
+ };
+
+ return template;
+};
+
+const buildControlCollectionInputFieldTemplate = ({
+ schemaObject,
+ baseField,
+}: BuildInputFieldArg): ControlCollectionInputFieldTemplate => {
+ const template: ControlCollectionInputFieldTemplate = {
+ ...baseField,
+ type: 'ControlCollection',
+ default: schemaObject.default ?? [],
+ item_default: (schemaObject.item_default as ControlField) ?? undefined,
+ };
+
+ return template;
+};
+
const buildEnumInputFieldTemplate = ({
schemaObject,
baseField,
@@ -408,6 +701,32 @@ const buildColorInputFieldTemplate = ({
return template;
};
+const buildColorPolymorphicInputFieldTemplate = ({
+ schemaObject,
+ baseField,
+}: BuildInputFieldArg): ColorPolymorphicInputFieldTemplate => {
+ const template: ColorPolymorphicInputFieldTemplate = {
+ ...baseField,
+ type: 'ColorPolymorphic',
+ default: schemaObject.default ?? { r: 127, g: 127, b: 127, a: 255 },
+ };
+
+ return template;
+};
+
+const buildColorCollectionInputFieldTemplate = ({
+ schemaObject,
+ baseField,
+}: BuildInputFieldArg): ColorCollectionInputFieldTemplate => {
+ const template: ColorCollectionInputFieldTemplate = {
+ ...baseField,
+ type: 'ColorCollection',
+ default: schemaObject.default ?? [],
+ };
+
+ return template;
+};
+
const buildSchedulerInputFieldTemplate = ({
schemaObject,
baseField,
@@ -421,45 +740,138 @@ const buildSchedulerInputFieldTemplate = ({
return template;
};
-export const getFieldType = (schemaObject: InvocationFieldSchema): string => {
- let fieldType = '';
-
- const { ui_type } = schemaObject;
- if (ui_type) {
- fieldType = ui_type;
+export const getFieldType = (
+ schemaObject: InvocationFieldSchema
+): string | undefined => {
+ if (schemaObject?.ui_type) {
+ return schemaObject.ui_type;
} else if (!schemaObject.type) {
- // console.log('refObject', schemaObject);
// if schemaObject has no type, then it should have one of allOf, anyOf, oneOf
+
if (schemaObject.allOf) {
- fieldType = refObjectToFieldType(
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- schemaObject.allOf![0] as OpenAPIV3.ReferenceObject
- );
+ const allOf = schemaObject.allOf;
+ if (allOf && allOf[0] && isRefObject(allOf[0])) {
+ return refObjectToSchemaName(allOf[0]);
+ }
} else if (schemaObject.anyOf) {
- fieldType = refObjectToFieldType(
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- schemaObject.anyOf![0] as OpenAPIV3.ReferenceObject
- );
- } else if (schemaObject.oneOf) {
- fieldType = refObjectToFieldType(
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- schemaObject.oneOf![0] as OpenAPIV3.ReferenceObject
- );
+ const anyOf = schemaObject.anyOf;
+ /**
+ * Handle Polymorphic inputs, eg string | string[]. In OpenAPI, this is:
+ * - an `anyOf` with two items
+ * - one is an `ArraySchemaObject` with a single `SchemaObject or ReferenceObject` of type T in its `items`
+ * - the other is a `SchemaObject` or `ReferenceObject` of type T
+ *
+ * Any other cases we ignore.
+ */
+
+ let firstType: string | undefined;
+ let secondType: string | undefined;
+
+ if (isArraySchemaObject(anyOf[0])) {
+ // first is array, second is not
+ const first = anyOf[0].items;
+ const second = anyOf[1];
+ if (isRefObject(first) && isRefObject(second)) {
+ firstType = refObjectToSchemaName(first);
+ secondType = refObjectToSchemaName(second);
+ } else if (
+ isNonArraySchemaObject(first) &&
+ isNonArraySchemaObject(second)
+ ) {
+ firstType = first.type;
+ secondType = second.type;
+ }
+ } else if (isArraySchemaObject(anyOf[1])) {
+ // first is not array, second is
+ const first = anyOf[0];
+ const second = anyOf[1].items;
+ if (isRefObject(first) && isRefObject(second)) {
+ firstType = refObjectToSchemaName(first);
+ secondType = refObjectToSchemaName(second);
+ } else if (
+ isNonArraySchemaObject(first) &&
+ isNonArraySchemaObject(second)
+ ) {
+ firstType = first.type;
+ secondType = second.type;
+ }
+ }
+ if (firstType === secondType && isPolymorphicItemType(firstType)) {
+ return SINGLE_TO_POLYMORPHIC_MAP[firstType];
+ }
}
} else if (schemaObject.enum) {
- fieldType = 'enum';
+ return 'enum';
} else if (schemaObject.type) {
if (schemaObject.type === 'number') {
- // floats are "number" in OpenAPI, while ints are "integer"
- fieldType = 'float';
+ // floats are "number" in OpenAPI, while ints are "integer" - we need to distinguish them
+ return 'float';
+ } else if (schemaObject.type === 'array') {
+ const itemType = isSchemaObject(schemaObject.items)
+ ? schemaObject.items.type
+ : refObjectToSchemaName(schemaObject.items);
+
+ if (isCollectionItemType(itemType)) {
+ return COLLECTION_MAP[itemType];
+ }
+
+ return;
} else {
- fieldType = schemaObject.type;
+ return schemaObject.type;
}
}
-
- return fieldType;
+ return;
};
+const TEMPLATE_BUILDER_MAP = {
+ boolean: buildBooleanInputFieldTemplate,
+ BooleanCollection: buildBooleanCollectionInputFieldTemplate,
+ BooleanPolymorphic: buildBooleanPolymorphicInputFieldTemplate,
+ ClipField: buildClipInputFieldTemplate,
+ Collection: buildCollectionInputFieldTemplate,
+ CollectionItem: buildCollectionItemInputFieldTemplate,
+ ColorCollection: buildColorCollectionInputFieldTemplate,
+ ColorField: buildColorInputFieldTemplate,
+ ColorPolymorphic: buildColorPolymorphicInputFieldTemplate,
+ ConditioningCollection: buildConditioningCollectionInputFieldTemplate,
+ ConditioningField: buildConditioningInputFieldTemplate,
+ ConditioningPolymorphic: buildConditioningPolymorphicInputFieldTemplate,
+ ControlCollection: buildControlCollectionInputFieldTemplate,
+ ControlField: buildControlInputFieldTemplate,
+ ControlNetModelField: buildControlNetModelInputFieldTemplate,
+ ControlPolymorphic: buildControlPolymorphicInputFieldTemplate,
+ DenoiseMaskField: buildDenoiseMaskInputFieldTemplate,
+ enum: buildEnumInputFieldTemplate,
+ float: buildFloatInputFieldTemplate,
+ FloatCollection: buildFloatCollectionInputFieldTemplate,
+ FloatPolymorphic: buildFloatPolymorphicInputFieldTemplate,
+ ImageCollection: buildImageCollectionInputFieldTemplate,
+ ImageField: buildImageInputFieldTemplate,
+ ImagePolymorphic: buildImagePolymorphicInputFieldTemplate,
+ integer: buildIntegerInputFieldTemplate,
+ IntegerCollection: buildIntegerCollectionInputFieldTemplate,
+ IntegerPolymorphic: buildIntegerPolymorphicInputFieldTemplate,
+ LatentsCollection: buildLatentsCollectionInputFieldTemplate,
+ LatentsField: buildLatentsInputFieldTemplate,
+ LatentsPolymorphic: buildLatentsPolymorphicInputFieldTemplate,
+ LoRAModelField: buildLoRAModelInputFieldTemplate,
+ MainModelField: buildMainModelInputFieldTemplate,
+ Scheduler: buildSchedulerInputFieldTemplate,
+ SDXLMainModelField: buildSDXLMainModelInputFieldTemplate,
+ SDXLRefinerModelField: buildRefinerModelInputFieldTemplate,
+ string: buildStringInputFieldTemplate,
+ StringCollection: buildStringCollectionInputFieldTemplate,
+ StringPolymorphic: buildStringPolymorphicInputFieldTemplate,
+ UNetField: buildUNetInputFieldTemplate,
+ VaeField: buildVaeInputFieldTemplate,
+ VaeModelField: buildVaeModelInputFieldTemplate,
+};
+
+const isTemplatedFieldType = (
+ fieldType: string | undefined
+): fieldType is keyof typeof TEMPLATE_BUILDER_MAP =>
+ Boolean(fieldType && fieldType in TEMPLATE_BUILDER_MAP);
+
/**
* Builds an input field from an invocation schema property.
* @param fieldSchema The schema object
@@ -474,7 +886,8 @@ export const buildInputFieldTemplate = (
const { input, ui_hidden, ui_component, ui_type, ui_order } = fieldSchema;
const extra = {
- input,
+ // TODO: Can we support polymorphic inputs in the UI?
+ input: POLYMORPHIC_TYPES.includes(fieldType) ? 'connection' : input,
ui_hidden,
ui_component,
ui_type,
@@ -490,146 +903,12 @@ export const buildInputFieldTemplate = (
...extra,
};
- if (fieldType === 'ImageField') {
- return buildImageInputFieldTemplate({
- schemaObject: fieldSchema,
- baseField,
- });
+ if (!isTemplatedFieldType(fieldType)) {
+ return;
}
- if (fieldType === 'ImageCollection') {
- return buildImageCollectionInputFieldTemplate({
- schemaObject: fieldSchema,
- baseField,
- });
- }
- if (fieldType === 'DenoiseMaskField') {
- return buildDenoiseMaskInputFieldTemplate({
- schemaObject: fieldSchema,
- baseField,
- });
- }
- if (fieldType === 'LatentsField') {
- return buildLatentsInputFieldTemplate({
- schemaObject: fieldSchema,
- baseField,
- });
- }
- if (fieldType === 'ConditioningField') {
- return buildConditioningInputFieldTemplate({
- schemaObject: fieldSchema,
- baseField,
- });
- }
- if (fieldType === 'UNetField') {
- return buildUNetInputFieldTemplate({
- schemaObject: fieldSchema,
- baseField,
- });
- }
- if (fieldType === 'ClipField') {
- return buildClipInputFieldTemplate({
- schemaObject: fieldSchema,
- baseField,
- });
- }
- if (fieldType === 'VaeField') {
- return buildVaeInputFieldTemplate({ schemaObject: fieldSchema, baseField });
- }
- if (fieldType === 'ControlField') {
- return buildControlInputFieldTemplate({
- schemaObject: fieldSchema,
- baseField,
- });
- }
- if (fieldType === 'MainModelField') {
- return buildMainModelInputFieldTemplate({
- schemaObject: fieldSchema,
- baseField,
- });
- }
- if (fieldType === 'SDXLRefinerModelField') {
- return buildRefinerModelInputFieldTemplate({
- schemaObject: fieldSchema,
- baseField,
- });
- }
- if (fieldType === 'SDXLMainModelField') {
- return buildSDXLMainModelInputFieldTemplate({
- schemaObject: fieldSchema,
- baseField,
- });
- }
- if (fieldType === 'VaeModelField') {
- return buildVaeModelInputFieldTemplate({
- schemaObject: fieldSchema,
- baseField,
- });
- }
- if (fieldType === 'LoRAModelField') {
- return buildLoRAModelInputFieldTemplate({
- schemaObject: fieldSchema,
- baseField,
- });
- }
- if (fieldType === 'ControlNetModelField') {
- return buildControlNetModelInputFieldTemplate({
- schemaObject: fieldSchema,
- baseField,
- });
- }
- if (fieldType === 'enum') {
- return buildEnumInputFieldTemplate({
- schemaObject: fieldSchema,
- baseField,
- });
- }
- if (fieldType === 'integer') {
- return buildIntegerInputFieldTemplate({
- schemaObject: fieldSchema,
- baseField,
- });
- }
- if (fieldType === 'float') {
- return buildFloatInputFieldTemplate({
- schemaObject: fieldSchema,
- baseField,
- });
- }
- if (fieldType === 'string') {
- return buildStringInputFieldTemplate({
- schemaObject: fieldSchema,
- baseField,
- });
- }
- if (fieldType === 'boolean') {
- return buildBooleanInputFieldTemplate({
- schemaObject: fieldSchema,
- baseField,
- });
- }
- if (fieldType === 'Collection') {
- return buildCollectionInputFieldTemplate({
- schemaObject: fieldSchema,
- baseField,
- });
- }
- if (fieldType === 'CollectionItem') {
- return buildCollectionItemInputFieldTemplate({
- schemaObject: fieldSchema,
- baseField,
- });
- }
- if (fieldType === 'ColorField') {
- return buildColorInputFieldTemplate({
- schemaObject: fieldSchema,
- baseField,
- });
- }
- if (fieldType === 'Scheduler') {
- return buildSchedulerInputFieldTemplate({
- schemaObject: fieldSchema,
- baseField,
- });
- }
- return;
+
+ return TEMPLATE_BUILDER_MAP[fieldType]({
+ schemaObject: fieldSchema,
+ baseField,
+ });
};
diff --git a/invokeai/frontend/web/src/features/nodes/util/fieldValueBuilders.ts b/invokeai/frontend/web/src/features/nodes/util/fieldValueBuilders.ts
index 1d06d644d1..a3046feee7 100644
--- a/invokeai/frontend/web/src/features/nodes/util/fieldValueBuilders.ts
+++ b/invokeai/frontend/web/src/features/nodes/util/fieldValueBuilders.ts
@@ -1,104 +1,79 @@
import { InputFieldTemplate, InputFieldValue } from '../types/types';
+const FIELD_VALUE_FALLBACK_MAP = {
+ 'enum.number': 0,
+ 'enum.string': '',
+ boolean: false,
+ BooleanCollection: [],
+ BooleanPolymorphic: false,
+ ClipField: undefined,
+ Collection: [],
+ CollectionItem: undefined,
+ ColorCollection: [],
+ ColorField: undefined,
+ ColorPolymorphic: undefined,
+ ConditioningCollection: [],
+ ConditioningField: undefined,
+ ConditioningPolymorphic: undefined,
+ ControlCollection: [],
+ ControlField: undefined,
+ ControlNetModelField: undefined,
+ ControlPolymorphic: undefined,
+ DenoiseMaskField: undefined,
+ float: 0,
+ FloatCollection: [],
+ FloatPolymorphic: 0,
+ ImageCollection: [],
+ ImageField: undefined,
+ ImagePolymorphic: undefined,
+ integer: 0,
+ IntegerCollection: [],
+ IntegerPolymorphic: 0,
+ LatentsCollection: [],
+ LatentsField: undefined,
+ LatentsPolymorphic: undefined,
+ LoRAModelField: undefined,
+ MainModelField: undefined,
+ ONNXModelField: undefined,
+ Scheduler: 'euler',
+ SDXLMainModelField: undefined,
+ SDXLRefinerModelField: undefined,
+ string: '',
+ StringCollection: [],
+ StringPolymorphic: '',
+ UNetField: undefined,
+ VaeField: undefined,
+ VaeModelField: undefined,
+};
+
export const buildInputFieldValue = (
id: string,
template: InputFieldTemplate
): InputFieldValue => {
- const fieldValue: InputFieldValue = {
+ // TODO: this should be `fieldValue: InputFieldValue`, but that introduces a TS issue I couldn't
+ // resolve - for some reason, it doesn't like `template.type`, which is the discriminant for both
+ // `InputFieldTemplate` union. It is (type-structurally) equal to the discriminant for the
+ // `InputFieldValue` union, but TS doesn't seem to like it...
+ const fieldValue = {
id,
name: template.name,
type: template.type,
label: '',
fieldKind: 'input',
- };
-
- if (template.type === 'string') {
- fieldValue.value = template.default ?? '';
- }
-
- if (template.type === 'integer') {
- fieldValue.value = template.default ?? 0;
- }
-
- if (template.type === 'float') {
- fieldValue.value = template.default ?? 0;
- }
-
- if (template.type === 'boolean') {
- fieldValue.value = template.default ?? false;
- }
+ } as InputFieldValue;
if (template.type === 'enum') {
if (template.enumType === 'number') {
- fieldValue.value = template.default ?? 0;
+ fieldValue.value =
+ template.default ?? FIELD_VALUE_FALLBACK_MAP['enum.number'];
}
if (template.enumType === 'string') {
- fieldValue.value = template.default ?? '';
+ fieldValue.value =
+ template.default ?? FIELD_VALUE_FALLBACK_MAP['enum.string'];
}
- }
-
- if (template.type === 'Collection') {
- fieldValue.value = template.default ?? 1;
- }
-
- if (template.type === 'ImageField') {
- fieldValue.value = undefined;
- }
-
- if (template.type === 'ImageCollection') {
- fieldValue.value = [];
- }
-
- if (template.type === 'DenoiseMaskField') {
- fieldValue.value = undefined;
- }
-
- if (template.type === 'LatentsField') {
- fieldValue.value = undefined;
- }
-
- if (template.type === 'ConditioningField') {
- fieldValue.value = undefined;
- }
-
- if (template.type === 'UNetField') {
- fieldValue.value = undefined;
- }
-
- if (template.type === 'ClipField') {
- fieldValue.value = undefined;
- }
-
- if (template.type === 'VaeField') {
- fieldValue.value = undefined;
- }
-
- if (template.type === 'ControlField') {
- fieldValue.value = undefined;
- }
-
- if (template.type === 'MainModelField') {
- fieldValue.value = undefined;
- }
-
- if (template.type === 'SDXLRefinerModelField') {
- fieldValue.value = undefined;
- }
-
- if (template.type === 'VaeModelField') {
- fieldValue.value = undefined;
- }
-
- if (template.type === 'LoRAModelField') {
- fieldValue.value = undefined;
- }
-
- if (template.type === 'ControlNetModelField') {
- fieldValue.value = undefined;
- }
-
- if (template.type === 'Scheduler') {
- fieldValue.value = 'euler';
+ } else {
+ fieldValue.value =
+ template.default ?? FIELD_VALUE_FALLBACK_MAP[template.type];
}
return fieldValue;
diff --git a/invokeai/frontend/web/src/services/api/schema.d.ts b/invokeai/frontend/web/src/services/api/schema.d.ts
index c38aa95fe5..f48892113d 100644
--- a/invokeai/frontend/web/src/services/api/schema.d.ts
+++ b/invokeai/frontend/web/src/services/api/schema.d.ts
@@ -1397,9 +1397,8 @@ export type components = {
/**
* Control Model
* @description ControlNet model to load
- * @default lllyasviel/sd-controlnet-canny
*/
- control_model?: components["schemas"]["ControlNetModelField"];
+ control_model: components["schemas"]["ControlNetModelField"];
/**
* Control Weight
* @description The weight given to the ControlNet
@@ -5806,12 +5805,12 @@ export type components = {
*/
target_height?: number;
/**
- * Clip
+ * CLIP 1
* @description CLIP (tokenizer, text encoder, LoRAs) and skipped layer count
*/
clip?: components["schemas"]["ClipField"];
/**
- * Clip2
+ * CLIP 2
* @description CLIP (tokenizer, text encoder, LoRAs) and skipped layer count
*/
clip2?: components["schemas"]["ClipField"];
@@ -5855,7 +5854,7 @@ export type components = {
*/
weight?: number;
/**
- * UNET
+ * UNet
* @description UNet (scheduler, LoRAs)
*/
unet?: components["schemas"]["UNetField"];
@@ -6998,7 +6997,7 @@ export type components = {
* If a field should be provided a data type that does not exactly match the python type of the field, use this to provide the type that should be used instead. See the node development docs for detail on adding a new field type, which involves client-side changes.
* @enum {string}
*/
- UIType: "integer" | "float" | "boolean" | "string" | "array" | "ImageField" | "LatentsField" | "ConditioningField" | "ControlField" | "ColorField" | "ImageCollection" | "ConditioningCollection" | "ColorCollection" | "LatentsCollection" | "IntegerCollection" | "FloatCollection" | "StringCollection" | "BooleanCollection" | "MainModelField" | "SDXLMainModelField" | "SDXLRefinerModelField" | "ONNXModelField" | "VaeModelField" | "LoRAModelField" | "ControlNetModelField" | "UNetField" | "VaeField" | "ClipField" | "Collection" | "CollectionItem" | "enum" | "Scheduler" | "WorkflowField" | "IsIntermediate" | "MetadataField";
+ UIType: "boolean" | "ColorField" | "ConditioningField" | "ControlField" | "float" | "ImageField" | "integer" | "LatentsField" | "string" | "BooleanCollection" | "ColorCollection" | "ConditioningCollection" | "ControlCollection" | "FloatCollection" | "ImageCollection" | "IntegerCollection" | "LatentsCollection" | "StringCollection" | "BooleanPolymorphic" | "ColorPolymorphic" | "ConditioningPolymorphic" | "ControlPolymorphic" | "FloatPolymorphic" | "ImagePolymorphic" | "IntegerPolymorphic" | "LatentsPolymorphic" | "StringPolymorphic" | "MainModelField" | "SDXLMainModelField" | "SDXLRefinerModelField" | "ONNXModelField" | "VaeModelField" | "LoRAModelField" | "ControlNetModelField" | "UNetField" | "VaeField" | "ClipField" | "Collection" | "CollectionItem" | "enum" | "Scheduler" | "WorkflowField" | "IsIntermediate" | "MetadataField";
/**
* UIComponent
* @description The type of UI component to use for a field, used to override the default components, which are inferred from the field type.
@@ -7020,6 +7019,8 @@ export type components = {
ui_component?: components["schemas"]["UIComponent"];
/** Ui Order */
ui_order?: number;
+ /** Item Default */
+ item_default?: unknown;
};
/**
* _OutputField
@@ -7035,6 +7036,12 @@ export type components = {
/** Ui Order */
ui_order?: number;
};
+ /**
+ * StableDiffusionOnnxModelFormat
+ * @description An enumeration.
+ * @enum {string}
+ */
+ StableDiffusionOnnxModelFormat: "olive" | "onnx";
/**
* StableDiffusion1ModelFormat
* @description An enumeration.
@@ -7059,12 +7066,6 @@ export type components = {
* @enum {string}
*/
StableDiffusion2ModelFormat: "checkpoint" | "diffusers";
- /**
- * StableDiffusionOnnxModelFormat
- * @description An enumeration.
- * @enum {string}
- */
- StableDiffusionOnnxModelFormat: "olive" | "onnx";
};
responses: never;
parameters: never;
diff --git a/tests/nodes/test_node_graph.py b/tests/nodes/test_node_graph.py
index fe6709827f..56bf823d14 100644
--- a/tests/nodes/test_node_graph.py
+++ b/tests/nodes/test_node_graph.py
@@ -1,3 +1,4 @@
+from invokeai.app.invocations.baseinvocation import BaseInvocation, BaseInvocationOutput, invocation, invocation_output
from .test_nodes import (
ImageToImageTestInvocation,
TextToImageTestInvocation,
@@ -20,7 +21,7 @@ from invokeai.app.invocations.upscale import ESRGANInvocation
from invokeai.app.invocations.image import ShowImageInvocation
from invokeai.app.invocations.math import AddInvocation, SubtractInvocation
-from invokeai.app.invocations.primitives import IntegerInvocation
+from invokeai.app.invocations.primitives import FloatInvocation, IntegerInvocation
from invokeai.app.services.default_graphs import create_text_to_image
import pytest
@@ -610,6 +611,59 @@ def test_graph_can_deserialize():
assert g2.edges[0].destination.field == "image"
+def test_invocation_decorator():
+ invocation_type = "test_invocation"
+ title = "Test Invocation"
+ tags = ["first", "second", "third"]
+ category = "category"
+
+ @invocation(invocation_type, title=title, tags=tags, category=category)
+ class Test(BaseInvocation):
+ def invoke(self):
+ pass
+
+ schema = Test.schema()
+
+ assert schema.get("title") == title
+ assert schema.get("tags") == tags
+ assert schema.get("category") == category
+ assert Test(id="1").type == invocation_type # type: ignore (type is dynamically added)
+
+
+def test_invocation_output_decorator():
+ output_type = "test_output"
+
+ @invocation_output(output_type)
+ class TestOutput(BaseInvocationOutput):
+ pass
+
+ assert TestOutput().type == output_type # type: ignore (type is dynamically added)
+
+
+def test_floats_accept_ints():
+ g = Graph()
+ n1 = IntegerInvocation(id="1", value=1)
+ n2 = FloatInvocation(id="2")
+ g.add_node(n1)
+ g.add_node(n2)
+ e = create_edge(n1.id, "value", n2.id, "value")
+
+ # Not throwing on this line is sufficient
+ g.add_edge(e)
+
+
+def test_ints_do_not_accept_floats():
+ g = Graph()
+ n1 = FloatInvocation(id="1", value=1.0)
+ n2 = IntegerInvocation(id="2")
+ g.add_node(n1)
+ g.add_node(n2)
+ e = create_edge(n1.id, "value", n2.id, "value")
+
+ with pytest.raises(InvalidEdgeError):
+ g.add_edge(e)
+
+
def test_graph_can_generate_schema():
# Not throwing on this line is sufficient
# NOTE: if this test fails, it's PROBABLY because a new invocation type is breaking schema generation