2023-02-14 15:20:30 +00:00
|
|
|
class Example:
|
|
|
|
"""
|
|
|
|
A example node
|
|
|
|
|
|
|
|
Class methods
|
|
|
|
-------------
|
|
|
|
INPUT_TYPES (dict):
|
|
|
|
Tell the main program input parameters of nodes.
|
2024-02-05 04:15:49 +00:00
|
|
|
IS_CHANGED:
|
|
|
|
optional method to control when the node is re executed.
|
2023-02-14 15:20:30 +00:00
|
|
|
|
|
|
|
Attributes
|
|
|
|
----------
|
|
|
|
RETURN_TYPES (`tuple`):
|
2024-07-01 21:21:12 +00:00
|
|
|
The type of each element in the output tuple.
|
2023-04-02 14:27:01 +00:00
|
|
|
RETURN_NAMES (`tuple`):
|
2024-07-01 21:21:12 +00:00
|
|
|
Optional: The name of each output in the output tuple.
|
2023-02-14 15:20:30 +00:00
|
|
|
FUNCTION (`str`):
|
2023-02-17 16:19:49 +00:00
|
|
|
The name of the entry-point method. For example, if `FUNCTION = "execute"` then it will run Example().execute()
|
2023-02-14 15:20:30 +00:00
|
|
|
OUTPUT_NODE ([`bool`]):
|
2023-02-17 16:19:49 +00:00
|
|
|
If this node is an output node that outputs a result/image from the graph. The SaveImage node is an example.
|
|
|
|
The backend iterates on these output nodes and tries to execute all their parents if their parent graph is properly connected.
|
|
|
|
Assumed to be False if not present.
|
2023-02-14 15:20:30 +00:00
|
|
|
CATEGORY (`str`):
|
2023-02-17 16:19:49 +00:00
|
|
|
The category the node should appear in the UI.
|
2023-02-14 15:20:30 +00:00
|
|
|
execute(s) -> tuple || None:
|
|
|
|
The entry point method. The name of this method must be the same as the value of property `FUNCTION`.
|
|
|
|
For example, if `FUNCTION = "execute"` then this method's name must be `execute`, if `FUNCTION = "foo"` then it must be `foo`.
|
|
|
|
"""
|
|
|
|
def __init__(self):
|
|
|
|
pass
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def INPUT_TYPES(s):
|
|
|
|
"""
|
|
|
|
Return a dictionary which contains config for all input fields.
|
2023-02-17 16:19:49 +00:00
|
|
|
Some types (string): "MODEL", "VAE", "CLIP", "CONDITIONING", "LATENT", "IMAGE", "INT", "STRING", "FLOAT".
|
|
|
|
Input types "INT", "STRING" or "FLOAT" are special values for fields on the node.
|
|
|
|
The type can be a list for selection.
|
|
|
|
|
2023-02-14 15:20:30 +00:00
|
|
|
Returns: `dict`:
|
|
|
|
- Key input_fields_group (`string`): Can be either required, hidden or optional. A node class must have property `required`
|
|
|
|
- Value input_fields (`dict`): Contains input fields config:
|
|
|
|
* Key field_name (`string`): Name of a entry-point method's argument
|
|
|
|
* Value field_config (`tuple`):
|
|
|
|
+ First value is a string indicate the type of field or a list for selection.
|
2024-07-01 21:21:12 +00:00
|
|
|
+ Second value is a config for type "INT", "STRING" or "FLOAT".
|
2023-02-14 15:20:30 +00:00
|
|
|
"""
|
|
|
|
return {
|
|
|
|
"required": {
|
2023-02-17 16:19:49 +00:00
|
|
|
"image": ("IMAGE",),
|
2023-02-14 15:20:30 +00:00
|
|
|
"int_field": ("INT", {
|
|
|
|
"default": 0,
|
|
|
|
"min": 0, #Minimum value
|
|
|
|
"max": 4096, #Maximum value
|
2023-08-07 12:29:50 +00:00
|
|
|
"step": 64, #Slider's step
|
Execution Model Inversion (#2666)
* Execution Model Inversion
This PR inverts the execution model -- from recursively calling nodes to
using a topological sort of the nodes. This change allows for
modification of the node graph during execution. This allows for two
major advantages:
1. The implementation of lazy evaluation in nodes. For example, if a
"Mix Images" node has a mix factor of exactly 0.0, the second image
input doesn't even need to be evaluated (and visa-versa if the mix
factor is 1.0).
2. Dynamic expansion of nodes. This allows for the creation of dynamic
"node groups". Specifically, custom nodes can return subgraphs that
replace the original node in the graph. This is an incredibly
powerful concept. Using this functionality, it was easy to
implement:
a. Components (a.k.a. node groups)
b. Flow control (i.e. while loops) via tail recursion
c. All-in-one nodes that replicate the WebUI functionality
d. and more
All of those were able to be implemented entirely via custom nodes,
so those features are *not* a part of this PR. (There are some
front-end changes that should occur before that functionality is
made widely available, particularly around variant sockets.)
The custom nodes associated with this PR can be found at:
https://github.com/BadCafeCode/execution-inversion-demo-comfyui
Note that some of them require that variant socket types ("*") be
enabled.
* Allow `input_info` to be of type `None`
* Handle errors (like OOM) more gracefully
* Add a command-line argument to enable variants
This allows the use of nodes that have sockets of type '*' without
applying a patch to the code.
* Fix an overly aggressive assertion.
This could happen when attempting to evaluate `IS_CHANGED` for a node
during the creation of the cache (in order to create the cache key).
* Fix Pyright warnings
* Add execution model unit tests
* Fix issue with unused literals
Behavior should now match the master branch with regard to undeclared
inputs. Undeclared inputs that are socket connections will be used while
undeclared inputs that are literals will be ignored.
* Make custom VALIDATE_INPUTS skip normal validation
Additionally, if `VALIDATE_INPUTS` takes an argument named `input_types`,
that variable will be a dictionary of the socket type of all incoming
connections. If that argument exists, normal socket type validation will
not occur. This removes the last hurdle for enabling variant types
entirely from custom nodes, so I've removed that command-line option.
I've added appropriate unit tests for these changes.
* Fix example in unit test
This wouldn't have caused any issues in the unit test, but it would have
bugged the UI if someone copy+pasted it into their own node pack.
* Use fstrings instead of '%' formatting syntax
* Use custom exception types.
* Display an error for dependency cycles
Previously, dependency cycles that were created during node expansion
would cause the application to quit (due to an uncaught exception). Now,
we'll throw a proper error to the UI. We also make an attempt to 'blame'
the most relevant node in the UI.
* Add docs on when ExecutionBlocker should be used
* Remove unused functionality
* Rename ExecutionResult.SLEEPING to PENDING
* Remove superfluous function parameter
* Pass None for uneval inputs instead of default
This applies to `VALIDATE_INPUTS`, `check_lazy_status`, and lazy values
in evaluation functions.
* Add a test for mixed node expansion
This test ensures that a node that returns a combination of expanded
subgraphs and literal values functions correctly.
* Raise exception for bad get_node calls.
* Minor refactor of IsChangedCache.get
* Refactor `map_node_over_list` function
* Fix ui output for duplicated nodes
* Add documentation on `check_lazy_status`
* Add file for execution model unit tests
* Clean up Javascript code as per review
* Improve documentation
Converted some comments to docstrings as per review
* Add a new unit test for mixed lazy results
This test validates that when an output list is fed to a lazy node, the
node will properly evaluate previous nodes that are needed by any inputs
to the lazy node.
No code in the execution model has been changed. The test already
passes.
* Allow kwargs in VALIDATE_INPUTS functions
When kwargs are used, validation is skipped for all inputs as if they
had been mentioned explicitly.
* List cached nodes in `execution_cached` message
This was previously just bugged in this PR.
2024-08-15 15:21:11 +00:00
|
|
|
"display": "number", # Cosmetic only: display as "number" or "slider"
|
|
|
|
"lazy": True # Will only be evaluated if check_lazy_status requires it
|
2023-02-14 15:20:30 +00:00
|
|
|
}),
|
2023-09-17 16:49:06 +00:00
|
|
|
"float_field": ("FLOAT", {
|
|
|
|
"default": 1.0,
|
|
|
|
"min": 0.0,
|
|
|
|
"max": 10.0,
|
|
|
|
"step": 0.01,
|
2024-07-01 21:21:12 +00:00
|
|
|
"round": 0.001, #The value representing the precision to round to, will be set to the step value by default. Can be set to False to disable rounding.
|
Execution Model Inversion (#2666)
* Execution Model Inversion
This PR inverts the execution model -- from recursively calling nodes to
using a topological sort of the nodes. This change allows for
modification of the node graph during execution. This allows for two
major advantages:
1. The implementation of lazy evaluation in nodes. For example, if a
"Mix Images" node has a mix factor of exactly 0.0, the second image
input doesn't even need to be evaluated (and visa-versa if the mix
factor is 1.0).
2. Dynamic expansion of nodes. This allows for the creation of dynamic
"node groups". Specifically, custom nodes can return subgraphs that
replace the original node in the graph. This is an incredibly
powerful concept. Using this functionality, it was easy to
implement:
a. Components (a.k.a. node groups)
b. Flow control (i.e. while loops) via tail recursion
c. All-in-one nodes that replicate the WebUI functionality
d. and more
All of those were able to be implemented entirely via custom nodes,
so those features are *not* a part of this PR. (There are some
front-end changes that should occur before that functionality is
made widely available, particularly around variant sockets.)
The custom nodes associated with this PR can be found at:
https://github.com/BadCafeCode/execution-inversion-demo-comfyui
Note that some of them require that variant socket types ("*") be
enabled.
* Allow `input_info` to be of type `None`
* Handle errors (like OOM) more gracefully
* Add a command-line argument to enable variants
This allows the use of nodes that have sockets of type '*' without
applying a patch to the code.
* Fix an overly aggressive assertion.
This could happen when attempting to evaluate `IS_CHANGED` for a node
during the creation of the cache (in order to create the cache key).
* Fix Pyright warnings
* Add execution model unit tests
* Fix issue with unused literals
Behavior should now match the master branch with regard to undeclared
inputs. Undeclared inputs that are socket connections will be used while
undeclared inputs that are literals will be ignored.
* Make custom VALIDATE_INPUTS skip normal validation
Additionally, if `VALIDATE_INPUTS` takes an argument named `input_types`,
that variable will be a dictionary of the socket type of all incoming
connections. If that argument exists, normal socket type validation will
not occur. This removes the last hurdle for enabling variant types
entirely from custom nodes, so I've removed that command-line option.
I've added appropriate unit tests for these changes.
* Fix example in unit test
This wouldn't have caused any issues in the unit test, but it would have
bugged the UI if someone copy+pasted it into their own node pack.
* Use fstrings instead of '%' formatting syntax
* Use custom exception types.
* Display an error for dependency cycles
Previously, dependency cycles that were created during node expansion
would cause the application to quit (due to an uncaught exception). Now,
we'll throw a proper error to the UI. We also make an attempt to 'blame'
the most relevant node in the UI.
* Add docs on when ExecutionBlocker should be used
* Remove unused functionality
* Rename ExecutionResult.SLEEPING to PENDING
* Remove superfluous function parameter
* Pass None for uneval inputs instead of default
This applies to `VALIDATE_INPUTS`, `check_lazy_status`, and lazy values
in evaluation functions.
* Add a test for mixed node expansion
This test ensures that a node that returns a combination of expanded
subgraphs and literal values functions correctly.
* Raise exception for bad get_node calls.
* Minor refactor of IsChangedCache.get
* Refactor `map_node_over_list` function
* Fix ui output for duplicated nodes
* Add documentation on `check_lazy_status`
* Add file for execution model unit tests
* Clean up Javascript code as per review
* Improve documentation
Converted some comments to docstrings as per review
* Add a new unit test for mixed lazy results
This test validates that when an output list is fed to a lazy node, the
node will properly evaluate previous nodes that are needed by any inputs
to the lazy node.
No code in the execution model has been changed. The test already
passes.
* Allow kwargs in VALIDATE_INPUTS functions
When kwargs are used, validation is skipped for all inputs as if they
had been mentioned explicitly.
* List cached nodes in `execution_cached` message
This was previously just bugged in this PR.
2024-08-15 15:21:11 +00:00
|
|
|
"display": "number",
|
|
|
|
"lazy": True
|
|
|
|
}),
|
2023-02-17 16:19:49 +00:00
|
|
|
"print_to_screen": (["enable", "disable"],),
|
|
|
|
"string_field": ("STRING", {
|
|
|
|
"multiline": False, #True if you want the field to look like the one on the ClipTextEncode node
|
Execution Model Inversion (#2666)
* Execution Model Inversion
This PR inverts the execution model -- from recursively calling nodes to
using a topological sort of the nodes. This change allows for
modification of the node graph during execution. This allows for two
major advantages:
1. The implementation of lazy evaluation in nodes. For example, if a
"Mix Images" node has a mix factor of exactly 0.0, the second image
input doesn't even need to be evaluated (and visa-versa if the mix
factor is 1.0).
2. Dynamic expansion of nodes. This allows for the creation of dynamic
"node groups". Specifically, custom nodes can return subgraphs that
replace the original node in the graph. This is an incredibly
powerful concept. Using this functionality, it was easy to
implement:
a. Components (a.k.a. node groups)
b. Flow control (i.e. while loops) via tail recursion
c. All-in-one nodes that replicate the WebUI functionality
d. and more
All of those were able to be implemented entirely via custom nodes,
so those features are *not* a part of this PR. (There are some
front-end changes that should occur before that functionality is
made widely available, particularly around variant sockets.)
The custom nodes associated with this PR can be found at:
https://github.com/BadCafeCode/execution-inversion-demo-comfyui
Note that some of them require that variant socket types ("*") be
enabled.
* Allow `input_info` to be of type `None`
* Handle errors (like OOM) more gracefully
* Add a command-line argument to enable variants
This allows the use of nodes that have sockets of type '*' without
applying a patch to the code.
* Fix an overly aggressive assertion.
This could happen when attempting to evaluate `IS_CHANGED` for a node
during the creation of the cache (in order to create the cache key).
* Fix Pyright warnings
* Add execution model unit tests
* Fix issue with unused literals
Behavior should now match the master branch with regard to undeclared
inputs. Undeclared inputs that are socket connections will be used while
undeclared inputs that are literals will be ignored.
* Make custom VALIDATE_INPUTS skip normal validation
Additionally, if `VALIDATE_INPUTS` takes an argument named `input_types`,
that variable will be a dictionary of the socket type of all incoming
connections. If that argument exists, normal socket type validation will
not occur. This removes the last hurdle for enabling variant types
entirely from custom nodes, so I've removed that command-line option.
I've added appropriate unit tests for these changes.
* Fix example in unit test
This wouldn't have caused any issues in the unit test, but it would have
bugged the UI if someone copy+pasted it into their own node pack.
* Use fstrings instead of '%' formatting syntax
* Use custom exception types.
* Display an error for dependency cycles
Previously, dependency cycles that were created during node expansion
would cause the application to quit (due to an uncaught exception). Now,
we'll throw a proper error to the UI. We also make an attempt to 'blame'
the most relevant node in the UI.
* Add docs on when ExecutionBlocker should be used
* Remove unused functionality
* Rename ExecutionResult.SLEEPING to PENDING
* Remove superfluous function parameter
* Pass None for uneval inputs instead of default
This applies to `VALIDATE_INPUTS`, `check_lazy_status`, and lazy values
in evaluation functions.
* Add a test for mixed node expansion
This test ensures that a node that returns a combination of expanded
subgraphs and literal values functions correctly.
* Raise exception for bad get_node calls.
* Minor refactor of IsChangedCache.get
* Refactor `map_node_over_list` function
* Fix ui output for duplicated nodes
* Add documentation on `check_lazy_status`
* Add file for execution model unit tests
* Clean up Javascript code as per review
* Improve documentation
Converted some comments to docstrings as per review
* Add a new unit test for mixed lazy results
This test validates that when an output list is fed to a lazy node, the
node will properly evaluate previous nodes that are needed by any inputs
to the lazy node.
No code in the execution model has been changed. The test already
passes.
* Allow kwargs in VALIDATE_INPUTS functions
When kwargs are used, validation is skipped for all inputs as if they
had been mentioned explicitly.
* List cached nodes in `execution_cached` message
This was previously just bugged in this PR.
2024-08-15 15:21:11 +00:00
|
|
|
"default": "Hello World!",
|
|
|
|
"lazy": True
|
2023-02-17 16:19:49 +00:00
|
|
|
}),
|
2023-02-14 15:20:30 +00:00
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2023-02-17 16:19:49 +00:00
|
|
|
RETURN_TYPES = ("IMAGE",)
|
2023-04-02 14:27:01 +00:00
|
|
|
#RETURN_NAMES = ("image_output_name",)
|
|
|
|
|
2023-02-14 15:20:30 +00:00
|
|
|
FUNCTION = "test"
|
|
|
|
|
2023-02-17 16:19:49 +00:00
|
|
|
#OUTPUT_NODE = False
|
2023-02-14 15:20:30 +00:00
|
|
|
|
|
|
|
CATEGORY = "Example"
|
|
|
|
|
Execution Model Inversion (#2666)
* Execution Model Inversion
This PR inverts the execution model -- from recursively calling nodes to
using a topological sort of the nodes. This change allows for
modification of the node graph during execution. This allows for two
major advantages:
1. The implementation of lazy evaluation in nodes. For example, if a
"Mix Images" node has a mix factor of exactly 0.0, the second image
input doesn't even need to be evaluated (and visa-versa if the mix
factor is 1.0).
2. Dynamic expansion of nodes. This allows for the creation of dynamic
"node groups". Specifically, custom nodes can return subgraphs that
replace the original node in the graph. This is an incredibly
powerful concept. Using this functionality, it was easy to
implement:
a. Components (a.k.a. node groups)
b. Flow control (i.e. while loops) via tail recursion
c. All-in-one nodes that replicate the WebUI functionality
d. and more
All of those were able to be implemented entirely via custom nodes,
so those features are *not* a part of this PR. (There are some
front-end changes that should occur before that functionality is
made widely available, particularly around variant sockets.)
The custom nodes associated with this PR can be found at:
https://github.com/BadCafeCode/execution-inversion-demo-comfyui
Note that some of them require that variant socket types ("*") be
enabled.
* Allow `input_info` to be of type `None`
* Handle errors (like OOM) more gracefully
* Add a command-line argument to enable variants
This allows the use of nodes that have sockets of type '*' without
applying a patch to the code.
* Fix an overly aggressive assertion.
This could happen when attempting to evaluate `IS_CHANGED` for a node
during the creation of the cache (in order to create the cache key).
* Fix Pyright warnings
* Add execution model unit tests
* Fix issue with unused literals
Behavior should now match the master branch with regard to undeclared
inputs. Undeclared inputs that are socket connections will be used while
undeclared inputs that are literals will be ignored.
* Make custom VALIDATE_INPUTS skip normal validation
Additionally, if `VALIDATE_INPUTS` takes an argument named `input_types`,
that variable will be a dictionary of the socket type of all incoming
connections. If that argument exists, normal socket type validation will
not occur. This removes the last hurdle for enabling variant types
entirely from custom nodes, so I've removed that command-line option.
I've added appropriate unit tests for these changes.
* Fix example in unit test
This wouldn't have caused any issues in the unit test, but it would have
bugged the UI if someone copy+pasted it into their own node pack.
* Use fstrings instead of '%' formatting syntax
* Use custom exception types.
* Display an error for dependency cycles
Previously, dependency cycles that were created during node expansion
would cause the application to quit (due to an uncaught exception). Now,
we'll throw a proper error to the UI. We also make an attempt to 'blame'
the most relevant node in the UI.
* Add docs on when ExecutionBlocker should be used
* Remove unused functionality
* Rename ExecutionResult.SLEEPING to PENDING
* Remove superfluous function parameter
* Pass None for uneval inputs instead of default
This applies to `VALIDATE_INPUTS`, `check_lazy_status`, and lazy values
in evaluation functions.
* Add a test for mixed node expansion
This test ensures that a node that returns a combination of expanded
subgraphs and literal values functions correctly.
* Raise exception for bad get_node calls.
* Minor refactor of IsChangedCache.get
* Refactor `map_node_over_list` function
* Fix ui output for duplicated nodes
* Add documentation on `check_lazy_status`
* Add file for execution model unit tests
* Clean up Javascript code as per review
* Improve documentation
Converted some comments to docstrings as per review
* Add a new unit test for mixed lazy results
This test validates that when an output list is fed to a lazy node, the
node will properly evaluate previous nodes that are needed by any inputs
to the lazy node.
No code in the execution model has been changed. The test already
passes.
* Allow kwargs in VALIDATE_INPUTS functions
When kwargs are used, validation is skipped for all inputs as if they
had been mentioned explicitly.
* List cached nodes in `execution_cached` message
This was previously just bugged in this PR.
2024-08-15 15:21:11 +00:00
|
|
|
def check_lazy_status(self, image, string_field, int_field, float_field, print_to_screen):
|
|
|
|
"""
|
|
|
|
Return a list of input names that need to be evaluated.
|
|
|
|
|
|
|
|
This function will be called if there are any lazy inputs which have not yet been
|
|
|
|
evaluated. As long as you return at least one field which has not yet been evaluated
|
|
|
|
(and more exist), this function will be called again once the value of the requested
|
|
|
|
field is available.
|
|
|
|
|
|
|
|
Any evaluated inputs will be passed as arguments to this function. Any unevaluated
|
|
|
|
inputs will have the value None.
|
|
|
|
"""
|
|
|
|
if print_to_screen == "enable":
|
|
|
|
return ["int_field", "float_field", "string_field"]
|
|
|
|
else:
|
|
|
|
return []
|
|
|
|
|
2023-02-17 16:19:49 +00:00
|
|
|
def test(self, image, string_field, int_field, float_field, print_to_screen):
|
|
|
|
if print_to_screen == "enable":
|
2023-02-14 15:20:30 +00:00
|
|
|
print(f"""Your input contains:
|
|
|
|
string_field aka input text: {string_field}
|
|
|
|
int_field: {int_field}
|
|
|
|
float_field: {float_field}
|
|
|
|
""")
|
2023-02-17 16:19:49 +00:00
|
|
|
#do some processing on the image, in this example I just invert it
|
|
|
|
image = 1.0 - image
|
|
|
|
return (image,)
|
2023-02-14 15:20:30 +00:00
|
|
|
|
2024-02-05 04:15:49 +00:00
|
|
|
"""
|
|
|
|
The node will always be re executed if any of the inputs change but
|
|
|
|
this method can be used to force the node to execute again even when the inputs don't change.
|
|
|
|
You can make this node return a number or a string. This value will be compared to the one returned the last time the node was
|
|
|
|
executed, if it is different the node will be executed again.
|
|
|
|
This method is used in the core repo for the LoadImage node where they return the image hash as a string, if the image hash
|
|
|
|
changes between executions the LoadImage node is executed again.
|
|
|
|
"""
|
|
|
|
#@classmethod
|
|
|
|
#def IS_CHANGED(s, image, string_field, int_field, float_field, print_to_screen):
|
|
|
|
# return ""
|
2023-02-14 15:20:30 +00:00
|
|
|
|
2024-02-25 12:34:22 +00:00
|
|
|
# Set the web directory, any .js file in that directory will be loaded by the frontend as a frontend extension
|
|
|
|
# WEB_DIRECTORY = "./somejs"
|
|
|
|
|
2024-07-01 22:02:42 +00:00
|
|
|
|
|
|
|
# Add custom API routes, using router
|
|
|
|
from aiohttp import web
|
|
|
|
from server import PromptServer
|
|
|
|
|
|
|
|
@PromptServer.instance.routes.get("/hello")
|
|
|
|
async def get_hello(request):
|
|
|
|
return web.json_response("hello")
|
|
|
|
|
|
|
|
|
2023-02-17 16:19:49 +00:00
|
|
|
# A dictionary that contains all nodes you want to export with their names
|
|
|
|
# NOTE: names should be globally unique
|
2023-02-14 15:20:30 +00:00
|
|
|
NODE_CLASS_MAPPINGS = {
|
|
|
|
"Example": Example
|
|
|
|
}
|
2023-03-31 05:05:17 +00:00
|
|
|
|
|
|
|
# A dictionary that contains the friendly/humanly readable titles for the nodes
|
|
|
|
NODE_DISPLAY_NAME_MAPPINGS = {
|
|
|
|
"Example": "Example Node"
|
|
|
|
}
|