wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-01-15 00:30:55 +08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
1,035 Commits 58 Branches 109 Tags 1.3 GiB
5fab1c57bb
Commit Graph

183 Commits

Author SHA1 Message Date
comfyanonymous
60ac983238 Merge branch 'master' of https://github.com/city96/ComfyUI 2023-04-08 15:50:26 -04:00
pythongosssss
92e912c065 Fix multiple missing 2023-04-08 16:55:09 +01:00
pythongosssss
b78ebfcf9d Improve error UI 2023-04-08 16:37:09 +01:00
pythongosssss
12f9bfe895 Better filename check 2023-04-08 16:31:10 +01:00
pythongosssss
79ff7d67a5 Add error handling around initial load of workflow 2023-04-08 16:23:57 +01:00
Filipe
e76890dcb4 Fix large workflow pnginfo import 2023-04-08 12:00:03 -03:00
pythongosssss
aad71add69 const 2023-04-08 14:52:24 +01:00
pythongosssss
cceb530395 Adds warning when loading graph with nodes you dont have 2023-04-08 14:50:57 +01:00
pythongosssss
357c0753f8 Support dataset when creating elements 
Allow dialog to show element and override buttons
 2023-04-08 14:38:45 +01:00
Silversith
65fadd0d88 Handle too many files in output folder 
Added a 50 png files from output folder limit. If this fails it also deletes the "DeleteAll" button to prevent deleting files that aren't on the list.
 2023-04-08 10:05:57 +02:00
comfyanonymous
ebd7f9bf80 Change the default prompt to something more impressive. 2023-04-08 01:10:15 -04:00
Silversith
a52b976dd5 Merge remote-tracking branch 'upstream/master' 2023-04-07 14:39:46 +02:00
Silversith
9059fc5dcf Add Output Dir Drawer 
Added output directory drawer. On refresh it will load all images in the drawer, on new image trigger it'll add the image to the drawer.
 2023-04-07 14:26:38 +02:00
comfyanonymous
60b4c31ab3 Add webp images to upload accept list. 2023-04-06 22:22:59 -04:00
comfyanonymous
0bb5f93b92 Merge branch 'image-node-keybindings' of https://github.com/ALSchwalm/ComfyUI 2023-04-06 03:27:42 -04:00
comfyanonymous
fb73d008bf Merge branch 'menu-drag' of https://github.com/missionfloyd/ComfyUI 2023-04-06 03:19:20 -04:00
missionfloyd
1a74611c6e Style modals to match rest of UI 2023-04-05 15:56:41 -06:00
missionfloyd
3536a7c8d1 Put drag icon back 2023-04-05 08:57:44 -06:00
missionfloyd
a595c56872 Remove menu drag handle 2023-04-04 22:03:22 -06:00
missionfloyd
30f274bf48
Make the default true 2023-04-04 21:53:02 -06:00
missionfloyd
1b556ea9f4
Add confirmation for clearing canvas 2023-04-04 21:20:49 -06:00
Adam Schwalm
bf7dbe4702 Add left/right/escape hotkeys for image nodes 2023-04-04 21:02:40 -05:00
City
080c758cda Ask for confirmation before clearing nodes 2023-04-04 18:16:23 +02:00
comfyanonymous
72f9235a49 Merge branch 'snap-to-grid' of https://github.com/pythongosssss/ComfyUI 2023-04-02 14:13:55 -04:00
pythongosssss
519890a5cc Adds middle click for default node creation 
Enable two useful properties
 2023-04-02 15:57:12 +01:00
pythongosssss
26dc8e3056 formatting 2023-04-02 15:36:27 +01:00
pythongosssss
d027ff121c Snap to grid 2023-04-02 15:33:34 +01:00
pythongosssss
5aefd6cdf3 Support numeric settings, tooltip, extra attrs 2023-04-02 15:16:08 +01:00
comfyanonymous
27fc64ad46 Merge branch 'menu-save-and-anchor' of https://github.com/pythongosssss/ComfyUI 2023-04-02 01:56:12 -04:00
pythongosssss
178fc76363 Added a queue for the queue action 2023-04-01 18:46:05 +01:00
pythongosssss
06c2c19b5a Clone default graph before using 2023-03-31 20:35:26 +01:00
pythongosssss
1716aaa7a6 Swap order to prevent being cleared 2023-03-31 18:04:53 +01:00
Silversith
b8a0fb6e83 Merge remote-tracking branch 'upstream/master' 2023-03-31 09:17:07 +02: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
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
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
Silversith
b128e4ef94
Merge pull request #2 from comfyanonymous/master 
Merge Latest code from ComfyAnon to Silversith
 2023-03-26 09:06:37 +02: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
pythongosssss
8d0a142321 adds simple access to server from custom nodes 2023-03-24 11:39:09 +00:00
Silversith
6ad3ae1731
Merge pull request #1 from comfyanonymous/master 
Merge Main into Local
 2023-03-24 11:35:29 +02: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
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
Silversith
97980628a4 Add a confirmation dialog 2023-03-21 22:41:08 +02:00
Silversith
4e5c0f4fa0 Add a delete images button on main floating menu 2023-03-21 22:36:27 +02: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
Silversith
96dc344b0c Minor changes and extra nodes 2023-03-21 12:18:06 +02: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
ba4a754a53 Merge remote-tracking branch 'origin/master' into a1111-meta-v2 2023-03-16 21:30:23 +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
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