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
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