mirrors/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2025-07-29 09:16:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added multitype support for Widget Inputs via the types argument, MultiType.Input io_types renamed to types

Browse Source
This commit is contained in:
Jedrzej Kosinski 2025-06-19 01:22:03 -05:00
parent 11d87760ca
commit ef3f45807f
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
comfy_api/v3/io.py
View File

@ -175,11 +175,12 @@ class WidgetInputV3(InputV3):
''' '''
def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None, def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None,
default: Any=None, default: Any=None,
socketless: bool=None, widgetType: str=None): socketless: bool=None, widgetType: str=None, types: list[type[ComfyType] | ComfyType]=None):
super().__init__(id, display_name, optional, tooltip, lazy) super().__init__(id, display_name, optional, tooltip, lazy)
self.default = default self.default = default
self.socketless = socketless self.socketless = socketless
self.widgetType = widgetType self.widgetType = widgetType
self.types = types if types is not None else []
def as_dict_V1(self): def as_dict_V1(self):
return super().as_dict_V1() | prune_dict({ return super().as_dict_V1() | prune_dict({
@ -188,6 +189,13 @@ class WidgetInputV3(InputV3):
"widgetType": self.widgetType, "widgetType": self.widgetType,
}) })
def get_io_type_V1(self):
# combine passed-in types and expected widgetType
str_types = [x.io_type for x in self.types]
str_types.insert(0, self.widgetType)
# ensure types are unique and order is preserved
return ','.join(list(dict.fromkeys(str_types)))
class OutputV3(IO_V3): class OutputV3(IO_V3):
def __init__(self, id: str, display_name: str=None, tooltip: str=None, def __init__(self, id: str, display_name: str=None, tooltip: str=None,
is_output_list=False): is_output_list=False):
@ -236,8 +244,8 @@ class Boolean:
'''Boolean input.''' '''Boolean input.'''
def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None, def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None,
default: bool=None, label_on: str=None, label_off: str=None, default: bool=None, label_on: str=None, label_off: str=None,
socketless: bool=None, widgetType: str=None): socketless: bool=None, types: list[type[ComfyType] | ComfyType]=None):
super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, widgetType) super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, self.io_type, types)
self.label_on = label_on self.label_on = label_on
self.label_off = label_off self.label_off = label_off
self.default: bool self.default: bool
@ -259,8 +267,8 @@ class Int:
'''Integer input.''' '''Integer input.'''
def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None, def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None,
default: int=None, min: int=None, max: int=None, step: int=None, control_after_generate: bool=None, default: int=None, min: int=None, max: int=None, step: int=None, control_after_generate: bool=None,
display_mode: NumberDisplay=None, socketless: bool=None, widgetType: str=None): display_mode: NumberDisplay=None, socketless: bool=None, types: list[type[ComfyType] | ComfyType]=None):
super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, widgetType) super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, self.io_type, types)
self.min = min self.min = min
self.max = max self.max = max
self.step = step self.step = step
@ -288,8 +296,8 @@ class Float:
'''Float input.''' '''Float input.'''
def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None, def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None,
default: float=None, min: float=None, max: float=None, step: float=None, round: float=None, default: float=None, min: float=None, max: float=None, step: float=None, round: float=None,
display_mode: NumberDisplay=None, socketless: bool=None, widgetType: str=None): display_mode: NumberDisplay=None, socketless: bool=None, types: list[type[ComfyType] | ComfyType]=None):
super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, widgetType) super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, self.io_type, types)
self.default = default self.default = default
self.min = min self.min = min
self.max = max self.max = max
@ -318,8 +326,8 @@ class String:
'''String input.''' '''String input.'''
def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None, def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None,
multiline=False, placeholder: str=None, default: int=None, multiline=False, placeholder: str=None, default: int=None,
socketless: bool=None, widgetType: str=None): socketless: bool=None, types: list[type[ComfyType] | ComfyType]=None):
super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, widgetType) super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, self.io_type, types)
self.multiline = multiline self.multiline = multiline
self.placeholder = placeholder self.placeholder = placeholder
self.default: str self.default: str
@ -343,8 +351,8 @@ class Combo:
default: str=None, control_after_generate: bool=None, default: str=None, control_after_generate: bool=None,
image_upload: bool=None, image_folder: FolderType=None, image_upload: bool=None, image_folder: FolderType=None,
remote: RemoteOptions=None, remote: RemoteOptions=None,
socketless: bool=None, widgetType: str=None): socketless: bool=None, types: list[type[ComfyType] | ComfyType]=None):
super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, widgetType) super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, self.io_type, types)
self.multiselect = False self.multiselect = False
self.options = options self.options = options
self.control_after_generate = control_after_generate self.control_after_generate = control_after_generate
@ -366,6 +374,7 @@ class Combo:
@comfytype(io_type=IO.COMBO) @comfytype(io_type=IO.COMBO)
class MultiCombo: class MultiCombo:
'''Multiselect Combo input (dropdown for selecting potentially more than one value).''' '''Multiselect Combo input (dropdown for selecting potentially more than one value).'''
# TODO: something is wrong with the serialization, frontend does not recognize it as multiselect
Type = list[str] Type = list[str]
class Input(Combo.Input): class Input(Combo.Input):
def __init__(self, id: str, options: list[str], display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None, def __init__(self, id: str, options: list[str], display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None,
@ -378,11 +387,12 @@ class MultiCombo:
self.default: list[str] self.default: list[str]
def as_dict_V1(self): def as_dict_V1(self):
return super().as_dict_V1() | prune_dict({ to_return = super().as_dict_V1() | prune_dict({
"multiselect": self.multiselect, "multiselect": self.multiselect,
"placeholder": self.placeholder, "placeholder": self.placeholder,
"chip": self.chip, "chip": self.chip,
}) })
return to_return
@comfytype(io_type=IO.IMAGE) @comfytype(io_type=IO.IMAGE)
@ -484,9 +494,9 @@ class MultiType:
''' '''
Input that permits more than one input type. Input that permits more than one input type.
''' '''
def __init__(self, id: str, io_types: list[type[ComfyType] | ComfyType | IO |str], display_name: str=None, optional=False, tooltip: str=None,): def __init__(self, id: str, types: list[type[ComfyType] | ComfyType], display_name: str=None, optional=False, tooltip: str=None,):
super().__init__(id, display_name, optional, tooltip) super().__init__(id, display_name, optional, tooltip)
self._io_types = io_types self._io_types = types
@property @property
def io_types(self) -> list[type[InputV3]]: def io_types(self) -> list[type[InputV3]]:
@ -502,7 +512,8 @@ class MultiType:
return io_types return io_types
def get_io_type_V1(self): def get_io_type_V1(self):
return ",".join(x.io_type for x in self.io_types) # ensure types are unique and order is preserved
return ",".join(list(dict.fromkeys([x.io_type for x in self.io_types])))
class DynamicInput(InputV3): class DynamicInput(InputV3):
''' '''

7
comfy_extras/nodes_v3_test.py
View File

@ -35,13 +35,12 @@ class V3TestNode(io.ComfyNodeV3):
io.Image.Input("image", display_name="new_image"), io.Image.Input("image", display_name="new_image"),
XYZ.Input("xyz", optional=True), XYZ.Input("xyz", optional=True),
io.Custom("JKL").Input("jkl", optional=True), io.Custom("JKL").Input("jkl", optional=True),
#JKL.Input("jkl", optional=True),
#CustomInput("xyz", "XYZ", optional=True),
io.Mask.Input("mask", optional=True), io.Mask.Input("mask", optional=True),
io.Int.Input("some_int", display_name="new_name", min=0, max=127, default=42, io.Int.Input("some_int", display_name="new_name", min=0, max=127, default=42,
tooltip="My tooltip 😎", display_mode=io.NumberDisplay.slider), tooltip="My tooltip 😎", display_mode=io.NumberDisplay.slider, types=[io.Float]),
io.Combo.Input("combo", options=["a", "b", "c"], tooltip="This is a combo input"), io.Combo.Input("combo", options=["a", "b", "c"], tooltip="This is a combo input", types=[io.Mask]),
io.MultiCombo.Input("combo2", options=["a","b","c"]), io.MultiCombo.Input("combo2", options=["a","b","c"]),
io.MultiType.Input("multitype", types=[io.Mask, io.Float, io.Int], optional=True),
# ComboInput("combo", image_upload=True, image_folder=FolderType.output, # ComboInput("combo", image_upload=True, image_folder=FolderType.output,
# remote=RemoteOptions( # remote=RemoteOptions(
# route="/internal/files/output", # route="/internal/files/output",