The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
add support for kwargs inputs to allow arbitrary inputs from frontend (#12063)
pythongosssssed6002cb60e0
diff --git a/comfy_api/latest/_io.py b/comfy_api/latest/_io.pyindex 2ec8d6e4b..03c77a531 100644--- a/comfy_api/latest/_io.py+++ b/comfy_api/latest/_io.py@@ -1383,6 +1383,8 @@ class Schema:"""Flags a node as not idempotent; when True, the node will run and not reuse the cached outputs when identical inputs are provided on a different node in the graph."""enable_expand: bool=False"""Flags a node as expandable, allowing NodeOutput to include 'expand' property."""+ accept_all_inputs: bool=False+ """When True, all inputs from the prompt will be passed to the node as kwargs, even if not defined in the schema."""def validate(self):'''Validate the schema:@@ -1853,6 +1855,14 @@ class _ComfyNodeBaseInternal(_ComfyNodeInternal):cls.GET_SCHEMA()return cls._NOT_IDEMPOTENT+ _ACCEPT_ALL_INPUTS = None+ @final+ @classproperty+ def ACCEPT_ALL_INPUTS(cls): # noqa+ if cls._ACCEPT_ALL_INPUTS is None:+ cls.GET_SCHEMA()+ return cls._ACCEPT_ALL_INPUTS+@final@classmethoddef INPUT_TYPES(cls) -> dict[str, dict]:@@ -1891,6 +1901,8 @@ class _ComfyNodeBaseInternal(_ComfyNodeInternal):cls._INPUT_IS_LIST = schema.is_input_listif cls._NOT_IDEMPOTENT is None:cls._NOT_IDEMPOTENT = schema.not_idempotent+ if cls._ACCEPT_ALL_INPUTS is None:+ cls._ACCEPT_ALL_INPUTS = schema.accept_all_inputsif cls._RETURN_TYPES is None:output = []diff --git a/comfy_extras/nodes_logic.py b/comfy_extras/nodes_logic.pyindex 1ed060205..c066064ac 100644--- a/comfy_extras/nodes_logic.py+++ b/comfy_extras/nodes_logic.py@@ -104,19 +104,23 @@ class CustomComboNode(io.ComfyNode):category="utils",is_experimental=True,inputs=[io.Combo.Input("choice", options=[])],- outputs=[io.String.Output()]+ outputs=[+ io.String.Output(display_name="STRING"),+ io.Int.Output(display_name="INDEX"),+ ],+ accept_all_inputs=True,)@classmethod- def validate_inputs(cls, choice: io.Combo.Type) -> bool:+ def validate_inputs(cls, choice: io.Combo.Type, index: int = 0, **kwargs) -> bool:# NOTE: DO NOT DO THIS unless you want to skip validation entirely on the node's inputs.# I am doing that here because the widgets (besides the combo dropdown) on this node are fully frontend defined.# I need to skip checking that the chosen combo option is in the options list, since those are defined by the user.return True@classmethod- def execute(cls, choice: io.Combo.Type) -> io.NodeOutput:- return io.NodeOutput(choice)+ def execute(cls, choice: io.Combo.Type, index: int = 0, **kwargs) -> io.NodeOutput:+ return io.NodeOutput(choice, index)class DCTestNode(io.ComfyNode):diff --git a/execution.py b/execution.pyindex 648f204ec..4b4f63c80 100644--- a/execution.py+++ b/execution.py@@ -175,7 +175,7 @@ def get_input_data(inputs, class_def, unique_id, execution_list=None, dynprompt=continueobj = cached.outputs[output_index]input_data_all[x] = obj- elif input_category is not None:+ elif input_category is not None or (is_v3 and class_def.ACCEPT_ALL_INPUTS):input_data_all[x] = [input_data]if is_v3: