Commit Graph

196 Commits

Author SHA1 Message Date
space-nuko eed4f62cc5 Add comment support to dynamic prompts nodes 2023-06-08 12:08:00 -05:00
space-nuko b4f434ee66 Preview sampled images with TAESD 2023-06-05 09:20:17 -05:00
Dr.Lt.Data 9f3a19b728
improve: lightweight preview to reduce network traffic (#733)
* To reduce bandwidth traffic in a remote environment, a lossy compression-based preview mode is provided for displaying simple visualizations in node-based widgets.

* Added 'preview=[image format]' option to the '/view' API.
* Updated node to use preview for displaying images as widgets.
* Excluded preview usage in the open image, save image, mask editor where the original data is required.

* Made preview_format parameterizable for extensibility.

* default preview format changed: jpeg -> webp

* Support advanced preview_format option.
- grayscale option for visual debugging
- quality option for aggressive reducing

L?;format;quality?

ex)
jpeg => rgb, jpeg, quality 90
L;webp;80 => grayscale, webp, quality 80
L;png => grayscale, png, quality 90
webp;50 => rgb, webp, quality 50

* move comment

* * add settings for preview_format
* default value is ''(= don't reencode)

---------

Co-authored-by: Lt.Dr.Data <lt.dr.data@gmail.com>
2023-06-05 01:49:43 -04:00
Dr.Lt.Data 126b4050dc
Crash fix for intermittent crashes that occur when opening MaskEditor. (#732) 2023-06-03 12:25:49 -04:00
comfyanonymous bfb13f5eee Remove useless call to /object_info 2023-05-22 17:05:23 -04:00
comfyanonymous 13d94caf49 Add control_after_generate to combo primitive. 2023-05-16 03:18:11 -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 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
EllangoK 6aae1f497f style context menu
fix graphdialog background, and palette template
2023-05-01 13:16:19 -04:00
pythongosssss ffd0f9f417 Search filter by type 2023-04-29 17:19:14 +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
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
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
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
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
missionfloyd 307ef543bf
Change grid size to slider 2023-04-13 10:04:06 -06:00
EllangoK ff0be60ac4 fix comfy list not styled, and light theme border 2023-04-13 06:38:24 -04: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
pythongosssss a3516225f9 Changed default name to be the node type not title 2023-04-12 13:52:19 +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
comfyanonymous e07f8eab6a Merge branch 'node-templates' of https://github.com/pythongosssss/ComfyUI 2023-04-08 18:37:05 -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
EllangoK 327e49da42 remove test render link file 2023-04-08 11:13:27 -04: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 1acd2ef5d2 Adds menu for adding + managing node templates 2023-04-08 14:39:10 +01:00
EllangoK 5bb1358dd6 manual set default link color 2023-04-08 09:28:35 -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
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
pythongosssss 519890a5cc Adds middle click for default node creation
Enable two useful properties
2023-04-02 15:57:12 +01:00
Tomoaki Hayasaka 1917064b56 Fix "extra filename replacements in SaveImage is not done when prefix is supplied by Primitive". 2023-04-02 23:42:50 +09:00
pythongosssss d027ff121c Snap to grid 2023-04-02 15:33:34 +01:00
flyingshutter 9586de9dc8 fix client freeze on connect reroutes in a circle 2023-04-01 17:30:47 +02:00
hnmr293 04b42bad87 allow converting optional widgets to inputs 2023-03-30 21:50:35 +09:00
pythongosssss 80e014a69e Extra formatting values on SaveImage 2023-03-29 22:09:11 +01:00
Jairo Correa 4b9e11053c Color palette setting 2023-03-27 23:36:53 -03:00
comfyanonymous 44b6eaad6f Don't completely break workflow if field name changes. 2023-03-25 01:04:02 -04:00
pythongosssss d6830b958c Prevent exactly overlapping nodes
Throttle double click
2023-03-24 20:20:34 +00: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 b13539c3dd Sync widget changes 2023-03-24 10:27:19 +00:00
pythongosssss 7a7e3288ee Added support for converting widgets to inputs (and back) 2023-03-23 21:37:19 +00: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
pythongosssss c0f5325018 Increase size of node 2023-03-16 21:04:54 +00:00
pythongosssss 37b70d7987 Made node non collapsable
Fixed color of first input link
2023-03-16 14:08:11 +00: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
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
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 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