Commit Graph

383 Commits

Author SHA1 Message Date
ltdrdata 1f34bf08f0 To support dynamic custom loading, separate the node registration
process based on the defs in the registerNodes function.
2023-05-31 22:01:25 +09:00
space-nuko 468c27afea Fix litegraph dialog z-index/font 2023-05-30 16:06:17 -05:00
space-nuko 04f4fba013 Fix litegraph dialog CSS 2023-05-30 16:01:49 -05:00
Lt.Dr.Data 08abd838b8 HOTFIX: Patched the conflict issue between the Combo Refresh feature and PrimitiveNodes. 2023-05-30 15:26:45 +09:00
Dr.Lt.Data 23ffafeb5d typo fix: field name in error message 2023-05-28 23:31:40 +09:00
space-nuko 6b2a8a3845 Show message in the frontend if prompt execution raises an exception 2023-05-27 21:06:07 -05:00
space-nuko cc4d3435d3 Highlight failing nodes/inputs in frontend 2023-05-27 21:06:07 -05:00
comfyanonymous 9b1396e93a Fix issue importing other ui prompts. 2023-05-24 14:01:11 -04:00
comfyanonymous bfb13f5eee Remove useless call to /object_info 2023-05-22 17:05:23 -04:00
comfyanonymous 4796e615dd Revert DPI fix since it caused more issues than it solved. 2023-05-21 10:34:26 -04:00
malern e6e1999f96 Render UI at a higher resolution when viewing with a higher pixel ratio 2023-05-19 20:04:36 +01:00
malern 2998e232cb Make multiline widget work with different canvas dimensions.
It now scales the textarea positioning using the canvas height/width.
2023-05-19 19:57:15 +01:00
comfyanonymous 62a371e12b Load workflow from latent file. 2023-05-18 02:41:21 -04:00
comfyanonymous 4088e61aa6 Update litegraph from upstream. 2023-05-16 15:35:07 -04:00
comfyanonymous 6a12094345 Merge branch 'patch/touch' of https://github.com/ltdrdata/ComfyUI 2023-05-16 11:55:20 -04:00
comfyanonymous 11e7168d56 Remove print. 2023-05-16 11:55:16 -04:00
ltdrdata 7ada9e7d85 allows touch drag 2023-05-16 22:55:00 +09:00
comfyanonymous 13d94caf49 Add control_after_generate to combo primitive. 2023-05-16 03:18:11 -04:00
comfyanonymous 84ea21c815 Update litegraph from upstream. 2023-05-14 17:02:40 -04:00
Dr.Lt.Data d926f65f56
Feature/maskeditor context menu (#649)
* add "Open in MaskEditor" to context menu

* change save button name to 'Save to node' if open in node.
clear clipspace_return_node after auto paste

* * leak patch: prevent infinite duplication of MaskEditorDialog instance on every dialog open
* prevent conflict of multiple opening of MaskEditorDialog
* name of save button fix

* patch: brushPreview hiding by dialog

* consider close by 'esc' key on maskeditor.

* bugfix about last patch

* patch: invalid close detection

* 'enter' key as save action

* * batch support enhance
  - pick index based on imageIndex on copy action
* paste fix on batch image node

* typo

---------

Co-authored-by: Lt.Dr.Data <lt.dr.data@gmail.com>
2023-05-14 10:21:22 -04:00
comfyanonymous e7b9d2c02c /prompt endpoint error is now in json format. 2023-05-14 01:30:58 -04:00
BlenderNeko 1201d2eae5
Make nodes map over input lists (#579)
* allow nodes to map over lists

* make work with IS_CHANGED and VALIDATE_INPUTS

* give list outputs distinct socket shape

* add rebatch node

* add batch index logic

* add repeat latent batch

* deal with noise mask edge cases in latentfrombatch
2023-05-13 11:15:45 -04:00
comfyanonymous a8705dbfe2 Speed up the mask save and fix refresh replacing copied image. 2023-05-08 17:05:28 -04:00
comfyanonymous a7ebd5aa12 Fix masked editor issue with firefox on windows. 2023-05-08 15:52:33 -04:00
comfyanonymous 850daf0416 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 ae08fdb999
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 9bd33b6bd4 Merge branch 'progress-shape-fix' of https://github.com/pythongosssss/ComfyUI 2023-05-05 13:14:55 -04:00
pythongosssss de4623a8a4 actually fix card 2023-05-05 10:34:09 +01:00
pythongosssss f31e31ee0a Fix box shape
Match card to litegraph selection
2023-05-05 10:12:06 +01:00
pythongosssss 7e51bbd07f automatic calculation of image pos from widgets 2023-05-04 19:42:07 +01:00
EllangoK 81bee39ca0 style everything
styles searchbox, should be actually everything
2023-05-01 15:57:10 -04:00
EllangoK 6aae1f497f style context menu
fix graphdialog background, and palette template
2023-05-01 13:16:19 -04:00
comfyanonymous b04e16ef5a Make default workflow use an existing checkpoint if no SD1.5 checkpoint. 2023-04-30 18:19:03 -04:00
comfyanonymous 2012362493 Adjust node resize area depending on outputs. 2023-04-30 13:02:07 -04:00
comfyanonymous 4cea9aecda Make nodes easier to resize. 2023-04-29 20:53:03 -04:00
comfyanonymous a89cbb6651 Merge branch 'filter-search-by-type' of https://github.com/pythongosssss/ComfyUI 2023-04-29 15:03:08 -04:00
pythongosssss 15a4c0db3b - button hover style
- ensure context menu is always above everything
2023-04-29 17:29:07 +01:00
pythongosssss ffd0f9f417 Search filter by type 2023-04-29 17:19:14 +01:00
Jake D 54251ad85e
Colored MultilineWidget (#524)
* fixes colors and z-index

* light mode fix

* Update widgets.js
2023-04-26 01:22:36 -04:00
comfyanonymous ee3a12d283 Update litegraph from upstream. 2023-04-25 19:18:50 -04:00
comfyanonymous 36acce58e7 Auto increase the size of the image upload widget when there's an image. 2023-04-24 18:13:18 -04:00
comfyanonymous ccad603b2e Add a way for nodes to validate their own inputs. 2023-04-23 16:03:26 -04:00
ltdrdata f7a8218814
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 c8355ed39f use window.name instead of session storage
- prevents duplicate stealing session id
2023-04-23 10:31:21 +01:00
comfyanonymous 989acd769a Cleanup. 2023-04-21 23:43:38 -04:00
comfyanonymous d5a59da662 Merge branch 'slotDefaults-dynamic' of https://github.com/omar92/ComfyUI 2023-04-21 23:39:55 -04:00
missionfloyd 98ae4bbfde
Remove brackets if weight == 1 2023-04-20 23:55:20 -06:00
missionfloyd d2ef3465ca
Improve current word selection 2023-04-20 18:23:51 -06:00
omar92 5229c1f972 add option on the settings to change the number of the suggestions 2023-04-20 21:13:14 +02:00
omar92 94e9798a4b when drag from node input or output show all possible nodes that you can connect 2023-04-20 06:19:56 +02:00
comfyanonymous b016e2769f Saner range of values. 2023-04-18 02:25:57 -04:00
missionfloyd a7c7da68dc
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 b9b1df3038 Merge branch 'edit-attention-fix' of https://github.com/EllangoK/ComfyUI 2023-04-17 23:57:20 -04:00
EllangoK a962222992 correctly checks end of the text 2023-04-17 23:40:44 -04:00
comfyanonymous c8afa7e9fb Merge branch 'settings-slider' of https://github.com/missionfloyd/ComfyUI 2023-04-17 22:45:46 -04:00
EllangoK 79ba0399d8 selects current word automatically 2023-04-17 19:02:08 -04:00
comfyanonymous b8c636b10d Lower how much CTRL+arrow key changes the number. 2023-04-17 18:21:24 -04:00
EllangoK 7b5eb196db allows control arrow to edit attention in textarea 2023-04-17 17:29:22 -04:00
Tomoaki Hayasaka 22bde7957e Fix "Ctrl+Enter doesn't work when textarea has focus" regression introduced in #491. 2023-04-17 01:58:33 +09:00
Karun bc16b70bde
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 d7ec37f296 Merge branch 'master' of https://github.com/jwd-dev/ComfyUI 2023-04-15 20:34:20 -04:00
jwd-dev 8cd170f40d node serialization 2023-04-15 20:16:28 -04:00
jwd-dev fb61c75e39 default text property incase we need one. 2023-04-15 19:58:46 -04:00
Jake D 9587ea90c8
Create noteNode.js 2023-04-15 19:50:05 -04:00
pythongosssss 2dd28d4d20 style 2023-04-15 21:41:21 +01:00
pythongosssss eb4035c8bd Adds jsdoc for better dev experience 2023-04-15 21:40:39 +01:00
comfyanonymous a40499891e Merge branch 'fix-combo-auto-primitive' of https://github.com/pythongosssss/ComfyUI 2023-04-15 12:36:43 -04:00
pythongosssss f5a78658b7 Fix double click on converted combo widget link 2023-04-15 17:34:46 +01:00
comfyanonymous 7f23353d63 Merge branch 'fix-combo-primitive' of https://github.com/pythongosssss/ComfyUI 2023-04-15 11:07:03 -04:00
pythongosssss 887ea0ba83 style 2023-04-15 10:55:19 +01:00
pythongosssss 901a890199 Allow combo primitive to connect to multiple inputs 2023-04-15 10:53:30 +01:00
pythongosssss 5186b3266a Prevent generating bad replacement regex 2023-04-15 10:29:32 +01:00
comfyanonymous 61e7767ca6 Merge branch 'Allow-connect-premitiveNode-to-forceInput-comfyiUI-nodes' of https://github.com/omar92/ComfyUI 2023-04-14 00:59:31 -04:00
comfyanonymous f5f701388b Merge branch 'comfy-list-fix' of https://github.com/EllangoK/ComfyUI 2023-04-13 13:50:44 -04:00
missionfloyd 307ef543bf
Change grid size to slider 2023-04-13 10:04:06 -06:00
comfyanonymous 501f200d86 Fix widgets not getting converted correctly in workflows. 2023-04-13 10:38:41 -04:00
EllangoK ff0be60ac4 fix comfy list not styled, and light theme border 2023-04-13 06:38:24 -04:00
missionfloyd 8810e1b4b9 Fix indentation 2023-04-12 21:15:21 -06:00
missionfloyd e87aa1873f Add slider setting type 2023-04-12 19:36:35 -06:00
FizzleDorf 3f52e7cbb1
Seed controls added to Ksamplers (#296)
Co-authored-by: flyingshutter <flyingshutter@users.noreply.github.com>
2023-04-12 20:57:13 -04:00
comfyanonymous e3566679bd Update litegraph from upstream. 2023-04-12 18:00:13 -04:00
comfyanonymous ad8e0cc0fe Merge branch 'default-replace-name' of https://github.com/pythongosssss/ComfyUI 2023-04-12 09:37:14 -04:00
pythongosssss a3516225f9 Changed default name to be the node type not title 2023-04-12 13:52:19 +01:00
pythongosssss d6a3c0d424 Add support for dropping images from urls 2023-04-12 13:49:32 +01:00
comfyanonymous 6c69853afd Change colour of background in light theme. 2023-04-11 23:23:06 -04:00
EllangoK 19ce3df8c0 simplify setting color of root, fixes fg and bg 2023-04-11 13:24:32 -04:00
EllangoK eae159eb4c adds light theme, fixes multiline css 2023-04-11 13:11:39 -04:00
EllangoK c975fef620 fix node slot colors for solarized
previously many dupes, and same colors as base
2023-04-11 12:09:15 -04:00
EllangoK 73c4ba11fa colorPalette modifies comfyUI as well 2023-04-11 11:38:55 -04:00
EllangoK 40ad2d4a10 use variables in css stylesheet 2023-04-11 01:08:01 -04:00
pythongosssss 0f5352d96c style 2023-04-09 11:30:31 +01:00
pythongosssss 3736dc90e1 Add arrow to menu items with submenu 2023-04-09 11:29:55 +01:00
comfyanonymous bece24d25e Merge branch 'fix/pnginfo-import' of https://github.com/filipemeneses/ComfyUI 2023-04-08 18:48:53 -04:00
comfyanonymous c982c937a7 Merge branch 'catch-configure-errors' of https://github.com/pythongosssss/ComfyUI 2023-04-08 18:37:47 -04:00
comfyanonymous b0edcfdc8e Merge branch 'missing-node-warning' of https://github.com/pythongosssss/ComfyUI 2023-04-08 18:37:27 -04:00
comfyanonymous e07f8eab6a Merge branch 'node-templates' of https://github.com/pythongosssss/ComfyUI 2023-04-08 18:37:05 -04:00
comfyanonymous 15da5404e7 Merge branch 'themes' of https://github.com/EllangoK/ComfyUI 2023-04-08 18:14:05 -04:00
comfyanonymous 60ac983238 Merge branch 'master' of https://github.com/city96/ComfyUI 2023-04-08 15:50:26 -04:00
EllangoK 53fba56ee5 assign link_type_colors directly 2023-04-08 13:18:23 -04:00
omar92 9d095c52f3 handle double click create primitive widget 2023-04-08 19:05:22 +02:00
omar92 2dc7257e29 Allow connect premitive Node to "comfyiUI-nodes that have forceInput setting" 2023-04-08 18:58:47 +02:00
EllangoK d9220a0bd6 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 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
EllangoK 327e49da42 remove test render link file 2023-04-08 11:13:27 -04:00
Filipe e76890dcb4 Fix large workflow pnginfo import 2023-04-08 12:00:03 -03:00
EllangoK 0d358b9566 cleanup customizeRenderLink 2023-04-08 10:59:34 -04:00
EllangoK 6b638c965b matches entry for correct link color 2023-04-08 10:47:15 -04:00
EllangoK 620c0f9376 link color is set to nodeType color 2023-04-08 10:43:04 -04: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 fe93261456 Add style update 2023-04-08 14:48:15 +01:00
pythongosssss 1acd2ef5d2 Adds menu for adding + managing node templates 2023-04-08 14:39:10 +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
EllangoK 5bb1358dd6 manual set default link color 2023-04-08 09:28:35 -04:00
comfyanonymous ebd7f9bf80 Change the default prompt to something more impressive. 2023-04-08 01:10:15 -04:00
comfyanonymous 463792f068 Allow dragging again. 2023-04-07 23:07:19 -04:00
EllangoK 7bce83aa03 fixes NODE_TITLE_COLOR not being set 2023-04-07 20:12:24 -04:00
EllangoK 2d7ad41142 colorPalette sets LiteGraph colors 2023-04-07 19:42:03 -04:00
comfyanonymous f4e359cce1 Set title of page to ComfyUI. 2023-04-07 16:26:06 -04:00
comfyanonymous 07e9a6b826 Update litegraph from upstream. 2023-04-07 15:11:00 -04: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 8af2fe1e87 Remove redundant lines 2023-04-04 22:10:45 -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 a126e2c185
Merge branch 'master' into confirm-clear 2023-04-04 21:43:28 -06:00
missionfloyd 1b556ea9f4
Add confirmation for clearing canvas 2023-04-04 21:20:49 -06:00
comfyanonymous 255dac25ba Merge branch 'graphdialog-style' of https://github.com/missionfloyd/ComfyUI 2023-04-04 23:04:25 -04:00
Adam Schwalm bf7dbe4702 Add left/right/escape hotkeys for image nodes 2023-04-04 21:02:40 -05:00
missionfloyd de3d5f46ce
Fix .graphdialog style 2023-04-04 19:32:49 -06:00
City 080c758cda Ask for confirmation before clearing nodes 2023-04-04 18:16:23 +02:00
mligaintart dc24d7e2fd Adds orientation settings to reroute nodes, allowing for cleaner
graphes.
2023-04-03 17:47:32 -04:00
comfyanonymous 1ed6cadf12 Merge branch 'master' of https://github.com/omar92/ComfyUI 2023-04-03 16:52:59 -04:00
omar92 ca2ae98470 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 4e43758236 fix bug in reroute node , that didnt allow to load old worflows 2023-04-03 21:27:43 +02:00
pythongosssss de2894ac2c Merge remote-tracking branch 'origin/master' into combo_filter_input 2023-04-03 11:00:12 +01:00
pythongosssss 028e1f7ad2 Fix scaled position when filtering
Add esc to close
2023-04-03 08:11:44 +01:00
pythongosssss 1a322ca67a Fix scaled position 2023-04-02 21:37:24 +01:00
pythongosssss 32fd39b424 Update comment 2023-04-02 21:02:40 +01:00
pythongosssss 74893be1ce Added keyboard navigation + selection 2023-04-02 21:01:39 +01:00
comfyanonymous 72f9235a49 Merge branch 'snap-to-grid' of https://github.com/pythongosssss/ComfyUI 2023-04-02 14:13:55 -04:00
pythongosssss 04234152c1 Add support for multiselect 2023-04-02 19:12:00 +01:00
pythongosssss 8a0a85e0fa Added filter input to combos 2023-04-02 19:03:34 +01:00
comfyanonymous cc66fbe5da Merge branch 'fix-hidden-save-prefix' of https://github.com/tjhayasaka/ComfyUI 2023-04-02 14:00:05 -04:00