blessedcoolant
6e40b543cd
Merge branch 'main' into minimapcontrol
2023-07-18 16:25:49 +12:00
blessedcoolant
3d1ad86e8a
chore: Clean Schema before final merge
2023-07-18 15:18:31 +12:00
mickr777
6c03d9f8f2
Spelling mistake
2023-07-18 13:13:31 +10:00
mickr777
9e01a13d63
Add translation entries to right file
2023-07-18 13:09:26 +10:00
mickr777
e74eac5c91
revert en.json
2023-07-18 13:08:31 +10:00
mickr777
47617b8f63
Spelling Mistake
2023-07-18 12:58:42 +10:00
mickr777
9c2a2b313e
Add entries for the viewportcontrols tool tips
2023-07-18 12:58:00 +10:00
mickr777
32662c5ee8
Add tool tips
2023-07-18 12:56:34 +10:00
blessedcoolant
c16325a244
feat: Disable convert button on SDXL and Refiner Checkpoints
2023-07-18 14:37:20 +12:00
blessedcoolant
7221a238b3
fix: Fix Add Scan Auto Checkpoint logic
2023-07-18 14:36:56 +12:00
blessedcoolant
84275a3f12
Merge branch 'main' into sdxl-support
2023-07-18 14:17:09 +12:00
blessedcoolant
d45ff7e100
fix: Model Manager scan Auto Add not detecting checkpoint correctly
2023-07-18 14:14:44 +12:00
mickr777
9dbffadc6e
Update nodesSlice.ts
2023-07-18 12:11:13 +10:00
mickr777
11882173e3
Update ViewportControls.tsx
2023-07-18 12:10:57 +10:00
mickr777
990f34aa15
Update MinimapPanel.tsx
2023-07-18 12:10:42 +10:00
blessedcoolant
5b7eef3d43
merge: Make Model Manager work with SDXL stuff
2023-07-18 14:01:56 +12:00
blessedcoolant
13da881953
Merge branch 'main' into sdxl-support
2023-07-18 13:34:07 +12:00
blessedcoolant
ec3c15ead0
Merge branch 'main' into mm-ui
2023-07-18 12:58:57 +12:00
blessedcoolant
a137f7fe7b
Merge branch 'main' into feat/model-events
2023-07-18 12:55:02 +12:00
blessedcoolant
7c3eb06a71
fix: Scan again not refetching the model list
2023-07-18 12:44:16 +12:00
blessedcoolant
715e3217d0
feat: Improve Scanned / Model Lists layout
...
- Now inside ScrollArea
- Now displays installed models
2023-07-18 12:14:35 +12:00
blessedcoolant
72c1a8db08
fix: Diffusers Model edit form not closing on Scan Add
2023-07-18 11:58:04 +12:00
blessedcoolant
337399ff7c
fix: Add API tags for Scanned Models
2023-07-18 11:57:45 +12:00
mickr777
7ec1be80ad
Merge branch 'main' into HideLegend2
2023-07-18 08:14:34 +10:00
Lincoln Stein
6ae10798b0
Merge branch 'main' into feat/model-events
2023-07-17 17:15:12 -04:00
Lincoln Stein
65ed43afb9
resolve conflicts with main
2023-07-17 17:10:57 -04:00
Lincoln Stein
3f8e978543
remove yarn.lock from repo
2023-07-17 17:09:51 -04:00
psychedelicious
c82ae74610
feat(ui): consolidate imagecontextmenu and send to menu
...
Both support the same actions:
- Open in new tab
- Copy image (if supported by browser)
- Use prompt
- Use seed
- Use all
- Send to img2img
- Send to canvas
- Change board
- Download image
- Delete
2023-07-17 16:43:24 -04:00
psychedelicious
380aa1d7b5
feat(ui): fix copy image, add context menu to IAIDndImage
...
- restore copy image functionality* in image context menu, current image buttons
- give IAIDndImage the same context menu
* copying image to clipboard is not possible on Firefox unless the user enables a setting which is disabled by default. if the browser does not support copying an image, the copy functionality is disabled.
2023-07-17 16:43:24 -04:00
psychedelicious
81ccbc5c6a
feat(ui): improve context menu feel
...
- faster animation
- do not handle context menu events inside context menu (fixes issue where the context menu appears to not fire)
2023-07-17 16:43:24 -04:00
blessedcoolant
0712294c17
fix: Model Manager light mode color fixes
2023-07-18 00:29:20 +12:00
blessedcoolant
e039771d07
fix: Incorrect type on SDXL Model Loader
2023-07-17 21:47:41 +12:00
blessedcoolant
cfdaa30d44
feat: Scan models add to differentiate between ckpt and diffusers
2023-07-17 19:40:08 +12:00
psychedelicious
3e2a948007
Merge branch 'main' into feat/model-events
2023-07-17 17:36:20 +10:00
psychedelicious
af9e8fefce
feat(ui): socket event timestamps have ms precision
2023-07-17 17:35:20 +10:00
blessedcoolant
f398fe4136
fix: Merge models not respecting save directory
2023-07-17 17:59:05 +12:00
blessedcoolant
41e7b008fb
feat: Add search to Scanned Models
2023-07-17 17:32:34 +12:00
blessedcoolant
98e6a56714
fix: Model Manager jank / bugs / refinement
2023-07-17 17:09:41 +12:00
blessedcoolant
cbd5be73d2
feat: Add Scan Models Advanced Add
2023-07-17 16:44:01 +12:00
blessedcoolant
38e6e3b36b
feat: Add Quick Add To Scan Model
2023-07-17 16:07:38 +12:00
blessedcoolant
540f40c293
fix: Better file and component naming for Add Models
2023-07-17 13:58:11 +12:00
blessedcoolant
641b90cc3f
chore: regen types
2023-07-17 13:50:35 +12:00
blessedcoolant
aebd595607
Merge branch 'main' into mm-ui
2023-07-17 13:49:25 +12:00
mickr777
ce58c41553
Merge branch 'main' into HideLegend2
2023-07-17 10:35:22 +10:00
mickr777
9b55eea673
Silly prettier
2023-07-17 10:31:25 +10:00
mickr777
d9a853857c
Change icon to FaInfo
2023-07-17 10:11:18 +10:00
mickr777
036e5d7292
Update nodesSlice.ts
2023-07-17 08:43:45 +10:00
mickr777
b4e09d4143
Update TopRightPanel.tsx
2023-07-17 08:43:05 +10:00
mickr777
bc3aab93f1
Update ViewportControls.tsx
2023-07-17 08:42:31 +10:00
blessedcoolant
dabd2bf301
fix: Readd model name to edit forms
...
Will be needed when we implement changing name and base model type.
2023-07-16 16:15:53 +12:00
blessedcoolant
92029e69c6
feat: Update Checkpoint Model Edit to use config picker
2023-07-16 15:48:44 +12:00
blessedcoolant
5351171d0e
cleanup: Scan Models component (to begin anew)
2023-07-16 15:29:25 +12:00
blessedcoolant
5b047baeb0
fix: Mantine Required icon being on new line
2023-07-16 15:29:01 +12:00
blessedcoolant
d93d42af4a
feat: Add Manual Checkpoint / Safetensor Models
2023-07-16 15:21:49 +12:00
Lincoln Stein
b767b5d44c
user must adjust terminal size on Windows
2023-07-15 23:19:50 -04:00
blessedcoolant
421fcb761b
feat: Manual Add Diffusers Model
2023-07-16 14:20:27 +12:00
blessedcoolant
2e0370d845
feat: Extract BaseModel and ModelVariant Select's
...
For reusability
2023-07-16 14:07:26 +12:00
Lincoln Stein
72c891bbac
remove conhost from windows install process
2023-07-15 21:48:04 -04:00
Lincoln Stein
39e66ec934
rebuild front end
2023-07-15 20:32:22 -04:00
Lincoln Stein
ccbfa5d862
resolve conflicts
2023-07-15 19:47:50 -04:00
Lincoln Stein
6b0a158ffa
Merge branch 'main' into lstein/default-model-install
2023-07-15 18:23:34 -04:00
psychedelicious
c487166d9c
feat(ui): add listeners for model load events
...
- currently only exposed as DEBUG-level logs
2023-07-16 02:26:30 +10:00
psychedelicious
8a1b9d1001
chore(ui): regen types
2023-07-16 01:06:57 +10:00
Kent Keirsey
77b0129b4c
Merge branch 'main' into lstein/migrate-fix
2023-07-15 10:37:56 -04:00
Lincoln Stein
e01706f5f5
add fp16 support to controlnet models
2023-07-15 10:37:11 -04:00
Lincoln Stein
f504c7ebbd
Merge branch 'main' into lstein/migrate-fix
2023-07-15 10:13:44 -04:00
Lincoln Stein
a111539059
migrate script now initializes destination root if needed
2023-07-15 09:59:34 -04:00
blessedcoolant
cd033f4ead
fix: Refine some UI
2023-07-16 01:57:42 +12:00
blessedcoolant
b1e16aa3db
fix: placeholder text for Add model input
2023-07-16 01:41:32 +12:00
blessedcoolant
e1c0ca1ab2
feat: Add Auto Import Model
2023-07-16 01:36:00 +12:00
Lincoln Stein
32e7e52d69
Merge branch 'main' into lstein/default-model-install
2023-07-15 08:30:22 -04:00
blessedcoolant
dcbb3dc49a
Merge branch 'main' into mm-ui
2023-07-16 00:30:11 +12:00
blessedcoolant
ff74de7a60
fix: Minor UI tweak to Control Net enable button
2023-07-16 00:27:52 +12:00
psychedelicious
f7230d07db
feat(ui): fix controlnet image preview alignment
2023-07-15 20:49:03 +10:00
psychedelicious
b265956083
fix(ui): disable drop when controlnet disabled
2023-07-15 20:47:02 +10:00
psychedelicious
8e0ba24bf2
feat(ui): fix cnet ui alignment
2023-07-15 20:36:32 +10:00
psychedelicious
be4705ec32
feat(ui): move control mode and processor to main view
2023-07-15 20:34:26 +10:00
psychedelicious
4ac0ce59fb
fix(ui): add custom label to IAIMantineSelects
...
needed to have their label styles match chakras
2023-07-15 20:29:15 +10:00
blessedcoolant
4a2f34f77f
wip: Model Search
...
Going to rework the whole thing. The old system is convoluted and too difficult to plug back.
2023-07-15 22:23:00 +12:00
blessedcoolant
558c26d78f
feat: Create Model Manager Store
2023-07-15 22:22:22 +12:00
psychedelicious
7daafc03d3
fix(ui): fix invoke button styles when processing
2023-07-15 20:04:33 +10:00
psychedelicious
457e4b7fc5
feat(ui): tweak slider label spacing
2023-07-15 19:56:45 +10:00
psychedelicious
d1ecd007ab
feat(ui): promote controlnet to be just under general
...
It is the most impactful feature, and also takes up the most space when you expand it. Promoted.
2023-07-15 19:56:45 +10:00
psychedelicious
7dec2d09f0
feat(ui): disable specific controlnet inputs when that controlnet is disabled
...
The UX is clearer now, but it's still easy to miss that your individual controlnets are enabled, but the overall controlnet feature is disabled.
2023-07-15 19:56:45 +10:00
psychedelicious
13d182ead2
feat(ui): move cnet add button to top of list
2023-07-15 19:56:45 +10:00
psychedelicious
401727b0c9
feat(ui): add cnet advanced tooltip
2023-07-15 19:56:45 +10:00
psychedelicious
19e076cd15
fix(ui): fix no controlnet model selected by default
2023-07-15 19:56:45 +10:00
psychedelicious
8a14c5db00
feat(ui): wip controlnet layout
2023-07-15 19:56:45 +10:00
psychedelicious
77ad3c959b
feat(ui): tweak slider styles
2023-07-15 19:56:45 +10:00
psychedelicious
952a7a8674
feat(ui): do not autoprocess if user just disabled autoconfig
2023-07-15 19:56:45 +10:00
psychedelicious
7b6d91c69f
feat(ui): control net UI weights 0 to 2
2023-07-15 19:56:44 +10:00
psychedelicious
8f66d826a5
feat(ui): refactor controlnet UI components to use local memoized selectors
...
makes them more portable and easier to reason about
2023-07-15 19:56:44 +10:00
psychedelicious
0d41346417
feat(ui): fix controlNet models
...
- update controlnet state to use object format for model
- update model-parsing helper functions to log errors
- update nodes components, types and state
- remove controlnets from state when models are loaded and the controlnet's model is not available
2023-07-15 19:56:44 +10:00
Mary Hipp
76dc47e88d
remove frontend constants, use backend response for controlnet models. add disabled state if base model is not compatible. clear control net model if main base model changes. add logic to guess processor and move it up in UI
2023-07-15 19:56:44 +10:00
psychedelicious
5ac114576f
feat(ui): add controlnet field to nodes
2023-07-15 19:56:44 +10:00
psychedelicious
96c9db6d2e
chore(ui): typegen
2023-07-15 19:56:44 +10:00
blessedcoolant
9769b48661
feat: Add Custom location support for model conversion
2023-07-15 19:17:16 +12:00
blessedcoolant
8c8eddcc60
feat: Handle toasts for Model Delete
2023-07-15 18:48:18 +12:00
blessedcoolant
79ca0d0d02
feat: Allow user to pick where to saved merged model
2023-07-15 17:33:44 +12:00
blessedcoolant
690331b8c0
chore: Regen Schema
2023-07-15 17:33:09 +12:00
Mary Hipp
194434dbfa
restore scrollbar
2023-07-15 12:25:28 +10:00
psychedelicious
8cb19578c2
fix(ui): fix crash on LoRA remove / weight change
2023-07-15 11:09:18 +10:00
Lincoln Stein
a45f7ce355
add --list-models command
2023-07-14 19:52:47 -04:00
Lincoln Stein
eb9d74653d
set default models for realesrgan, controlnet and text inversion
2023-07-14 19:03:41 -04:00
blessedcoolant
48561908b1
Merge branch 'main' into fix/nodes/fix-mouse-interactions
2023-07-15 04:13:46 +12:00
psychedelicious
f6752965b7
fix(ui): allow decimals in number inputs
...
still some jank but eh
2023-07-15 01:05:10 +10:00
psychedelicious
30e45eaf47
feat(ui): hold shift to make nodes draggable from anywhere
2023-07-15 00:45:26 +10:00
psychedelicious
0257b4a611
fix(ui): fix mouse interactions
2023-07-15 00:13:45 +10:00
blessedcoolant
3c7cf72423
fix: Clean up merge models submit handler
2023-07-15 01:29:51 +12:00
blessedcoolant
25d07891b5
Merge branch 'mm-ui' of https://github.com/blessedcoolant/InvokeAI into mm-ui
2023-07-15 01:24:20 +12:00
blessedcoolant
401fa6deb5
fix: Misc fixes
2023-07-15 01:23:08 +12:00
psychedelicious
f68ab55d6b
fix(ui): fix missing mantineTheme, fixes fonts
2023-07-14 23:16:05 +10:00
psychedelicious
79d65125c2
feat(ui): extract mantine component styles to hook, add less opinionated mantine components
...
IAIMantineSelect and IAIMantineMultiSelect have a bit of extra logic that prevents simple select functionality from working as expected.
- extract the styles into hooks
- rename those two components to IAIMantineSearchableSelect and IAIMantineSearchableMultiSelect
- Create IAIMantineSelect (which is just a dropdown) and use it in model manager and a few other places
When we only have a few options to present and searching is not efficient, we should use this instead.
2023-07-14 23:00:38 +10:00
psychedelicious
d4dfd84525
feat(ui): mm colors
2023-07-14 20:12:02 +10:00
psychedelicious
eb2a7058bf
feat(ui): tweak fontSize in modellist
2023-07-14 19:49:05 +10:00
psychedelicious
56d209842f
feat(ui): only show modellistitem when none in array
2023-07-14 19:46:18 +10:00
psychedelicious
0b2f0c05b2
fix(ui): fix selecting model does not update form
2023-07-14 19:31:52 +10:00
psychedelicious
1e5ae9d986
feat(ui): refactor model manager ui
...
- simplify UI logic in `ModelManagerPanel` components
- fix up the types a bit to make it easier to select models
- remove `openModel` state, just make it a useState since it is very local to model manager
2023-07-14 19:22:37 +10:00
psychedelicious
f2af82bf73
feat(ui): add model convert for success/failure handling
2023-07-14 17:39:00 +10:00
psychedelicious
6d7fb49a7a
fix(ui): fix model edit button disabled status
2023-07-14 17:36:10 +10:00
psychedelicious
48a8bd4985
feat(ui): add model update for success/failure handling
2023-07-14 17:35:45 +10:00
psychedelicious
d8437d3036
feat(ui): add simple selectIsBusy selector
2023-07-14 17:34:34 +10:00
psychedelicious
a0cb18a12c
feat(ui): refetch models on socket connect
2023-07-14 17:34:13 +10:00
psychedelicious
b2005d821a
fix(ui): fix types for models queries
2023-07-14 16:59:31 +10:00
psychedelicious
66b12ab0ea
fix(ui): do not blacklist the rtk query events
...
doing so breaks the devtools
2023-07-14 16:59:13 +10:00
blessedcoolant
834774ce4c
fix: Merge Conflicts
2023-07-14 18:16:34 +12:00
blessedcoolant
7cd60214cb
Merge branch 'main' into mm-ui
2023-07-14 18:14:45 +12:00
blessedcoolant
5c58bc6348
fix: Missing VAE Input Field Component
2023-07-14 16:07:22 +10:00
blessedcoolant
e1d6c09ed2
fix: Type errors & missing Unet field component
2023-07-14 16:07:22 +10:00
psychedelicious
8dd4ca5723
feat(ui): update node editor to use model object format
...
similar to the previous commit, update the node editor to not just store models as strings - instead, store the model object.
the model select components in nodes are now just kinda copy-pastes over the linear UI versions of the same components, but they were different enough that we can't just share them.
i explored adding some props to override the linear ui components' logic, but it was too brittle. so just copy/paste.
2023-07-14 16:07:22 +10:00
psychedelicious
a071873327
feat(ui): fix a lot of model-related crashes/bugs
...
We were storing all types of models by their model ID, which is a format like `sd-1/main/deliberate`.
This meant we had to do a lot of extra parsing, because nodes actually wants something like `{base_model: 'sd-1', model_name: 'deliberate'}`.
Some of this parsing was done with zod's error-throwing `parse()` method, and in other places it was done with brittle string parsing.
This commit refactors the state to use the object form of models.
There is still a bit of string parsing done in the to construct the ID from the object form, but it's far less complicated.
Also, the zod parsing is now done using `safeParse()`, which does not throw. This requires a few more conditional checks, but should prevent further crashes.
2023-07-14 16:07:22 +10:00
psychedelicious
14587464d5
fix(ui): check for metadataAccumulator before connecting to it
...
Fixes an edge case in graph building.
2023-07-14 16:07:22 +10:00
psychedelicious
d858a0c5d8
fix(ui): fix rtk tags
...
I had mixed up `type` and `id` on a bunch of the tags. Fixing those
2023-07-14 15:32:09 +10:00
blessedcoolant
abe2a0f9b4
fix: merge conflicts (name renamed to model_name) for models
2023-07-14 15:53:28 +12:00
blessedcoolant
16e93c6455
Merge branch 'main' into mm-ui
2023-07-14 15:46:53 +12:00
psychedelicious
536a397b12
ui: gallery enhancements ( #3752 )
...
* feat(ui): salvaged gallery UI enhancements
* restore boardimage functionality, load boardimages and remove some cachine optimizations in the name of data integrity
* fix assets, fix load more params
* jk NOW fix assets, fix load more params
---------
Co-authored-by: Mary Hipp <maryhipp@Marys-MacBook-Air.local>
Co-authored-by: Mary Hipp Rogers <maryhipp@gmail.com>
2023-07-13 20:31:10 +00:00
blessedcoolant
50f10ce5d7
fix: model_name reference in Model Manager
2023-07-14 03:36:11 +12:00
psychedelicious
d46261a528
chore(ui): regen types
2023-07-13 23:26:52 +10:00
psychedelicious
978016ea51
feat(ui): use query to populate infill methods dropdown
...
- available infill methods is server state - remove it from client state, use the query to populate the dropdown
- add listener to ensure the selected infill method is an available one
2023-07-13 23:26:52 +10:00
Mary Hipp
d6c914eedc
detect if user has patchmatch enabled
2023-07-13 23:26:52 +10:00
mickr777
3cf75e48c5
remove clearnode export
2023-07-13 21:34:12 +10:00
mickr777
b5e7384f09
Delete clearnodes and change nodeEditorReset
2023-07-13 21:34:12 +10:00
mickr777
ee253ea4f1
add useCallback
2023-07-13 21:34:12 +10:00
psychedelicious
4ab4942e69
fix(ui): fix nodes crash when adding model loader
2023-07-13 20:29:03 +10:00
blessedcoolant
98a5b3fc24
Merge branch 'main' into fix/ui/fix-missing-nodes
2023-07-13 22:18:27 +12:00
psychedelicious
944b46908a
fix(ui): fix node parsing failing
2023-07-13 20:17:18 +10:00
psychedelicious
23d2af52df
fix(ui): fix lora name disappearing
2023-07-13 20:14:26 +10:00
psychedelicious
43cc96255b
fix(ui): check for metadata accumulator before connecting to it
2023-07-13 20:05:45 +10:00
psychedelicious
4702eb2e6a
fix(ui): fix inpaint invalid model error
2023-07-13 19:59:51 +10:00
blessedcoolant
19fdb70e20
Merge branch 'clearnodes' of https://github.com/mickr777/InvokeAI into pr/3747
2023-07-13 20:34:57 +12:00
