Lincoln Stein
e9352227f3
add merge api
2023-07-06 15:12:34 -04:00
blessedcoolant
1ac787f3c1
feat: Change Clip Skip to Slider & Add Collapse Active Text
2023-07-07 06:37:07 +12:00
blessedcoolant
bc5371eeee
Merge branch 'main' into feat/clip_skip
2023-07-07 06:03:39 +12:00
blessedcoolant
ce7803231b
feat: Add Clip Skip To Linear UI
2023-07-07 05:57:39 +12:00
Lincoln Stein
e573a533ae
remove redundant import
2023-07-06 13:24:58 -04:00
Lincoln Stein
581be42c75
Merge branch 'main' into lstein/model-manager-router-api
2023-07-06 13:20:36 -04:00
Lincoln Stein
90c66aab3d
merge with upstream
2023-07-06 13:17:02 -04:00
Lincoln Stein
3e925fbf34
model merging API ready for testing
2023-07-06 13:15:15 -04:00
Lincoln Stein
ec7c2f07c6
model merge backend, CLI and TUI working
2023-07-06 12:21:42 -04:00
Mary Hipp Rogers
d5f90b1a02
Improved loading for UI ( #3667 )
...
* load images on gallery render
* wait for models to be loaded before you can invoke
---------
Co-authored-by: Mary Hipp <maryhipp@Marys-MacBook-Air.local>
2023-07-06 14:48:42 +00:00
Sergey Borisov
a9e77675a8
Move clip skip to separate node
2023-07-06 17:39:49 +03:00
blessedcoolant
b229fe19aa
Merge branch 'main' into lstein/configure-max-cache-size
2023-07-07 01:52:12 +12:00
Sergey Borisov
04b57c408f
Add clip skip option to prompt node
2023-07-06 16:09:40 +03:00
blessedcoolant
c2eb6c33b9
Merge branch 'main' into lstein/more-model-loading-fixes
2023-07-07 01:00:02 +12:00
psychedelicious
94e38e9769
feat(ui): remove delete image button in gallery
...
it was really easy to accidentally click, just commented out, easy to add back or add a setting for it in the future
2023-07-06 22:35:50 +10:00
Mary Hipp
984121d682
only show delete icon if big enough
2023-07-06 22:35:50 +10:00
blessedcoolant
6f1268e2b1
Merge branch 'main' into lstein/more-model-loading-fixes
2023-07-07 00:32:22 +12:00
psychedelicious
a901a37433
feat(ui): improve no loaded loras UI
2023-07-06 22:26:54 +10:00
psychedelicious
e09c07a97d
fix(ui): fix board auto-add
2023-07-06 22:25:05 +10:00
psychedelicious
87feae959d
feat(ui): improve no loaded embeddings UI
2023-07-06 22:24:50 +10:00
psychedelicious
c21245f590
fix(api): make list models params querys, make path /
, remove defaults
...
The list models route should just be the base route path, and should use query parameters as opposed to path parameters (which cannot be optional)
Removed defaults for update model route - for the purposes of the API, we should always be explicit with this
2023-07-06 15:34:50 +10:00
psychedelicious
fbd6b25b4d
feat(ui): improve ux on TI autcomplete
...
- cursor reinserts at the end of the trigger
- `enter` closes the select
- popover styling
2023-07-06 14:56:37 +10:00
psychedelicious
2415dc1235
feat(ui): refactor embedding ui; now is autocomplete
2023-07-06 13:40:13 +10:00
Lincoln Stein
8f5fcb188c
Merge branch 'main' into lstein/model-manager-router-api
2023-07-05 23:16:43 -04:00
Lincoln Stein
f7daa6e71d
all methods now return OPENAPI_MODEL_CONFIGS; convert uses PUT
2023-07-05 23:13:01 -04:00
Lincoln Stein
3691b55565
fix autoimport crash
2023-07-05 21:53:08 -04:00
Lincoln Stein
fbad839d23
add missing .js files
2023-07-05 21:09:13 -04:00
Lincoln Stein
f610045a14
Merge branch 'main' into mps-fp16-fixes
2023-07-05 21:01:48 -04:00
Lincoln Stein
a7cbcae176
expose max_cache_size to invokeai-configure interface
2023-07-05 20:59:57 -04:00
Lincoln Stein
0a6dccd607
expose max_cache_size to invokeai-configure interface
2023-07-05 20:59:14 -04:00
Lincoln Stein
43c51ff157
Merge branch 'main' into lstein/more-model-loading-fixes
2023-07-05 20:48:15 -04:00
Lincoln Stein
bf25818d76
rebuild front end; bump version
2023-07-05 20:33:28 -04:00
Lincoln Stein
cfa3b2419c
partial implementation of merge
2023-07-05 20:25:47 -04:00
Lincoln Stein
d4550b3059
clean up lint errors in lora.py
2023-07-05 19:18:25 -04:00
Lincoln Stein
83d3a043da
merge latest changes from main
2023-07-05 19:15:53 -04:00
gogurtenjoyer
169ff6368b
Update mps_fixes.py - additional torch op for nodes
...
This fixes scaling in the nodes UI.
2023-07-05 17:47:23 -04:00
Lincoln Stein
71dad6d404
Merge branch 'main' into ti-ui
2023-07-05 16:57:31 -04:00
Lincoln Stein
c21bd806f0
default LoRA weight to 0.75
2023-07-05 16:54:23 -04:00
Lincoln Stein
685a47cc7d
fix crash during lora application
2023-07-05 16:40:47 -04:00
Lincoln Stein
cb947bcbf0
Merge branch 'main' into lstein/fix-migrate3-textencoder
2023-07-05 16:23:00 -04:00
Lincoln Stein
f8bbec8572
Recognize and load diffusers-style LoRAs (.bin)
...
Prevent double-reporting of autoimported models
- closes #3636
Allow autoimport of diffusers-style LoRA models
- closes #3637
2023-07-05 16:21:23 -04:00
Lincoln Stein
863336acbb
Recognize and load diffusers-style LoRAs (.bin)
...
Prevent double-reporting of autoimported models
- closes #3636
Allow autoimport of diffusers-style LoRA models
- closes #3637
2023-07-05 16:19:16 -04:00
Lincoln Stein
90ae8ce26a
prevent model install crash "torch needs to be restarted with spawn"
2023-07-05 16:18:20 -04:00
Lincoln Stein
ad5d90aca8
prevent model install crash "torch needs to be restarted with spawn"
2023-07-05 15:38:07 -04:00
Lincoln Stein
5b6dd47b9f
add API for model convert
2023-07-05 15:13:21 -04:00
Lincoln Stein
5027d0a603
accept @psychedelicious suggestions above
2023-07-05 14:50:57 -04:00
Lincoln Stein
9f9ce08e44
Merge branch 'main' into lstein/remove-hardcoded-cuda-device
2023-07-05 13:38:33 -04:00
Lincoln Stein
021e1eca8e
Merge branch 'main' into mps-fp16-fixes
2023-07-05 13:19:52 -04:00
Lincoln Stein
5fe722900d
allow clip-vit-large-patch14 text encoder to coexist with tokenizer in same directory
2023-07-05 13:15:08 -04:00
Lincoln Stein
cf173b522b
allow clip-vit-large-patch14 text encoder to coexist with tokenizer in same directory
2023-07-05 13:14:41 -04:00
Mary Hipp Rogers
ea81ce9489
close modal when user clicks cancel ( #3656 )
...
* close modal when user clicks cancel
* close modal when delete image context cleared
---------
Co-authored-by: Mary Hipp <maryhipp@Marys-MacBook-Air.local>
2023-07-05 17:12:27 +00:00
blessedcoolant
9e2d63ef97
Merge branch 'main' into fix/ckpt_convert_scan
2023-07-06 05:01:34 +12:00
Sergey Borisov
0ac9dca926
Fix loading diffusers ti
2023-07-05 19:46:00 +03:00
Lincoln Stein
bd82c4ace0
model installer confirms deletion of models
2023-07-05 09:57:23 -04:00
blessedcoolant
e4d92da3a9
fix: Make space for icons in prompt box
2023-07-06 01:48:50 +12:00
blessedcoolant
9204b72383
feat: Make Embedding Picker a mini toggle
2023-07-06 01:45:00 +12:00
Lincoln Stein
9edf78dd2e
merge with main
2023-07-05 09:12:54 -04:00
Lincoln Stein
5d31703224
Merge branch 'release/invokeai-3-0-alpha' of github.com:invoke-ai/InvokeAI into release/invokeai-3-0-alpha
2023-07-05 09:05:59 -04:00
Lincoln Stein
6112197edf
convert implemented; need router
2023-07-05 09:05:05 -04:00
Lincoln Stein
44d5bef7e4
bump version number
2023-07-05 09:02:35 -04:00
blessedcoolant
a556bf45bb
Merge branch 'main' into ti-ui
2023-07-05 23:42:48 +12:00
blessedcoolant
8c9266359d
feat: Add Embedding Select To Linear UI
2023-07-05 23:41:15 +12:00
blessedcoolant
3b324a7d0a
Merge branch 'main' into fix/ui/fix-prompt-resize
2023-07-05 23:40:47 +12:00
gogurtenjoyer
ba7345deb4
Merge branch 'main' into mps-fp16-fixes
2023-07-05 07:38:41 -04:00
Sergey Borisov
ee042ab76d
Fix ckpt scanning on conversion
2023-07-05 14:18:30 +03:00
psychedelicious
596c791844
fix(ui): fix prompt resize & style resizer
2023-07-05 21:02:31 +10:00
blessedcoolant
780e77d2ae
Merge branch 'main' into fix/clip_path
2023-07-05 22:45:52 +12:00
Sergey Borisov
e3fc1b3816
Fix clip path in migrate script
2023-07-05 13:43:09 +03:00
Lincoln Stein
307a01d604
when migrating models, changes / to _ in model names to avoid breaking model name keys
2023-07-05 20:27:03 +10:00
psychedelicious
56d4ea3252
fix(api): improve mm routes
2023-07-05 20:08:47 +10:00
psychedelicious
5d4d0e795c
fix(mm): fix up mm service types
2023-07-05 20:07:10 +10:00
psychedelicious
2a7dee17be
fix(ui): fix dnd on nodes
...
I had broken this earlier today
2023-07-05 19:06:40 +10:00
blessedcoolant
1c7166d2c6
Merge branch 'main' into fix/ui/delete-image-select
2023-07-05 20:57:34 +12:00
psychedelicious
9ebab013c1
fix(ui): deleting image selects first image
2023-07-05 18:21:46 +10:00
psychedelicious
e41e8606b5
feat(ui): improve accordion ux
...
- Accordions now may be opened or closed regardless of whether or not their contents are enabled or active
- Accordions have a short text indicator alerting the user if their contents are enabled, either a simple `Enabled` or, for accordions like LoRA or ControlNet, `X Active` if any are active
2023-07-05 17:33:03 +10:00
blessedcoolant
bc8cfc2baa
Merge branch 'main' into fix/model_detect
2023-07-05 18:52:11 +12:00
Eugene Brodsky
7170e82f73
expose max_cache_size in config
2023-07-05 02:44:15 -04:00
Sergey Borisov
2beb8f049e
Fix model detection
2023-07-05 09:43:46 +03:00
blessedcoolant
1fb317243d
fix: Change Lora weight bounds to -1 to 2
2023-07-05 18:12:45 +12:00
blessedcoolant
1a29a3fe39
feat: Add Lora to Canvas
2023-07-05 16:39:28 +12:00
blessedcoolant
639d88afd6
revert: inference_mode to no_grad
2023-07-05 16:39:15 +12:00
psychedelicious
f155887b7d
fix(ui): change multi image drop to not have selection as payload
...
This caused a lot of re-rendering whenever the selection changed, which caused a huge performance hit. It also made changing the current image lag a bit.
Instead of providing an array of image names as a multi-select dnd payload, there is now no multi-select dnd payload at all - instead, the payload types are used by the `imageDropped` listener to pull the selection out of redux.
Now, the only big re-renders are when the selectionCount changes. In the future I'll figure out a good way to do image names as payload without incurring re-renders.
2023-07-05 13:25:07 +10:00
psychedelicious
1358c5eb7d
fix(ui): fix selector memoization
...
Every `GalleryImage` was rerendering any time the app rerendered bc the selector function itself was not memoized. This resulted in the memoization cache inside the selector constantly being reset.
Same for `BatchImage`.
Also updated memoization for a few other selectors.
2023-07-05 13:25:07 +10:00
blessedcoolant
c0501ed5c2
fix: Slow loading of Loras
...
Co-Authored-By: StAlKeR7779 <7768370+StAlKeR7779@users.noreply.github.com>
2023-07-05 12:47:34 +10:00
psychedelicious
0f0336b6ef
fix(ui): fix incorrect lora id processing
2023-07-05 12:47:34 +10:00
psychedelicious
52a09422c7
feat(ui): create rtk-query hooks for individual model types
...
Eg `useGetMainModelsQuery()`, `useGetLoRAModelsQuery()` instead of `useListModelsQuery({base_type})`.
Add specific adapters for each model type. Just more organised and easier to consume models now.
Also updated LoRA UI to use the model name.
2023-07-05 12:47:34 +10:00
psychedelicious
c21b56ba31
fix(ui): fix mantine disabled styles
2023-07-05 12:47:34 +10:00
blessedcoolant
bf895221c2
fix: Tab index not being correct
...
This probably needs to be updated to an object over an array so the index of item in the array doesnt break the rest of it.
2023-07-05 12:47:34 +10:00
psychedelicious
db8862d860
feat(ui): add LoRA ui & update graphs
2023-07-05 12:47:34 +10:00
psychedelicious
d537b9f0cb
chore(ui): regen types
2023-07-05 12:47:34 +10:00
psychedelicious
08d428a5e7
feat(nodes): add lora field, update lora loader
2023-07-05 12:47:34 +10:00
gogurtenjoyer
233869b56a
Mac MPS FP16 fixes
...
This PR is to allow FP16 precision to work on Macs with MPS. In addition, it centralizes the torch fixes/workarounds
required for MPS into a new backend utility file `mps_fixes.py`. This is conditionally imported in `api_app.py`/`cli_app.py`.
Many MANY thanks to StAlKeR7779 for patiently working to debug and fix these issues.
2023-07-04 18:10:53 -04:00
Lincoln Stein
5d099f4a49
update_model working
2023-07-04 17:26:57 -04:00
Lincoln Stein
752b4d50cf
model_delete method now working
2023-07-04 10:40:32 -04:00
Lincoln Stein
c1c49d9a76
import model returns 404 for invalid path, 409 for duplicate model
2023-07-04 10:08:10 -04:00
psychedelicious
af728b4b1d
chore(ui): regen types
2023-07-04 15:04:01 +10:00
psychedelicious
099082abc1
feat(ui): model manager tab naming tweaks
2023-07-04 14:52:00 +10:00
Lincoln Stein
96bf92ead4
add the import model router
2023-07-04 14:35:47 +10:00
blessedcoolant
0988725c1b
fix: Floating gallery button showing up in Model Manager
2023-07-04 14:35:47 +10:00
blessedcoolant
089d95baeb
fix: Change graph id vals to constants
2023-07-04 14:35:47 +10:00
blessedcoolant
511978979e
feat: Add Custom VAE Support to Linear UI
2023-07-04 14:35:47 +10:00
blessedcoolant
7e18814dd0
Add standard names for Model Loader Nodes
2023-07-04 14:35:06 +10:00
blessedcoolant
bd5a764988
Remove 'automatic' from VAE Loader in Nodes
2023-07-04 14:35:06 +10:00
Lincoln Stein
a8a2209560
VAE loader is loading proper VAE. Unclear if it is changing the image
2023-07-04 14:35:06 +10:00
Lincoln Stein
fa8a5838d3
add vae lodaer
2023-07-04 14:35:06 +10:00
blessedcoolant
630f3c8b0b
fix: Missing VAE Loader stuff
2023-07-04 14:34:41 +10:00
blessedcoolant
6c6299ce49
fix: Style fixes to the MM edit forms
2023-07-04 14:34:41 +10:00
blessedcoolant
6684e00f0a
wip: Move Merge Models to new panel & use new model fetch
2023-07-04 14:34:41 +10:00
blessedcoolant
2f8f558df3
wip: Move Add Model from Modal to new Panel
2023-07-04 14:34:41 +10:00
blessedcoolant
de7b059e67
feat: Port Checkpoint Edit to Mantine Form
2023-07-04 14:34:41 +10:00
blessedcoolant
33db4e27a0
feat: Update DiffusersEdit Component to use Mantine Form
2023-07-04 14:34:41 +10:00
blessedcoolant
009c20bfea
feat: Add Mantine Form
2023-07-04 14:34:41 +10:00
blessedcoolant
d61b3818fe
feat: Add VAE Select to Linea UI Panels (non func)
2023-07-04 14:34:41 +10:00
blessedcoolant
51db4d1269
fix: Minor fixes to the VAESelect components
2023-07-04 14:34:41 +10:00
blessedcoolant
38660a2162
feat: Addvae_model
input type front end
2023-07-04 14:34:41 +10:00
blessedcoolant
5ad6b64721
cleanup: merge conflicts
2023-07-04 14:34:22 +10:00
blessedcoolant
0da4f4bb6f
fix: Add missing Unet, Clip, VAE Field Template types
2023-07-04 14:34:22 +10:00
blessedcoolant
8d5a953dcb
feat: Add VAESelect Component
2023-07-04 14:33:56 +10:00
blessedcoolant
6c62f41f2e
chore: Change PipelineModels to MainModels
2023-07-04 14:33:56 +10:00
blessedcoolant
2ad5a4ea46
feat: Initial port of Model Manager to new tab
2023-07-04 14:31:48 +10:00
blessedcoolant
9e35643911
feat: Make new tab for Model Manager
2023-07-04 14:31:24 +10:00
blessedcoolant
0bb668b8a8
feat: hook up model edit forms
2023-07-04 14:29:42 +10:00
blessedcoolant
e73f774920
fix: Restore Model display and select functionality
2023-07-04 14:29:42 +10:00
Lincoln Stein
4d2c7806fc
quash memory leak when compel invocation called
2023-07-03 14:12:35 -04:00
Lincoln Stein
3937428563
Merge branch 'release/invokeai-3-0-alpha' of github.com:invoke-ai/InvokeAI into release/invokeai-3-0-alpha
2023-07-03 14:11:28 -04:00
Lincoln Stein
fc419546bc
Merge branch 'main' into lstein/remove-hardcoded-cuda-device
2023-07-03 14:10:47 -04:00
Lincoln Stein
cfd09214d3
Merge branch 'main' into lstein/fix-vae-conversion-crash
2023-07-03 14:03:13 -04:00
Lincoln Stein
b128ba81db
Merge branch 'main' into lstein/remove-hardcoded-cuda-device
2023-07-03 13:58:14 -04:00
Lincoln Stein
9c83a4eada
Merge branch 'main' into dev/fix-unit-tests
2023-07-03 12:44:02 -04:00
Lincoln Stein
27088610ed
Merge branch 'main' into dev/fix-unit-tests
2023-07-03 12:38:42 -04:00
Lincoln Stein
7f054431df
Merge branch 'main' into fix/controlnet_cfg_inj_cond
2023-07-03 12:37:22 -04:00
Lincoln Stein
b17406a985
Merge branch 'main' into lstein/improve-model-install-stability
2023-07-03 12:37:02 -04:00
Lincoln Stein
ebcbfc8a12
Merge branch 'main' into lstein/recognize-legacy-sampler-names
2023-07-03 12:36:00 -04:00
Lincoln Stein
d6de11bd56
resolve merge conflict
2023-07-03 12:19:11 -04:00
Lincoln Stein
ed86d0b708
Union[foo, None]=>Optional[foo]
2023-07-03 12:17:45 -04:00
Lincoln Stein
fb2b2a371d
Merge branch 'lstein/fix-vae-conversion-crash' into release/invokeai-3-0-alpha
2023-07-03 11:21:16 -04:00
Lincoln Stein
10d513c5f7
add runtime root path to relative vaes and other submodels
2023-07-03 11:19:33 -04:00
Lincoln Stein
877b187a1b
Merge branch 'lstein/restore-3.9-compatibility' into release/invokeai-3-0-alpha
2023-07-03 11:01:34 -04:00
Lincoln Stein
ac9ec4e75a
restore 3.9 compatibility by replacing | with Union[]
2023-07-03 10:57:40 -04:00
Lincoln Stein
2465c7987b
Revert "restore 3.9 compatibility by replacing | with Union[]"
...
This reverts commit 76bafeb99e
.
2023-07-03 10:56:41 -04:00
Lincoln Stein
73a27918c6
Merge branch 'main' of github.com:invoke-ai/InvokeAI into main
2023-07-03 10:55:12 -04:00
Lincoln Stein
76bafeb99e
restore 3.9 compatibility by replacing | with Union[]
2023-07-03 10:55:04 -04:00
psychedelicious
c33f0ae055
feat(ui): hide batch ui pending logic implementation
2023-07-04 00:26:58 +10:00
psychedelicious
90aa97edd4
feat(ui): add multi-select and batch capabilities
...
This introduces the core functionality for batch operations on images and multiple selection in the gallery/batch manager.
A number of other substantial changes are included:
- `imagesSlice` is consolidated into `gallerySlice`, allowing for simpler selection of filtered images
- `batchSlice` is added to manage the batch
- The wonky context pattern for image deletion has been changed, much simpler now using a `imageDeletionSlice` and redux listeners; this needs to be implemented still for the other image modals
- Minimum gallery size in px implemented as a hook
- Many style fixes & several bug fixes
TODO:
- The UI and UX need to be figured out, especially for controlnet
- Batch processing is not hooked up; generation does not do anything with batch
- Routes to support batch image operations, specifically delete and add/remove to/from boards
2023-07-04 00:18:27 +10:00
psychedelicious
fa169b5517
feat(nodes): add ImageCollection node in prep for batch processing
2023-07-04 00:18:27 +10:00
Lincoln Stein
aae60b6142
quash memory leak when compel invocation called
2023-07-03 10:08:10 -04:00
Lincoln Stein
b79740d61d
back out torch.no_grad()
2023-07-02 23:03:24 -04:00
Lincoln Stein
8c93c8dda8
add web dist files to enable network pip install
2023-07-02 22:02:53 -04:00
Lincoln Stein
fa8ccd2a94
add no_grad() to compel node invoke() method
2023-07-02 18:20:16 -04:00
Lincoln Stein
6935858ef3
add debugging messages to aid in memory leak tracking
2023-07-02 13:34:53 -04:00
Lincoln Stein
2b67509061
bump version; rebuild frontend
2023-07-02 13:02:31 -04:00
Lincoln Stein
fa1f9939cc
adjust invokeai-configure TUI vertical height to show NEXT button on Mac
2023-07-02 09:44:16 -04:00
Lincoln Stein
2d314d2b3d
another fix to repo_id loading
2023-07-02 09:18:11 -04:00
blessedcoolant
f399b36ae6
fix: Progress Bar being broken
2023-07-02 18:49:24 +12:00
mickr777
a6334750cb
Update InvokeButton.tsx
2023-07-02 15:07:01 +10:00
mickr777
45a551125d
Update NodeInvokeButton.tsx
2023-07-02 15:06:32 +10:00
mickr777
72d64513d0
add borderBottomRadius: '5px',
2023-07-02 15:05:32 +10:00
psychedelicious
0e50005643
fix(ui): show skeletons only for currently loading images
2023-07-02 11:55:51 +10:00
Mary Hipp
19c632e793
remove width
2023-07-02 11:55:51 +10:00
Mary Hipp
85a4d37883
remove long loading state, introduce loading to gallery and model list
2023-07-02 11:55:51 +10:00
Lincoln Stein
b2775d6b4c
Merge branch 'lstein/recognize-legacy-sampler-names' into release/invokeai-3-0-alpha
2023-07-01 21:45:39 -04:00
Lincoln Stein
06694d465d
add missing k-* legacy sampler names to init file migrate list
2023-07-01 21:45:14 -04:00
Lincoln Stein
3c2ce51f10
Merge branch 'lstein/remove-hardcoded-cuda-device' into release/invokeai-3-0-alpha
2023-07-01 21:15:58 -04:00
Lincoln Stein
0f02915012
remove hardcoded cuda device in model manager init
2023-07-01 21:15:42 -04:00
Lincoln Stein
0016236889
Merge branch 'lstein/fix-imported-model-names' into release/invokeai-3-0-alpha
2023-07-01 21:09:29 -04:00
Lincoln Stein
f4bd5bb986
when migrating models, changes / to _ in model names to avoid breaking model name keys
2023-07-01 21:08:59 -04:00
Lincoln Stein
1cf61feead
print GPU device at startup
2023-07-01 20:47:11 -04:00
Lincoln Stein
5de820f2dc
fix updater and model installer
2023-07-01 20:13:28 -04:00
Lincoln Stein
f1fb1c9a60
Merge branch 'lstein/fix-update-script' into release/invokeai-3-0-alpha
2023-07-01 20:13:04 -04:00
Lincoln Stein
f7d8ae20a6
rolled back changes to package.json
2023-07-01 20:07:14 -04:00
Lincoln Stein
9724143ab7
rolled back changes to package.json
2023-07-01 20:05:00 -04:00
Lincoln Stein
ecc5b6eec5
change single to double quotes so that pip install works on windows
2023-07-01 19:56:18 -04:00
Lincoln Stein
4ac9be115e
rebuild frontend
2023-07-01 14:48:23 -04:00
Lincoln Stein
41a8f155ed
Merge branch 'main' into fix/controlnet_cfg_inj_cond
2023-07-01 14:36:09 -04:00
Lincoln Stein
3458f45a2b
Merge branch 'lstein/improve-model-install-stability' into release/invokeai-3-0-alpha
2023-07-01 14:35:35 -04:00
Lincoln Stein
6c80620c25
Merge branch 'main' into release/invokeai-3-0-alpha
2023-07-01 14:34:38 -04:00
Lincoln Stein
f1928d2588
prevent crashes on malformed models
2023-07-01 14:32:58 -04:00
psychedelicious
f46c50f69a
feat(ui): gallery minSize tweak
...
- Set min size for floating gallery panel
- Correct the default pinned width (it cannot be less than the min width and this was sometimes happening during window resize)
2023-07-01 20:27:52 +10:00
psychedelicious
3aa6a7e7df
feat(ui): minimum gallery size
...
Add `useMinimumPanelSize()` hook to provide minimum resizable panel sizes (in pixels).
The library we are using for the gallery panel uses percentages only. To provide a minimum size in pixels, we need to do some math to calculate the percentage of window size that corresponds to the desired min width in pixels.
2023-07-01 18:29:55 +10:00
blessedcoolant
c74bb5cdbf
Merge branch 'main' into lstein/fix-vae-convert
2023-07-01 11:18:21 +12:00
Lincoln Stein
1347fc2f00
fix incorrect VAE config file path during conversion of ckpts
2023-06-30 19:14:06 -04:00
Mary Hipp Rogers
d0834cfa19
export new ColorModeButton component ( #3614 )
...
Co-authored-by: Mary Hipp <maryhipp@Marys-MacBook-Air.local>
2023-06-30 09:07:36 -04:00
blessedcoolant
9a123ed662
Merge branch 'main' into fix/ui/fix-canvas-crash
2023-06-30 23:31:42 +12:00
psychedelicious
d6cfbe982f
feat(ui): tweak light mode colors, buttons pop
2023-06-30 13:15:58 +10:00
psychedelicious
30464f4fe1
fix(ui): fix canvas crash by rolling back swagger-parser
...
The node polyfills needed to run the `swagger-parser` library (used to dereference the OpenAPI schema) cause the canvas tab to immediately crash when the package build is used in another react application.
I'm sure this is fixable but it's not clear what is causing the issue and troubleshooting is very time consuming.
Selectively rolling back the implementation of `swagger-parser`.
2023-06-30 12:24:28 +10:00
blessedcoolant
295444c730
cleanup: Minor theme related cleanup
2023-06-30 06:09:14 +12:00
blessedcoolant
fb015332f2
feat: Add tooltips to color mode switcher
2023-06-30 06:05:08 +12:00
blessedcoolant
6e917dcbb0
chore: More colors to own files + small color tweaks
2023-06-30 06:04:42 +12:00
psychedelicious
032c7e68d0
feat(ui): remove themes, add hand-crafted dark and light modes
...
Themes are very fun but due to the differences in perceived saturation and lightness across the
the color spectrum, it's impossible to have have multiple themes that look great without hand-
crafting *every* shade for *every* theme. We've ended up with 4 OK themes (well, 3, because the
light theme was pretty bad).
I've removed the themes and added color mode support. There is now a single dark and light mode,
each with their own color palette and the classic grey / purple / yellow invoke colors that
@blessedcoolant first designed.
I've re-styled almost everything except the model manager and lightbox, which I keep forgetting
to work on.
One new concept is the Chakra `layerStyle`. This lets us define "layers" - think body, first layer,
second layer, etc - that can be applied on various components. By defining layers, we can be more
consistent about the z-axis and its relationship to color and lightness.
2023-06-30 03:24:36 +10:00
psychedelicious
c00aea7a6c
tests(nodes): fix nodes tests
2023-06-29 23:11:48 +10:00
Lincoln Stein
2c5b050d82
add image board support to invokeai-node-cli
2023-06-29 22:12:34 +10:00
Mary Hipp
723d68e496
add image usage for board images and listener to handle actual deletion
2023-06-29 21:14:53 +10:00
Mary Hipp
ba67e57a7e
(wip) delete images along with board
2023-06-29 21:14:53 +10:00
maryhipp
45935caf1d
fix query
2023-06-29 21:14:53 +10:00
Mary Hipp
73f2092ec5
(api) add option to board delete route and logic to services
2023-06-29 21:14:53 +10:00
blessedcoolant
5be1e71d1b
Merge branch 'main' into lstein/fix-model-scan-on-rel-root
2023-06-29 17:54:12 +12:00
mickr777
30a917f70c
Fix Typo in migrate_to_3.py
2023-06-29 14:45:55 +10:00
psychedelicious
4308d593c3
fix(ui): improve IDE TS performance by not resolving JSON
...
The TS Language Server slows down immensely with our translation JSON, which is used to provide kinda-type-safe translation keys. I say "kinda", because you don't get autocomplete - you only get red squigglies when the key is incorrect.
To improve the performance, we can opt out of this process entirely, at the cost of no red squigglies for translation keys. Hopefully we can resolve this in the future.
It's not clear why this became an issue only recently (like past couple weeks). We've tried rolling back the app dependencies, VSCode extensions, VSCode itself, and the TS version to before the time when the issue started, but nothing seems to improve the performance.
1. Disable `resolveJsonModule` in `tsconfig.json`
2. Ignore TS in `i18n.ts` when importing the JSON
3. Comment out the custom types in `i18.d.ts` entirely
It's possible that only `3` is needed to fix the issue.
I've tested building the app and running the build - it works fine, and translation works fine.
2023-06-28 23:55:44 -04:00
Brandon Rising
8f6b3660c5
Set use-credentials on commercial deployment if authToken is set on canvas image calls, comment out the UpdateImageUrls on connect listener
2023-06-29 13:55:03 +10:00
Lincoln Stein
1e97ba3628
merge with fix needed to run installer
2023-06-28 17:04:44 -04:00
Lincoln Stein
ace4f6d586
fix duplicate model key addition when root directory is a relative path
2023-06-28 17:02:03 -04:00
Lincoln Stein
261ca823c0
bump version number
2023-06-28 17:00:38 -04:00
Lincoln Stein
20fbe81395
Merge branch 'main' into fix/controlnet_cfg_inj_cond
2023-06-28 15:44:50 -04:00
StAlKeR7779
ac46b129bf
Merge branch 'main' into feat/lora_model_patch
2023-06-28 22:43:58 +03:00
Lincoln Stein
79fc708580
warn but do not crash when model scan finds random cruft in models
directory
2023-06-28 15:26:42 -04:00
Lincoln Stein
72209d0cc3
Merge branch 'main' into lstein/installer-for-new-model-layout
2023-06-28 14:49:37 -04:00
blessedcoolant
75614bbba3
Merge branch 'main' into feat/nodes/cpu-noise
2023-06-28 18:22:08 +12:00
blessedcoolant
32883adf6e
Merge branch 'main' into feat/controlnet_extras
2023-06-28 17:36:21 +12:00
blessedcoolant
1ea3160594
Merge branch 'main' into feat/ui/dynamic-prompts-ux
2023-06-28 17:34:36 +12:00
Kent Keirsey
fc322aa9f7
Update controlnet-aux to 0.0.6 and add LeReS
2023-06-27 23:45:47 -04:00
psychedelicious
73f63853ba
fix(nodes): use context for logger in param_easing
2023-06-27 23:30:10 -04:00
Lincoln Stein
e8ed0fad6c
autoimport from embedding/controlnet/lora folders designated in startup file
2023-06-27 12:30:53 -04:00
psychedelicious
1f3e5582f4
feat(ui): add type extraction helpers
2023-06-28 01:17:34 +10:00
psychedelicious
642db657c2
feat(ui): use max prompts for combinatorial, iterations for non-combinatorial
2023-06-27 20:29:41 +10:00
psychedelicious
246298d1d6
chore(ui): regen types
2023-06-27 13:57:41 +10:00
psychedelicious
2e14528e4c
feat(nodes): default to CPU noise
2023-06-27 13:57:31 +10:00
Lincoln Stein
f15d28d141
improved wording of v2 selection prompt
2023-06-26 20:30:08 -04:00
user1
862bfa2c36
Merge branch 'main' of github.com:invoke-ai/InvokeAI into feat/controlnet_extras
2023-06-26 16:39:31 -07:00
Sergey Borisov
dc1f220b3e
Fix wrong conditioning used
2023-06-27 01:18:15 +03:00
Lincoln Stein
044fe6bb20
remove dangling debug statement
2023-06-26 17:48:06 -04:00
Lincoln Stein
8c74f49a18
Merge branch 'lstein/installer-for-new-model-layout' of github.com:invoke-ai/InvokeAI into lstein/installer-for-new-model-layout
2023-06-26 16:31:00 -04:00
Lincoln Stein
823e098b7c
prompt user for prediction type when autoimporting a v2 model without .yaml file
...
don't ask user for prediction type of a config.yaml provided
2023-06-26 16:30:34 -04:00
Eugene Brodsky
b7e9d09537
Merge branch 'main' into lstein/installer-for-new-model-layout
2023-06-26 16:22:23 -04:00
Lincoln Stein
ea15d037f9
Merge branch 'main' into lstein/tweak-installer-ui
2023-06-26 15:05:16 -04:00
user1
10d2d85c83
Started to add ControlNet resize_crop and resize_fill options, but commented out, not ready to deploy yet.
2023-06-26 12:03:05 -07:00
Lincoln Stein
011adfc958
merge with main
2023-06-26 13:53:59 -04:00
Lincoln Stein
befd95eb19
rename root_dir to root_path attributes to emphasize return of a Path
2023-06-26 13:52:25 -04:00
Lincoln Stein
a2ddb3823b
fix add_model() logic
2023-06-26 13:33:38 -04:00
user1
af566adf56
For MediapipeFace ControlNet preprocessor, if input image is RGBA format then convert to RGB (otherwise MediapipeFace image processing throws an error)
2023-06-26 04:29:43 -07:00
user1
873c18bc4b
Added TileResampler ControlNet preprocessor node.
...
Also fixes to SegmentAnything ControlNet preprocessor node.
2023-06-26 04:27:26 -07:00
psychedelicious
6ccf62a863
feat(ui): only show canvas image fallback on loading error
2023-06-26 19:20:05 +10:00
psychedelicious
6390af229d
feat(ui): add dynamic prompts to t2i tab
...
- add param accordion for dynamic prompts
- update graphs
2023-06-26 19:15:54 +10:00
Eugene Brodsky
47e651225d
query for 'main' model type when populating UI lists
...
to support renaming of 'pipeline' models to 'main'
2023-06-26 01:39:46 -04:00
blessedcoolant
3a19be1606
fix: Add missing IAIMantineSelect disabled styles
2023-06-26 17:37:47 +12:00
blessedcoolant
b51ab056f2
Merge branch 'main' into feat/ui/update-node-parsing
2023-06-26 17:32:44 +12:00
Eugene Brodsky
7b97639961
Merge branch 'main' into lstein/installer-for-new-model-layout
2023-06-26 01:24:30 -04:00
psychedelicious
60780e990d
fix(ui): fix controlnet image size
2023-06-26 12:03:11 +10:00
psychedelicious
8d43cf92f6
feat(ui): update action santizer for schema actions
2023-06-26 12:00:38 +10:00
psychedelicious
862bf7546c
feat(ui): improved node parsing
...
- use `swagger-parser` to dereference openapi schema
- tidy vite plugins
- use mantine select for node add menu
2023-06-26 11:53:54 +10:00
Sergey Borisov
91c3a58fb6
Fix lycoris layers init
2023-06-26 04:33:37 +03:00
Sergey Borisov
5cebf67ee4
Apply lora by patching lora instead of hooks
2023-06-26 03:57:33 +03:00
Sergey Borisov
1ba94a92b3
Fixes
2023-06-26 03:54:42 +03:00
Sergey Borisov
23c22ac933
Refactor logic/small fixes
2023-06-26 03:07:54 +03:00
Lincoln Stein
160b5d7992
add support for an autoimport models directory scanned at startup time
2023-06-25 18:50:15 -04:00
user1
10e8389fa4
Commenting out LeReS ControlNet image preprocessor until release of controlnet_aux v0.0.6 (supported on controlnet_aux current main, but not on latest release v0.0.5)
2023-06-25 14:25:14 -07:00
user1
414a04774c
Added LeReS ControlNet image preprocessor.
2023-06-25 14:19:55 -07:00
Lincoln Stein
c91d1eacba
Merge branch 'lstein/installer-for-new-model-layout' of github.com:invoke-ai/InvokeAI into lstein/installer-for-new-model-layout
2023-06-25 16:04:48 -04:00
Lincoln Stein
60b37b7ff4
fix model manager documentation
2023-06-25 16:04:43 -04:00
user1
b872e7a5e0
Simplifying ControlNet SAM preprocessor segmentation color mapping.
2023-06-25 12:54:48 -07:00
user1
de4064bdac
Fixed problem with with non-reproducible results from ControlNet SegmentAnything preprocessor. Cause was controlnet_aux randomization of segmentation coloring, which seems to lead to some randomization of resulting images using ControlNet seg model. Switched to using deterministic ADE20K color palette instead, which solved the problem.
2023-06-25 12:38:17 -07:00
user1
10c3753d7f
Added SAM preprocessor
2023-06-25 11:16:39 -07:00
Sergey Borisov
a3c22b5fe6
Remove upcast_attention and prediction_type from stable diffusion model logic, fix ckpt conversion according to this
2023-06-25 21:06:22 +03:00
psychedelicious
57e719702d
fix(ui): add missing ControlNetInvocation type; tidy schema-derived types
2023-06-25 14:04:53 +10:00
psychedelicious
11378a9236
chore(ui): regen api schema
2023-06-25 14:04:16 +10:00
psychedelicious
132829c88f
fix(ui): fix path of generated schema types
2023-06-25 14:04:00 +10:00
blessedcoolant
4d4b5b56dc
Merge branch 'main' into feat/controlnet-control-modes
2023-06-25 15:48:07 +12:00
psychedelicious
6b276587d8
chore(ui): bump all packages
...
Everything seems to be working.
- Due to a change to `reactflow`, I regenerated `yarn.lock`
- New chakra CLI fixes issue I had made a patch for; removed the patch
- Change to fontsource changed how we import that font
- Change to fontawesome means we lost the txt2img tab icon, just chose a similar one
2023-06-25 13:44:10 +10:00
user1
c5faffc18b
Merge branch 'main' of github.com:invoke-ai/InvokeAI into feat/controlnet-control-modes
...
Only "real" conflicts were in:
invokeai/frontend/web/src/features/controlNet/components/ControlNet.tsx
invokeai/frontend/web/src/features/controlNet/store/controlNetSlice.ts
2023-06-24 17:05:57 -07:00
Lincoln Stein
c3c4a71173
implemented Stalker's suggested improvements
2023-06-24 12:37:26 -04:00
Lincoln Stein
d5f742620f
Merge branch 'main' into lstein/installer-for-new-model-layout
2023-06-24 11:58:06 -04:00
Lincoln Stein
ba1371a88f
rename ModelType.Pipeline to ModelType.Main
2023-06-24 11:45:49 -04:00
psychedelicious
3ae996ebcb
fix(ui): fix metadata viewer too stronk
2023-06-24 18:15:49 +10:00
psychedelicious
3d16605762
fix(ui): fix controlnet upload button
2023-06-24 18:15:49 +10:00
psychedelicious
b6dec2b826
fix(ui): fix controlnet dnd overlay not showing on dragover
2023-06-24 18:15:49 +10:00
psychedelicious
013e2aa2a1
fix(ui): fix control image sizes
...
they were all weird
2023-06-24 18:15:49 +10:00
psychedelicious
8f9fa15fc8
fix(ui): fix image fetching query string
2023-06-24 18:15:49 +10:00
psychedelicious
dde497404b
fix(ui): fix init image display buttons
...
- Reset and Upload buttons along top of initial image
- Also had to mess around with the control net & DnD image stuff after changing the styles
- Abstract image upload logic into hook - does not handle native HTML drag and drop upload - only the button click upload
2023-06-24 18:15:49 +10:00
psychedelicious
0472b33164
fix(ui): fix duplicate is_intermediate
query param when fetching images
2023-06-24 17:57:39 +10:00
psychedelicious
a6c615a98c
fix(ui): fix canvas staging area
...
Missed some of the `imageUpdated` stuff
2023-06-24 17:57:39 +10:00
psychedelicious
bab3a9504e
fix(nodes): fix LatentsToImage not using is_intermediate
when creating images
...
Appears this was removed during a merge conflict resolution.
2023-06-24 17:57:39 +10:00
psychedelicious
13f25edb1e
fix(ui): fix incorrect boards endpoint matchers being used
...
Should fix some stale-data issues with the auto-adding of images to selected boards, and deleting images from boards.
2023-06-24 17:57:39 +10:00
psychedelicious
8bacee115a
fix(ui): fix thunks not using configured api client
2023-06-24 17:57:39 +10:00
psychedelicious
3619c86f07
fix(ui): fix deleting image does not refresh board
...
I had some some wonkiness in the thunks
2023-06-24 17:57:39 +10:00
psychedelicious
8e724b5abe
fix(ui): fix image upload
...
`openapi-fetch` does not handle non-JSON `body`s, always stringifying them, and sets the `content-type` to `application/json`.
The patch here does two things:
- Do not stringify `body` if it is one of the types that should not be stringified (https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch#body )
- Do not add `content-type: application/json` unless it really is stringified JSON.
Upstream issue: https://github.com/drwpow/openapi-typescript/issues/1123
I'm not a bit lost on fixing the types and adding tests, so not raising a PR upstream.
2023-06-24 17:57:39 +10:00
psychedelicious
e076231398
fix(ui): fix node editor image fields
...
I had broken this when converting to rtk-query
2023-06-24 17:57:39 +10:00
psychedelicious
e386b5dc53
feat(ui): api layer refactor
...
*migrate from `openapi-typescript-codegen` to `openapi-typescript` and `openapi-fetch`*
`openapi-typescript-codegen` is not very actively maintained - it's been over a year since the last update.
`openapi-typescript` and `openapi-fetch` are part of the actively maintained repo. key differences:
- provides a `fetch` client instead of `axios`, which means we need to be a bit more verbose with typing thunks
- fetch client is created at runtime and has a very nice typescript DX
- generates a single file with all types in it, from which we then extract individual types. i don't like how verbose this is, but i do like how it is more explicit.
- removed npm api generation scripts - now we have a single `typegen` script
overall i have more confidence in this new library.
*use nanostores for api base and token*
very simple reactive store for api base url and token. this was suggested in the `openapi-fetch` docs and i quite like the strategy.
*organise rtk-query api*
split out each endpoint (models, images, boards, boardImages) into their own api extensions. tidy!
2023-06-24 17:57:39 +10:00
Mary Hipp
8137a99981
simplify
2023-06-24 17:57:39 +10:00
Mary Hipp
878847defd
use BASE and TOKEN from OpenAPI if they are set
2023-06-24 17:57:39 +10:00
Lincoln Stein
539d1f3bde
remove redundant prediction_type and attention_upscaling flags
2023-06-23 16:54:52 -04:00
Lincoln Stein
466ec3ab5e
add router API support for model manager heuristic_import()`
2023-06-23 16:35:39 -04:00
Lincoln Stein
54b74427f4
adjust for change in list_models() API
2023-06-23 14:13:37 -04:00
Lincoln Stein
58d1857ab6
merge with main
2023-06-23 13:57:25 -04:00
Lincoln Stein
3043af4620
implement vae passthru
2023-06-23 13:56:30 -04:00
Lincoln Stein
56bd873d7a
make relative model paths work in model manager
2023-06-23 10:52:59 -04:00
Sergey Borisov
5aaaaf64a1
Fix ckpt conversion
2023-06-23 17:29:54 +03:00
StAlKeR7779
9140e2c0f2
Merge branch 'main' into fix/vae_conversion
2023-06-23 15:03:59 +03:00
Lincoln Stein
a910403003
correctly migrate models that have relative paths
2023-06-22 21:10:31 -04:00
Lincoln Stein
c7b7e087e4
Merge branch 'main' into lstein/installer-for-new-model-layout
2023-06-23 01:45:05 +01:00
Lincoln Stein
d65c833b90
migration now integrated into invokeai-configure
2023-06-22 16:44:55 -04:00
Lincoln Stein
33b04f6386
migration script working well
2023-06-22 15:47:12 -04:00
psychedelicious
339e7ce213
feat(ui): initial implementation of model loading
...
- Update model listing code to use `rtk-query`
- Update all graph generation to use new `pipeline_model_loader` node
2023-06-22 17:48:57 +10:00
psychedelicious
2a178f5a25
chore(ui): regen api client
2023-06-22 17:48:13 +10:00
psychedelicious
1bc170727b
tidy(nodes): rename sd_model_loader
to pipeline_model_loader
...
this is more accurate bc it can do eg kandinsky also
2023-06-22 17:47:58 +10:00
psychedelicious
3722cdf5d6
chore(ui): regen api client
2023-06-22 17:36:20 +10:00
psychedelicious
42a59aa147
feat(nodes): add sd_model_loader
node
...
Loads any pipeline model.
Also introduced is `PipelineModelField`, which includes a model name and base model.
2023-06-22 17:36:05 +10:00
psychedelicious
b937b7da01
feat(models): update model manager service & route to return list of models
2023-06-22 17:34:12 +10:00
Sergey Borisov
21245a0fb2
Set model type to const value in openapi schema, add model format enums to model schema(as they not not referenced in case of Literal definition)
2023-06-22 16:51:53 +10:00
Sergey Borisov
da566b59e8
Update model format field to use enums
2023-06-22 16:51:53 +10:00
Sergey Borisov
e4dc9c5a04
Rename format to model_format(still named format when work with config)
2023-06-22 16:51:53 +10:00
Sergey Borisov
aceadacad4
Remove default model logic
2023-06-22 16:51:53 +10:00
blessedcoolant
d3dec59cc3
tweal: UI colors
2023-06-22 16:51:53 +10:00
blessedcoolant
6c98700740
fix: Adjust the Schedular select width
...
So the long names do not get cut off.
2023-06-22 16:51:53 +10:00
blessedcoolant
c4c3c96062
Revert "feat: Port Schedulers to Mantine"
...
This reverts commit e0c105f413
.
2023-06-22 16:51:35 +10:00
blessedcoolant
6256be480c
fix: Remove type from Model type name
2023-06-22 16:48:35 +10:00
blessedcoolant
7033071934
fix: Unserialization key issue
2023-06-22 16:48:35 +10:00
blessedcoolant
e48528bbef
revert: getModels to receivedModels
2023-06-22 16:48:35 +10:00
blessedcoolant
6bdf68dd4c
feat: Port Schedulers to Mantine
2023-06-22 16:48:35 +10:00
blessedcoolant
0c3616229e
cleanup: Updated model slice names to be more descriptive
...
Basically updated all slices to be more descriptive in their names. Did so in order to make sure theres good naming scheme available for secondary models.
2023-06-22 16:43:14 +10:00
blessedcoolant
604cc1adcd
wip: Move Model Selector to own file
2023-06-22 16:43:14 +10:00
blessedcoolant
4847212d5b
feat: Enable 2.x Model Generation in Linear UI
2023-06-22 16:43:14 +10:00
blessedcoolant
727293d722
fix: 2.1 models breaking generation
...
Co-Authored-By: StAlKeR7779 <7768370+StAlKeR7779@users.noreply.github.com>
2023-06-22 16:42:59 +10:00
blessedcoolant
d2f3500e1b
chore: Rebuild API - base_model and type added
2023-06-22 16:42:59 +10:00
Sergey Borisov
ef83a2fffe
Add name, base_mode, type fields to model info
2023-06-22 16:42:51 +10:00
blessedcoolant
f8d7477c7a
wip: Add 2.x Models to the Model List
2023-06-22 16:42:51 +10:00
blessedcoolant
e374211313
chore: Rebuild API with new Model API names
2023-06-22 16:41:31 +10:00
Sergey Borisov
01d17601b8
Generate config names for openapi
2023-06-22 16:41:19 +10:00
blessedcoolant
bf0d5f4cfc
fix: Update missing name types to new names
2023-06-22 16:41:02 +10:00
blessedcoolant
663f4935f5
chore: Rebuild API
2023-06-22 16:41:02 +10:00
blessedcoolant
9838dda1b7
chore: Update model config type names
2023-06-22 16:40:40 +10:00
psychedelicious
2d889e133d
chore(ui): regen api client
2023-06-22 16:25:49 +10:00
psychedelicious
6779f1a5ad
fix(db): update models for boards w/ nullable deleted_at
2023-06-22 16:25:49 +10:00
psychedelicious
19a6e5dad8
chore(ui): regen api client
2023-06-22 16:25:49 +10:00
psychedelicious
285195bf72
feat(api): add get_board
route
2023-06-22 16:25:49 +10:00
psychedelicious
10008859a4
tidy(ui): remove all refs to boards thunks
2023-06-22 16:25:49 +10:00
psychedelicious
3c04340f3f
tidy(ui): tidy up update image board modal
2023-06-22 16:25:49 +10:00
psychedelicious
79f0c4d3c4
feat(ui): add remove from board to image context menu
2023-06-22 16:25:49 +10:00
psychedelicious
37d4e05838
fix(ui): fix board's image list not updating when image removed from board
2023-06-22 16:25:49 +10:00
psychedelicious
a00ad6ac03
feat(ui): dropping image on All Images
board removes it from board
2023-06-22 16:25:49 +10:00
psychedelicious
2ffead000c
tidy(ui): remove console.log()
2023-06-22 16:25:49 +10:00
psychedelicious
922319cb84
fix(ui): fix first added board doesn't show until refresh
...
Had incorrect `invalidatesTags` array for the mutation.
2023-06-22 16:25:49 +10:00
psychedelicious
6ee0e197bb
feat(db): add deleted_at
to board_images
2023-06-22 16:25:49 +10:00
psychedelicious
d3e6f0130c
fix(ui): fix issue with gallery not letting you load more images
...
To determine whether the Load More button should work, we need to keep track of how many images are left to load for a given board or category.
The Assets tab doesn't work, though. Need to figure out a better way to handle this.
2023-06-22 16:25:49 +10:00
psychedelicious
421c23d3ea
fix(ui): fix gallery image fetching for board categories
2023-06-22 16:25:49 +10:00
psychedelicious
4545f3209f
fix(ui): fix bug with image deletion not removing image from gallery
2023-06-22 16:25:49 +10:00
psychedelicious
e2ee8102c2
tidy(db): tidy image_record_storage.py
2023-06-22 16:25:49 +10:00
psychedelicious
083a0fc4cf
tidy(ui): remove references to boardsAdapter
2023-06-22 16:25:49 +10:00
psychedelicious
26b75b85f7
fix(ui): if deleting selected board, deselect it
2023-06-22 16:25:49 +10:00
psychedelicious
f560a462a0
feat(ui): rudimentary categorized gallery image fetching
2023-06-22 16:25:49 +10:00
psychedelicious
d501986610
chore(ui): regen api client
2023-06-22 16:25:49 +10:00
psychedelicious
67a75f6895
feat(api, db): support board_id
filter on images service get_many()
2023-06-22 16:25:49 +10:00
psychedelicious
3c032c0767
feat(ui): only auto-add image to board if is not intermediate
2023-06-22 16:25:49 +10:00
psychedelicious
abd6561140
feat(ui): just fetch all boards instead of paginating them
2023-06-22 16:25:49 +10:00
psychedelicious
bd533426fc
feat(ui): first pass at boards styling
2023-06-22 16:25:49 +10:00
psychedelicious
2489d5459f
chore(ui): regen api client
2023-06-22 16:25:49 +10:00
psychedelicious
ac477cf5d6
fix(ui): improve image deletion handling
2023-06-22 16:25:49 +10:00
psychedelicious
be3bdae847
fix: resolve rebase conflicts
2023-06-22 16:25:49 +10:00
psychedelicious
3e0ee838cf
fix(ui): add initial image dimensions to state
...
We need to access the initial image dimensions during the creation of the `ImageToImage` graph to determine if we need to resize the image.
Because the `initialImage` is now just an image name, we need to either store (easy) or dynamically retrieve its dimensions during graph creation (a bit less easy).
Took the easiest path. May need to revise this in the future.
2023-06-22 16:25:49 +10:00
psychedelicious
8d3bec57d5
feat(ui): store only image name in parameters
...
Images that are used as parameters (e.g. init image, canvas images) are stored as full `ImageDTO` objects in state, separate from and duplicating any object representing those same objects in the `imagesSlice`.
We cannot store only image names as parameters, then pull the full `ImageDTO` from `imagesSlice`, because if an image is not on a loaded page, it doesn't exist in `imagesSlice`. For example, if you scroll down a few pages in the gallery and send that image to canvas, on reloading the app, the canvas will be unable to load that image.
We solved this temporarily by storing the full `ImageDTO` object wherever it was needed, but this is both inefficient and allows for stale `ImageDTO`s across the app.
One other possible solution was to just fetch the `ImageDTO` for all images at startup, and insert them into the `imagesSlice`, but then we run into an issue where we are displaying images in the gallery totally out of context.
For example, if an image from several pages into the gallery was sent to canvas, and the user refreshes, we'd display the first 20 images in gallery. Then to populate the canvas, we'd fetch that image we sent to canvas and add it to `imagesSlice`. Now we'd have 21 images in the gallery: 1 to 20 and whichever image we sent to canvas. Weird.
Using `rtk-query` solves this by allowing us to very easily fetch individual images in the components that need them, and not directly interact with `imagesSlice`.
This commit changes all references to images-as-parameters to store only the name of the image, and not the full `ImageDTO` object. Then, we use an `rtk-query` generated `useGetImageDTOQuery()` hook in each of those components to fetch the image.
We can use cache invalidation when we mutate any image to trigger automated re-running of the query and all the images are automatically kept up to date.
This also obviates the need for the convoluted URL fetching scheme for images that are used as parameters. The `imagesSlice` still need this handling unfortunately.
2023-06-22 16:25:49 +10:00
psychedelicious
cfda128e06
feat(ui): wip boards via rtk-query
2023-06-22 16:25:49 +10:00
psychedelicious
661a94b3de
feat(db): add get_all()
method for boards
...
This is needed to show the full list of boards in the update boards modal.
2023-06-22 16:25:49 +10:00