0864fca641
Resolving conflicts in rebase to origin/main
2023-05-26 21:44:00 -04:00
5e4c0217c7
Switching to ControlField for output from controlnet nodes.
2023-05-26 21:44:00 -04:00
78cd106c23
Initial port of controlnet node support from generator-based TextToImageInvocation node to latent-based TextToLatentsInvocation node
2023-05-26 21:44:00 -04:00
6ed0efa938
Added first controlnet preprocessor node for canny edge detection.
2023-05-26 21:44:00 -04:00
ca0669c337
Resolving rebase conflict
2023-05-26 21:44:00 -04:00
b59a749627
Added example of using ControlNet with legacy Txt2Img generator
2023-05-26 21:44:00 -04:00
a91dee87d0
Added support for ControlNet and MultiControlNet to legacy non-nodal Txt2Img in backend/generator. Although backend/generator will likely disappear by v3.x, right now they are very useful for testing core ControlNet and MultiControlNet functionality while node codebase is rapidly evolving.
2023-05-26 21:44:00 -04:00
5ff98a4179
Core implementation of ControlNet and MultiControlNet.
2023-05-26 21:44:00 -04:00
36b2f12219
Merge branch 'main' into release/make-web-dist-startable
2023-05-26 12:56:24 -04:00
5569f205ee
Update CODEOWNERS
2023-05-26 08:59:10 -04:00
a76cf8aab2
Update CODEOWNERS
2023-05-26 08:59:10 -04:00
5c0f0d1808
Merge branch 'main' into lstein/logging-improvements
2023-05-26 08:57:17 -04:00
951900a86a
Merge branch 'main' into lstein/config-management-fixes
2023-05-26 08:56:41 -04:00
582f516fef
Merge branch 'main' into release/make-web-dist-startable
2023-05-26 18:06:38 +10:00
a25bae2545
fix(ui): tweak log levels
2023-05-26 18:06:08 +10:00
0ea35b1e3d
feat(ui): improve session canceled handling
2023-05-26 18:06:08 +10:00
c6f935bf1a
feat(ui): improve gallery page handling
2023-05-26 18:06:08 +10:00
96b4d35d43
fix(ui): fix uploads not loading more images correctly after generation
2023-05-26 18:06:08 +10:00
7b0938e7e4
feat(ui): add comments for weird stuff
2023-05-26 18:06:08 +10:00
249522b568
fix(ui): fix gallery not loading more images correctly after generation
2023-05-26 18:06:08 +10:00
39088e42cc
fix(ui): remove console logs
2023-05-26 18:06:08 +10:00
30e0033ebe
fix(ui): fix results not added to gallery
2023-05-26 18:06:08 +10:00
b599c40099
feat(ui): improve session invoked handling
2023-05-26 18:06:08 +10:00
8f190169db
feat(ui): improve session creation handling
2023-05-26 18:06:08 +10:00
1d4d705795
feat(ui): improve image urls handling
2023-05-26 18:06:08 +10:00
b3f71b3078
feat(ui): improve image metadata handling
2023-05-26 18:06:08 +10:00
6059db4f15
feat(ui): improve image delete handling
2023-05-26 18:06:08 +10:00
0d5f44b153
feat(ui): improve image upload handling
2023-05-26 18:06:08 +10:00
17164a37a8
fix(ui): fix gallery auto switch
2023-05-26 18:06:08 +10:00
f88ccabe30
fix(ui): gallery not loading on page load
2023-05-26 18:06:08 +10:00
e1c85f1234
Merge branch 'main' into release/make-web-dist-startable
2023-05-26 18:04:09 +10:00
57a3eb3652
feat(ui): unset progress image inside invocationComplete listener
2023-05-26 13:25:50 +10:00
82a8972bde
create listener for imageMetdataReceived to swap our progressImage
2023-05-26 13:25:50 +10:00
497a885c85
Merge branch 'main' into release/make-web-dist-startable
2023-05-25 22:49:18 -04:00
4d9f55d0f6
replace deleted get_root()
2023-05-25 22:48:50 -04:00
0c3b4bb70d
chore(ui): regen api client
2023-05-25 22:17:14 -04:00
33e13820fc
feat(nodes): remove meta node field; use individual is_intermediate field instead
...
as suggested by @Kyle0654
2023-05-25 22:17:14 -04:00
43d991cfdb
fix(ui): fix incorrect comment
2023-05-25 22:17:14 -04:00
291e9cf14b
fix(nodes): add is_intermediate to all image-outputting nodes
2023-05-25 22:17:14 -04:00
a2de5c9963
feat(ui): change intermediates handling
...
- Update the canvas graph generation to flag its uploaded init and mask images as `intermediate`.
- During canvas setup, hit the update route to associate the uploaded images with the session id.
- Organize the socketio and RTK listener middlware better. Needed to facilitate the updated canvas logic.
- Add a new action `sessionReadyToInvoke`. The `sessionInvoked` action is *only* ever run in response to this event. This lets us do whatever complicated setup (eg canvas) and explicitly invoking. Previously, invoking was tied to the socket subscribe events.
- Some minor tidying.
2023-05-25 22:17:14 -04:00
5025f84627
chore(ui): regen api client
2023-05-25 22:17:14 -04:00
d2c8a53c55
feat(nodes): change intermediates handling
...
- `ImageType` is now restricted to `results` and `uploads`.
- Add a reserved `meta` field to nodes to hold the `is_intermediate` boolean. We can extend it in the future to support other node `meta`.
- Add a `is_intermediate` column to the `images` table to hold this. (When `latents`, `conditioning` etc are added to the DB, they will also have this column.)
- All nodes default to `*not* intermediate`. Nodes must explicitly be marked `intermediate` for their outputs to be `intermediate`.
- When building a graph, you can set `node.meta.is_intermediate=True` and it will be handled as an intermediate.
- Add a new `update()` method to the `ImageService`, and a route to call it. Updates have a strict model, currently only `session_id` and `image_category` may be updated.
- Add a new `update()` method to the `ImageRecordStorageService` to update the image record using the model.
2023-05-25 22:17:14 -04:00
5659d10778
remove unused function get_root()
2023-05-25 22:06:37 -04:00
46cab81d6f
fix missing web_dir
2023-05-25 22:01:48 -04:00
dd157bce85
Merge branch 'main' into release/make-web-dist-startable
2023-05-25 21:52:05 -04:00
2f25dd7d0d
Merge branch 'main' into lstein/config-management-fixes
2023-05-25 21:10:12 -04:00
e56965ad76
documentation tweaks; fixed initialization in a couple more places
2023-05-25 21:10:00 -04:00
2273b3a8c8
fix potential race condition in config system
2023-05-25 20:41:26 -04:00
05fb0ac2b2
Update latent.py
2023-05-26 10:27:33 +10:00
d4acd49ee3
Update generate.py
2023-05-26 10:27:33 +10:00
