Commit Graph

540 Commits

Author SHA1 Message Date
Jacob Segal
9d624564fa Merge branch 'master' into execution_model_inversion 2024-06-16 19:08:09 -07:00
comfyanonymous
cb8d0ebccc Don't load the view coordinates when loading a workflow from the history.
I think this makes things slightly less annoying for some users.
2024-06-03 19:48:27 -04:00
luke zhang
34030fed92
improve dom widget performance (#3584) 2024-05-27 14:26:07 -04:00
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.
2024-05-27 14:05:51 -04:00
DLohn
5b87369474
Load titles from API format JSON (#3563) 2024-05-24 23:53:15 -04:00
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.
2024-05-23 01:29:22 -04:00
comfyanonymous
1c4af5918a Better error message if the webcam node doesn't work. 2024-05-17 14:02:09 -04:00
pythongosssss
91590adf04
Add webcam node (#3497)
* Add webcam node

* unused import
2024-05-17 13:16:08 -04:00
freakabcd
cf6e1efb69
Show message on error when loading wf from file (works on drag and drop) (#3466) 2024-05-13 15:22:22 -04:00
comfyanonymous
4f63ee99f1 Add a button to reset the view. 2024-05-10 17:30:52 -04:00
pythongosssss
f374ea714d
Setting for saving and restoring canvas position and zoom level (#3437) 2024-05-10 17:07:46 -04:00
Dr.Lt.Data
d7fa417bfa
feat: shortcuts for zoom in/out (#3410)
* feat: shortcuts for zoom in/out

* feat: pen support for canvas zoom

ctrl + LMB + vertical drag

* Ctrl+LMB+Drag -> ctrl+Shift+LMB+Drag

---------

Co-authored-by: Lt.Dr.Data <lt.dr.data@gmail.com>
2024-05-07 04:40:56 -04:00
vilanele
9a70b70de4
add opacity slider in maskeditor (#3404)
Co-authored-by: vilanele <nomail@email.com>
2024-05-05 05:01:06 -04:00
comfyanonymous
daa92a8ff4 Fix potential issues with the int rounding fix. 2024-05-03 05:49:21 -04:00
comfyanonymous
89d0e9abeb Fix int widgets rounding. 2024-05-02 03:34:19 -04:00
Jacob Segal
b3e547f22b Merge branch 'master' into execution_model_inversion 2024-04-21 21:31:58 -07:00
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.
2024-04-18 16:41:23 -04:00
comfyanonymous
d64e217427 Fix annoying float issue causing the value to be rounded to above the max. 2024-04-17 17:34:02 -04:00
Dr.Lt.Data
072e3bd2b5
Fixed an issue where the main menu disappears intermittently as the coordinates become negative. (#3269) 2024-04-17 16:36:49 -04:00
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.
2024-04-13 16:18:00 -04:00
NyaamZ
2bef134ebf
change Convert.. input (#3246) 2024-04-12 17:02:17 -04:00
comfyanonymous
4bd7d55b90 Add some colors to SamplerCustom links.
If you don't like them I am open to a PR.
2024-04-11 22:43:05 -04:00
Gorka Eguileor
de172f8be7
Improve A1111 metadata parsing (#3216)
* A1111 import: Set VAE name

This patch sets the VAE name for the `VAELoader` when present in the png
metadata.

* A1111 import: Skip all hashes

When importing from A1111 the parsing assumes that values of a key will
never contain a ":", which is not correct.

There are 2 cases where we can have ":" in the value:

- Inside a string. E.g.:
  Lora hashes: "xl_more_art-full_v1: fe3b4816be83, add-detail-xl: 9c783c8ce46c"

- When the value is a json dictionary. E.g.:
  Hashes: {"vae": "63aeecb90f", "embed:negativeXL_D": "fff5d51ab6"}

This patch changes how we parse the metadata to take those 2 cases into
account and also skips the following additional keys that are present in
some Forge images:

- Version
- VAE hash
- TI hashes
- Lora hashes
- Hashes

* A1111 import: Parse Hires steps

This patch parses the `Hires steps` parameter that is part of the High
Resolution Upscale configuration when it  is present, and fallbacks to
the one from the `samplerNode` (like the code currently does) if it's
not present.
2024-04-06 12:10:17 -04:00
comfyanonymous
a7dd82e668 Fix copy paste issue with litegraph. 2024-04-05 14:59:05 -04:00
Jacob Segal
5ab1565418 Merge branch 'master' into execution_model_inversion 2024-02-21 19:41:09 -08:00
shiimizu
5171414143 Support additional PNG info. 2024-02-18 17:57:53 -08:00
chrisgoringe
cf4910a3a4
Prevent hideWidget being called twice for same widget
Fix for #2766
2024-02-12 08:59:25 +11:00
Steven Lu
02409c30d9
Safari: Draws certain elements on CPU. In case of search popup, can cause 10 seconds+ main thread lock due to painting. (#2763)
* lets toggle this setting first.

* also makes it easier for debug. I'll be honest this is generally preferred behavior as well for me but I ain't no power user shrug.

* attempting trick to put the work for filter: brightness on GPU as a first attempt before falling back to not using filter for large lists!

* revert litegraph.core.js changes from branch

* oops
2024-02-12 03:44:53 +09:00
comfyanonymous
fd73b5ee3a Merge branch 'improved-mobile-support' of https://github.com/pythongosssss/ComfyUI 2024-02-08 01:06:33 -05:00
comfyanonymous
7daad468ec Sync litegraph to repo.
https://github.com/comfyanonymous/litegraph.js/pull/6
2024-02-06 12:43:06 -05:00
pythongosssss
d2e7f1b04b Support linking converted inputs from api json 2024-02-06 16:55:55 +00:00
ultimabear
5f3dbede58 Mask editor: semitransparent brush, brush color modes 2024-02-03 10:29:44 +03:00
Chaoses-Ib
951a2064a3 Fix frontend webp prompt handling 2024-02-02 13:27:03 +08:00
comfyanonymous
4c54c2ec0f Merge branch 'increment-wrap' of https://github.com/pksebben/ComfyUI 2024-02-01 17:01:21 -05:00
pksebben
53a22e1ab9 add increment-wrap as option to ValueControlWidget when isCombo, which loops back to 0 when at end of list 2024-01-31 16:14:50 -08:00
Lt.Dr.Data
6ab4205422 feat: better pen support for mask editor
- alt-drag: erase
- shift-drag(up/down): zoom in/out
2024-01-31 18:28:36 +09:00
comfyanonymous
6565c9ad4d Litegraph node search improvements.
See: https://github.com/comfyanonymous/litegraph.js/pull/5
2024-01-31 02:26:27 -05:00
comfyanonymous
eeca72488b Merge branch 'group-manage-fixes' of https://github.com/pythongosssss/ComfyUI 2024-01-31 00:25:03 -05:00
pythongosssss
af6165ab69 Fix scrolling with lots of nodes 2024-01-30 18:00:01 +00:00
pythongosssss
29558fb3ac Fix crash when no widgets on customized group node 2024-01-30 17:59:47 +00:00
Meowu
364ef19354
fix: inpaint on mask editor bottom area 2024-01-30 14:23:01 +08:00
pythongosssss
ed2fa105ae Make auto saved workflow stored per tab 2024-01-29 18:43:59 +00:00
Jacob Segal
36b2214e30 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.
2024-01-28 20:48:42 -08:00
comfyanonymous
b9911dcb2f Sync litegraph with repo.
https://github.com/comfyanonymous/litegraph.js/pull/4
2024-01-23 20:01:37 -05:00
pythongosssss
3762e676a9
Support refresh on group node combos (#2625)
* Support refresh on group node combos

* fix check
2024-01-23 14:15:52 -05:00
pythongosssss
8a92ac2120 Ability to hide menu
Responsive setting screen
Touch events for zooming/context menu
2024-01-22 18:56:43 +00:00
Kristjan Pärt
45bf88d8ef
Fix queue on change to respect auto queue checkbox (#2608)
* 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
2024-01-21 21:34:39 -05:00
pythongosssss
ee2c5fa72d
Fix renaming upload widget (#2554)
* Fix renaming upload widget

* Allow custom name
2024-01-16 08:58:54 -05:00
comfyanonymous
818d0c01b2 Merge branch 'fix-logging-setting' of https://github.com/pythongosssss/ComfyUI 2024-01-16 08:29:38 -05:00
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
2024-01-16 08:27:40 -05:00