From ef385980306311b3aca4d93ef61552121e9758a0 Mon Sep 17 00:00:00 2001 From: doctorpangloss <@hiddenswitch.com> Date: Tue, 18 Jun 2024 20:25:57 -0700 Subject: [PATCH] Fix validation issues --- comfy_extras/nodes/nodes_arithmetic.py | 30 +++++++++++++++++--------- comfy_extras/nodes/nodes_open_api.py | 6 ++++-- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/comfy_extras/nodes/nodes_arithmetic.py b/comfy_extras/nodes/nodes_arithmetic.py index 7527d5bfe..40772f32f 100644 --- a/comfy_extras/nodes/nodes_arithmetic.py +++ b/comfy_extras/nodes/nodes_arithmetic.py @@ -11,7 +11,8 @@ class FloatAdd(CustomNode): range_.update({f"value{i}": ("FLOAT", {"default": 0.0, "step": 0.01, "round": 0.000001}) for i in range(1, 5)}) return { - "required": range_ + "required": {}, + "optional": range_ } CATEGORY = "arithmetic" @@ -47,7 +48,8 @@ class FloatMultiply(CustomNode): range_.update({f"value{i}": ("FLOAT", {"default": 1.0}) for i in range(1, 5)}) return { - "required": range_ + "required": {}, + "optional": range_ } CATEGORY = "arithmetic" @@ -101,7 +103,8 @@ class IntAdd(CustomNode): range_.update({f"value{i}": ("INT", {"default": 0}) for i in range(1, 5)}) return { - "required": range_ + "required": {}, + "optional": range_ } CATEGORY = "arithmetic" @@ -137,7 +140,8 @@ class IntMultiply(CustomNode): range_.update({f"value{i}": ("INT", {"default": 1}) for i in range(1, 5)}) return { - "required": range_ + "required": {}, + "optional": range_ } CATEGORY = "arithmetic" @@ -209,7 +213,8 @@ class FloatMin(CustomNode): range_.update({f"value{i}": ("FLOAT", {"default": 0.0, "step": 0.01, "round": 0.000001}) for i in range(1, 5)}) return { - "required": range_ + "required": {}, + "optional": range_ } CATEGORY = "arithmetic" @@ -227,7 +232,8 @@ class FloatMax(CustomNode): range_.update({f"value{i}": ("FLOAT", {"default": 0.0, "step": 0.01, "round": 0.000001}) for i in range(1, 5)}) return { - "required": range_ + "required": {}, + "optional": range_ } CATEGORY = "arithmetic" @@ -262,7 +268,8 @@ class FloatAverage(CustomNode): range_.update({f"value{i}": ("FLOAT", {"default": 0.0, "step": 0.01, "round": 0.000001}) for i in range(1, 5)}) return { - "required": range_ + "required": {}, + "optional": range_ } CATEGORY = "arithmetic" @@ -280,7 +287,8 @@ class IntMin(CustomNode): range_.update({f"value{i}": ("INT", {"default": 0}) for i in range(1, 5)}) return { - "required": range_ + "required": {}, + "optional": range_ } CATEGORY = "arithmetic" @@ -298,7 +306,8 @@ class IntMax(CustomNode): range_.update({f"value{i}": ("INT", {"default": 0}) for i in range(1, 5)}) return { - "required": range_ + "required": {}, + "optional": range_ } CATEGORY = "arithmetic" @@ -333,7 +342,8 @@ class IntAverage(CustomNode): range_.update({f"value{i}": ("INT", {"default": 0}) for i in range(1, 5)}) return { - "required": range_ + "required": {}, + "optional": range_ } CATEGORY = "arithmetic" diff --git a/comfy_extras/nodes/nodes_open_api.py b/comfy_extras/nodes/nodes_open_api.py index 714240efe..d68558d1a 100644 --- a/comfy_extras/nodes/nodes_open_api.py +++ b/comfy_extras/nodes/nodes_open_api.py @@ -214,7 +214,8 @@ class StringPosixPathJoin(CustomNode): @classmethod def INPUT_TYPES(cls) -> InputTypes: return { - "required": { + "required": {}, + "optional": { f"value{i}": ("STRING", {"default": "", "multiline": False, "forceInput": True}) for i in range(5) } } @@ -391,7 +392,8 @@ class ImageExifMerge(CustomNode): @classmethod def INPUT_TYPES(cls) -> InputTypes: return { - "required": { + "required": {}, + "optional": { f"value{i}": ("EXIF",) for i in range(5) } }