Commit Graph

378 Commits

Author SHA1 Message Date
Guillaume Faguet 6cdc9afc7c pass slider type as option 2023-07-31 08:48:44 +02:00
Guillaume Faguet d3d9ad00d8 added slider and toggle widget 2023-07-29 14:48:00 +02:00
melMass 5190aa284d fix: ️ small type fix
getCustomWidgets expects a plain record and not an array of records
2023-07-21 13:19:05 +02:00
comfyanonymous 907c9fbf0d Refactor to make it easier to set the api path. 2023-07-14 00:50:49 -04:00
comfyanonymous 30ea187160 Merge branch 'use-relative-paths' of https://github.com/mcmonkey4eva/ComfyUI 2023-07-13 23:56:29 -04:00
comfyanonymous 8a577966c5 Enables a way to save workflows in api format in frontend.
Enable the dev mode in the settings to see it.
2023-07-13 21:08:54 -04:00
comfyanonymous 876dadca84 Highlight nodes with errors in red even when workflow works fine. 2023-07-13 10:07:50 -04:00
comfyanonymous 90aa597099 Add back roundRect to fix issue on firefox ESR. 2023-07-12 02:07:48 -04:00
comfyanonymous 2b2a1474f7 Move to litegraph. 2023-07-11 03:12:00 -04:00
comfyanonymous cef30cc6b6 Merge branch 'hidpi-canvas' of https://github.com/EHfive/ComfyUI 2023-07-11 03:04:10 -04:00
comfyanonymous 880c9b928b Update litegraph to latest. 2023-07-11 03:00:52 -04:00
Huang-Huang Bao 05e6eac7b3
Scale graph canvas based on DPI factor
Similar to fixes in litegraph.js editor demo:
3ef215cf11/editor/js/code.js (L19-L28)

Also workarounds to address viewpoint problem of lightgrapgh.js in DPI scaling scenario.

Fixes #161
2023-07-11 14:47:58 +08:00
Alex "mcmonkey" Goodwin 5797ff89b0 use relative paths for all web connections
This enables local reverse-proxies to host ComfyUI on a path, eg "http://example.com/ComfyUI/" in such a way that at least everything I tested works. Without this patch, proxying ComfyUI in this way will yield errors.
2023-07-10 02:09:03 -07:00
comfyanonymous af15add967 Fix annoyance with textbox unselecting in chromium. 2023-07-09 15:41:19 -04:00
Dr.Lt.Data d43cff2105 bugfix: image widget's was mis-aligned when node has multiline widget 2023-07-08 01:42:33 +09:00
comfyanonymous 9b93b920be Add CheckpointSave node to save checkpoints.
The created checkpoints contain workflow metadata that can be loaded by
dragging them on top of the UI or loading them with the "Load" button.

Checkpoints will be saved in fp16 or fp32 depending on the format ComfyUI
is using for inference on your hardware. To force fp32 use: --force-fp32

Anything that patches the model weights like merging or loras will be
saved.

The output directory is currently set to: output/checkpoints but that might
change in the future.
2023-06-26 12:22:27 -04:00
Dr.Lt.Data c9f5d5b2e1
optimize: support preview mode for mask editor. (#755)
* support preview mode for mask editor.
* use original file reference instead of loaded frontend blob

bugfix:
* prevent file open dialog when save to load image

* bugfix: cannot clear previous mask painted image's alpha

* bugfix

* bugfix

---------

Co-authored-by: Lt.Dr.Data <lt.dr.data@gmail.com>
2023-06-24 03:45:41 -04:00
comfyanonymous 852cf4db99 Merge branch 'widget-input-overlapping' of https://github.com/ssitu/ComfyUI 2023-06-21 02:45:59 -04:00
ssit 6f54b01954 Fix reroute node connecting different types 2023-06-20 15:25:56 -04:00
ssit 8c3d24434a Fix overlapping when converting widgets to inputs 2023-06-20 12:03:46 -04:00
reaper47 96e8307bd3 Clean keybinds extension 2023-06-19 21:32:21 +02:00
reaper47 3fbd0abc5f Add missed .comfy-table in CSS 2023-06-15 18:39:18 +02:00
reaper47 34ddbfdc8a Beautify settings dialog 2023-06-15 18:36:52 +02:00
comfyanonymous 84f13f828a Merge branch 'issue-752' of https://github.com/reaper47/ComfyUI 2023-06-14 00:17:25 -04:00
reaper47 aba886e9da Issue 741: Darken white background 2023-06-13 08:27:26 +02:00
ssit 0c874e604c Fix unhandled message "execution_cached" 2023-06-12 17:16:03 -04:00
reaper47 3402ec0c0d Issue 752: Fix background 2023-06-12 15:58:05 +02:00
comfyanonymous b18946c53b Merge branch 'next-task' of https://github.com/reaper47/ComfyUI 2023-06-10 03:23:25 -04:00
reaper47 bfebe2d6c3 Improve ContextMenuFilter extension 2023-06-09 13:29:15 +02:00
comfyanonymous 4b0b516544 Add code to handle primitive nodes connected to reroute nodes.
Revert last commit because I noticed it broke a few things.
2023-06-09 02:49:13 -04:00
Dr.Lt.Data 8e14c46a38
allows connect primitive node to reroute if primitive node has type (#751)
Co-authored-by: Lt.Dr.Data <lt.dr.data@gmail.com>
2023-06-09 02:21:30 -04:00
space-nuko eed4f62cc5 Add comment support to dynamic prompts nodes 2023-06-08 12:08:00 -05:00
Dr.Lt.Data 28677342c1 robust paste for image 2023-06-08 00:06:56 +09:00
Dr.Lt.Data 70e02b443f robust patch on pasteFromClipspace 2023-06-07 22:56:08 +09:00
Dr.Lt.Data 422163c2ba bugfix: Fixing the calculation issue when an image widget is added to the size calculation of the text widget. 2023-06-06 22:29:19 +09:00
space-nuko 48f7ec750c Make previews into cli option 2023-06-05 13:19:02 -05:00
space-nuko 1c40296d74 Fix 2023-06-05 09:20:20 -05:00
space-nuko b4f434ee66 Preview sampled images with TAESD 2023-06-05 09:20:17 -05:00
comfyanonymous 2ec980bb9f Limit preview to webp and RGB jpeg. 2023-06-05 01:50:14 -04: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 0764bb5218 Move node properties panel from double click to menu option. 2023-06-03 11:47:20 -04:00
comfyanonymous c092ffcc18 Latest litegraph from upstream. 2023-06-03 11:46:52 -04:00
comfyanonymous 32f282c861 Search box style fix. 2023-06-03 11:19:10 -04:00
ltdrdata 8e8d6070f2 race condition patch 2023-05-31 23:26:56 +09:00
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