Commit Graph

325 Commits

Author SHA1 Message Date
flyingshutter 9586de9dc8 fix client freeze on connect reroutes in a circle 2023-04-01 17:30:47 +02:00
comfyanonymous 7e682784d7 Merge branch 'fix-modifying-default-graph' of https://github.com/pythongosssss/ComfyUI 2023-03-31 16:11:14 -04:00
pythongosssss 06c2c19b5a Clone default graph before using 2023-03-31 20:35:26 +01:00
comfyanonymous 91f27f08ec Merge branch 'fix-load-history-outputs' of https://github.com/pythongosssss/ComfyUI 2023-03-31 13:13:56 -04:00
pythongosssss 1716aaa7a6 Swap order to prevent being cleared 2023-03-31 18:04:53 +01:00
City e6e30ee7cb Fallback for node title 2023-03-31 00:54:35 +02:00
City 5bcbc007dd Add human-readable names for nodes 2023-03-30 23:13:58 +02:00
pythongosssss 722801ed2d Formatting 2023-03-30 20:15:48 +01:00
pythongosssss 3a5bcdf8b9 Formatting 2023-03-30 20:15:12 +01:00
pythongosssss c93dc2fb89 Remove bottom anchor 2023-03-30 20:14:01 +01:00
pythongosssss 6481c90371 Merge remote-tracking branch 'origin/master' into menu-save-and-anchor 2023-03-30 19:39:50 +01:00
hnmr293 04b42bad87 allow converting optional widgets to inputs 2023-03-30 21:50:35 +09:00
comfyanonymous 974235a272 Merge branch 'master' of https://github.com/city96/ComfyUI 2023-03-30 00:35:07 -04:00
comfyanonymous 786f7f767a Merge branch 'extra-filename-replacements' of https://github.com/pythongosssss/ComfyUI 2023-03-30 00:14:48 -04:00
City 8a730ed20e Turn comfy-menu into a sidebar on small screens 2023-03-30 01:43:31 +02:00
pythongosssss 80e014a69e Extra formatting values on SaveImage 2023-03-29 22:09:11 +01:00
pythongosssss 7db120b9a9 Merge remote-tracking branch 'origin/master' into menu-save-and-anchor 2023-03-29 19:39:25 +01:00
pythongosssss 00c1ec498f Fix crash if node is removed mid run 2023-03-29 19:03:38 +01:00
pythongosssss 6f72c4c6ff Allows nodes to return ui data and output data
Fire executed event on node when message received
2023-03-29 18:53:24 +01:00
comfyanonymous 2b60c308be Merge branch 'mute-nodes' of https://github.com/jn-jairo/ComfyUI 2023-03-29 10:58:52 -04:00
City 0f92d41ac7 Match comfy-menu style to litegraph 2023-03-29 15:52:38 +02:00
pythongosssss 8363ef967d Merge remote-tracking branch 'origin/master' into menu-save-and-anchor 2023-03-29 14:40:45 +01:00
Jairo Correa d5bf2314b3 Mute nodes and shortcuts in README 2023-03-29 05:04:06 -03:00
Farid Safi 40a377775e move clean to handleFile and loadGraphData functions 2023-03-28 20:22:49 +02:00
Farid Safi 393084877c clean state when loading another workflow 2023-03-28 19:45:17 +02:00
pythongosssss 9fdd5245fd Merge remote-tracking branch 'origin/master' into menu-save-and-anchor 2023-03-28 09:53:55 +01:00
Jairo Correa 4b9e11053c Color palette setting 2023-03-27 23:36:53 -03:00
pythongosssss 2d046f85e8 Merge remote-tracking branch 'origin/master' into menu-save-and-anchor 2023-03-27 20:20:08 +01:00
ltdrdata d3a375c8fb
Add support for file list refresh feature in node (#192)
* Added file reload feature to widgets.

* Modify feature name 'reload' to 'refresh' and fixed ignoring button name.

* refresh widget bugfix

* crash patch for "widget" input by type mismatch

* compensate offset on showimage
* adding widget caused misaligned offset

* patch refresh feature for general method

* clean up patch and following upstream

* make more clean code for refresh feature

* move refresh button position

* robust patch for refresh feature

* patch for refreh feature
* avoid specify REFRESH_LIST for each node
* prevent updating selected value unless removed item
* update all combo list for 'required input' in node

---------

Co-authored-by: Lt.Dr.Data <lt.dr.data@gmail.com>
2023-03-27 13:27:09 -04:00
Silversith bb1503ed63
Bugfix/include optional node inputs (#271)
* Minor changes and extra nodes

* Added Preview Image for Nodes

* Add a delete images button on main floating menu

* Add a confirmation dialog

* Remove DeleteAll, Remove Custom KSampler, Remove Image List

* Remove Image and Custom Json Load

* Remove Custom Nodes

* remove patch.diff
2023-03-27 01:16:22 -04:00
comfyanonymous 479ef4b38f Merge branch 'group-header' of https://github.com/jn-jairo/ComfyUI 2023-03-27 00:46:30 -04:00
Jairo Correa 63525ee83c Move group by header 2023-03-26 22:53:49 -03:00
Jairo Correa 967bfce0f3 Optional RETURN_NAMES to set the output name 2023-03-26 21:40:36 -03:00
pythongosssss 0b1e85fbea Add manual flag when restoring pos 2023-03-26 15:10:38 +01:00
pythongosssss 716d8e746a Remove log 2023-03-26 15:03:57 +01:00
pythongosssss 20ae48515e Add setting to save menu position
Add anchoring to side when resizing
Fix losing menu when resizing
2023-03-26 15:01:34 +01:00
pythongosssss a49b5659bc
Merge branch 'comfyanonymous:master' into custom-node-socket 2023-03-26 10:12:39 +01:00
comfyanonymous d68350eee5 Merge branch 'draggable-menu' of https://github.com/jn-jairo/ComfyUI 2023-03-26 00:22:04 -04:00
mezzo-anon 980379bab2 change colors to a more consistent and pleasing palette 2023-03-26 04:11:53 +02:00
Jairo Correa 48d4edbceb Prevent draggable menu to get outside of window 2023-03-25 23:06:00 -03:00
Jairo Correa a5c78a5796 Draggable menu 2023-03-25 20:23:46 -03:00
comfyanonymous 8d66827b15 Merge branch 'slot-color' of https://github.com/jn-jairo/ComfyUI 2023-03-25 12:37:55 -04:00
comfyanonymous 58695f9c7a Fix seed being impossible to increment/decrement by 1. 2023-03-25 11:12:03 -04:00
Jairo Correa 070b5749b3 Slot colors by type 2023-03-25 06:28:09 -03:00
comfyanonymous 44b6eaad6f Don't completely break workflow if field name changes. 2023-03-25 01:04:02 -04:00
comfyanonymous edb3dea88b Merge branch 'widget-inputs' of https://github.com/pythongosssss/ComfyUI 2023-03-24 22:45:40 -04:00
comfyanonymous 5c03b2f31e Merge branch 'mobile-support' of https://github.com/Zentropivity/ComfyUI 2023-03-24 18:23:37 -04:00
pythongosssss d6830b958c Prevent exactly overlapping nodes
Throttle double click
2023-03-24 20:20:34 +00:00
Zentropivity 4461ddc9e6 Change close on mouseleave to false 2023-03-24 19:18:58 +01:00
pythongosssss 1fa9ccaa16 Set title to widget name 2023-03-24 16:51:17 +00:00
pythongosssss 97198f5b74 Restore original size after add/remove input 2023-03-24 16:36:11 +00:00
pythongosssss 8d0a142321 adds simple access to server from custom nodes 2023-03-24 11:39:09 +00:00
pythongosssss b13539c3dd Sync widget changes 2023-03-24 10:27:19 +00:00
pythongosssss bb00176731 Remove debugger 2023-03-23 21:43:51 +00:00
pythongosssss 7a7e3288ee Added support for converting widgets to inputs (and back) 2023-03-23 21:37:19 +00:00
Zentropivity e9206a52da Fix double click handling by not using faulty is_primary check 2023-03-23 10:06:06 +01:00
pythongosssss 4257e4ce51 tidy 2023-03-22 18:52:24 +00:00
pythongosssss 76f4d65d79 Remove initial call as now unnecessary
Set canvas to dirty if we grow the node
2023-03-22 18:50:45 +00:00
pythongosssss 2b94dee3da Calculate sizes when drawing if required 2023-03-22 18:43:43 +00:00
pythongosssss b810ca49f1 Add support for multiple multiline text areas on the same widget 2023-03-21 21:34:00 +00:00
xss eb67d05540 add canvas tab index so it recieves keydown events 2023-03-21 13:31:47 -05:00
comfyanonymous 451447bd9f Merge branch 'saveimage' of https://github.com/pythongosssss/ComfyUI 2023-03-21 13:30:22 -04:00
Guo Y.K 49705dc947
ui: hide decimal fraction for int fields 2023-03-21 17:48:00 +08:00
pythongosssss 0b6ba21f52 Added save image menu item 2023-03-21 08:00:13 +00:00
comfyanonymous e85fcb822b Small fix. 2023-03-20 14:55:28 -04:00
comfyanonymous 0abe001edd Merge branch 'save-images' of https://github.com/m957ymj75urz/ComfyUI 2023-03-20 14:29:45 -04:00
comfyanonymous 46b674c9c2 Make saved json more pretty. 2023-03-20 02:23:47 -04:00
m957ymj75urz d1138e8ba0 rework payload from server 2023-03-19 12:54:29 +01:00
comfyanonymous 07dab962da Add an auto queue checkbox.
This will auto queue the current prompt when the queue hits zero.
2023-03-19 00:03:18 -04:00
m957ymj75urz 5fa514fa51 rollback urlparams 2023-03-18 20:13:25 +01:00
comfyanonymous 739c1a753d Fix annoyance. 2023-03-18 14:52:19 -04:00
comfyanonymous e51d240eec Merge branch 'reroute-rewrite' of https://github.com/pythongosssss/ComfyUI 2023-03-17 20:54:05 -04:00
comfyanonymous 2e73367f45 Merge T2IAdapterLoader and ControlNetLoader.
Workflows will be auto updated.
2023-03-17 18:17:59 -04:00
pythongosssss 52e74a2bb2 Fixed crash removing nodes
due to output link is still being set but not valid
2023-03-17 17:52:20 +00:00
Zentropivity 963b68b81c Remove mobile client-side zoom 2023-03-17 10:36:50 +01:00
pythongosssss ba4a754a53 Merge remote-tracking branch 'origin/master' into a1111-meta-v2 2023-03-16 21:30:23 +00:00
pythongosssss c0f5325018 Increase size of node 2023-03-16 21:04:54 +00:00
pythongosssss aff1e3936a Simplify and fix bug with following virtual nodes
courtesy of someanon
2023-03-16 19:15:02 +00:00
m957ymj75urz 16001e9429 fixes for specific paths 2023-03-16 19:48:59 +01:00
Zentropivity 8c5d45e7f8 Correct html head and switch litegraph to pointer mode. 2023-03-16 17:05:26 +01:00
pythongosssss 37b70d7987 Made node non collapsable
Fixed color of first input link
2023-03-16 14:08:11 +00:00
comfyanonymous ef71d2c281 Merge branch 'dragdrop-image-upload' of https://github.com/pythongosssss/ComfyUI into m1 2023-03-16 02:39:55 -04:00
comfyanonymous 07598e27e5 I think it looks a bit better like this. 2023-03-15 14:32:52 -04:00
comfyanonymous 10bbf208c4 Merge branch 'batch-count' of https://github.com/m957ymj75urz/ComfyUI 2023-03-15 12:52:37 -04:00
m957ymj75urz 3d2f60b315
Merge branch 'master' into save-images 2023-03-15 10:48:15 +00:00
m957ymj75urz 29cee297a0 ignore/restore custom batch count when extra options is unchecked 2023-03-15 11:44:49 +01:00
comfyanonymous 268a2dab71 Merge branch 'queue-prompt-hotkey' of https://github.com/pythongosssss/ComfyUI 2023-03-14 18:19:43 -04:00
pythongosssss 235dce3977 Explain why animation frame used 2023-03-14 21:25:52 +00:00
pythongosssss 4758752939 Updated comment 2023-03-14 21:22:47 +00:00
pythongosssss 019bd519cb Add dragleave handler to remove stuck highlight 2023-03-14 21:21:50 +00:00
pythongosssss f2a6cff466 Add dragdrop handling to nodes with upload widget 2023-03-14 21:13:29 +00:00
pythongosssss 01ec3db932 Add ctrl+shift+enter for queue front 2023-03-14 20:31:27 +00:00
pythongosssss 255ff2d6dd Added ctrl+enter to queue prompt 2023-03-14 20:29:18 +00:00
pythongosssss 94a279373b Better auto pos of images 2023-03-14 19:39:49 +00:00
m957ymj75urz a1b30f102b toggle extra options 2023-03-14 08:16:48 +01:00
pythongosssss 97f3c23036 Fix node link colors 2023-03-13 22:11:09 +00:00
pythongosssss a5d3eb9715 Rewrote reroute node for much better usability 2023-03-13 22:00:37 +00:00
pythongosssss e5318d918c Combo support detault value 2023-03-13 19:34:29 +00:00
pythongosssss 85989c74e5 Updated a1111 pnginfo importer, supports:
- model name, other basic settings
 - clip skip
 - hr upscale
 - loras
 - embeddings
2023-03-12 21:36:42 +00:00
m957ymj75urz 195d7aec9f can specify a subfolder in the SaveImage node 2023-03-12 19:51:39 +01:00
m957ymj75urz 67795e4085 added a range input 2023-03-10 10:38:35 +01:00
comfyanonymous b94ed02aae Merge branch 'uploadimages' of https://github.com/pythongosssss/ComfyUI 2023-03-09 13:30:19 -05:00
pythongosssss 99abc0eb2e Changed to upload to input dir
Fixed jpg
Added dupe support
Changed to use existing nodes
2023-03-09 17:57:59 +00:00
m957ymj75urz 21553316f2 add batch count to the menu 2023-03-09 18:02:03 +01:00
pythongosssss 4a326a2548 Added UploadImage+Mask nodes 2023-03-08 22:07:44 +00:00
pythongosssss 4ed39cf038 Added invert scrolling setting 2023-03-08 20:04:22 +00:00
pythongosssss 863e747dbd Added simple settings dialog
Updated to use css vars for colors
2023-03-08 20:03:37 +00:00
pythongosssss 5c55c93367 Updated to reuse session id if available 2023-03-07 13:24:15 +00:00
pythongosssss 4bdfbb3379 Fixed check for polling 2023-03-06 16:47:02 +00:00
pythongosssss a8315a6fb8 Allow any node to draw images 2023-03-06 15:50:29 +00:00
pythongosssss 1ee35fd909 Merge remote-tracking branch 'origin/master' into frontendrefactor 2023-03-05 21:55:16 +00:00
pythongosssss dc85b3b8d0 Allow serializeValue to be async 2023-03-03 21:13:40 +00:00
pythongosssss 9913114044 Only poll if it has never opened 2023-03-03 21:13:11 +00:00
pythongosssss 0e7b98e429 Restored accidently removed code 2023-03-03 20:17:03 +00:00
pythongosssss 947e786c0a Restored missing input edit fix 2023-03-03 20:10:18 +00:00
pythongosssss 592b377ac4 Added dynamic loading of extensions 2023-03-03 19:05:39 +00:00
pythongosssss c23af92baf Redraw node on opt change 2023-03-03 18:48:22 +00:00
pythongosssss e14b79c14e Changed to store resolved prompt in workflow info 2023-03-03 18:40:50 +00:00
pythongosssss 4ef4cf913f Adding built in extensions + example 2023-03-03 18:28:34 +00:00
pythongosssss 2e52d01cdc Documenting methods 2023-03-03 15:47:33 +00:00
pythongosssss 72cdd83c06 Readded loading file 2023-03-03 15:27:08 +00:00
pythongosssss a5c5c97ded More work on UI 2023-03-03 15:20:49 +00:00
pythongosssss 7e436ba9cc
Added handling of sockets
Started rework of UI elements
Added pnginfo handling
2023-03-02 21:34:29 +00:00
pythongosssss 2eaa664089
Refactored sockets 2023-03-02 21:33:50 +00:00
pythongosssss 5e25c77074
Initial refactoring changes
- Moved to web folder
 - Splitting into individual files
2023-03-02 20:00:06 +00:00