Lincoln Stein
01f46d3c7d
Merge branch 'main' into lstein/fix-logger-reconfiguration
2023-06-07 19:50:44 -07:00
Lincoln Stein
ae9d0c6c1b
fix logger behavior so that it is initialized after command line parsed
2023-06-06 23:19:10 -04:00
Lincoln Stein
90333c0074
merge with main
2023-06-05 22:03:44 -04:00
Lincoln Stein
9e31b1f387
Merge branch 'main' into lstein/config-management-fixes
2023-06-04 18:17:43 -04:00
Lincoln Stein
5f6f38074d
merge with main
2023-06-04 13:59:31 -04:00
blessedcoolant
fb06f5b892
Merge branch 'main' into feat_compel_longprompts_and_concat
2023-06-05 04:34:39 +12:00
Damian Stewart
cdcfda164d
enable long prompts, upgrade compel to enable .and() (concatenating prompts)
2023-06-04 15:30:54 +02:00
psychedelicious
6bbb5f061a
feat(nodes): update controlnet names/descriptions
2023-06-04 22:34:58 +10:00
psychedelicious
d6a959b000
feat(nodes): tidy controlnet processor nodes & improve descriptions
2023-06-04 22:34:58 +10:00
Lincoln Stein
31e97ead2a
move invokeai.db to ~/invokeai/databases
...
- The invokeai.db database file has now been moved into
`INVOKEAIROOT/databases`. Using plural here for possible
future with more than one database file.
- Removed a few dangling debug messages that appeared during
testing.
- Rebuilt frontend to test web.
2023-06-03 20:25:34 -04:00
Lincoln Stein
0b49995659
merge with main
2023-06-03 20:06:27 -04:00
Lincoln Stein
713fb061e8
Merge branch 'main' into release/make-web-dist-startable
2023-06-02 23:19:33 -04:00
Lincoln Stein
ff63433591
Merge branch 'main' into lstein/config-management-fixes
2023-06-02 22:56:43 -04:00
Lincoln Stein
31281d7181
Merge branch 'main' into lstein/logging-improvements
2023-06-02 22:56:13 -04:00
Lincoln Stein
1632ac6b9f
add controlnet model downloading
2023-05-30 13:49:43 -04:00
psychedelicious
a9a2bd90c2
fix(nodes): set min and max for l2l strength
2023-05-30 09:06:13 -04:00
psychedelicious
47ca71a7eb
fix(nodes): set cfg_scale min to 1 in latents
2023-05-30 09:06:13 -04:00
Lincoln Stein
c9ee42450e
added controlnet models to frontend; backend needs to be done
2023-05-30 00:38:37 -04:00
Lincoln Stein
10fe31c2a1
Merge branch 'main' into lstein/config-management-fixes
2023-05-29 21:03:03 -04:00
Lincoln Stein
dc54cbb1fc
Merge branch 'main' into release/make-web-dist-startable
2023-05-29 14:16:10 -04:00
psychedelicious
bbb4e8f5ef
feat(nodes): add resize image and scale image nodes
2023-05-29 09:07:46 -04:00
psychedelicious
3e3dd39ae4
fix(nodes): fix images service update() for is_intermediate
2023-05-28 20:19:56 -04:00
psychedelicious
f31e62afad
feat(nodes): make list images route use offset pagination
...
Because we dynamically insert images into the DB and UI's images state, `page`/`per_page` pagination makes loading the images awkward.
Using `offset`/`limit` pagination lets us query for images with an offset equal to the number of images already loaded (which match the query parameters).
The result is that we always get the correct next page of images when loading more.
2023-05-28 20:19:56 -04:00
psychedelicious
08a14ee6d5
fix(nodes): fix conflicts with controlnet
2023-05-28 20:19:56 -04:00
psychedelicious
160267c71a
feat(nodes): refactor image types
...
- Remove `ImageType` entirely, it is confusing
- Create `ResourceOrigin`, may be `internal` or `external`
- Revamp `ImageCategory`, may be `general`, `mask`, `control`, `user`, `other`. Expect to add more as time goes on
- Update images `list` route to accept `include_categories` OR `exclude_categories` query parameters to afford finer-grained querying. All services are updated to accomodate this change.
The new setup should account for our types of images, including the combinations we couldn't really handle until now:
- Canvas init and masks
- Canvas when saved-to-gallery or merged
2023-05-28 20:19:56 -04:00
psychedelicious
fd47e70c92
feat(nodes): use higher precision timestamps in db
2023-05-28 20:19:56 -04:00
psychedelicious
9317b42e5f
feat(nodes, ui): wip image types
2023-05-28 20:19:56 -04:00
psychedelicious
3ea5e78322
fix(nodes): fix list images route param descriptions
2023-05-28 20:19:56 -04:00
psychedelicious
ee0225f4ba
fix(nodes): handle intermediates during images.get_many()
2023-05-28 20:19:56 -04:00
psychedelicious
33a0af4637
feat(nodes): add nameservice
...
Currenly only used to make names for images, but when latents, conditioning, etc are managed in DB, will do the same for them.
Intended to eventually support custom naming schemes.
2023-05-28 20:19:56 -04:00
Lincoln Stein
d37b08a7dd
Merge branch 'main' into release/make-web-dist-startable
2023-05-28 19:46:09 -04:00
user1
9a796364da
Fixed controlnet preprocessors and controlnet handling in TextToLatents to work with revised Image services.
2023-05-26 21:44:00 -04:00
user1
d9b1e4a98c
Added nodes for float params: ParamFloatInvocation and FloatCollectionOutput. Also added FloatOutput.
2023-05-26 21:44:00 -04:00
user1
a4dec8c1d6
Fixed bug where MediapipFaceProcessorInvocation was ignoring max_faces and min_confidence params.
2023-05-26 21:44:00 -04:00
user1
8960ceb98b
Added Mediapipe image processor for use as ControlNet preprocessor.
...
Also hacked in ability to specify HF subfolder when loading ControlNet models from string.
2023-05-26 21:44:00 -04:00
psychedelicious
be79d088c0
fix(nodes): controlnet input accepts list or single controlnet
2023-05-26 21:44:00 -04:00
psychedelicious
009407ea3f
fix(ui): fix node ui type hints
2023-05-26 21:44:00 -04:00
user1
324e9eb74b
Extended node-based ControlNet support to LatentsToLatentsInvocation.
2023-05-26 21:44:00 -04:00
user1
56cff40362
Cleaning up after ControlNet refactor in TextToLatentsInvocation
2023-05-26 21:44:00 -04:00
user1
2ba40c5e52
Refactored most of controlnet code into its own method to declutter TextToLatents.invoke(), and make upcoming integration with LatentsToLatents easier.
2023-05-26 21:44:00 -04:00
user1
3ab147204c
Fix to work with current stable release of controlnet_aux (v0.0.3). Turned of pre-processor params that were added post v0.0.3. Also change defaults for shuffle.
2023-05-26 21:44:00 -04:00
user1
e4c89cba9c
Switched CotrolNet node modelname input from free text to default list of popular ControlNet model names.
2023-05-26 21:44:00 -04:00
user1
322ea84c4e
Commented out ZoeDetector. Will re-instate once there's a controlnet-aux release that supports it.
2023-05-26 21:44:00 -04:00
user1
f2b41c60ff
Cleaning up prior to submitting ControlNet PR. Mostly turning off diagnostic printing. Also fixed error when there is no controlnet input.
2023-05-26 21:44:00 -04:00
user1
754acec92f
Added support for specifying which step iteration to start using
...
each ControlNet, and which step to end using each controlnet (specified as fraction of total steps)
2023-05-26 21:44:00 -04:00
user1
11fc7e40a5
Refactored ControNet support to consolidate multiple parameters into data struct. Also redid how multiple controlnets are handled.
2023-05-26 21:44:00 -04:00
user1
d15bb88eb2
Removed last bits of dtype and and device hardwiring from controlnet section
2023-05-26 21:44:00 -04:00
user1
70ba36eefc
Cleaning up mistakes after rebase.
2023-05-26 21:44:00 -04:00
user1
7e70391c2b
Cleaning up TextToLatent arg testing
2023-05-26 21:44:00 -04:00
user1
e2a94be336
Added resizing of controlnet image based on noise latent. Fixes a tensor mismatch issue.
2023-05-26 21:44:00 -04:00
