* 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.
* menu
* wip
* wip
* wip
* wip
* wip
* workflow saving/loading
* Support inserting workflows
Move buttosn to top of lists
* fix session storage
implement renaming
* temp
* refactor, better workflow instance management
* wip
* progress on progress
* added send to workflow
various fixes
* Support multiple image loaders
* Support dynamic size breakpoints based on content
* various fixes
add close unsaved warning
* Add filtering tree
* prevent renaming unsaved
* fix zindex on hover
* fix top offset
* use filename as workflow name
* resize on setting change
* hide element until it is drawn
* remove glow
* Fix export name
* Fix test, revert accidental changes to groupNode
* Fix colors on all themes
* show hover items on smaller screen (mobile)
* remove debugging code
* dialog fix
* Dont reorder open workflows
Allow elements around canvas
* Toggle body display on setting change
* Fix menu disappearing on chrome
* Increase delay when typing, remove margin on Safari, fix dialog location
* Fix overflow issue on iOS
* Add reset view button
Prevent view changes causing history entries
* Bottom menu wip
* Various fixes
* Fix merge
* Fix breaking old menu position
* Fix merge adding restore view to loadGraphData
* Fix render on change not respecting auto queue checkbox
Fix issue where autoQueueEnabled checkbox is ignored for changes if autoQueueMode is left on `change`
* Make check more specific
* Add toggle to enable auto queue when graph is changed
* type fix
* better
* better alignment
* Change undoredo to not ignore inputs when autoqueue in change mode
* wip per user data
* Rename, hide menu
* better error
rework default user
* store pretty
* Add userdata endpoints
Change nodetemplates to userdata
* add multi user message
* make normal arg
* Fix tests
* Ignore user dir
* user tests
* Changed to default to browser storage and add server-storage arg
* fix crash on empty templates
* fix settings added before load
* ignore parse errors
* setup ui unit tests
* Refactoring, adding connections
* Few tweaks
* Fix type
* Add general test
* Refactored and extended test
* move to describe
* for groups
* wip group nodes
* Relink nodes
Fixed widget values
Convert to nodes
* Reconnect on convert back
* add via node menu + canvas
refactor
* Add ws event handling
* fix using wrong node on widget serialize
* allow reroute pipe
fix control_after_generate configure
* allow multiple images
* Add test for converted widgets on missing nodes + fix crash
* tidy
* mores tests + refactor
* throw earlier to get less confusing error
* support outputs
* more test
* add ci action
* use lts node
* Fix?
* Prevent connecting non matching combos
* update
* accidently removed npm i
* Disable logging extension
* fix naming
allow control_after_generate custom name
allow convert from reroutes
* group node tests
* Add executing info, custom node icon
Tidy
* internal reroute just works
* Fix crash on virtual nodes e.g. note
* Save group nodes to templates
* Fix template nodes not being stored
* Fix aborting convert
* tidy
* Fix reconnecting output links on convert to group
* Fix links on convert to nodes
* Handle missing internal nodes
* Trigger callback on text change
* Apply value on connect
* Fix converted widgets not reconnecting
* Group node updates
- persist internal ids in current session
- copy widget values when converting to nodes
- fix issue serializing converted inputs
* Resolve issue with sanitized node name
* Fix internal id
* allow outputs to be used internally and externally
* order widgets on group node
various fixes
* fix imageupload widget requiring a specific name
* groupnode imageupload test
give widget unique name
* Fix issue with external node links
* Add VAE model
* Fix internal node id check
* fix potential crash
* wip widget input support
* more wip group widget inputs
* Group node refactor
Support for primitives/converted widgets
* Fix convert to nodes with internal reroutes
* fix applying primitive
* Fix control widget values
* fix test
* Added label for autoQueueCheckbox.
* Menu gets behind of some custom nodes.
* Edited extraOptions.
Options divided in to different divs to manage them with ease.
The created checkpoints contain workflow metadata that can be loaded by
dragging them on top of the UI or loading them with the "Load" button.
Checkpoints will be saved in fp16 or fp32 depending on the format ComfyUI
is using for inference on your hardware. To force fp32 use: --force-fp32
Anything that patches the model weights like merging or loras will be
saved.
The output directory is currently set to: output/checkpoints but that might
change in the future.
* To reduce bandwidth traffic in a remote environment, a lossy compression-based preview mode is provided for displaying simple visualizations in node-based widgets.
* Added 'preview=[image format]' option to the '/view' API.
* Updated node to use preview for displaying images as widgets.
* Excluded preview usage in the open image, save image, mask editor where the original data is required.
* Made preview_format parameterizable for extensibility.
* default preview format changed: jpeg -> webp
* Support advanced preview_format option.
- grayscale option for visual debugging
- quality option for aggressive reducing
L?;format;quality?
ex)
jpeg => rgb, jpeg, quality 90
L;webp;80 => grayscale, webp, quality 80
L;png => grayscale, png, quality 90
webp;50 => rgb, webp, quality 50
* move comment
* * add settings for preview_format
* default value is ''(= don't reencode)
---------
Co-authored-by: Lt.Dr.Data <lt.dr.data@gmail.com>
* Add clipspace feature.
* feat: copy content to clipspace
* feat: paste content from clipspace
Extend validation to allow for validating annotated_path in addition to other parameters.
Add support for annotated_filepath in folder_paths function.
Generalize the '/upload/image' API to allow for uploading images to the 'input', 'temp', or 'output' directories.
* rename contentClipboard -> clipspace
* Do deep copy for imgs on copy to clipspace.
* mask painting on clipspace
* add original_imgs into clipspace
* Preserve the original image when 'imgs' are modified
* robust patch & refactoring folder_paths about annotated_filepath
* wip
* Only show the Paste menu if the ComfyApp.clipspace is not empty
* clipspace feature added
maskeditor feature added
* instant refresh on paste
force triggering 'changed' on paste action
* enhance mask painting
smooth drawing
add brush_size +/- button
* robust patch
use mouseup event
* robust patch
again...
* subfolder fix on paste logic
attach subfolder if subfolder isn't empty
* event listener patch
add ], [ key event for brush size
remove listener on close
* Fix button positioning issue related to window height.
Change brush size from button to slider.
* clean commit
* clean code
* various bug fixes
* paste action
- prevent opening upload popup
- ensure rendering after widget_value update
* view api update
- support annotated_filepath
* maskeditor layout
- prevent covering button by hidden div
* remove dbg message
* Add cursor functionality to display brush size
* refactor: Replace brush preview feature with missionfloyd implementation
* missionfloyd implementation
* hiding brush preview off the canvas
* change brush size on wheel event
* keyup -> keydown event
* Update web/extensions/core/maskeditor.js
Co-authored-by: missionfloyd <missionfloyd@users.noreply.github.com>
* Add support for channel-specific image data retrieval in /view API to fix alpha mask loading issue
When loading an image with an alpha mask in JavaScript canvas, there is an issue where the alpha and RGB channels are premultiplied. To avoid reliance on JavaScript canvas, I added support for channel-specific image data retrieval in the "/view" API. This allows us to retrieve data for each channel separately and fix the alpha mask loading issue. The changes have been committed to the repository.
* Enable brush preview for key and slider events
* optimize
* preview fix
* robust patch
* fix copy (clipspace) action
imgs[0] copy -> whole imgs copy
* support batch images on clipspace, maskeditor
* copy/paste bug fixes for batch images
enhance selector preview on clipspace menu
add img_paste_mode option into clipspace menu
* crash fix
* print message if clipspace content cannot editable
* Update web/extensions/core/maskeditor.js
Co-authored-by: missionfloyd <missionfloyd@users.noreply.github.com>
* make default img_paste_mode to 'selected'
refactor space -> tab
* save clipspace files to input/clipspace instead of temp
* show "clipspace/filename.png" instead of 'filename.png [clipspace]' in LoadImage/LoadImageMask
* refresh fix related to FILE_COMBO
* Update web/extensions/core/maskeditor.js
Co-authored-by: missionfloyd <missionfloyd@users.noreply.github.com>
* Update web/extensions/core/maskeditor.js
Co-authored-by: missionfloyd <missionfloyd@users.noreply.github.com>
* adjust margin based on missionfloyd impelements
* mouse event -> pointer event
* pen, touch, mouse drawing patched and tested
* Update web/extensions/core/maskeditor.js
Co-authored-by: missionfloyd <missionfloyd@users.noreply.github.com>
* add comment about touch event.
---------
Co-authored-by: Lt.Dr.Data <lt.dr.data@gmail.com>
Co-authored-by: missionfloyd <missionfloyd@users.noreply.github.com>
* adds keybinds that interact w/ comfy menu
* adds remaining keybinds
* adds keybinds to readme and converts to table
* ctrl s and o save and open workflow
* moves keybinds to sep file, update readme
* remap load default, support keycodes
* update keybinds table, prepends comfy to ids
* escape exits out of modals
* modifier keys also use map
* adds setting for filename prompt
* better handle filename prompt
Co-authored-by: missionfloyd <missionfloyd@users.noreply.github.com>
Chenlei Hu
guill
comfyanonymous
pythongosssss
Dr.Lt.Data
Kristjan Pärt
Jairo Correa
City
Muhammed Yusuf
reaper47
Karun
missionfloyd