Commit Graph

169 Commits

Author SHA1 Message Date
ltdrdata
62150c008d race condition patch 2023-05-31 23:26:56 +09:00
ltdrdata
df09b19360 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
Lt.Dr.Data
caa1962c13 HOTFIX: Patched the conflict issue between the Combo Refresh feature and PrimitiveNodes. 2023-05-30 15:26:45 +09:00
Dr.Lt.Data
7264da8560 typo fix: field name in error message 2023-05-28 23:31:40 +09:00
space-nuko
cbd9aac327 Show message in the frontend if prompt execution raises an exception 2023-05-27 21:06:07 -05:00
space-nuko
7abd22878d Highlight failing nodes/inputs in frontend 2023-05-27 21:06:07 -05:00
comfyanonymous
f7bc2dffd4 Fix issue importing other ui prompts. 2023-05-24 14:01:11 -04:00
comfyanonymous
af5b837b09 Revert DPI fix since it caused more issues than it solved. 2023-05-21 10:34:26 -04:00
malern
f0cd736047 Render UI at a higher resolution when viewing with a higher pixel ratio 2023-05-19 20:04:36 +01:00
malern
85cac6c46d 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
0cba25cd20 Load workflow from latent file. 2023-05-18 02:41:21 -04:00
comfyanonymous
bf0bed48d2 Merge branch 'patch/touch' of https://github.com/ltdrdata/ComfyUI 2023-05-16 11:55:20 -04:00
comfyanonymous
108b69e50f Remove print. 2023-05-16 11:55:16 -04:00
ltdrdata
9e5b5ef453 allows touch drag 2023-05-16 22:55:00 +09:00
comfyanonymous
c7903e72ad Add control_after_generate to combo primitive. 2023-05-16 03:18:11 -04:00
Dr.Lt.Data
a395b80989 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
efa48a3426 /prompt endpoint error is now in json format. 2023-05-14 01:30:58 -04:00
BlenderNeko
dd1be4e992 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
1c31924215 Speed up the mask save and fix refresh replacing copied image. 2023-05-08 17:05:28 -04:00
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
comfyanonymous
cf4d7d19a8 Make default workflow use an existing checkpoint if no SD1.5 checkpoint. 2023-04-30 18:19:03 -04: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
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
922a327ca9 Merge branch 'settings-slider' of https://github.com/missionfloyd/ComfyUI 2023-04-17 22:45:46 -04: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
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
pythongosssss
855442e5b1 Prevent generating bad replacement regex 2023-04-15 10:29:32 +01:00
comfyanonymous
3a21c11f68 Fix widgets not getting converted correctly in workflows. 2023-04-13 10:38:41 -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
pythongosssss
a64d858356 Add support for dropping images from urls 2023-04-12 13:49:32 +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
25edb68351 Merge branch 'master' of https://github.com/city96/ComfyUI 2023-04-08 15:50:26 -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