201 Commits (bb50e6983970e3e01d1f2516a38e532883a416ae)

Author SHA1 Message Date
Chenlei Hu bfc214f434
Use new TS frontend uncompressed (#4379)
* Swap frontend uncompressed

* Add uncompressed files
6 months ago
guill 5cfe38f41c
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.
6 months ago
pythongosssss e60e19b175
Add support for simple tooltips (#3842)
* Add support for simple tooltips

* Fix overflow

* Add tooltips for nodes in the default workflow

* new line

* Prevent potential crash

* PR feedback

* Hide tooltip when clicking (e.g. combo widget)

* Refactor tooltips, add node level support

* Fix

* move

* Fix test (and undo last change)

* Fixed indent

* Fix dom widgets, dont show tooltip if not over canvas
6 months ago
bymyself 011b11d8d7
LoadAudio restores file value from workflow (#4043)
* LoadAudio restores file value from workflow

* use onAfterGraphConfigured

* Don't use anonnymous function
7 months ago
bymyself 374e093e09
Disable audio widget trying to get previews (#4044) 7 months ago
comfyanonymous fbb7a1f1b6 PreviewAudio node. 8 months ago
Chenlei Hu 5ff3d4eb3a
Fix audio upload when no audio in input dir (#3891) 8 months ago
Chenlei Hu 3b423afcca
Add audio widget (#3863)
* Add audio widget

* Fix audio bugs

* Add CSS

* Populate audio widget when load history
8 months ago
pythongosssss 90aebb6c86
New Menu & Workflow Management (#3112)
* 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
8 months ago
Regis Gaughan, III f6a203951f
Extend core snapToGrid to LiteGraph Groups. (#3393)
Extends the core Comfy.SnapToGrid behavior for nodes to apply to LiteGraph's LGraphGroup with the same behavior. Also, pulls out redundant rounding code into util function.
9 months ago
comfyanonymous 6507a9c716 Remove the CTRL-Delete keybind.
On some keyboards it's apparently too easy to accidentally do CTRL-Delete
when pressing CTRL-Enter repeatedly.

CTRL-Backspace can still be used to clear the workflow.
9 months ago
comfyanonymous 1c4af5918a Better error message if the webcam node doesn't work. 9 months ago
pythongosssss 91590adf04
Add webcam node (#3497)
* Add webcam node

* unused import
9 months ago
vilanele 9a70b70de4
add opacity slider in maskeditor (#3404)
Co-authored-by: vilanele <nomail@email.com>
10 months ago
Torbjörn Lönnemark a88b0ebc2d
Improve node input/widget conversion sub-menus (#3281)
* Make input/widget conversion sub-menus optional

* Improve input/widget conversion sub-menu text

- Fix incorrect text for conversion from widget to input, previously it
  effectively said "convert input to input"
- Use "input" instead of "🔘".  The former is clearer and consistent
  with the rest of the application.
- Use title case (consistent with the rest of the menu entries).
- Strip the trailing periods. There is already a visual indicator for
  sub-menus, and no other sub-menus use trailing periods.
10 months ago
comfyanonymous 744ac944db Don't make dynamicPrompts the default on multiline string inputs.
This should be less confusing to those who want to use multiline input
without them.
11 months ago
NyaamZ 2bef134ebf
change Convert.. input (#3246) 11 months ago
comfyanonymous 4bd7d55b90 Add some colors to SamplerCustom links.
If you don't like them I am open to a PR.
11 months ago
chrisgoringe cf4910a3a4
Prevent hideWidget being called twice for same widget
Fix for #2766
1 year ago
comfyanonymous fd73b5ee3a Merge branch 'improved-mobile-support' of https://github.com/pythongosssss/ComfyUI 1 year ago
pythongosssss d2e7f1b04b Support linking converted inputs from api json 1 year ago
ultimabear 5f3dbede58 Mask editor: semitransparent brush, brush color modes 1 year ago
Lt.Dr.Data 6ab4205422 feat: better pen support for mask editor
- alt-drag: erase
- shift-drag(up/down): zoom in/out
1 year ago
comfyanonymous eeca72488b Merge branch 'group-manage-fixes' of https://github.com/pythongosssss/ComfyUI 1 year ago
pythongosssss af6165ab69 Fix scrolling with lots of nodes 1 year ago
pythongosssss 29558fb3ac Fix crash when no widgets on customized group node 1 year ago
Meowu 364ef19354
fix: inpaint on mask editor bottom area 1 year ago
pythongosssss 3762e676a9
Support refresh on group node combos (#2625)
* Support refresh on group node combos

* fix check
1 year ago
pythongosssss 8a92ac2120 Ability to hide menu
Responsive setting screen
Touch events for zooming/context menu
1 year ago
pythongosssss ee2c5fa72d
Fix renaming upload widget (#2554)
* Fix renaming upload widget

* Allow custom name
1 year ago
pythongosssss 93bbe3f4c0
Auto queue on change (#2542)
* 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
1 year ago
comfyanonymous b5ece6354d Merge branch 'undoredo-fix-modifiers' of https://github.com/pythongosssss/ComfyUI 1 year ago
pythongosssss 9bddc9d94b Fix crash on group render 1 year ago
pythongosssss 18511dd581
Manage group nodes (#2455)
* wip group manage

* prototyping ui

* tweaks

* wip

* wip

* more wip

* fixes
add deletion

* Fix tests

* fixes

* Remove test code

* typo

* fix crash when link is invalid
1 year ago
pythongosssss df49a727ff Fix modifiers triggering key down checks 1 year ago
pythongosssss 235727fed7
Store user settings/data on the server and multi user support (#2160)
* 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
1 year ago
pythongosssss 6453dc1ca2 Fix name counter preventing more than 3 of the same node
Fix linked widget offset when populating values
1 year ago
pythongosssss 390078904c
Group node fixes (#2259)
* Prevent cleaning graph state on undo/redo

* Remove pause rendering due to LG bug

* Fix crash on disconnected internal reroutes

* Fix widget inputs being incorrect order and value

* Fix initial primitive values on connect

* basic support for basic rerouted converted inputs

* Populate primitive to reroute input

* dont crash on bad primitive links

* Fix convert to group changing control value

* reduce restrictions

* fix random crash in tests
1 year ago
pythongosssss ab93abd4b2
Prevent cleaning graph state on undo/redo (#2255)
* Prevent cleaning graph state on undo/redo

* Remove pause rendering due to LG bug
1 year ago
Dr.Lt.Data 69033081c5 mask editor bugfix
- Addressing the issue where an unnecessary hidden panel disrupts the drawing.
1 year ago
pythongosssss 9aaf368a41 Fix internal reroutes connected to other groups 1 year ago
comfyanonymous e134547341 Merge branch 'reroute-converted-inputs' of https://github.com/pythongosssss/ComfyUI
# Conflicts:
#	web/extensions/core/widgetInputs.js
1 year ago
Dr.Lt.Data 8112a0d9fc
improve: Mask Editor (#2171)
* renewal mask editor

* fix: ignoring keydown when 2nd open
1 year ago
pythongosssss 8de6f94f5c Allow widget placeholder replacement on primitives 1 year ago
pythongosssss 44265e0810 Allow connecting primitivenode to reroutes 1 year ago
comfyanonymous 6efe561c2a Merge branch 'fix-template-sorting' of https://github.com/pythongosssss/ComfyUI 1 year ago
pythongosssss 77ab2c3f69 fix template sorting 1 year ago
pythongosssss 496de0891d Allow removing erroring embedded groups
Unregister group nodes on workflow change
1 year ago
Jairo Correa c92f3dca73
Merge branch 'master' into image-cache 1 year ago
comfyanonymous ec7a00aa96 Fix extension widgets not working. 1 year ago