Commit Graph

913 Commits

Author SHA1 Message Date
ltdrdata
7dc1dd6503
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-04-25 16:21:17 +09:00
comfyanonymous
aa57136dae Some fixes to the batch masks PR. 2023-04-25 01:12:40 -04:00
comfyanonymous
c7c1f0d074 Merge branch 'multiple_inpaint_masks' of https://github.com/guill/ComfyUI
# Conflicts:
#	nodes.py
2023-04-25 00:54:15 -04:00
comfyanonymous
c50208a703 Refactor more code to sample.py 2023-04-24 23:25:51 -04:00
Lt.Dr.Data
79a07bb813 clean commit 2023-04-25 12:01:32 +09:00
Lt.Dr.Data
55e46e708e Merge branch 'Main' into feature/maskpainting 2023-04-25 11:52:53 +09:00
comfyanonymous
7983b3a975 This is cleaner this way. 2023-04-24 22:45:35 -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
a2236a0c2a Merge branch 'master' of https://github.com/BlenderNeko/ComfyUI 2023-04-24 17:57:27 -04:00
BlenderNeko
0b07b2cc0f gligen tuple 2023-04-24 21:47:57 +02:00
Dr.Lt.Data
76db999497 Fix button positioning issue related to window height.
Change brush size from button to slider.
2023-04-24 21:30:06 +09:00
pythongosssss
c8c9926eeb Add progress to vae decode tiled 2023-04-24 11:55:44 +01:00
BlenderNeko
d9b1595f85 made sample functions more explicit 2023-04-24 12:53:10 +02:00
comfyanonymous
463bde66a1 Add hypernetwork example link to readme.
Move hypernetwork loader node to loaders.
2023-04-24 03:08:51 -04:00
comfyanonymous
4e345b31f6 Support all known hypernetworks. 2023-04-24 02:36:06 -04:00
comfyanonymous
f1b87f50fa Add hypernetworks path config to extra_model_paths.yaml.example 2023-04-24 01:50:56 -04:00
comfyanonymous
0ac319fd81 Don't delete all outputs when execution gets interrupted. 2023-04-23 22:44:38 -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
BlenderNeko
5818539743 add docstrings 2023-04-23 20:09:09 +02:00
BlenderNeko
8d2de420d3 Merge branch 'master' of https://github.com/BlenderNeko/ComfyUI 2023-04-23 20:02:18 +02:00
BlenderNeko
2a09e2aa27 refactor/split various bits of code for sampling 2023-04-23 20:02:08 +02:00
comfyanonymous
737c158763 Merge branch 'change-session-store' of https://github.com/pythongosssss/ComfyUI 2023-04-23 12:56:12 -04:00
comfyanonymous
5282f56434 Implement Linear hypernetworks.
Add a HypernetworkLoader node to use hypernetworks.
2023-04-23 12:35:25 -04:00
ltdrdata
ea19315b4d event listener patch
add ], [ key event for brush size
remove listener on close
2023-04-24 00:01:20 +09:00
ltdrdata
cc7ad627a8 Merge branch 'feature/clipspace' into feature/maskpainting 2023-04-23 23:34:39 +09:00
ltdrdata
b2abfa6ad7 subfolder fix on paste logic
attach subfolder if subfolder isn't empty
2023-04-23 23:32:48 +09:00
ltdrdata
a09406bff5 robust patch
again...
2023-04-23 23:05:00 +09:00
ltdrdata
1a9c556890 robust patch
use mouseup event
2023-04-23 22:59:20 +09:00
ltdrdata
b5a7bd2be1 enhance mask painting
smooth drawing
add brush_size +/- button
2023-04-23 22:32:32 +09:00
ltdrdata
f8e6adac06 Merge branch 'feature/clipspace' into feature/maskpainting 2023-04-23 21:23:25 +09:00
ltdrdata
8af0b2b52e instant refresh on paste
force triggering 'changed' on paste action
2023-04-23 21:04:06 +09:00
ltdrdata
fb658e7cf3
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-04-23 18:56:32 +09:00
ltdrdata
80ec9a5ecf
Merge branch 'comfyanonymous:master' into feature/clipspace 2023-04-23 18:55:43 +09:00
pythongosssss
c8355ed39f use window.name instead of session storage
- prevents duplicate stealing session id
2023-04-23 10:31:21 +01:00
Jacob Segal
ee030d281b Add support for multiple unique inpainting masks
This enables workflows like "Inpaint at full resolution" when using
batch sizes greater than 1.
2023-04-22 16:02:26 -07:00
comfyanonymous
6908f9c949 This makes pytorch2.0 attention perform a bit faster. 2023-04-22 14:30:39 -04: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
Dr.Lt.Data
588456583d clipspace feature added
maskeditor feature added
2023-04-22 12:31:48 +09:00
Lt.Dr.Data
f5af731ffd Merge branch 'feature/clipspace' into feature/maskpainting 2023-04-21 15:46:57 +09:00
Lt.Dr.Data
5920edba3a Only show the Paste menu if the ComfyApp.clipspace is not empty 2023-04-21 15:45:22 +09:00
Lt.Dr.Data
e09f42bb18 wip 2023-04-21 15:18:06 +09:00
Lt.Dr.Data
10f17f97a6 Merge branch 'feature/clipspace' into feature/maskpainting 2023-04-21 15:17:46 +09:00
ltdrdata
a364df24cc
Merge branch 'comfyanonymous:master' into feature/clipspace 2023-04-21 15:17:28 +09:00
Lt.Dr.Data
4d93ef8a0a robust patch & refactoring folder_paths about annotated_filepath 2023-04-21 15:13:18 +09:00
missionfloyd
98ae4bbfde
Remove brackets if weight == 1 2023-04-20 23:55:20 -06:00
Lt.Dr.Data
d0952e84fe Merge branch 'feature/clipspace' into feature/maskpainting 2023-04-21 13:41:46 +09:00
Lt.Dr.Data
2c21210c72 add original_imgs into clipspace
* Preserve the original image when 'imgs' are modified
2023-04-21 13:40:07 +09:00
comfyanonymous
0be92710b4 Merge branch 'currentword-select' of https://github.com/missionfloyd/ComfyUI 2023-04-21 00:01:09 -04:00