Lincoln Stein
5c740452f6
Model Manager rewrite ( #3335 )
2023-06-14 08:44:04 -07:00
Lincoln Stein
82c2498043
Merge branch 'main' into lstein/new-model-manager
2023-06-14 08:41:40 -07:00
psychedelicious
0497bea264
fix: add dynamicprompts to pyproject.toml
2023-06-15 01:05:16 +10:00
psychedelicious
b8e32fa459
chore(ui): regen api client
2023-06-15 01:05:16 +10:00
psychedelicious
34ebee67b7
fix(nodes): fix revert conflict
2023-06-15 01:05:16 +10:00
psychedelicious
e0c998d192
Revert "feat(ui): add warning socket event handling"
...
This reverts commit e7a61e631a42190e4b64e0d5e22771c669c5b30c.
2023-06-15 01:05:16 +10:00
psychedelicious
b51e9a6bdb
Revert "feat(nodes): add warning socket event"
...
This reverts commit cefdd9d634e515239bd85666c872a0d64bb9d772.
2023-06-15 01:05:16 +10:00
psychedelicious
09f396ce84
feat(ui): add warning socket event handling
2023-06-15 01:05:16 +10:00
psychedelicious
abee37eab3
feat(nodes): add warning socket event
2023-06-15 01:05:16 +10:00
psychedelicious
42e48b2bef
feat(nodes): add dynamic prompt node
2023-06-15 01:05:16 +10:00
blessedcoolant
70ece4364c
refactor(minor): Image & Latent File Storage ( #3538 )
...
- `DiskImageStorage` and `DiskLatentsStorage` have now both been updated
to exclusively work with `Path` objects and not rely on the `os` lib to
handle pathing related functions.
- We now also validate the existence of the required image output
folders and latent output folders to ensure that the app does not break
in case the required folders get tampered with mid-session.
- Just overall general cleanup.
Tested it. Don't seem to be any thing breaking.
2023-06-15 02:43:27 +12:00
psychedelicious
f9d5f9d52c
fix(nodes): minor fixes for folder validation
...
- fix type for `__output_folder`
- prefix `validate_storage_folders()` with `__` to indicate private method
2023-06-15 00:40:39 +10:00
StAlKeR7779
d0ee3558d1
Merge branch 'main' into lstein/new-model-manager
2023-06-14 17:29:01 +03:00
blessedcoolant
587297878a
refactor(minor): Latent Disk Storage
2023-06-15 02:21:49 +12:00
blessedcoolant
b4c998a9ae
refactor(minor): Image File Storage
2023-06-15 01:58:58 +12:00
psychedelicious
88e8e3977b
feat(ui): update UI to not use image_origin
...
see commit `8ad8de8: feat(nodes): remove `image_origin` from most places` for details.
2023-06-14 23:08:27 +10:00
psychedelicious
24b86cffe9
chore(ui): regen api client & types
2023-06-14 23:08:27 +10:00
psychedelicious
a1773197e9
feat(nodes): remove image_origin from most places
...
- remove `image_origin` from most places where we interact with images
- consolidate image file storage into a single `images/` dir
Images have an `image_origin` attribute but it is not actually used when retrieving images, nor will it ever be. It is still used when creating images and helps to differentiate between internally generated images and uploads.
It was included in eg API routes and image service methods as a holdover from the previous app implementation where images were not managed in a database. Now that we have images in a db, we can do away with this and simplify basically everything that touches images.
The one potentially controversial change is to no longer separate internal and external images on disk. If we retain this separation, we have to keep `image_origin` around in a number of spots and it getting image paths on disk painful.
So, I am have gotten rid of this organisation. Images are now all stored in `images`, regardless of their origin. As we improve the image management features, this change will hopefully become transparent.
2023-06-14 23:08:27 +10:00
psychedelicious
1e08d865c9
chore: dummy commit to trigger actions
2023-06-14 14:14:24 +10:00
blessedcoolant
f8bb650cc1
revert: IAIScrollArea
2023-06-14 14:14:24 +10:00
psychedelicious
2cee8bebb2
fix(ui): revert offset scrollbars
...
The wonky padding is too janky. Just overlay for now.
2023-06-14 14:14:24 +10:00
psychedelicious
ade4ec5fd8
fix(ui): fix crash when toggling pinned parameters panel
2023-06-14 14:14:24 +10:00
psychedelicious
70ffd6b03f
fix(ui): fix controlnet selects data types
2023-06-14 14:14:24 +10:00
psychedelicious
6c551df311
fix(ui): fix rebase conflicts
2023-06-14 14:14:24 +10:00
blessedcoolant
24f605629e
cleanup: Remove OverlayScrollable component
2023-06-14 14:14:24 +10:00
blessedcoolant
2af1ec9d02
fix: Minor padding issue in unpinned drawer
2023-06-14 14:14:24 +10:00
blessedcoolant
79d53341de
fix: Stretch scroll area so it retains parent width
2023-06-14 14:14:24 +10:00
blessedcoolant
e40b3506c4
fix: Options squishing on accordion collapse
2023-06-14 14:14:24 +10:00
blessedcoolant
33912382e3
feat: Introduce Mantine's ScrollArea
2023-06-14 14:14:24 +10:00
blessedcoolant
d282810e53
cleanup: Remove IAICustomSelect and port types
2023-06-14 14:14:24 +10:00
psychedelicious
9df502fc77
fix(ui): fix mantine select props
2023-06-14 14:14:24 +10:00
psychedelicious
705573f0a8
feat(ui): even more pedantic mantine select theming
2023-06-14 14:14:24 +10:00
blessedcoolant
1878ea94f6
feat: Port Canvas Layer Select to IAIMantineSelect
2023-06-14 14:14:24 +10:00
psychedelicious
4ba5086b9a
feat(ui): add tooltip to IAIMantineSelect
2023-06-14 14:14:24 +10:00
psychedelicious
4a991b4daa
feat(ui): more pedantic mantine select theming
2023-06-14 14:14:24 +10:00
psychedelicious
80474d26f9
feat(ui): mantine scrollbar theming
2023-06-14 14:14:24 +10:00
blessedcoolant
9a77bd9140
feat: Port IAISelect's to IAIMantineSelect's
...
Ported everything except Model Manager selects and the Canvas Layer Select (this needs tooltip support)
2023-06-14 14:14:24 +10:00
psychedelicious
14cdc800c3
feat(ui): pedantic mantine select theming
2023-06-14 14:14:24 +10:00
blessedcoolant
9cfbea4c25
feat: Match styling of Mantine Select with InvokeAI
2023-06-14 14:14:24 +10:00
blessedcoolant
5fe674e223
feat: Standardize IAIMantineSelect Component
2023-06-14 14:14:24 +10:00
blessedcoolant
32200efce8
feat: Change default font to Inter
2023-06-14 14:14:24 +10:00
blessedcoolant
68a02da990
feat: Use Mantine Select for Scheduler
2023-06-14 14:14:24 +10:00
blessedcoolant
5b20766ea3
chore: Move Mantine Theme Override to own file
2023-06-14 14:14:24 +10:00
blessedcoolant
9a914250a0
feat: Change Model Select To Mantine
2023-06-14 14:14:24 +10:00
blessedcoolant
0e3106f631
feat: Add Mantine Support
2023-06-14 14:14:24 +10:00
Sergey Borisov
6c5954f9d1
Add controlnet to model manager, fixes
2023-06-14 04:26:21 +03:00
Sergey Borisov
740c05a0bb
Save models on rescan, uncache model on edit/delete, fixes
2023-06-14 03:12:12 +03:00
Sergey Borisov
26090011c4
Fix conflict resolve, add model configs to type annotation
2023-06-14 00:26:37 +03:00
StAlKeR7779
c9ae26a176
Merge branch 'main' into lstein/new-model-manager
2023-06-13 23:37:52 +03:00
Sergey Borisov
e7db6d8120
Fix ckpt and vae conversion, migrate script, remove sd2-base
2023-06-13 18:05:12 +03:00
