The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
feat: add advanced parameter to Input classes for advanced widgets support (#11939)
Christian Byrnea498556d0dcd
diff --git a/comfy_api/latest/_io.py b/comfy_api/latest/_io.pyindex e6a0d1821..c30d92aaa 100644--- a/comfy_api/latest/_io.py+++ b/comfy_api/latest/_io.py@@ -153,7 +153,7 @@ class Input(_IO_V3):'''Base class for a V3 Input.'''- def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None, extra_dict=None, raw_link: bool=None):+ def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None, extra_dict=None, raw_link: bool=None, advanced: bool=None):super().__init__()self.id = idself.display_name = display_name@@ -162,6 +162,7 @@ class Input(_IO_V3):self.lazy = lazyself.extra_dict = extra_dict if extra_dict is not None else {}self.rawLink = raw_link+ self.advanced = advanceddef as_dict(self):return prune_dict({@@ -170,6 +171,7 @@ class Input(_IO_V3):"tooltip": self.tooltip,"lazy": self.lazy,"rawLink": self.rawLink,+ "advanced": self.advanced,}) | prune_dict(self.extra_dict)def get_io_type(self):@@ -184,8 +186,8 @@ class WidgetInput(Input):'''def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None,default: Any=None,- socketless: bool=None, widget_type: str=None, force_input: bool=None, extra_dict=None, raw_link: bool=None):- super().__init__(id, display_name, optional, tooltip, lazy, extra_dict, raw_link)+ socketless: bool=None, widget_type: str=None, force_input: bool=None, extra_dict=None, raw_link: bool=None, advanced: bool=None):+ super().__init__(id, display_name, optional, tooltip, lazy, extra_dict, raw_link, advanced)self.default = defaultself.socketless = socketlessself.widget_type = widget_type@@ -242,8 +244,8 @@ class Boolean(ComfyTypeIO):'''Boolean input.'''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,- socketless: bool=None, force_input: bool=None, extra_dict=None, raw_link: bool=None):- super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, force_input, extra_dict, raw_link)+ socketless: bool=None, force_input: bool=None, extra_dict=None, raw_link: bool=None, advanced: bool=None):+ super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, force_input, extra_dict, raw_link, advanced)self.label_on = label_onself.label_off = label_offself.default: bool@@ -262,8 +264,8 @@ class Int(ComfyTypeIO):'''Integer input.'''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,- display_mode: NumberDisplay=None, socketless: bool=None, force_input: bool=None, extra_dict=None, raw_link: bool=None):- super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, force_input, extra_dict, raw_link)+ display_mode: NumberDisplay=None, socketless: bool=None, force_input: bool=None, extra_dict=None, raw_link: bool=None, advanced: bool=None):+ super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, force_input, extra_dict, raw_link, advanced)self.min = minself.max = maxself.step = step@@ -288,8 +290,8 @@ class Float(ComfyTypeIO):'''Float input.'''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,- display_mode: NumberDisplay=None, socketless: bool=None, force_input: bool=None, extra_dict=None, raw_link: bool=None):- super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, force_input, extra_dict, raw_link)+ display_mode: NumberDisplay=None, socketless: bool=None, force_input: bool=None, extra_dict=None, raw_link: bool=None, advanced: bool=None):+ super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, force_input, extra_dict, raw_link, advanced)self.min = minself.max = maxself.step = step@@ -314,8 +316,8 @@ class String(ComfyTypeIO):'''String input.'''def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None,multiline=False, placeholder: str=None, default: str=None, dynamic_prompts: bool=None,- socketless: bool=None, force_input: bool=None, extra_dict=None, raw_link: bool=None):- super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, force_input, extra_dict, raw_link)+ socketless: bool=None, force_input: bool=None, extra_dict=None, raw_link: bool=None, advanced: bool=None):+ super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, force_input, extra_dict, raw_link, advanced)self.multiline = multilineself.placeholder = placeholderself.dynamic_prompts = dynamic_prompts@@ -350,12 +352,13 @@ class Combo(ComfyTypeIO):socketless: bool=None,extra_dict=None,raw_link: bool=None,+ advanced: bool=None,):if isinstance(options, type) and issubclass(options, Enum):options = [v.value for v in options]if isinstance(default, Enum):default = default.value- super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, None, extra_dict, raw_link)+ super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, None, extra_dict, raw_link, advanced)self.multiselect = Falseself.options = optionsself.control_after_generate = control_after_generate@@ -387,8 +390,8 @@ class MultiCombo(ComfyTypeI):class Input(Combo.Input):def __init__(self, id: str, options: list[str], display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None,default: list[str]=None, placeholder: str=None, chip: bool=None, control_after_generate: bool=None,- socketless: bool=None, extra_dict=None, raw_link: bool=None):- super().__init__(id, options, display_name, optional, tooltip, lazy, default, control_after_generate, socketless=socketless, extra_dict=extra_dict, raw_link=raw_link)+ socketless: bool=None, extra_dict=None, raw_link: bool=None, advanced: bool=None):+ super().__init__(id, options, display_name, optional, tooltip, lazy, default, control_after_generate, socketless=socketless, extra_dict=extra_dict, raw_link=raw_link, advanced=advanced)self.multiselect = Trueself.placeholder = placeholderself.chip = chip@@ -421,9 +424,9 @@ class Webcam(ComfyTypeIO):Type = strdef __init__(self, id: str, display_name: str=None, optional=False,- tooltip: str=None, lazy: bool=None, default: str=None, socketless: bool=None, extra_dict=None, raw_link: bool=None+ tooltip: str=None, lazy: bool=None, default: str=None, socketless: bool=None, extra_dict=None, raw_link: bool=None, advanced: bool=None):- super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, None, extra_dict, raw_link)+ super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, None, extra_dict, raw_link, advanced)@comfytype(io_type="MASK")@@ -776,7 +779,7 @@ class MultiType:'''Input that permits more than one input type; if `id` is an instance of `ComfyType.Input`, then that input will be used to create a widget (if applicable) with overridden values.'''- def __init__(self, id: str | Input, types: list[type[_ComfyType] | _ComfyType], display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None, extra_dict=None, raw_link: bool=None):+ def __init__(self, id: str | Input, types: list[type[_ComfyType] | _ComfyType], display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None, extra_dict=None, raw_link: bool=None, advanced: bool=None):# if id is an Input, then use that Input with overridden valuesself.input_override = Noneif isinstance(id, Input):@@ -789,7 +792,7 @@ class MultiType:# if is a widget input, make sure widget_type is set appropriatelyif isinstance(self.input_override, WidgetInput):self.input_override.widget_type = self.input_override.get_io_type()- super().__init__(id, display_name, optional, tooltip, lazy, extra_dict, raw_link)+ super().__init__(id, display_name, optional, tooltip, lazy, extra_dict, raw_link, advanced)self._io_types = types@property@@ -843,8 +846,8 @@ class MatchType(ComfyTypeIO):class Input(Input):def __init__(self, id: str, template: MatchType.Template,- display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None, extra_dict=None, raw_link: bool=None):- super().__init__(id, display_name, optional, tooltip, lazy, extra_dict, raw_link)+ display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None, extra_dict=None, raw_link: bool=None, advanced: bool=None):+ super().__init__(id, display_name, optional, tooltip, lazy, extra_dict, raw_link, advanced)self.template = templatedef as_dict(self):@@ -1119,8 +1122,8 @@ class ImageCompare(ComfyTypeI):class Input(WidgetInput):def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None,- socketless: bool=True):- super().__init__(id, display_name, optional, tooltip, None, None, socketless)+ socketless: bool=True, advanced: bool=None):+ super().__init__(id, display_name, optional, tooltip, None, None, socketless, None, None, None, None, advanced)def as_dict(self):return super().as_dict()