Lincoln Stein
633bbb4e85
[MM2] Use typed ModelRecordChanges for model_install() rather than untyped dict ( #6645 )
...
* [MM2] replace untyped config dict passed to install_model with typed ModelRecordChanges
- adjusted frontend to work with new schema
- used this facility to assign "starter model" names and descriptions to the installed
models.
* documentation fix
* [MM2] replace untyped config dict passed to install_model with typed ModelRecordChanges
- adjusted frontend to work with new schema
- used this facility to assign "starter model" names and descriptions to the installed
models.
* documentation fix
* remove v9 pnpm lockfile
* [MM2] replace untyped config dict passed to install_model with typed ModelRecordChanges
- adjusted frontend to work with new schema
- used this facility to assign "starter model" names and descriptions to the installed
models.
* [MM2] replace untyped config dict passed to install_model with typed ModelRecordChanges
- adjusted frontend to work with new schema
- used this facility to assign "starter model" names and descriptions to the installed
models.
* remove v9 pnpm lockfile
* regenerate schema.ts
* prettified
---------
Co-authored-by: Lincoln Stein <lstein@gmail.com>
2024-07-23 21:41:00 +00:00
psychedelicious
a221ab2fb6
fix(ui): upsell menuitem styling
2024-07-24 06:58:27 +10:00
psychedelicious
0279a27f66
fix(ui): render settingsmenu in portal, no zindex
2024-07-24 06:58:27 +10:00
chainchompa
54aef4959c
cleanup
2024-07-24 06:56:02 +10:00
chainchompa
4017609b91
clean up useIsAllowedToUpscale since its no longer necessary
2024-07-24 06:56:02 +10:00
chainchompa
cb0bffedd5
fix board handling for simple upscale
2024-07-24 06:56:02 +10:00
chainchompa
1fd2a91ccd
only show warning for simple upscale if no simple upscale model is available
2024-07-24 06:56:02 +10:00
chainchompa
bf6066d834
Merge branch 'main' into chainchompa/simple-upscale-updates
2024-07-23 13:27:48 -04:00
Mary Hipp
5635f65ee9
feat(ui): add upsells for pro edition to settings menu
2024-07-23 13:27:00 -04:00
chainchompa
6317cf8ef9
move handleSimpleUpscaleModels logic into handleSpandrelImageToImageModels listener
2024-07-23 13:13:21 -04:00
chainchompa
e1a718b512
cleanup
2024-07-23 12:16:35 -04:00
chainchompa
cbce89162b
update simple upscale metadata to match upscale metadata
2024-07-23 12:15:26 -04:00
chainchompa
b46b20210d
handle simple upscale models on modelsLoaded
2024-07-23 11:53:43 -04:00
chainchompa
8e89157a83
reuse ParamSpandrelModel for simple upscale
2024-07-23 11:36:46 -04:00
chainchompa
a2f49ef7c1
cleanup esrgan frontend code
2024-07-23 10:22:38 -04:00
chainchompa
c098edc6b2
updated simple upscale to use spandrel node and list of available spandrel models
2024-07-23 10:15:31 -04:00
chainchompa
bc1d9748ce
updated upscale warning to work for simple upscale
2024-07-23 10:04:31 -04:00
psychedelicious
154e8f6e78
chore(ui): lint
2024-07-23 15:42:16 +10:00
psychedelicious
2d31b82e60
feat(ui): tweak layout for warning message
2024-07-23 15:42:16 +10:00
psychedelicious
8f934747f3
feat(ui): updated upscale tab warnings
2024-07-23 15:42:16 +10:00
psychedelicious
4352341a00
feat(ui): starter models filter matches spandrel models to "upscale" search term
2024-07-23 15:42:16 +10:00
psychedelicious
d7e0ec52ff
feat(ui): make model install tab controlled
...
This lets us navigate directly to eg the Starter Models tab
2024-07-23 15:42:16 +10:00
psychedelicious
1072b74c0e
fix(ui): edge cases in starter models search
2024-07-23 15:42:16 +10:00
psychedelicious
46dc8c6641
chore(ui): lint
2024-07-23 15:42:16 +10:00
psychedelicious
a8bc6ab5b1
fix(ui): typos
2024-07-23 15:42:16 +10:00
Kent Keirsey
bd91bd4a84
Math Updates
2024-07-23 15:42:16 +10:00
psychedelicious
8756a6b8c3
fix(ui): remove sharpness param
2024-07-23 10:55:54 +10:00
psychedelicious
2e0cebb571
fix(ui): bug where viewer would disappear on upscaling tab
2024-07-23 10:55:54 +10:00
psychedelicious
c3a8184431
feat(ui): add number input to scale slider
2024-07-23 10:55:54 +10:00
psychedelicious
ffa39d74b3
feat(ui): remove first unsharp from upscale graph
2024-07-23 10:55:54 +10:00
psychedelicious
f9d3966ea2
feat(ui): add scale param to upscaling tab
2024-07-23 10:55:54 +10:00
psychedelicious
7cee4e42a7
feat(ui): add addEdgeToMetadata graph helper
2024-07-23 10:55:54 +10:00
psychedelicious
071c7c7c7e
chore(ui): typegen
2024-07-23 10:55:54 +10:00
psychedelicious
818045f678
tidy(ui): use × instead of translation string
2024-07-23 10:55:54 +10:00
Mary Hipp
13f3560e55
more lint fixes
2024-07-23 10:55:54 +10:00
Mary Hipp
c4bd60e00f
knip fix
2024-07-23 10:55:54 +10:00
Mary Hipp
54eda9163c
remove tiledVAE option and make it true
2024-07-23 10:55:54 +10:00
Mary Hipp
582f384fff
lint fix
2024-07-23 10:55:54 +10:00
Mary Hipp
a43211e650
math updates for controlnet tiles
2024-07-23 10:55:54 +10:00
Mary Hipp
6cb0581b0d
add description to upscale model dropdown tooltip
2024-07-23 10:55:54 +10:00
Mary Hipp
845d77916e
lint fix
2024-07-23 10:55:54 +10:00
Mary Hipp
f18431a999
use fn to get width/height of output image
2024-07-23 10:55:54 +10:00
Mary Hipp
5060bf2f62
lint fix
2024-07-23 10:55:54 +10:00
Mary Hipp
7854d913b2
add upscaling data to metadata
2024-07-23 10:55:54 +10:00
Mary Hipp
890a3ce32a
add limited metadata
2024-07-23 10:55:54 +10:00
Mary Hipp
fb4b3f3350
fix creativity/sharpness/structure scales, move where loras are added, get scale const working
2024-07-23 10:55:54 +10:00
Mary Hipp
d166b08b6a
restore scale but hardcode it to 2 regardless of upscale model
2024-07-23 10:55:54 +10:00
psychedelicious
5266e9e682
fix(ui): remove unused scale param
2024-07-23 10:55:54 +10:00
psychedelicious
d0265e21b0
fix(ui): use spandrel node for upscaling
2024-07-23 10:55:54 +10:00
psychedelicious
3126e8e49a
chore(ui): typegen
2024-07-23 10:55:54 +10:00
Mary Hipp
9e3412d776
translations and lint fix
2024-07-23 10:55:54 +10:00
Mary Hipp
4a09cc57be
use the tile conttrolnet in graph instad of marys hardcoded key
2024-07-23 10:55:54 +10:00
Mary Hipp
5ab36e0433
add warning if no upscale model or no tile controlnet for base model
2024-07-23 10:55:54 +10:00
Mary Hipp
d2bf3629bf
base scale off of upscale model selected
2024-07-23 10:55:54 +10:00
Mary Hipp
d9b217d908
hook up sharpness, structure, and creativity
2024-07-23 10:55:54 +10:00
Mary Hipp
2847f1b5ac
add vae toggle, lint fix
2024-07-23 10:55:54 +10:00
Mary Hipp
bc30850f3a
hardcode marys tile cnet key
2024-07-23 10:55:54 +10:00
Mary Hipp
7668dc68a0
cleanup, add loras
2024-07-23 10:55:54 +10:00
Mary Hipp
ea449f5a0a
upscale graph built, no multidiffusion yet
2024-07-23 10:55:54 +10:00
Mary Hipp
5a1ed99ca1
restore adhoc upscale button
2024-07-23 10:55:54 +10:00
Mary Hipp
3a2707ac02
disable invoke button properly for upscaling tab
2024-07-23 10:55:54 +10:00
Mary Hipp
ce5b1103ed
add send to upscale to context menu
2024-07-23 10:55:54 +10:00
Mary Hipp
fd91b83d86
build out the rest of the accordions
2024-07-23 10:55:54 +10:00
Mary Hipp
a0a54348e8
removed upscale button, created spandrel model dropdown, created upscale initial image that works with dnd
2024-07-23 10:55:54 +10:00
Mary Hipp
43b3e242b0
tidy(ui): refactor parameters panel components to be 1:1 with tabs
2024-07-23 10:55:54 +10:00
chainchompa
e92af52fb8
fix moving items to uncategorized updating
2024-07-22 16:11:36 -04:00
chainchompa
339dddd018
update uncategorized board totals when deleting and moving images
2024-07-22 16:03:01 -04:00
Ryan Dick
81991e072b
Merge branch 'main' into ryan/spandrel-upscale
2024-07-16 15:14:08 -04:00
psychedelicious
24bf1ea65a
fix(ui): boards cut off when search open
2024-07-15 14:07:20 +10:00
psychedelicious
5cbe9fafb2
fix(ui): clear selection when deleting last image in board
2024-07-15 08:57:13 +10:00
psychedelicious
fb1130c644
fix(ui): do not invalidate image dto cache when deleting image
2024-07-12 14:25:38 +10:00
psychedelicious
0f65a12cf3
fix(ui): handle archived boards like other boards when they are visible, do not reset board selection when autoadd board is hidden
2024-07-12 14:25:38 +10:00
psychedelicious
84abdc5780
fix(ui): prevent cutoff of last board
2024-07-12 14:25:38 +10:00
psychedelicious
88c3a71586
fix(ui): fix bug with usePanel
2024-07-10 04:27:24 -07:00
psychedelicious
ec1b429d45
feat(ui): add divider between board search and list
2024-07-10 04:27:24 -07:00
psychedelicious
146e3a3377
feat(ui): tweak board tooltip behaviour
2024-07-10 04:27:24 -07:00
psychedelicious
7db767b7c3
feat(ui): sticky board list header
2024-07-10 04:27:24 -07:00
psychedelicious
b70e87f25b
feat(ui): tweak add board button style
2024-07-10 04:27:24 -07:00
psychedelicious
fea1ec9085
feat(ui): updated boards resizable panel logic
2024-07-10 04:27:24 -07:00
psychedelicious
2e7a95998c
feat(ui): add support for default size in usePanel
2024-07-10 04:27:24 -07:00
psychedelicious
788f90a7d5
feat(ui): tweak resizehandle styling
2024-07-10 04:27:24 -07:00
psychedelicious
6bf29b20af
fix(ui): fix edge case in panels
...
Not sure why I didn't figure out how to do this before - we only should reset a panel if it's too small.
2024-07-10 04:27:24 -07:00
psychedelicious
8f0edcd4f4
fix(ui): edge cases when deleting, archiving, updating boards
...
Need to handle different cases where the selected or auto-add board is hidden - fall back to uncategorized in these situations.
2024-07-10 04:27:24 -07:00
psychedelicious
a7c44b4a98
feat(ui): rename gallery boards on double click
2024-07-10 04:27:24 -07:00
psychedelicious
48a57f0da8
feat(ui): boards styling
...
- Refine layout
- Update colors - more minimal, fewer shaded boxes
- Add indicator for search icons showing a search term is entered
- Handle new `projectName` and `projectUrl` ui props
2024-07-10 04:27:24 -07:00
psychedelicious
dfd94bbd0b
feat(ui): remove galleryHeader in favor of projectUrl & projectName
2024-07-10 04:27:24 -07:00
chainchompa
2edfb2356d
remove extra boardname
2024-07-10 04:27:24 -07:00
chainchompa
58d2c1557d
prettier
2024-07-10 04:27:24 -07:00
chainchompa
8fdff33cf8
update board header styling, toggle board search, resizing gallery panels
2024-07-10 04:27:24 -07:00
chainchompa
a96e34d2d1
remove collapsibles and update board title
2024-07-10 04:27:24 -07:00
chainchompa
8826adad24
filter out uncategorized when not included in search
2024-07-10 04:27:24 -07:00
chainchompa
cdacf2ecd0
clear out boards search when adding a new board
2024-07-10 04:27:24 -07:00
chainchompa
f193a576a6
move boardname back and make collapsible again
2024-07-10 04:27:24 -07:00
chainchompa
b7ebdca70a
update image and assets tabs styling
2024-07-10 04:27:24 -07:00
Ryan Dick
7b5d4935b4
Merge branch 'main' into ryan/spandrel-upscale
2024-07-09 13:47:11 -04:00
psychedelicious
476ebd13ae
feat(ui): add board button tooltip when private boards enabled
2024-07-09 22:51:08 +10:00
psychedelicious
2460689c00
feat(ui): style board name
2024-07-09 22:47:03 +10:00
psychedelicious
781b800ef7
feat(ui): boards lists start collapsed
2024-07-09 22:40:50 +10:00
psychedelicious
d38d513d23
fix(ui): autoadd badge doesn't flex shrink
2024-07-09 22:39:32 +10:00
psychedelicious
80e1b87b9e
fix(ui): autoadd badge hides when editing name
2024-07-09 22:39:17 +10:00
psychedelicious
6014382c7b
feat(ui): select a board when it is created
2024-07-09 22:37:41 +10:00
psychedelicious
060d698a12
feat(ui): restore image count for boards
2024-07-09 22:19:20 +10:00
psychedelicious
637802d803
fix(ui): restore auto-add indicator
2024-07-09 22:14:21 +10:00
psychedelicious
2faf1e2ed3
fix(ui): show uncategorized board when private boards disabled
2024-07-09 22:02:54 +10:00
psychedelicious
81cf47dd99
feat(ui): boards list layout & style tweaking
2024-07-09 21:58:48 +10:00
chainchompa
907b257984
remove unused file and addressed pr feedback
2024-07-08 23:20:50 -04:00
chainchompa
e2667f957c
prettier
2024-07-08 22:16:31 -04:00
chainchompa
40c3b5e727
generate types again
2024-07-08 22:13:12 -04:00
chainchompa
38c5804457
remove unused disclosure
2024-07-08 22:09:23 -04:00
chainchompa
faf65c988a
Merge branch 'main' into boards-ui-update
2024-07-08 22:06:26 -04:00
chainchompa
1785825690
add current gallery board name
2024-07-08 22:03:42 -04:00
chainchompa
0e092c0fb5
update is_private name
2024-07-08 22:03:12 -04:00
chainchompa
79a7b11214
remove old boards list
2024-07-08 15:02:22 -04:00
chainchompa
3a85ab15a1
update BoardRecord
2024-07-08 14:55:04 -04:00
chainchompa
9ca6980c7a
cleanup and bug fixes
2024-07-08 13:29:53 -04:00
Ryan Dick
d09999736c
Rename spandrel models to 'Image-to-Image Model' throughout the UI.
2024-07-05 14:04:08 -04:00
Ryan Dick
9d3739244f
Prettier formatting.
2024-07-03 16:28:21 -04:00
Ryan Dick
534528b85a
Re-generate schema.ts
2024-07-03 16:28:21 -04:00
Ryan Dick
9328c17ded
Add Spandrel models to the list of models in the Model Manager tab.
2024-07-03 16:28:21 -04:00
Ryan Dick
c1c8e55e8e
Fix static check errors.
2024-07-03 16:28:21 -04:00
Ryan Dick
29c8ddfb88
WIP - A bunch of boilerplate to support Spandrel Image-to-Image models throughout the model manager and the frontend.
2024-07-03 16:28:21 -04:00
chainchompa
6437ef3f82
add view that displays private boards with shared boards
2024-07-03 14:25:36 -04:00
Mary Hipp
e719018ba1
fix sort order
2024-07-03 09:20:08 -07:00
psychedelicious
7c01b69c12
fix(ui): revise image selection after deletion
...
- For single image deletion, select the image in the same slot as the deleted image
- For multiple image deletion, empty selection
- On list images, if no images are currently selected, select the first image
2024-07-03 13:20:40 +10:00
psychedelicious
5578660ccb
fix(ui): reset page when search term changes
2024-07-03 13:20:40 +10:00
psychedelicious
4075a81676
feat(ui): gallery image selection ux
...
The selection logic is a bit complicated. We have image selection and pagination, both of which can be triggered using the mouse or hotkeys. We have viewer image selection and comparison image selection, which is determined by the alt key.
This change ties the room together with these behaviours:
- Changing the page using pagination buttons never changes the selection.
- Changing the selected image using arrows may change the page, if the arrow key pressed would select an image off the current page.
- `right` on the last image of the current page goes to the next page
- `down` on the last row of images goes to the next page
- `left` on the first image of the current page goes to the previous page
- `up` on the first row of images goes to the previous page
- If `alt` is held when using arrow keys, we change the page, but we only change the comparison image selection.
- When using arrow keys, if the page has changed since the last image was selected, the selection is reset to the first image on the page.
- The next/previous buttons on the image viewer do the same thing as `left` and `right` without `alt`.
- When clicking an image in the gallery:
- If no modifier keys are held, the image is exclusively selected.
- If `ctrl` or `meta` are held, the image's selection status is toggled.
- If `shift` is held, all images from the last-selected image to the image are selected. If there are no images on the current page, the selection is unchanged.
- If `alt` is held, the image is set as the compare image.
- `ctrl+a` and `meta+a` add the current page to the selection.
The logic for gallery navigation and selection is now pretty hairy. It's spread across 3 hooks, a listener, redux slice, components.
When we next make changes to this part of the app, we should consider consolidating some of the related logic. Probably most of it can go into a single listener and make it much simpler to grok.
2024-07-02 13:52:32 +10:00
psychedelicious
4d39976909
feat(ui): restore loading spinner in search box
...
@maryhipp you were right, after trying loading bars and different placements, this feels like the best place for it.
2024-07-02 13:52:32 +10:00
Mary Hipp
d14894b3ae
(ui) clarify auto-add options
2024-07-02 06:44:09 +10:00
Mary Hipp
6f5c5b0757
lint fix
2024-07-01 15:36:06 -04:00
Mary Hipp
93caa23ef8
undo
2024-07-01 15:36:06 -04:00
Mary Hipp
977a77f4e6
fix(ui): dont mess up redux if 403 gets thrown
2024-07-01 15:36:06 -04:00
Mary Hipp
57c0fcb93d
(ui) clarify auto-add options
2024-07-01 15:36:06 -04:00
psychedelicious
b1cc413bbd
tidy(ui): remove search term fetching indicator
...
Don't like this UI (even though I suggested it). No need to prevent the user from interacting with the search term field during fetching. Let's figure out a nicer way to present this in a followup.
2024-07-01 20:06:28 +10:00
psychedelicious
f0b1f0e5b6
feat(ui): pass search term as-is to query
...
The images service does not add the query filter if the search term is an empty string.
2024-07-01 20:06:28 +10:00
Mary Hipp
20d5c3a8bf
(ui): improve loader/fetching state while searching, make search term a string in redux
2024-07-01 20:06:28 +10:00
Mary Hipp
da05034e20
feat(ui): debounced gallery search
2024-07-01 20:06:28 +10:00
psychedelicious
10076fb1e8
feat(ui): tweak gallery settings popover divider styling
2024-06-28 18:01:01 +10:00
psychedelicious
d6e85e5f67
tidy(ui): rename GalleryBulkSelect -> GallerySelectionCountTag
2024-06-28 18:01:01 +10:00
psychedelicious
1ce459198c
chore(ui): knip
2024-06-28 18:01:01 +10:00
psychedelicious
17d337169d
fix(ui): do not reset limit when changing gallery view
2024-06-28 18:01:01 +10:00
psychedelicious
1468f4d37e
perf(ui): split out gallery settings popover components
...
This was taking over 15ms (!) to render each time a setting changed, wtf
2024-06-28 18:01:01 +10:00
psychedelicious
2b744480d6
feat(ui): update UI for sorting
2024-06-28 18:01:01 +10:00
psychedelicious
abb8d34b56
chore(ui): typegen
2024-06-28 18:01:01 +10:00
Mary Hipp
6109a06f04
feat(ui): gallery sort by created at or starred, asc or desc
2024-06-28 18:01:01 +10:00
psychedelicious
0d4b80780b
feat(ui): handle edge cases when archiving/deleting boards
...
If the currently selected or auto-add board is archived or deleted, we should reset them. There are some edge cases taht weren't handled in the previous implementation.
All handling of this logic is moved to the (renamed) listener.
2024-06-28 10:36:05 +10:00
psychedelicious
15b9ece411
chore(ui): typegen
2024-06-28 10:36:05 +10:00
Mary Hipp
b5f23292d4
lint fix
2024-06-28 10:36:05 +10:00
Mary Hipp
740bf80f3e
(ui): update query param to include_archived, fix cache when archiving boards
2024-06-28 10:36:05 +10:00
Mary Hipp
dc90de600d
(ui) allow auto-add on archived boards, reset to uncategorized if auto-add board is not currently visible due to archived view
2024-06-28 10:36:05 +10:00
psychedelicious
5709f82e5f
feat(ui): separate context menu for no board board
...
Much easier to not need to handle the board being optional in the component.
2024-06-28 10:36:05 +10:00
