wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-02-11 05:52:33 +08:00
Code Issues Actions 16 Packages Projects Releases Wiki Activity
1,380 Commits 95 Branches 118 Tags 1.3 GiB
778c290a67
Commit Graph

359 Commits

Author SHA1 Message Date
comfyanonymous
7e151778a3 Masked editor changes. 
Add a way to upload to subfolders.

Clean up code.

Fix some issues.
 2023-05-08 14:37:51 -04:00
Dr.Lt.Data
4c259c71e5 Clipspace Menu and MaskEditor application. (#548) 
* 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>
 2023-05-08 14:37:36 -04:00
comfyanonymous
948a08261a Merge branch 'progress-shape-fix' of https://github.com/pythongosssss/ComfyUI 2023-05-05 13:14:55 -04:00
pythongosssss
fb6d06e69d actually fix card 2023-05-05 10:34:09 +01:00
pythongosssss
83bdb7c323 Fix box shape 
Match card to litegraph selection
 2023-05-05 10:12:06 +01:00
pythongosssss
b0da0a9f5b automatic calculation of image pos from widgets 2023-05-04 19:42:07 +01:00
EllangoK
f8115ab5dc style everything 
styles searchbox, should be actually everything
 2023-05-01 15:57:10 -04:00
EllangoK
84644db53a style context menu 
fix graphdialog background, and palette template
 2023-05-01 13:16:19 -04:00
comfyanonymous
cf4d7d19a8 Make default workflow use an existing checkpoint if no SD1.5 checkpoint. 2023-04-30 18:19:03 -04:00
comfyanonymous
443179744d Adjust node resize area depending on outputs. 2023-04-30 13:02:07 -04:00
comfyanonymous
b827c9be68 Make nodes easier to resize. 2023-04-29 20:53:03 -04:00
comfyanonymous
a6f7757865 Merge branch 'filter-search-by-type' of https://github.com/pythongosssss/ComfyUI 2023-04-29 15:03:08 -04:00
pythongosssss
48cab69093 - button hover style 
- ensure context menu is always above everything
 2023-04-29 17:29:07 +01:00
pythongosssss
680dc6116d Search filter by type 2023-04-29 17:19:14 +01:00
Jake D
281ddc671e Colored MultilineWidget (#524) 
* fixes colors and z-index

* light mode fix

* Update widgets.js
 2023-04-26 01:22:36 -04:00
comfyanonymous
7fe2ed0b50 Update litegraph from upstream. 2023-04-25 19:18:50 -04:00
comfyanonymous
eaf858df78 Auto increase the size of the image upload widget when there's an image. 2023-04-24 18:13:18 -04:00
comfyanonymous
04da98df66 Add a way for nodes to validate their own inputs. 2023-04-23 16:03:26 -04:00
ltdrdata
73ff5c5278 Add clipspace feature. (#541) 
* 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.

* add original_imgs into clipspace
* Preserve the original image when 'imgs' are modified

* robust patch & refactoring folder_paths about annotated_filepath

* Only show the Paste menu if the ComfyApp.clipspace is not empty

* instant refresh on paste

force triggering 'changed' on paste action

* subfolder fix on paste logic

attach subfolder if subfolder isn't empty

---------

Co-authored-by: Lt.Dr.Data <lt.dr.data@gmail.com>
 2023-04-23 15:58:55 -04:00
pythongosssss
7ffe40e3c2 use window.name instead of session storage 
- prevents duplicate stealing session id
 2023-04-23 10:31:21 +01:00
comfyanonymous
eb7a0faa30 Cleanup. 2023-04-21 23:43:38 -04:00
comfyanonymous
ce8dacc0de Merge branch 'slotDefaults-dynamic' of https://github.com/omar92/ComfyUI 2023-04-21 23:39:55 -04:00
missionfloyd
726927e17b Remove brackets if weight == 1 2023-04-20 23:55:20 -06:00
missionfloyd
a900b94df2 Improve current word selection 2023-04-20 18:23:51 -06:00
omar92
704383c26d add option on the settings to change the number of the suggestions 2023-04-20 21:13:14 +02:00
omar92
c232d693da when drag from node input or output show all possible nodes that you can connect 2023-04-20 06:19:56 +02:00
comfyanonymous
7085f624c7 Saner range of values. 2023-04-18 02:25:57 -04:00
missionfloyd
c15e61ffc9 Editattention setting (#533) 
* Add editAttention delta setting

* Update editAttention.js

* Update web/extensions/core/editAttention.js

Co-authored-by: Karun <karun.ellango7@gmail.com>

* Update editAttention.js

* Update editAttention.js

* Fix setting value

---------

Co-authored-by: Karun <karun.ellango7@gmail.com>
 2023-04-18 02:22:05 -04:00
comfyanonymous
d492b289d4 Merge branch 'edit-attention-fix' of https://github.com/EllangoK/ComfyUI 2023-04-17 23:57:20 -04:00
EllangoK
0d3b0553ae correctly checks end of the text 2023-04-17 23:40:44 -04:00
comfyanonymous
922a327ca9 Merge branch 'settings-slider' of https://github.com/missionfloyd/ComfyUI 2023-04-17 22:45:46 -04:00
EllangoK
9e00f1bfc5 selects current word automatically 2023-04-17 19:02:08 -04:00
comfyanonymous
40ef940c6f Lower how much CTRL+arrow key changes the number. 2023-04-17 18:21:24 -04:00
EllangoK
b26a787f18 allows control arrow to edit attention in textarea 2023-04-17 17:29:22 -04:00
Tomoaki Hayasaka
605fe1aeb1 Fix "Ctrl+Enter doesn't work when textarea has focus" regression introduced in #491. 2023-04-17 01:58:33 +09:00
Karun
80512e598a Adds several keybinds that interact with ComfyUI (#491) 
* 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>
 2023-04-16 01:25:11 -04:00
comfyanonymous
2de20e8f34 Merge branch 'master' of https://github.com/jwd-dev/ComfyUI 2023-04-15 20:34:20 -04:00
jwd-dev
5ebb0816c8 node serialization 2023-04-15 20:16:28 -04:00
jwd-dev
2442150ddd default text property incase we need one. 2023-04-15 19:58:46 -04:00
Jake D
8c8c44e8b0 Create noteNode.js 2023-04-15 19:50:05 -04:00
pythongosssss
51578c8ba6 style 2023-04-15 21:41:21 +01:00
pythongosssss
a496a45f3e Adds jsdoc for better dev experience 2023-04-15 21:40:39 +01:00
comfyanonymous
70bcf52e28 Merge branch 'fix-combo-auto-primitive' of https://github.com/pythongosssss/ComfyUI 2023-04-15 12:36:43 -04:00
pythongosssss
6edcf41977 Fix double click on converted combo widget link 2023-04-15 17:34:46 +01:00
comfyanonymous
4e90d7232e Merge branch 'fix-combo-primitive' of https://github.com/pythongosssss/ComfyUI 2023-04-15 11:07:03 -04:00
pythongosssss
498622f07e style 2023-04-15 10:55:19 +01:00
pythongosssss
b89b4ed61c Allow combo primitive to connect to multiple inputs 2023-04-15 10:53:30 +01:00
pythongosssss
855442e5b1 Prevent generating bad replacement regex 2023-04-15 10:29:32 +01:00
comfyanonymous
ba91d80870 Merge branch 'Allow-connect-premitiveNode-to-forceInput-comfyiUI-nodes' of https://github.com/omar92/ComfyUI 2023-04-14 00:59:31 -04:00
comfyanonymous
5b57df5424 Merge branch 'comfy-list-fix' of https://github.com/EllangoK/ComfyUI 2023-04-13 13:50:44 -04:00
missionfloyd
42f9a7452e Change grid size to slider 2023-04-13 10:04:06 -06:00
comfyanonymous
3a21c11f68 Fix widgets not getting converted correctly in workflows. 2023-04-13 10:38:41 -04:00
EllangoK
f9cd061774 fix comfy list not styled, and light theme border 2023-04-13 06:38:24 -04:00
missionfloyd
51d5668f14 Fix indentation 2023-04-12 21:15:21 -06:00
missionfloyd
52cd245d21 Add slider setting type 2023-04-12 19:36:35 -06:00
FizzleDorf
b062f87a7e Seed controls added to Ksamplers (#296) 
Co-authored-by: flyingshutter <flyingshutter@users.noreply.github.com>
 2023-04-12 20:57:13 -04:00
comfyanonymous
f177ad5e75 Update litegraph from upstream. 2023-04-12 18:00:13 -04:00
comfyanonymous
0de7e6d8f9 Merge branch 'default-replace-name' of https://github.com/pythongosssss/ComfyUI 2023-04-12 09:37:14 -04:00
pythongosssss
dadfac7d07 Changed default name to be the node type not title 2023-04-12 13:52:19 +01:00
pythongosssss
a64d858356 Add support for dropping images from urls 2023-04-12 13:49:32 +01:00
comfyanonymous
ee8ca50967 Change colour of background in light theme. 2023-04-11 23:23:06 -04:00
EllangoK
57be70b04a simplify setting color of root, fixes fg and bg 2023-04-11 13:24:32 -04:00
EllangoK
182bc15f03 adds light theme, fixes multiline css 2023-04-11 13:11:39 -04:00
EllangoK
e1f8b7b24d fix node slot colors for solarized 
previously many dupes, and same colors as base
 2023-04-11 12:09:15 -04:00
EllangoK
c458f7d9b4 colorPalette modifies comfyUI as well 2023-04-11 11:38:55 -04:00
EllangoK
334b8dbebf use variables in css stylesheet 2023-04-11 01:08:01 -04:00
pythongosssss
cfc4747ee9 style 2023-04-09 11:30:31 +01:00
pythongosssss
cfacbc0439 Add arrow to menu items with submenu 2023-04-09 11:29:55 +01:00
comfyanonymous
5d4c1c52c3 Merge branch 'fix/pnginfo-import' of https://github.com/filipemeneses/ComfyUI 2023-04-08 18:48:53 -04:00
comfyanonymous
04d13a1a37 Merge branch 'catch-configure-errors' of https://github.com/pythongosssss/ComfyUI 2023-04-08 18:37:47 -04:00
comfyanonymous
f069583252 Merge branch 'missing-node-warning' of https://github.com/pythongosssss/ComfyUI 2023-04-08 18:37:27 -04:00
comfyanonymous
b458942ab3 Merge branch 'node-templates' of https://github.com/pythongosssss/ComfyUI 2023-04-08 18:37:05 -04:00
comfyanonymous
5c01808f4b Merge branch 'themes' of https://github.com/EllangoK/ComfyUI 2023-04-08 18:14:05 -04:00
comfyanonymous
25edb68351 Merge branch 'master' of https://github.com/city96/ComfyUI 2023-04-08 15:50:26 -04:00
EllangoK
4354be0cb4 assign link_type_colors directly 2023-04-08 13:18:23 -04:00
omar92
b2779e064f handle double click create primitive widget 2023-04-08 19:05:22 +02:00
omar92
f1b146e82e Allow connect premitive Node to "comfyiUI-nodes that have forceInput setting" 2023-04-08 18:58:47 +02:00
EllangoK
d379a0abc5 link colors change after palette swap 
didn't work previously as same function was defined repeatedly
 2023-04-08 11:55:27 -04:00
pythongosssss
07859b9bdc Fix multiple missing 2023-04-08 16:55:09 +01:00
pythongosssss
95a43082e1 Improve error UI 2023-04-08 16:37:09 +01:00
pythongosssss
43eb049ddc Better filename check 2023-04-08 16:31:10 +01:00
pythongosssss
625acbec71 Add error handling around initial load of workflow 2023-04-08 16:23:57 +01:00
EllangoK
23dd6cf99b remove test render link file 2023-04-08 11:13:27 -04:00
Filipe
715ecf8f96 Fix large workflow pnginfo import 2023-04-08 12:00:03 -03:00
EllangoK
3d32435d5a cleanup customizeRenderLink 2023-04-08 10:59:34 -04:00
EllangoK
ee82a4c320 matches entry for correct link color 2023-04-08 10:47:15 -04:00
EllangoK
c91fcdbfb2 link color is set to nodeType color 2023-04-08 10:43:04 -04:00
pythongosssss
f9a6e5c6f4 const 2023-04-08 14:52:24 +01:00
pythongosssss
1b529aedb3 Adds warning when loading graph with nodes you dont have 2023-04-08 14:50:57 +01:00
pythongosssss
d2cda860ef Add style update 2023-04-08 14:48:15 +01:00
pythongosssss
2ce3dac5ad Adds menu for adding + managing node templates 2023-04-08 14:39:10 +01:00
pythongosssss
e2d6ba9fd1 Support dataset when creating elements 
Allow dialog to show element and override buttons
 2023-04-08 14:38:45 +01:00
EllangoK
8df8d9b7d0 manual set default link color 2023-04-08 09:28:35 -04:00
comfyanonymous
508d58dbfc Change the default prompt to something more impressive. 2023-04-08 01:10:15 -04:00
comfyanonymous
aa3da2fbb4 Allow dragging again. 2023-04-07 23:07:19 -04:00
EllangoK
998f1391eb fixes NODE_TITLE_COLOR not being set 2023-04-07 20:12:24 -04:00
EllangoK
36dfd0c513 colorPalette sets LiteGraph colors 2023-04-07 19:42:03 -04:00
comfyanonymous
9d1eaea760 Set title of page to ComfyUI. 2023-04-07 16:26:06 -04:00
comfyanonymous
c951ecc0fd Update litegraph from upstream. 2023-04-07 15:11:00 -04:00
comfyanonymous
f4e478eb4c Add webp images to upload accept list. 2023-04-06 22:22:59 -04:00
comfyanonymous
170da91441 Merge branch 'image-node-keybindings' of https://github.com/ALSchwalm/ComfyUI 2023-04-06 03:27:42 -04:00
comfyanonymous
01f9d8268d Merge branch 'menu-drag' of https://github.com/missionfloyd/ComfyUI 2023-04-06 03:19:20 -04:00
missionfloyd
e10577366b Style modals to match rest of UI 2023-04-05 15:56:41 -06:00
missionfloyd
d56ef7e753 Put drag icon back 2023-04-05 08:57:44 -06:00
missionfloyd
791d92615d Remove redundant lines 2023-04-04 22:10:45 -06:00
missionfloyd
1a6f38afe0 Remove menu drag handle 2023-04-04 22:03:22 -06:00
missionfloyd
5885832d11 Make the default true 2023-04-04 21:53:02 -06:00
missionfloyd
2c46a37229 Merge branch 'master' into confirm-clear 2023-04-04 21:43:28 -06:00
missionfloyd
b49a528720 Add confirmation for clearing canvas 2023-04-04 21:20:49 -06:00
comfyanonymous
b52df24907 Merge branch 'graphdialog-style' of https://github.com/missionfloyd/ComfyUI 2023-04-04 23:04:25 -04:00
Adam Schwalm
7f92a6c40e Add left/right/escape hotkeys for image nodes 2023-04-04 21:02:40 -05:00
missionfloyd
26f25c4d97 Fix .graphdialog style 2023-04-04 19:32:49 -06:00
City
850028f65c Ask for confirmation before clearing nodes 2023-04-04 18:16:23 +02:00
mligaintart
3afd02a351 Adds orientation settings to reroute nodes, allowing for cleaner 
graphes.
 2023-04-03 17:47:32 -04:00
comfyanonymous
39d93d5924 Merge branch 'master' of https://github.com/omar92/ComfyUI 2023-04-03 16:52:59 -04:00
omar92
25002a6f5b check if workflowNode And widgets_values are defined as they were causing errors on QueuePrompt after loading workFlow 2023-04-03 22:01:18 +02:00
omar92
16165d1cbb fix bug in reroute node , that didnt allow to load old worflows 2023-04-03 21:27:43 +02:00
pythongosssss
23ec655c0d Merge remote-tracking branch 'origin/master' into combo_filter_input 2023-04-03 11:00:12 +01:00
pythongosssss
41d39c8ed4 Fix scaled position when filtering 
Add esc to close
 2023-04-03 08:11:44 +01:00
pythongosssss
1fdc757b91 Fix scaled position 2023-04-02 21:37:24 +01:00
pythongosssss
2235bed569 Update comment 2023-04-02 21:02:40 +01:00
pythongosssss
b074cb6b88 Added keyboard navigation + selection 2023-04-02 21:01:39 +01:00
comfyanonymous
041c24e4d7 Merge branch 'snap-to-grid' of https://github.com/pythongosssss/ComfyUI 2023-04-02 14:13:55 -04:00
pythongosssss
82cf5eba28 Add support for multiselect 2023-04-02 19:12:00 +01:00
pythongosssss
23dbea1d3e Added filter input to combos 2023-04-02 19:03:34 +01:00
comfyanonymous
4884e4522c Merge branch 'fix-hidden-save-prefix' of https://github.com/tjhayasaka/ComfyUI 2023-04-02 14:00:05 -04:00
pythongosssss
a85b48aa5b Adds middle click for default node creation 
Enable two useful properties
 2023-04-02 15:57:12 +01:00
Tomoaki Hayasaka
3ee0d555aa Fix "extra filename replacements in SaveImage is not done when prefix is supplied by Primitive". 2023-04-02 23:42:50 +09:00
pythongosssss
d01b6780b0 formatting 2023-04-02 15:36:27 +01:00
pythongosssss
b740c40402 Snap to grid 2023-04-02 15:33:34 +01:00
pythongosssss
be0a94d11a Support numeric settings, tooltip, extra attrs 2023-04-02 15:16:08 +01:00
comfyanonymous
c27b187035 Merge branch 'menu-save-and-anchor' of https://github.com/pythongosssss/ComfyUI 2023-04-02 01:56:12 -04:00
comfyanonymous
653a49078b Merge branch 'fixReroute' of https://github.com/flyingshutter/ComfyUI 2023-04-02 01:55:37 -04:00
pythongosssss
990fccb776 Added a queue for the queue action 2023-04-01 18:46:05 +01:00
flyingshutter
5845c7487c fix client freeze on connect reroutes in a circle 2023-04-01 17:30:47 +02:00
comfyanonymous
dc0eba2aae Merge branch 'fix-modifying-default-graph' of https://github.com/pythongosssss/ComfyUI 2023-03-31 16:11:14 -04:00
pythongosssss
60c4724e24 Clone default graph before using 2023-03-31 20:35:26 +01:00
comfyanonymous
4ac9cc4cdd Merge branch 'fix-load-history-outputs' of https://github.com/pythongosssss/ComfyUI 2023-03-31 13:13:56 -04:00
pythongosssss
6bfdc94d88 Swap order to prevent being cleared 2023-03-31 18:04:53 +01:00
City
6e2686e199 Fallback for node title 2023-03-31 00:54:35 +02:00
City
dd438a9d3b Add human-readable names for nodes 2023-03-30 23:13:58 +02:00
pythongosssss
aed4296b1a Formatting 2023-03-30 20:15:48 +01:00
pythongosssss
a05660983d Formatting 2023-03-30 20:15:12 +01:00
pythongosssss
9b1f7f94bf Remove bottom anchor 2023-03-30 20:14:01 +01:00
pythongosssss
9d538d9b83 Merge remote-tracking branch 'origin/master' into menu-save-and-anchor 2023-03-30 19:39:50 +01:00
hnmr293
66c4e0e7e7 allow converting optional widgets to inputs 2023-03-30 21:50:35 +09:00
comfyanonymous
472855c9c7 Merge branch 'master' of https://github.com/city96/ComfyUI 2023-03-30 00:35:07 -04:00
comfyanonymous
6505a4bee3 Merge branch 'extra-filename-replacements' of https://github.com/pythongosssss/ComfyUI 2023-03-30 00:14:48 -04:00
City
cc78423e06 Turn comfy-menu into a sidebar on small screens 2023-03-30 01:43:31 +02:00
pythongosssss
bd6cfa687f Extra formatting values on SaveImage 2023-03-29 22:09:11 +01:00