StAlKeR7779
889b77d3d6
Merge branch 'main' into save_vram
2023-07-18 16:55:48 +03:00
Sergey Borisov
fbbc4b3f69
Fixes
2023-07-18 16:51:16 +03:00
Sergey Borisov
bc11296a5e
Disable lazy offloading on disabled vram cache, move resulted tensors to cpu(to not stack vram tensors in cache), fix - text encoder not freed(detach)
2023-07-18 16:20:25 +03:00
psychedelicious
c19d48abd0
fix(nodes): fix inpaint cond logic for new compel version
...
thanks @StAlKeR7779
2023-07-18 22:39:34 +10:00
Lincoln Stein
b0fb4950ed
rebuild front end
2023-07-18 08:12:41 -04:00
psychedelicious
42c440c73f
Merge branch 'main' into feat/ui/upscale
2023-07-18 22:08:02 +10:00
Lincoln Stein
65df821233
Merge branch 'main' into release/invokeai-3-0-beta
2023-07-18 08:04:59 -04:00
Lincoln Stein
f9459d650e
update version to b7
2023-07-18 08:01:14 -04:00
blessedcoolant
bd4eaa455a
fix: Update text to Badge in ModelListItem
2023-07-18 23:58:07 +12:00
blessedcoolant
1cab89fe8c
Merge branch 'main' into style-fixes
2023-07-18 23:47:05 +12:00
psychedelicious
1c1a72f4c4
feat(ui): hide sdxl from linear UI
2023-07-18 21:44:24 +10:00
Lincoln Stein
5ac6076944
bump version; add LowRA LoRA as recommended
2023-07-18 07:04:57 -04:00
Lincoln Stein
9c3c393b84
merge with main
2023-07-18 07:00:55 -04:00
blessedcoolant
5d635c7221
cleanup: Remove console hotkey from modal (no console anymore)
2023-07-18 22:27:36 +12:00
blessedcoolant
e6bfc382a5
cleanup: Removed unused hotkeys from hotkeys modal
2023-07-18 22:25:26 +12:00
blessedcoolant
f970e3792f
fix: Snap to grid hotkey not working
2023-07-18 22:20:45 +12:00
blessedcoolant
3ffca5490e
fix: Brush opacity hotkeys not working
2023-07-18 22:20:28 +12:00
blessedcoolant
f803d5cf1e
fix: Shift O and Shift G not resizing the canvas correctly
2023-07-18 21:00:43 +12:00
blessedcoolant
ab2343da51
fix: Hotkeys 'g' and 'o' not resizing the canvas
2023-07-18 20:51:08 +12:00
blessedcoolant
4975b1a704
style: Minor updates to the visual look of the nodes
2023-07-18 20:35:20 +12:00
blessedcoolant
e1b756658a
style: Minor update to Add Node Menu
...
So there's clear differentiation between the node title and desc
2023-07-18 20:34:58 +12:00
blessedcoolant
d17450bbe6
feat: Add base model label to Model Item
2023-07-18 20:00:22 +12:00
blessedcoolant
64d676219b
fix: Settings Modal colors in Light Mode
2023-07-18 19:49:33 +12:00
psychedelicious
416afd2781
chore(ui): regen types
2023-07-18 15:04:43 +10:00
psychedelicious
afa84a149c
feat(ui): restore ad-hoc upscaling
...
- remove face restoration entirely
- add dropdown for ESRGAN model select
- add ad-hoc upscaling graph and workflow
2023-07-18 14:57:47 +10:00
psychedelicious
be659364c2
chore(ui): regen types
2023-07-18 14:55:39 +10:00
psychedelicious
56098f370c
feat(nodes): add RealESRGAN_x2plus.pth, update upscale nodes
...
- add `RealESRGAN_x2plus.pth` model to installer
- add `RealESRGAN_x2plus.pth` to `realesrgan` node
- rename `RealESRGAN` to `ESRGAN` in nodes
- make `scale_factor` optional in `img_scale` node
2023-07-18 14:55:18 +10:00
blessedcoolant
6e40b543cd
Merge branch 'main' into minimapcontrol
2023-07-18 16:25:49 +12:00
Lincoln Stein
c955c13b6f
Merge branch 'sdxl-support' of github.com:invoke-ai/InvokeAI into sdxl-support
2023-07-17 23:49:48 -04:00
Lincoln Stein
ef31837167
fix caption on sdxl raw prompt
2023-07-17 23:49:23 -04:00
blessedcoolant
3d1ad86e8a
chore: Clean Schema before final merge
2023-07-18 15:18:31 +12:00
blessedcoolant
b08ad28daa
fix: typo in logger statement (import_model)
2023-07-18 15:17:52 +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
Lincoln Stein
73eeef34c4
Merge branch 'sdxl-support' of github.com:invoke-ai/InvokeAI into sdxl-support
2023-07-17 23:08:48 -04:00
Lincoln Stein
1353bf98b3
add specific exception for model probe failures
2023-07-17 23:08:39 -04: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
a61540859e
Merge branch 'sdxl-support' of https://github.com/invoke-ai/InvokeAI into sdxl-support
2023-07-18 14:37:39 +12: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
Lincoln Stein
af1c1ab51f
importing an unrecognized model now gives "Unsupported Media Type" error
2023-07-17 22:33:05 -04:00
Lincoln Stein
e7443867f6
Merge branch 'sdxl-support' of github.com:invoke-ai/InvokeAI into sdxl-support
2023-07-17 22:21:20 -04:00
Lincoln Stein
025cda3815
fix 424 error on model import
2023-07-17 22:21:11 -04: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
blessedcoolant
fbc0694527
Merge branch 'main' into HideLegend2
2023-07-18 11:18:22 +12:00
blessedcoolant
ccf093b189
Merge branch 'main' into fix/long_prompts
2023-07-18 11:05:22 +12:00
Sergey Borisov
ada9b06e48
Implement compel prompt nodes for sdxl
2023-07-18 01:49:45 +03: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
Lincoln Stein
0c9c7591c6
Merge branch 'main' into fix/long_prompts
2023-07-17 17:04:31 -04:00
Sergey Borisov
0fce35c54c
Cleanup, fix variable name, fix controlnet for sequential and cross attention guidance
2023-07-17 23:53:50 +03: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
Brandon Rising
bcce70fca6
Testing different session opts, added timings for testing
2023-07-17 16:27:33 -04:00
Sergey Borisov
1c680a7147
Fix - encoder_attention_mask not passed before to unet, even if passed it will broke sequential guidance run, so rewrite logic
2023-07-17 23:13:37 +03:00
mickr777
dcd7e01908
Merge branch 'main' into HideLegend2
2023-07-18 02:30:16 +10:00
Lincoln Stein
e03e43281b
Merge branch 'mm-ui' of github.com:blessedcoolant/InvokeAI into mm-ui
2023-07-17 10:00:36 -04:00
Lincoln Stein
08854b6d68
keep model path consistent with model manager key in model update api
2023-07-17 10:00:28 -04:00
blessedcoolant
0712294c17
fix: Model Manager light mode color fixes
2023-07-18 00:29:20 +12:00
Lincoln Stein
0ea8d3c30c
prevent crash on rename operation on models in models directory
2023-07-17 07:50:06 -04:00
Lincoln Stein
84a13ff8e1
Merge branch 'mm-ui' of github.com:blessedcoolant/InvokeAI into mm-ui
2023-07-17 07:29:35 -04:00
Lincoln Stein
3fba262c94
expose paths as absolute to web api
2023-07-17 07:29:26 -04:00
Lincoln Stein
107ca6bf47
expose model paths as absolute to web models API
2023-07-17 07:26:05 -04:00
blessedcoolant
cbfd1d1b27
Merge branch 'main' into feat/standalone_diffusers_ti
2023-07-17 22:01:52 +12:00
skunkworxdark
f767bf2330
use FileNotFoundError insted of "File path not found"
2023-07-17 05:49:09 -04:00
skunkworxdark
b1008af696
apply changes as suggested @psychedelicious in PR comments.
...
- filename -> file_path
- pre and post prompt changed to optional
- clearer pre and post prompt descriptions
- handle pre and post prompt passed as None
- max_prompts defaults to 1 isted of 0 to avoid accidentally processing large prompt files with it set to 0 when adding a new node.
2023-07-17 05:49:09 -04:00
skunkworxdark
956011066d
Added class PromptsFromFileInvocation to prompt.py. A new PromptFromFile Custom node that reads prompts from a file one line per prompt and outputs them as a prompt collection. With inputs for filename, pre_prompt, post_prompt, start line number, and max_prompts
2023-07-17 05:49:09 -04: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
psychedelicious
ba12849685
fix(nodes): fix some model load events not emitting
...
Missed adding the `context` arg to them initially
2023-07-17 17:16:55 +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
mickr777
c9233eeca2
Merge branch 'main' into HideLegend2
2023-07-17 13:58:51 +10: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
Lincoln Stein
ed88e72412
correct cannot assign to field 'unconditioned_embeddings' error
2023-07-16 21:06:40 -04:00
Sergey Borisov
6aefd8600a
Fix error with long prompts when controlnet used
2023-07-16 21:06:40 -04:00
Lincoln Stein
ccb43d5a91
make check for 2.3 root directory more stringent
2023-07-16 20:43:15 -04: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
Kent Keirsey
675a92401c
Merge branch 'main' into lstein/default-model-install
2023-07-16 19:32:59 -04: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
Sergey Borisov
b61c83e836
Allow bin extension to detect diffusers-ti provided as file
2023-07-17 00:32:17 +03:00
Lincoln Stein
2bc3e36bc0
add missing exception name
2023-07-16 16:14:28 -04:00
Lincoln Stein
6fbb5ce780
add renaming capabilities to model update API route
2023-07-16 14:17:05 -04:00
Lincoln Stein
cad3f96831
add model input to refiner
2023-07-16 12:38:04 -04:00
Lincoln Stein
6534288b75
refiner only has clip2 not clip
2023-07-16 12:36:38 -04:00
Lincoln Stein
0a2964d8c0
add differentiated sdxl and sdxl_refiner model loaders
2023-07-16 12:17:56 -04:00
Brandon Rising
932112b640
testing being super wasteful with data
2023-07-16 00:17:33 -04: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
Brandon Rising
91112167b1
Fix syntax err
2023-07-15 23:56:48 -04:00
Lincoln Stein
5206ddf9b2
truncate long prompts to avoid a crash with controlnet
2023-07-15 23:49:25 -04: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
Sergey Borisov
fe78a08e37
Fix sd1/2 models conditionings
2023-07-16 06:24:24 +03: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
Sergey Borisov
c9c2229917
Separate prompt to sdxl and sdxl-refiner, add denoising start-end fields, add l2l node(supports both sdxl and sdxl-refiner), add fp32 to vae encode
2023-07-16 06:00:37 +03: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
psychedelicious
5d59dd4b97
feat(nodes): use correctly-typed configuration service in upscale node
2023-07-16 10:54:52 +10:00
psychedelicious
48a031dbaf
fix(nodes): fix typing of configuration service
2023-07-16 10:52:18 +10:00
Lincoln Stein
39e66ec934
rebuild front end
2023-07-15 20:32:22 -04:00
Lincoln Stein
e95cb3aa71
Merge branch 'lstein/default-model-install' into release/invokeai-3-0-beta
2023-07-15 20:16:51 -04:00
Lincoln Stein
5b5d5ec978
Merge branch 'main' into sdxl-support
2023-07-15 19:49:57 -04:00
Lincoln Stein
ccbfa5d862
resolve conflicts
2023-07-15 19:47:50 -04:00
Lincoln Stein
7fa394912d
Merge branch 'main' into lstein/default-model-install
2023-07-15 18:26:35 -04:00
Lincoln Stein
373beefd13
remove restoration option from invokeai.yaml
2023-07-15 18:26:19 -04:00
Lincoln Stein
6b0a158ffa
Merge branch 'main' into lstein/default-model-install
2023-07-15 18:23:34 -04:00
Lincoln Stein
c90345d6a3
deprecate the face restoration option
2023-07-15 18:23:32 -04:00
Lincoln Stein
70b12d9693
Merge branch 'main' into update-textual-inversion-training
2023-07-15 18:16:20 -04:00
Lincoln Stein
9faffa2245
revert inadvertent breaking change to config causing test failures (override)
2023-07-15 18:15:59 -04:00
Lincoln Stein
f66ead0819
Merge branch 'main' into update-textual-inversion-training
2023-07-15 17:44:45 -04:00
Lincoln Stein
6073cb8020
add documentation on the configuration system
2023-07-15 16:14:47 -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
7b6159f8d6
feat(nodes): emit model loading events
...
- remove dependency on having access to a `node` during emits, would need a bit of additional args passed through the system and I don't think its necessary at this point. this also allowed us to drop an extraneous fetching/parsing of the session from db.
- provide the invocation context to all `get_model()` calls, so the events are able to be emitted
- test all model loading events in the app and confirm socket events are received
2023-07-16 02:12:01 +10:00
psychedelicious
c7b547ea3e
feat(nodes): remove references to restoration services
...
- remove restoration services
- remove the restore faces nodes
- update tests
2023-07-16 01:12:39 +10:00
psychedelicious
8a1b9d1001
chore(ui): regen types
2023-07-16 01:06:57 +10:00
psychedelicious
74ca87ac9e
feat(nodes): add realesrgan node
2023-07-16 01:06:50 +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
d234bf1cb9
feat(install): display full ESRGAN model filenames during installation
2023-07-15 21:27:10 +10: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
d270f21c85
feat(nodes): valid controlnet weights are -1 to 2
2023-07-15 19:56:44 +10:00
psychedelicious
ae72f372be
fix(nodes): do not use hardcoded controlnet model
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
29b2e59e65
fix(nodes): fix ref to ctx mgr service, missing import
2023-07-15 19:56:44 +10:00
psychedelicious
96c9db6d2e
chore(ui): typegen
2023-07-15 19:56:44 +10:00
psychedelicious
82fa39b531
feat(nodes): add controlnet nodes type hint
2023-07-15 19:56:44 +10:00
psychedelicious
788dcbde70
fix(nodes): add missing import
2023-07-15 19:56:44 +10:00
Sergey Borisov
6ab9a5e108
Draft
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
blessedcoolant
808b2de709
Merge branch 'main' into lstein/model-manager-route-enhancements
2023-07-15 16:56:54 +12:00
Lincoln Stein
2faa7cee37
add rename_model route
2023-07-14 23:03:18 -04:00
Brandon
467414f214
Merge branch 'main' into update-textual-inversion-training
2023-07-14 22:32:09 -04:00
Mary Hipp
194434dbfa
restore scrollbar
2023-07-15 12:25:28 +10:00
Brandon Rising
f88a338be0
Setup textual inversion training with new model manager
2023-07-14 21:58:51 -04:00
psychedelicious
8cb19578c2
fix(ui): fix crash on LoRA remove / weight change
2023-07-15 11:09:18 +10:00
blessedcoolant
c4a6f25717
Merge branch 'main' into fix/nodes/fix-mouse-interactions
2023-07-15 12:44:49 +12:00
Lincoln Stein
b306247eb5
remove clipseg model install
2023-07-14 20:39:42 -04: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
Sergey Borisov
7093e5d033
Pad conditionings using zeros and encoder_attention_mask
2023-07-15 00:52:54 +03:00
Brandon Rising
bd7b59910d
Testing onnx in new ui updates
2023-07-14 14:24:15 -04:00
Lincoln Stein
e71ce83e9c
Merge branch 'main' into lstein/model-manager-route-enhancements
2023-07-14 13:52:55 -04:00
Lincoln Stein
8600aad12b
multiple enhancements to model manager REACT API
...
1. add a /sync route for synchronizing the in-memory model lists to
models.yaml, the models directory, and the autoimport directories.
2. add optional destination_directories to convert_model and merge_model
operations.
3. add /ckpt_confs route for retrieving known legacy checkpoint configuration
files.
4. add /search route for finding all models in a directory located in the server
filesystem
2023-07-14 13:45:16 -04:00
Jonathan
9960d7ca2a
Allow ImageResizeInvocation w/h to take inputs from other nodes ( #3765 )
2023-07-15 05:34:13 +12:00
blessedcoolant
48561908b1
Merge branch 'main' into fix/nodes/fix-mouse-interactions
2023-07-15 04:13:46 +12:00
Lincoln Stein
ad076b1174
add model directory search route
2023-07-14 11:14:33 -04: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
2a533b275f
Merge branch 'main' into mm-ui
2023-07-15 01:24:40 +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
Mary Hipp Rogers
545e2f557f
Merge branch 'main' into feat/api/image-max-age
2023-07-14 08:21:44 -04:00
psychedelicious
23c1a6b9d5
fix(nodes): make ResizeLatents w/h optional
...
now you can connect to them in node editor
2023-07-14 21:42:42 +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
Sergey Borisov
9fb0b0959f
Make sde and ancestral schedulers reproducible
2023-07-14 05:25:09 +03:00
Sergey Borisov
d8f88c09ea
Fix pink output on a lot of samplers
2023-07-14 05:00:33 +03: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
Brandon Rising
524888bf3b
Merge branch 'main' into feat/onnx
2023-07-13 14:23:57 -04: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
psychedelicious
4d25d702a1
feat(api): app/config route returns available infill methods
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
maryhipp
fba25792f9
add new route for app config
2023-07-13 23:26:52 +10:00
blessedcoolant
9348dc8e0d
Merge branch 'main' into fix/controlnet_cfg_inj_cond
2023-07-14 01:11:04 +12:00
blessedcoolant
34bff3ba77
Merge branch 'main' into fix-inpainting
2023-07-13 23:35:12 +12: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
blessedcoolant
430b9c291f
fix: Loras not working correctly with Inpainting
2023-07-13 22:59:38 +12:00
blessedcoolant
16f53228c2
Merge branch 'main' into fix-inpainting
2023-07-13 22:31:08 +12: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
5a546e66f1
Merge branch 'main' into fix-inpainting
2023-07-13 20:42:13 +12:00
blessedcoolant
19fdb70e20
Merge branch 'clearnodes' of https://github.com/mickr777/InvokeAI into pr/3747
2023-07-13 20:34:57 +12:00
blessedcoolant
6861499697
fix: Simplify modal code
2023-07-13 20:34:23 +12:00
mickr777
8274488d2c
Merge branch 'main' into clearnodes
2023-07-13 18:30:12 +10:00
mickr777
91c4e4c9b9
useDisclosure instead of useState.
2023-07-13 18:08:30 +10:00
mickr777
d1ac50b061
Change Confirmation Dialog
...
Changed Confirmation Dialog to use chakra-ui alert dialog
2023-07-13 17:19:59 +10:00
psychedelicious
5f5c93abb4
feat(app): embed PNG info in invokeai_metadata and invokeai_graph
...
Using just `metadata` and `graph` feel a bit too generic.
2023-07-13 15:40:05 +10:00
psychedelicious
6bea7bac36
feat(ui): restore recall functionality
...
- Restore recall functionality to `CurrentImageButtons` and `ImageContextMenu`.
- Debounce metadata requests for `ImageMetadataViewer` and `CurrentImageButtons` by 500ms. It's possible to scroll through these really fast, so we want to debounce the network requests.
- `ImageContextMenu` is lazy-mounted so it does not need to be debounced; it makes the metadata request as soon as you click it.
- Move next/prev image selection logic into hook and add the hotkeys for this to `CurrentImageButtons`. The hotkeys now work when metadata viewer is open.
I will follow up with improved loading state during the debounced calls in the future
2023-07-13 15:40:05 +10:00
psychedelicious
a43c900961
feat(ui): update UI for new metadata
...
- Update for new routes
- Update model storage in state to be `MainModelField` type instead of `string`, simplifies a lot of model handling
- Update model-related stuff for model `name` --> `model_name`
- Update linear graphs to use `MetadataAccumulator`
- Update `ImageMetadataViewer` UI
- Ensure all `recall` functions work (well, the ones that are active anyways)
2023-07-13 15:40:05 +10:00
psychedelicious
bddc04af96
chore(ui): regen types
2023-07-13 15:40:05 +10:00
psychedelicious
50bef87da7
feat(db,nodes,api): refactor metadata
...
Metadata for the Linear UI is now sneakily provided via a `MetadataAccumulator` node, which the client populates / hooks up while building the graph.
Additionally, we provide the unexpanded graph with the metadata API response.
Both of these are embedded into the PNGs.
- Remove `metadata` from `ImageDTO`
- Split up the `images/` routes to accomodate this; metadata is only retrieved per-image
- `images/{image_name}` now gets the DTO
- `images/{image_name}/metadata` gets the new metadata
- `images/{image_name}/full` gets the full-sized image file
- Remove old metadata service
- Add `MetadataAccumulator` node, `CoreMetadataField`, hook up to `LatentsToImage` node
- Add `get_raw()` method to `ItemStorage`, retrieves the row from DB as a string, no pydantic parsing
- Update `images`related services to handle storing and retrieving the new metadata
- Add `get_metadata_graph_from_raw_session` which extracts the `graph` from `session` without needing to hydrate the session in pydantic, in preparation for providing it as metadata; also removes all references to the `MetadataAccumulator` node
2023-07-13 15:40:05 +10:00
psychedelicious
eb0d55263b
fix(mm): make model config attribute names consistent
...
Our model fields use `model_name`, but the API response uses `name`. Some places use `model_type` but the API response used `type`.
Changed the API response to provide `model_name` and `model_type`, which simplifies how we manage models on the client substantially.
2023-07-13 15:40:05 +10:00
Mary Hipp
be02a55cac
output stringified error for session and invocation errors
2023-07-13 15:24:56 +10:00
mickr777
8a25e22fb0
Update en.json
2023-07-13 14:42:09 +10:00
mickr777
90441c4257
Update TopCenterPanel.tsx
2023-07-13 14:41:00 +10:00
mickr777
99c1d5c044
Update nodesSlice.ts
2023-07-13 14:40:33 +10:00
mickr777
c7dcf1f4a0
Create ClearNodesButton.tsx
2023-07-13 14:40:09 +10:00
blessedcoolant
7e3b9f1320
fix: Inpaint not working with some schedulers
...
Co-Authored-By: StAlKeR7779 <7768370+StAlKeR7779@users.noreply.github.com>
2023-07-13 15:06:03 +12:00
blessedcoolant
1c2144794c
Merge branch 'main' into mm-ui
2023-07-13 13:58:22 +12:00
blessedcoolant
bc7c0f75a0
fix: Rename toggleBoundingBoxDimension to flipBoundingBoxAxes
2023-07-13 13:53:15 +12:00
blessedcoolant
b7a4f3c2cb
Merge branch 'main' into bbox-ar
2023-07-13 13:45:08 +12:00
blessedcoolant
2cfe67bf1f
Merge branch 'main' into save-load-nodes
2023-07-13 13:37:36 +12:00
blessedcoolant
71e34ac256
Merge branch 'main' into mm-ui
2023-07-13 12:48:43 +12:00
Mary Hipp Rogers
4a8172bcd0
disable features that are not supported yet or no longer supported ( #3739 )
...
Co-authored-by: Mary Hipp <maryhipp@Marys-MacBook-Air.local>
2023-07-12 13:03:39 -04:00
Sergey Borisov
67c8cf4bc2
Controlnet model detection
2023-07-12 08:50:19 -04:00
Sergey Borisov
a328986b43
Less naive model detection
2023-07-12 08:50:19 -04:00
blessedcoolant
31bb4bfc61
style: Update Model Manager Styling to new format
2023-07-12 23:12:12 +12:00
blessedcoolant
3db1aa738c
feat: Restore Model Merge functionality
2023-07-12 22:43:06 +12:00
blessedcoolant
683229e285
fix: Update model convert toast message
2023-07-12 20:44:57 +12:00
blessedcoolant
2cedf6aed5
feat: Restore Model Convert Functionality
2023-07-12 20:40:58 +12:00
blessedcoolant
6238a53fdd
feat: Add basic form validation for path input
2023-07-12 20:11:05 +12:00
blessedcoolant
310e401b03
feat: Create basic IAIMantineTextInput component for form usage
2023-07-12 20:10:33 +12:00
blessedcoolant
3568e28b1c
fix: Type resolutions & Bug Fixes
...
- Fix checkpoint filter not working
- Resolve all typescript and undefined issues in Model Manager List / Edit Forms and main panel
2023-07-12 19:05:16 +12:00
blessedcoolant
5a6ad99d4e
feat: Restore Delete Model Functionality
2023-07-12 16:39:07 +12:00
blessedcoolant
afb46564e8
feat: Restore Update Model functionality
2023-07-12 16:13:49 +12:00
blessedcoolant
0282aa83c5
feat: Do not store edge styling data when saving a graph setup
2023-07-12 14:32:54 +12:00
blessedcoolant
84af35597d
fix: Update Load & Save Icons to FontAwesome
2023-07-12 13:58:14 +12:00
blessedcoolant
3b61a3abeb
Merge branch 'main' into save-load-nodes
2023-07-12 13:52:26 +12:00
blessedcoolant
222d8b05a6
fix: Update Sync icon to FontAwesom
2023-07-12 13:31:24 +12:00
blessedcoolant
cd11d08d74
feat: Update Reload Schema button
2023-07-12 13:14:14 +12:00
blessedcoolant
acea304348
feat(node-editor): fit view on init
2023-07-12 13:11:43 +12:00
blessedcoolant
b444b8db25
chore: Regen Schema
2023-07-12 09:17:43 +12:00
StAlKeR7779
b8a9b499df
Merge branch 'main' into fix/controlnet_cfg_inj_cond
2023-07-11 23:43:47 +03:00
Lincoln Stein
75c5ce46bc
merged SDXLModelLoader into ModelLoader invocation
2023-07-11 16:33:08 -04:00
Lincoln Stein
25591788c1
fix conflicts
2023-07-11 15:55:10 -04:00
blessedcoolant
b6b22dc799
feat: Update Reload Schema button
2023-07-12 07:50:11 +12:00
Lincoln Stein
dab03fb646
rename gpu_mem_reserved to max_vram_cache_size
...
To be consistent with max_cache_size, the amount of memory to hold in
VRAM for model caching is now controlled by the max_vram_cache_size
configuration parameter.
2023-07-11 15:25:39 -04:00
Lincoln Stein
d32f9f7cb0
reverse logic of gpu_mem_reserved
...
- gpu_mem_reserved now indicates the amount of VRAM that will be reserved
for model caching (similar to max_cache_size).
2023-07-11 15:16:40 -04:00
Lincoln Stein
fabcf276ac
rebuild front end
2023-07-11 14:45:46 -04:00
Sergey Borisov
358ced6bab
SDXL Prompt and t2l nodes draft, add fp32 to vae decode
2023-07-11 18:19:36 +03:00
Lincoln Stein
9bd6b6068c
Merge branch 'main' into release/invokeai-3-0-beta
2023-07-11 10:57:59 -04:00
Lincoln Stein
f6302aa691
Merge branch 'main' into release/invokeai-3-0-beta
2023-07-11 10:57:36 -04:00
Lincoln Stein
8b62eb364c
bump version
2023-07-11 10:57:17 -04:00
Lincoln Stein
6b93c1451f
do not crash when probing an unknown model type
2023-07-11 10:56:47 -04:00
Lincoln Stein
34cff848c7
do not display sdxl models in main model loader
2023-07-11 08:51:02 -04:00
blessedcoolant
5bf144e6bc
feat(node-editor): fit view on init
2023-07-11 18:22:50 +12:00
blessedcoolant
4d9a342437
feat: Parametrize useGetMainModelsQuery
2023-07-11 16:33:26 +12:00
blessedcoolant
7ce43692c2
feat: Add multi param query support to getMainModels
2023-07-11 14:50:56 +12:00
Lincoln Stein
23d8a2777e
add ability to filter list_models on list of base models
2023-07-10 21:59:32 -04:00
blessedcoolant
913789d966
Merge branch 'main' into maryhipp/enable-wh-for-txt-2-img
2023-07-11 13:13:41 +12:00
Mary Hipp
48efcb0ba9
always enable these things on txt2img tab
2023-07-10 20:19:03 -04:00
Lincoln Stein
8e42502dfd
partial implementation of SDXL model loader
2023-07-10 20:18:30 -04:00
Lincoln Stein
d8ebbd258a
Merge branch 'main' into sdxl-support
2023-07-10 18:51:03 -04:00
Lincoln Stein
83ec4c983c
Merge branch 'main' into lstein/keep-models-in-vram
2023-07-10 18:47:05 -04:00
Lincoln Stein
c9c61ee459
Update invokeai/app/services/config.py
...
Co-authored-by: Eugene Brodsky <ebr@users.noreply.github.com>
2023-07-10 18:46:32 -04:00
Mary Hipp
83eb511330
disable hotkey for lightbox if lightbox is disabled
2023-07-10 18:44:54 -04:00
blessedcoolant
bbdb26511a
feat: Fit to view on load rather than using older position
2023-07-11 09:44:36 +12:00
blessedcoolant
b9767e9c6e
feat: Save and Loads Nodes From Disk
2023-07-11 07:22:45 +12:00
Mary Hipp
f46f8058be
load thumbnail
2023-07-10 23:47:49 +10:00
Mary Hipp
18e2b130fc
disable multiselect
2023-07-10 23:47:49 +10:00
blessedcoolant
0bfa5ffd8e
feat: Make BBox Handles adapt to Aspect Ratio lock
2023-07-10 20:37:00 +12:00
blessedcoolant
15175bb998
feat: Add Aspect Ratio To Canvas Bounding Box
2023-07-10 20:04:32 +12:00
blessedcoolant
964c71dcb0
feat: Add Swap Sizes
2023-07-10 18:10:57 +12:00
blessedcoolant
3476c58702
Merge branch 'main' into aspect-ratio
2023-07-10 17:13:27 +12:00
psychedelicious
00e26ffa9a
fix(nodes): remove board_id column from images table
...
This is extraneous; the `board_images` table holds image-board relationships.
2023-07-10 11:30:35 +10:00
psychedelicious
1c45d18e6d
fix(ui): correctly set disabled on invoke button during generation
...
It wasn't disabled when it should have been, looked clickable during generation.
2023-07-10 11:23:13 +10:00
psychedelicious
a7b8109ac2
feat(ui): memoize NextPrevImageButtons component
...
This was rerendering on every progress image, now it doesn't
2023-07-10 11:22:34 +10:00
psychedelicious
265996d230
feat(ui): memoize ImageContextMenu selector
...
Without the selector itself being memoized, the gallery was rerendering on every progress image.
2023-07-10 11:21:56 +10:00
Lincoln Stein
bf2b5b5cd4
improvements to sdxl support in model manager
...
- Move SDXL-related models to models/sdxl.py
- Create separate base type BaseModelType.StableDiffusionXLRefiner for the refiner
models.
2023-07-09 20:42:03 -04:00
Lincoln Stein
5759a390f9
introduce gpu_mem_reserved configuration parameter
2023-07-09 18:35:04 -04:00
Lincoln Stein
130249a2dd
add model loading support for SDXL
2023-07-09 15:47:06 -04:00
Lincoln Stein
8d7dba937d
fix undefined variable
2023-07-09 14:37:45 -04:00
Lincoln Stein
d6cb0e54b3
don't unload models from GPU until the space is needed
2023-07-09 14:26:30 -04:00
Lincoln Stein
2f3190ad6c
merge with main
2023-07-09 13:28:05 -04:00
Lincoln Stein
f9dc5a0530
bump version
2023-07-09 13:27:11 -04:00
Lincoln Stein
f335363a6f
Merge branch 'main' into release/invokeai-3-0-beta
2023-07-09 13:26:49 -04:00
psychedelicious
dfe338fc50
fix(ui): fix missing import
2023-07-09 22:47:54 +10:00
psychedelicious
c5539b442c
feat(api): set max-age for images
...
Image files are immutable and we expect deletion to result in no further requests for a given image, so we can set the max-age to something thicc.
Resolves #3426
2023-07-09 22:42:05 +10:00
psychedelicious
0e178c3bb7
feat(ui): aspect ratio styling
2023-07-09 22:13:38 +10:00
psychedelicious
50218f1595
fix(ui): fix number input on aspect ratio
2023-07-09 22:13:26 +10:00
blessedcoolant
cafd97e5bc
fix: Reset handler not adjusting correctly
2023-07-09 23:24:15 +12:00
blessedcoolant
d01d5b6fa9
feat: Add Aspect Ratio
2023-07-09 23:18:06 +12:00
mickr777
5b876bd646
Add Stop button to nodes tab
2023-07-09 11:48:31 +10:00
psychedelicious
4640969037
fix(api): fix for borked windows mimetypes registry
...
It's possible for the Windows mimetypes for js to be changed and cause content-type errors when running the app.
Explicitly set the mimetypes to rectify this. Note that the root cause is a misconfiguration on the client - not our end.
See https://github.com/invoke-ai/InvokeAI/discussions/3684#discussioncomment-6391352
2023-07-09 11:05:01 +10:00
psychedelicious
d7218d44d7
feat(ui): add progress image node
...
it is excluded from graph, so you can add it without affecting generation
2023-07-09 10:51:08 +10:00
psychedelicious
2454b51d51
fix(ui): escape on embedding popup closes it
2023-07-09 10:47:30 +10:00
blessedcoolant
df27218f96
Merge branch 'main' into main
2023-07-09 11:56:17 +12:00
Lincoln Stein
b6cc4df1d8
report processing stack traces to the console
2023-07-08 19:48:32 -04:00
blessedcoolant
5fb24197cd
fix: Rearrange Model Select to take full width
2023-07-09 07:23:31 +12:00
Lincoln Stein
5f7435955e
if models.yaml doesn't exist, rebuild it
2023-07-08 15:13:51 -04:00
Lincoln Stein
f4aa28bee0
bump version
2023-07-08 14:52:29 -04:00
Lincoln Stein
3616ac8754
model installer calls invokeai-configure if something wrong with root
2023-07-08 12:45:23 -04:00
Lincoln Stein
92d4486214
don't write 'version:' to the invokeai.yaml file
2023-07-08 12:06:23 -04:00
Lincoln Stein
69ef1e1e56
speculative change to upgrade script
2023-07-08 11:45:26 -04:00
blessedcoolant
9af61d3ff5
Merge branch 'main' into lstein/find-root-works-under-conda
2023-07-09 02:42:59 +12:00
psychedelicious
3001e4c947
feat(ui): update right arrow gallery load more
...
- add hotkey support
- add loading state
- only show if there are more images to load
2023-07-08 10:29:31 -04:00
mickr777
2c956806d7
Update NextPrevImageButtons.tsx
2023-07-08 10:29:31 -04:00
psychedelicious
be06d4c0af
fix(ui): fix selection on dropdowns
...
Mantine's multiselect does not let you edit the search box with mouse, paste into it, etc. Normal select is fine.
I can't remember why I made Lora etc multiselects, but everything seems to work with normal selects, so I've change to that.
2023-07-08 10:29:19 -04:00
psychedelicious
81817532f8
fix(ui): fix tab translations
...
model manager was using the wrong key due to the tabs render func subbing values in. made translation key a prop of a tab item.
2023-07-08 10:29:05 -04:00
Lincoln Stein
ae835f47b6
add missing frontend files
2023-07-08 10:18:47 -04:00
Lincoln Stein
8a3072db1a
fix image upload issue
2023-07-08 10:14:55 -04:00
Lincoln Stein
bd9786564c
merge with main
2023-07-08 10:11:25 -04:00
Lincoln Stein
f6ecee926f
version of _find_root() that works in conda environment
2023-07-08 09:02:17 -04:00
Lincoln Stein
454c2c0952
version of _find_root() that works in conda environment
2023-07-08 09:01:05 -04:00
blessedcoolant
b27bf7bb0c
Merge branch 'main' into add-app-version
2023-07-08 21:58:17 +12:00
psychedelicious
0c528f22a7
fix(ui): improve initial gallery loading logic
...
- `isLoading` - now `true` *only* on first load
- added `isFetching` - `true` whenever gallery images are fetching
- on first load, show a spinner instead of skeletons. this prevents an awkward flash of skeletons into empty gallery when the gallery doesn't have enough images to fill it.
- removed `imageCategoriesChanged` listener, bc now on app start, both images and assets will be populated. leaving this in caused jank flashes of skeletons when switching gallery tabs when gallery doesn't have images to load
2023-07-08 19:57:36 +10:00
psychedelicious
d418e763ce
fix(ui): fix controlnet processing fallback dimensions
...
Just made it a spinner, getting it to be styled correctly otherwise is a pain
2023-07-08 19:57:36 +10:00
psychedelicious
07ce53678b
fix(ui): fix drag preview image dimensions
2023-07-08 19:57:36 +10:00
psychedelicious
173d3e6918
fix(ui): ensure initial gallery fetch happens once, fix skeleton count for initial fetch
2023-07-08 19:57:36 +10:00
psychedelicious
18b6c1a24b
feat(ui): fill up gallery on app start
...
taking the coward's way out on this and just fetching 100 images & 100 assets on app start...
- add `appStarted` action, dispatched once on mount in App.tsx. listener fetches 100 images & 100 assets
- fix bug with selectedBoardId & assets tab
2023-07-08 19:57:36 +10:00
Mary Hipp
cbecf3cb89
handle case where user has no images
2023-07-08 19:57:36 +10:00
Mary Hipp
84645495a9
load images for whichever tab youre on
2023-07-08 19:57:36 +10:00
Mary Hipp
6399055f7f
make sure images tab is active if auto-switch to new images is on
2023-07-08 19:57:36 +10:00
psychedelicious
078a829b3a
feat(ui): add hover show/hide to appVersion
2023-07-08 19:55:19 +10:00
blessedcoolant
3333805821
feat: Add App Version to UI
2023-07-08 21:31:17 +12:00
psychedelicious
a0ccb4385f
fix(ui): fix inconsistent shift modifier capture
...
The shift key listener didn't catch pressed when focused in a textarea or input field, causing jank on slider number inputs.
Add keydown and keyup listeners to all such fields, which ensures that the `shift` state is always correct.
Also add the action tracking it to `actionsDenylist` to not clutter up devtools.
2023-07-08 18:52:37 +10:00
blessedcoolant
2c78ac4a13
Merge branch 'main' into fix/ui/fix-progress-toggle
2023-07-08 20:24:23 +12:00
blessedcoolant
e715aa075d
Merge branch 'main' into fix/ui/fix-inputs-readonly
2023-07-08 20:23:33 +12:00
psychedelicious
5146e92463
fix(ui): do not diable show progress toggle while generating
2023-07-08 17:23:36 +10:00
psychedelicious
e7370e5ef3
fix(ui): fix readonly inputs
...
There was a props on IAISlider to make the input component readonly - I didn't know this existed and at some point used a component with that prop as a template for other sliders, copying the flag over.
It's not actually used anywhere, so I removed the prop entirely, enabling the number inputs everywhere.
2023-07-08 17:16:34 +10:00
psychedelicious
a73206c105
feat(ui): add cpu noise to linear graphs
2023-07-08 14:52:19 +10:00
psychedelicious
0138f52220
feat(ui): add ui for cpu noise
...
not hooked up to graphs
2023-07-08 14:15:13 +10:00
Lincoln Stein
2bc99f5b6c
Revert "get uploads working again"
2023-07-08 12:22:10 +10:00
Lincoln Stein
b11d5970f6
get uploads working again ( #3679 )
...
I'm not sure if this was just my local install, but even after a fresh
`yarn install` my upload network request was failing because no file was
passed in. I don't think the `bodySerializer` part is getting run
2023-07-07 21:37:37 -04:00
Lincoln Stein
e1c7012125
Merge branch 'main' into maryhipp/restore-upload-functionality
2023-07-07 21:34:28 -04:00
Lincoln Stein
8e8f9cce0f
print version when --version provided at command line
2023-07-07 20:47:29 -04:00
Lincoln Stein
06961072c8
fix en.json "modelManager" key
2023-07-07 20:19:51 -04:00
Lincoln Stein
0ec00e3d11
rebuild front end
2023-07-07 17:47:47 -04:00
Lincoln Stein
657e8031bb
Merge branch 'main' into release/invokeai-3-0-beta
2023-07-07 17:45:18 -04:00
Lincoln Stein
10d3bccf32
Mac MPS FP16 fixes ( #3641 )
...
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 `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-07 17:43:23 -04:00
Lincoln Stein
b8e53ca135
fix version number
2023-07-07 17:28:10 -04:00
Lincoln Stein
24f6fecdd5
first 3.0.0 beta release candidate
2023-07-07 17:27:12 -04:00
Lincoln Stein
235c14ca2c
Merge branch 'main' into maryhipp/restore-upload-functionality
2023-07-07 17:17:27 -04:00
blessedcoolant
f32a2f135c
Merge branch 'release/invokeai-3-0-alpha' of https://github.com/invoke-ai/InvokeAI into release/invokeai-3-0-alpha
2023-07-08 06:30:04 +12:00
blessedcoolant
f4fe878781
cleanup: No longer used.
2023-07-08 06:27:11 +12:00
Eugene Brodsky
97b2ec58e2
Merge branch 'main' into release/invokeai-3-0-alpha
2023-07-07 14:18:12 -04:00
Mary Hipp
3dc42869f4
prop to hide toggle for advanced settings
2023-07-07 14:03:37 -04:00
Mary Hipp
294336b046
switch wording to embeddings
2023-07-07 13:58:07 -04:00
Mary Hipp
fd51edfc81
remove log
2023-07-07 12:04:41 -04:00
Mary Hipp
fbac11a521
get uploads working again
2023-07-07 12:02:22 -04:00
Mary Hipp
01b27a03a8
Merge branch 'maryhipp/hide-some-things' of https://github.com/invoke-ai/InvokeAI into maryhipp/hide-some-things
2023-07-07 11:45:05 -04:00
Mary Hipp
d9acb0eea6
fix bug
2023-07-07 11:44:58 -04:00
Mary Hipp Rogers
1ed72cdbed
Merge branch 'main' into maryhipp/hide-some-things
2023-07-07 11:34:32 -04:00
Mary Hipp
2933d81118
cleanup
2023-07-07 11:16:23 -04:00
Mary Hipp
888c47d37b
add ability to disable lora, ti, dynamic prompts, vae selection
2023-07-07 11:13:42 -04:00
Lincoln Stein
8d88ad3b8d
restore ability to launch web server with invokeai --web
2023-07-07 10:07:15 -04:00
Lincoln Stein
56f4712814
fix checkpoint VAE handling in migrate script
2023-07-07 09:34:42 -04:00
psychedelicious
78bcaec4da
feat(ui): improve embed button styles
2023-07-07 23:14:31 +10:00
psychedelicious
2cbe98b1b1
fix(ui): resolve merge conflicts
2023-07-07 22:50:22 +10:00
psychedelicious
8457fcf7d3
feat(ui): finalize base model compatibility for lora, ti, vae
2023-07-07 22:50:22 +10:00
Mary Hipp
a9a4081f51
add modelSelected middleware to clear submodels on base_model change
2023-07-07 22:50:22 +10:00
Mary Hipp
b9a1aa38e3
disable submodels that have incompatible base models
2023-07-07 22:50:22 +10:00
Mary Hipp
6356dc335f
change model store to object, update main model and vae dropdowns
2023-07-07 22:50:22 +10:00
Lincoln Stein
9f58ed35cf
improve user migration experience
...
- No longer fail root directory probing if invokeai.yaml is missing
(test is now whether a `models/core` directory exists).
- Migrate script does not overwrite previously-installed models.
- Can run migrate script on an existing 2.3 version directory
with --from and --to pointing to same 2.3 root.
2023-07-07 08:18:46 -04:00
psychedelicious
a8fc75b6d0
feat(ui): make clipSkip activeLabel "Clip Skip"
...
we know its active if it displays
2023-07-07 21:42:16 +10:00
blessedcoolant
74557c8b6e
fix: Loras breaking with clip skip
2023-07-07 23:27:21 +12:00
blessedcoolant
53cb200f85
fix: Clamp clipskip value when model changes
2023-07-07 19:29:11 +12:00
blessedcoolant
a4dec53b4d
fix: Adjust clip skip layer count based on model
2023-07-07 19:05:10 +12:00
psychedelicious
803e1aaa17
feat(ui): update openapi-fetch; fix upload issue
...
My PR to fix an issue with the handling of formdata in `openapi-fetch` is released. This means we no longer need to patch the package (no patches at all now!).
This PR bumps its version and adds a transformer to our typegen script to handle typing binary form fields correctly as `Blob`.
Also regens types.
2023-07-07 16:36:42 +10:00
blessedcoolant
7aa918677e
Merge branch 'main' into feat/clip_skip
2023-07-07 16:21:53 +12:00
blessedcoolant
c6d6b33e3c
feat: Reset clipSkip when advanced options is turned off
2023-07-07 16:21:16 +12:00
Lincoln Stein
54f3686e3b
merge with main, fix conflicts
2023-07-06 15:21:45 -04:00
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
blessedcoolant
0327eae509
chore: Regen API
2023-06-23 05:21:06 +12:00
blessedcoolant
bb85608890
Merge branch 'main' into feat/onnx
2023-06-23 05:18:41 +12:00
Sergey Borisov
6c7668aaca
Update onnx model structure, change code according
2023-06-22 20:03:17 +03: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
psychedelicious
9ef64016c7
feat(db): sort board by created_at
2023-06-22 16:25:49 +10:00
psychedelicious
21f0d0b0c1
fix(db): fix deserialize_board_record()
...
It was not adding `cover_image_name`
2023-06-22 16:25:49 +10:00
psychedelicious
8bce234542
feat(db): update image-board relationships on add
...
Functionally, `add_image_to_board()` now moves images between boards.
2023-06-22 16:25:49 +10:00
psychedelicious
daadf6ebfd
feat(ui): add board image count badge
2023-06-22 16:25:49 +10:00
Mary Hipp
fe10a9f747
render cover image based on URL in image entities
2023-06-22 16:25:49 +10:00
Mary Hipp
7a2d3f628a
add boardToAddTo state so that result can be added to board when generation is complete
2023-06-22 16:25:49 +10:00
Mary Hipp
4defb92105
handle long board names
2023-06-22 16:25:49 +10:00
Mary Hipp
f9f3c91a83
drag and drop to move image to board, a bit of board list UI
2023-06-22 16:25:49 +10:00
maryhipp
95b9c8e505
return cover_image_name since urls change, override one from db for now
2023-06-22 16:25:49 +10:00
psychedelicious
49a02c157b
feat(ui): fix UpdateImageBoardModal select
2023-06-22 16:25:49 +10:00
psychedelicious
d604d986f9
feat(db, api): update get_board_for_image & service dependencies
...
- previously was `get_boards_for_image`, returning a list of `BoardDTO`, now returns a single `board_id`
2023-06-22 16:25:49 +10:00
psychedelicious
70cc037a9c
fix(ui): do not persist boards
2023-06-22 16:25:49 +10:00
psychedelicious
e4893e4031
fix(db): return board records from CRUD methods
2023-06-22 16:25:49 +10:00
maryhipp
4a0a718b96
foiled by a comma
2023-06-22 16:25:49 +10:00
maryhipp
ca8f1a7828
(api) use most recently generated image for cover photo
2023-06-22 16:25:49 +10:00
Mary Hipp
2e41af2109
[half-baked] adding image to board modal
2023-06-22 16:25:49 +10:00
Mary Hipp
bd29e5e655
UI tweaks
2023-06-22 16:25:49 +10:00
Mary Hipp
dcfee2e1e4
add searching to boards list
2023-06-22 16:25:49 +10:00
Mary Hipp
8aac683319
can delete and rename boards
2023-06-22 16:25:49 +10:00
psychedelicious
d306a84447
feat(ui): rough out boards UI
2023-06-22 16:25:49 +10:00
psychedelicious
5865ecd530
feat(db): add FK for boards.cover_image_name
2023-06-22 16:25:49 +10:00
psychedelicious
e1f9685b02
feat(db): add index for boards
2023-06-22 16:25:49 +10:00
psychedelicious
498bf0d0ba
feat(db): add indices for board_images
2023-06-22 16:25:49 +10:00
psychedelicious
163ef2c941
feat(ui): remove refs to BoardRecord in UI
...
UI should only work w/ BoardDTO
2023-06-22 16:25:49 +10:00
psychedelicious
48193b7fa7
chore(ui): regen api client
2023-06-22 16:25:49 +10:00
psychedelicious
dd1b3c9f35
fix(api): update API models to use BoardDTOs
2023-06-22 16:25:49 +10:00
psychedelicious
4b32322a58
feat(nodes): make board <> images a one-to-many relationship
...
we can extend this to many-to-many in the future if desired.
2023-06-22 16:25:49 +10:00
Mary Hipp
e06c43adc8
lint fix
2023-06-22 16:25:49 +10:00
Mary Hipp
c009f46b00
regenerate api schema
2023-06-22 16:25:49 +10:00
maryhipp
748016bdab
routes working
2023-06-22 16:25:49 +10:00
psychedelicious
72e9ced889
feat(nodes): add boards and board_images services
2023-06-22 16:25:49 +10:00
maryhipp
3833304f57
[WIP] board list endpoint w cover photos
2023-06-22 16:25:49 +10:00
maryhipp
4bfaae6617
fix type
2023-06-22 16:25:49 +10:00
maryhipp
499a174832
some more
2023-06-22 16:25:49 +10:00
maryhipp
6ca5ad9075
filter images by board_id
2023-06-22 16:25:49 +10:00
maryhipp
a121e6b3a0
add board_id association to image
2023-06-22 16:25:49 +10:00
maryhipp
207602f425
remove unused
2023-06-22 16:25:49 +10:00
maryhipp
a1671519d5
board CRUD
2023-06-22 16:25:49 +10:00
Lincoln Stein
1c31efa57c
punctuation fix in user message
2023-06-21 09:37:24 -04:00
Lincoln Stein
b727442f84
better window size behavior under alacritty & terminator
2023-06-21 09:32:58 -04:00
Sergey Borisov
7759b3f75a
Small refactor
2023-06-21 04:24:25 +03:00
Sergey Borisov
4d337f6abc
ONNX Model/runtime first implementation
2023-06-21 02:12:21 +03:00
Lincoln Stein
90df316835
Merge branch 'main' into lstein/installer-for-new-model-layout
2023-06-20 22:50:41 +01:00
Lincoln Stein
2fc19d9afa
suppress description in "other models" tab for space reasons
2023-06-20 11:45:37 -04:00
Lincoln Stein
ac6403f877
address some of ebr issues
2023-06-20 11:08:27 -04:00
Lincoln Stein
678bb4fe10
Merge branch 'lstein/installer-for-new-model-layout' of github.com:invoke-ai/InvokeAI into lstein/installer-for-new-model-layout
2023-06-20 09:42:21 -04:00
Lincoln Stein
294b1e83e6
test and fix edge cases
2023-06-20 09:42:10 -04:00
Sergey Borisov
92c86fd0b8
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-20 03:44:58 +03:00
Sergey Borisov
46dc751139
Update model format field to use enums
2023-06-20 03:30:09 +03:00
Sergey Borisov
4cefe37723
Rename format to model_format(still named format when work with config)
2023-06-20 03:25:08 +03:00
Sergey Borisov
82b73c50a0
Remove default model logic
2023-06-20 03:13:10 +03:00
blessedcoolant
85b4b359c2
tweal: UI colors
2023-06-19 23:16:14 +12:00
blessedcoolant
cfe81b5e00
fix: Adjust the Schedular select width
...
So the long names do not get cut off.
2023-06-19 23:05:32 +12:00
blessedcoolant
b0c4451324
Merge branch 'main' into model-manager-ui-30
2023-06-19 23:02:59 +12:00
blessedcoolant
4f5693040e
Merge branch 'main' into fix/inpaint_new_manager
2023-06-19 22:55:00 +12:00
blessedcoolant
d4931522d4
Merge branch 'main' into model-manager-ui-30
2023-06-19 22:53:13 +12:00
psychedelicious
41442eb7f6
feat(ui): convert canvas txt2img & img2img to latents
...
- Add graph builders for canvas txt2img & img2img - they are mostly copy and paste from the linear graph builders but different in a few ways that are very tricky to work around. Just made totally new functions for them.
- Canvas txt2img and img2img support ControlNet (not inpaint/outpaint). There's no way to determine in real-time which mode the canvas is in just yet, so we cannot disable the ControlNet UI when the mode will be inpaint/outpaint - it will always display. It's possible to determine this in near-real-time, will add this at some point.
- Canvas inpaint/outpaint migrated to use model loader, though inpaint/outpaint are still using the non-latents nodes.
2023-06-19 15:57:28 +10:00
psychedelicious
223a679ac1
chore(ui): regen api client
2023-06-19 15:57:28 +10:00
psychedelicious
3c60616b4d
feat(ui): simplify linear graph creation logic
...
Instead of manually creating every node and edge, we can simply copy/paste the base graph from node editor, then sub in parameters.
This is a much more intelligible process. We still need to handle seed, img2img fit and controlnet separately.
2023-06-19 15:57:28 +10:00
Sergey Borisov
a01998d095
Remove more old logic
2023-06-19 15:57:28 +10:00
Sergey Borisov
7b35162b9e
Remove old logic except for inpaint, add support for lora and ti to inpaint node
2023-06-19 15:57:28 +10:00
Sergey Borisov
c26e1a9271
Rewrite inpaint node to new model manager, remove TextToImage and ImageToImage nodes
2023-06-19 15:57:28 +10:00
Sergey Borisov
9b32407744
Provide generator to all schedulers step function to make both ancestral and sde schedulers reproducible
2023-06-19 00:34:01 +03:00
Sergey Borisov
82091b9a66
Fix vae conversion
2023-06-18 23:46:07 +03:00
Sergey Borisov
f3d9797ebe
Add dpmpp_sde and dpmpp_2m_sde schedulers(with karras)
2023-06-18 23:38:15 +03:00
blessedcoolant
17e2a35228
fix: merge conflicts
2023-06-18 22:25:48 +12:00
blessedcoolant
91016d8b29
Merge branch 'main' into model-manager-ui-30
2023-06-18 22:23:18 +12:00
blessedcoolant
9fda21cf40
Revert "feat: Port Schedulers to Mantine"
...
This reverts commit e0c105f413
2023-06-18 22:22:56 +12:00
blessedcoolant
80a8d3ef28
style: Theme placeholder style for IAIMantineMultiSelect
2023-06-18 22:17:09 +12:00
blessedcoolant
f4ca9d0e09
Merge branch 'scheduler-select' of https://github.com/blessedcoolant/InvokeAI into scheduler-select
2023-06-18 22:05:12 +12:00
blessedcoolant
a960fa009d
fix: Fix some styling issues with IAIMantineMultiSelect
2023-06-18 22:04:12 +12:00
psychedelicious
b96b95bc95
feat(ui): enabledSchedulers -> favoriteSchedulers
2023-06-18 20:01:05 +10:00
psychedelicious
450641c414
fix(ui): enable all schedulers by default
2023-06-18 19:39:31 +10:00
psychedelicious
94cfcdc411
feat(ui): improve scheduler selection logic
...
- remove UI-specific state (the enabled schedulers) from redux, instead derive it in a selector
- simplify logic by putting schedulers in an object instead of an array
- rename `activeSchedulers` to `enabledSchedulers`
- remove need for `useEffect()` when `enabledSchedulers` changes by adding a listener for the `enabledSchedulersChanged` action/event to `generationSlice`
- increase type safety by making `enabledSchedulers` an array of `SchedulerParam`, which is created by the zod schema for scheduler
2023-06-18 19:34:37 +10:00
psychedelicious
150059f704
fix(ui): create all scheduler constants up-front
2023-06-18 18:49:10 +10:00
psychedelicious
f1a8b9daee
fix(ui): clarify scheduler logic
...
- use full conditional syntax with `{}`
- do not mutate `action.payload` in a reducer
2023-06-18 18:47:59 +10:00
blessedcoolant
be8c0bb952
feat: Use Labels for Schedulers
2023-06-18 20:17:51 +12:00
blessedcoolant
dae5b9b259
fix: Minor styling fix to the IAIMantineMultiSelect component
2023-06-18 20:06:56 +12:00
blessedcoolant
06428fac67
fix: Revert scheduler back to zod validation
2023-06-18 20:02:36 +12:00
blessedcoolant
59b5dfc3e0
feat: Port Schedulers to Mantine
2023-06-18 19:47:27 +12:00
blessedcoolant
809ec7163e
fix: Remove type from Model type name
2023-06-18 19:41:30 +12:00
blessedcoolant
7c9a939b47
fix: Unserialization key issue
2023-06-18 19:38:15 +12:00
blessedcoolant
9634c96020
revert: getModels to receivedModels
2023-06-18 19:35:46 +12:00
blessedcoolant
e0c105f413
feat: Port Schedulers to Mantine
2023-06-18 19:31:53 +12:00
blessedcoolant
f0bf32c476
Merge branch 'main' into model-manager-ui-30
2023-06-18 17:37:34 +12:00
blessedcoolant
28373dbb98
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-18 17:36:23 +12:00
Lincoln Stein
e1d53b86f3
Merge branch 'main' into lstein/installer-for-new-model-layout
2023-06-17 16:26:56 -07:00
Lincoln Stein
ddb3f4b02b
make configure script work properly on empty rootdir
2023-06-17 19:26:35 -04:00
blessedcoolant
4133d77772
wip: Move Model Selector to own file
2023-06-18 09:19:13 +12:00
blessedcoolant
61c426f502
feat: Enable 2.x Model Generation in Linear UI
2023-06-18 08:27:13 +12:00
blessedcoolant
bf0577c882
fix: 2.1 models breaking generation
...
Co-Authored-By: StAlKeR7779 <7768370+StAlKeR7779@users.noreply.github.com>
2023-06-18 08:26:25 +12:00
blessedcoolant
24673fd859
chore: Rebuild API - base_model and type added
2023-06-18 07:50:28 +12:00
Sergey Borisov
dc669d1447
Add name, base_mode, type fields to model info
2023-06-17 22:48:44 +03:00
blessedcoolant
ce4110b9f4
wip: Add 2.x Models to the Model List
2023-06-18 07:01:44 +12:00
Sergey Borisov
6b7cf3f3be
Add lms and dpmpp2_s karras scheduler
2023-06-17 21:00:16 +03:00
blessedcoolant
0f3b7d2b3d
chore: Rebuild API with new Model API names
2023-06-18 03:00:16 +12:00
Sergey Borisov
16dc78f6c6
Generate config names for openapi
2023-06-17 17:15:36 +03:00
blessedcoolant
7a66856785
wip: Update Linear UI Txt2Img and Img2Img Graphs
...
Update the text to imaeg and image to image graphs to work with the new model loader. Currently only supports 1.x models. Will update this soon to make it work with all models.
2023-06-18 01:38:01 +12:00
blessedcoolant
c8dfa49d86
fix: Update missing name types to new names
2023-06-17 22:04:28 +12:00
blessedcoolant
76dd749b1e
chore: Rebuild API
2023-06-17 21:29:32 +12:00
blessedcoolant
67d05d2066
chore: Update model config type names
2023-06-17 21:28:43 +12:00
Lincoln Stein
f28d50070e
configure/install basically working; needs edge case testing
2023-06-16 22:54:36 -04:00
Lincoln Stein
ada7399753
rewrite of widget display - marshalling needs rewrite
2023-06-15 23:32:33 -04:00
Sergey Borisov
5f2d07917d
Fix lora import, fix sd2 config, fix list models api
2023-06-15 21:30:15 +03:00
Lincoln Stein
82c2498043
Merge branch 'main' into lstein/new-model-manager
2023-06-14 08:41:40 -07:00
blessedcoolant
4ca325e8e6
chore: Rebuild API
2023-06-15 03:20:49 +12:00
blessedcoolant
6b8e88ad7f
Merge branch 'main' into feat/controlnet-control-modes
2023-06-15 03:18:41 +12:00
psychedelicious
b8e32fa459
chore(ui): regen api client
2023-06-15 01:05:16 +10:00
psychedelicious
34ebee67b7
fix(nodes): fix revert conflict
2023-06-15 01:05:16 +10:00
psychedelicious
e0c998d192
Revert "feat(ui): add warning socket event handling"
...
This reverts commit e7a61e631a42190e4b64e0d5e22771c669c5b30c.
2023-06-15 01:05:16 +10:00
psychedelicious
b51e9a6bdb
Revert "feat(nodes): add warning socket event"
...
This reverts commit cefdd9d634e515239bd85666c872a0d64bb9d772.
2023-06-15 01:05:16 +10:00
psychedelicious
09f396ce84
feat(ui): add warning socket event handling
2023-06-15 01:05:16 +10:00
psychedelicious
abee37eab3
feat(nodes): add warning socket event
2023-06-15 01:05:16 +10:00
psychedelicious
42e48b2bef
feat(nodes): add dynamic prompt node
2023-06-15 01:05:16 +10:00
psychedelicious
f9d5f9d52c
fix(nodes): minor fixes for folder validation
...
- fix type for `__output_folder`
- prefix `validate_storage_folders()` with `__` to indicate private method
2023-06-15 00:40:39 +10:00
StAlKeR7779
d0ee3558d1
Merge branch 'main' into lstein/new-model-manager
2023-06-14 17:29:01 +03:00
blessedcoolant
587297878a
refactor(minor): Latent Disk Storage
2023-06-15 02:21:49 +12:00
blessedcoolant
b4c998a9ae
refactor(minor): Image File Storage
2023-06-15 01:58:58 +12:00
psychedelicious
88e8e3977b
feat(ui): update UI to not use image_origin
...
see commit `8ad8de8: feat(nodes): remove `image_origin` from most places` for details.
2023-06-14 23:08:27 +10:00
psychedelicious
24b86cffe9
chore(ui): regen api client & types
2023-06-14 23:08:27 +10:00
psychedelicious
a1773197e9
feat(nodes): remove image_origin from most places
...
- remove `image_origin` from most places where we interact with images
- consolidate image file storage into a single `images/` dir
Images have an `image_origin` attribute but it is not actually used when retrieving images, nor will it ever be. It is still used when creating images and helps to differentiate between internally generated images and uploads.
It was included in eg API routes and image service methods as a holdover from the previous app implementation where images were not managed in a database. Now that we have images in a db, we can do away with this and simplify basically everything that touches images.
The one potentially controversial change is to no longer separate internal and external images on disk. If we retain this separation, we have to keep `image_origin` around in a number of spots and it getting image paths on disk painful.
So, I am have gotten rid of this organisation. Images are now all stored in `images`, regardless of their origin. As we improve the image management features, this change will hopefully become transparent.
2023-06-14 23:08:27 +10:00
blessedcoolant
6c53abc034
feat: Add ControlMode to Linear UI
2023-06-14 20:01:17 +12:00
blessedcoolant
eb7047b21d
chore: Rebuild WebAPI
2023-06-14 19:26:02 +12:00
blessedcoolant
43419ac761
Merge branch 'main' into feat/controlnet-control-modes
2023-06-14 19:04:42 +12:00
user1
5cd0e90816
Renamed ControlNet control_mode option "even_more_control" to "unbalanced"
2023-06-13 22:30:17 -07:00
user1
cfd49e3921
Removing vestigial comments.
2023-06-13 21:33:15 -07:00
user1
a8e0490133
Merge branch 'feat/controlnet-control-modes' of https://github.com/invoke-ai/InvokeAI into feat/controlnet-control-modes
2023-06-13 21:21:13 -07:00
psychedelicious
1e08d865c9
chore: dummy commit to trigger actions
2023-06-14 14:14:24 +10:00
blessedcoolant
f8bb650cc1
revert: IAIScrollArea
2023-06-14 14:14:24 +10:00
psychedelicious
2cee8bebb2
fix(ui): revert offset scrollbars
...
The wonky padding is too janky. Just overlay for now.
2023-06-14 14:14:24 +10:00
psychedelicious
ade4ec5fd8
fix(ui): fix crash when toggling pinned parameters panel
2023-06-14 14:14:24 +10:00
psychedelicious
70ffd6b03f
fix(ui): fix controlnet selects data types
2023-06-14 14:14:24 +10:00
psychedelicious
6c551df311
fix(ui): fix rebase conflicts
2023-06-14 14:14:24 +10:00
blessedcoolant
24f605629e
cleanup: Remove OverlayScrollable component
2023-06-14 14:14:24 +10:00
blessedcoolant
2af1ec9d02
fix: Minor padding issue in unpinned drawer
2023-06-14 14:14:24 +10:00
blessedcoolant
79d53341de
fix: Stretch scroll area so it retains parent width
2023-06-14 14:14:24 +10:00
blessedcoolant
e40b3506c4
fix: Options squishing on accordion collapse
2023-06-14 14:14:24 +10:00
blessedcoolant
33912382e3
feat: Introduce Mantine's ScrollArea
2023-06-14 14:14:24 +10:00
blessedcoolant
d282810e53
cleanup: Remove IAICustomSelect and port types
2023-06-14 14:14:24 +10:00
psychedelicious
9df502fc77
fix(ui): fix mantine select props
2023-06-14 14:14:24 +10:00
psychedelicious
705573f0a8
feat(ui): even more pedantic mantine select theming
2023-06-14 14:14:24 +10:00
blessedcoolant
1878ea94f6
feat: Port Canvas Layer Select to IAIMantineSelect
2023-06-14 14:14:24 +10:00
psychedelicious
4ba5086b9a
feat(ui): add tooltip to IAIMantineSelect
2023-06-14 14:14:24 +10:00
psychedelicious
4a991b4daa
feat(ui): more pedantic mantine select theming
2023-06-14 14:14:24 +10:00
psychedelicious
80474d26f9
feat(ui): mantine scrollbar theming
2023-06-14 14:14:24 +10:00
blessedcoolant
9a77bd9140
feat: Port IAISelect's to IAIMantineSelect's
...
Ported everything except Model Manager selects and the Canvas Layer Select (this needs tooltip support)
2023-06-14 14:14:24 +10:00
psychedelicious
14cdc800c3
feat(ui): pedantic mantine select theming
2023-06-14 14:14:24 +10:00
blessedcoolant
9cfbea4c25
feat: Match styling of Mantine Select with InvokeAI
2023-06-14 14:14:24 +10:00
blessedcoolant
5fe674e223
feat: Standardize IAIMantineSelect Component
2023-06-14 14:14:24 +10:00
blessedcoolant
32200efce8
feat: Change default font to Inter
2023-06-14 14:14:24 +10:00
blessedcoolant
68a02da990
feat: Use Mantine Select for Scheduler
2023-06-14 14:14:24 +10:00
blessedcoolant
5b20766ea3
chore: Move Mantine Theme Override to own file
2023-06-14 14:14:24 +10:00
blessedcoolant
9a914250a0
feat: Change Model Select To Mantine
2023-06-14 14:14:24 +10:00
blessedcoolant
0e3106f631
feat: Add Mantine Support
2023-06-14 14:14:24 +10:00
user1
de3e6cdb02
Switched over to ControlNet control_mode with 4 options: balanced, more_prompt, more_control, even_more_control. Based on True/False combinations of internal booleans cfg_injection and soft_injection
2023-06-13 21:08:34 -07:00
Sergey Borisov
6c5954f9d1
Add controlnet to model manager, fixes
2023-06-14 04:26:21 +03:00
Sergey Borisov
740c05a0bb
Save models on rescan, uncache model on edit/delete, fixes
2023-06-14 03:12:12 +03:00
Sergey Borisov
26090011c4
Fix conflict resolve, add model configs to type annotation
2023-06-14 00:26:37 +03:00
StAlKeR7779
c9ae26a176
Merge branch 'main' into lstein/new-model-manager
2023-06-13 23:37:52 +03:00
Sergey Borisov
e7db6d8120
Fix ckpt and vae conversion, migrate script, remove sd2-base
2023-06-13 18:05:12 +03:00
user1
8495764d45
Moving from ControlNet guess_mode to separate booleans for cfg_injection and soft_injection for testing control modes
2023-06-13 00:41:36 -07:00
user1
8b7fac75ed
First pass at ControlNet "guess mode" implementation.
2023-06-13 00:41:36 -07:00
user1
9e0e26f4c4
Moving from ControlNet guess_mode to separate booleans for cfg_injection and soft_injection for testing control modes
2023-06-12 23:57:57 -07:00
Lincoln Stein
87ba17a1f5
add migration script and update convert and face restoration paths
2023-06-13 01:27:51 -04:00
Lincoln Stein
1439dc7712
Add SchedulerPredictionType and ModelVariantType enums
2023-06-12 16:07:04 -04:00
blessedcoolant
2a814d886b
Merge branch 'main' into diffusers-upgrade
2023-06-13 05:29:15 +12:00
psychedelicious
60a2fbec41
feat(ui): improve controlnet-related config types
2023-06-13 00:04:21 +10:00
psychedelicious
f15a328b80
fix(ui): allow controlnet with preprocessed control image
2023-06-13 00:04:21 +10:00
psychedelicious
811d9ab55a
fix(ui): disable shouldAutoConfig switch while processing
2023-06-13 00:04:21 +10:00
psychedelicious
e00fed5c46
feat(ui): support disabling controlnet models & processors
2023-06-13 00:04:21 +10:00
psychedelicious
a3fa38b353
fix(ui): revert IAICustomSelect usage to IAISelect
...
There are some bugs with it that I cannot figure out related to `floating-ui` and `downshift`'s handling of refs.
Will need to revisit this component in the future.
2023-06-13 00:04:21 +10:00
psychedelicious
2e42a4bdd9
feat(ui): disable controlnets during processing
2023-06-13 00:04:21 +10:00
psychedelicious
36f72b5a49
fix(ui): check for valid controlnets before adding to graph
2023-06-13 00:04:21 +10:00
psychedelicious
af42d7d347
feat(ui): support negative controlnet weights
2023-06-13 00:04:21 +10:00
psychedelicious
8607b1994c
fix(ui): fix crash when controlnet enabled but no controlnets added
2023-06-13 00:04:21 +10:00
Sergey Borisov
36eb1bd893
Fixes
2023-06-12 16:14:09 +03:00
Sergey Borisov
9fa78443de
Fixes, add sd variant detection
2023-06-12 05:52:30 +03:00
Lincoln Stein
893f776f1d
model_probe working; model_install incomplete
2023-06-11 19:51:53 -04:00
blessedcoolant
50135b726e
fix: git stash
2023-06-12 08:53:09 +12:00
Lincoln Stein
085ab54124
remove modified models.py and migrate code to models/base.py
2023-06-11 16:10:15 -04:00
Lincoln Stein
8e1a56875e
remove defunct code
2023-06-11 12:57:06 -04:00
Lincoln Stein
000626ab2e
move all installation code out of model_manager
2023-06-11 12:51:50 -04:00
Sergey Borisov
694fd0c92f
Fixes, first runable version
2023-06-11 16:42:40 +03:00
user1
fd715026a7
First pass at ControlNet "guess mode" implementation.
2023-06-11 02:00:39 -07:00
Gregg Helt
c647056287
Feat/easy param ( #3504 )
...
* Testing change to LatentsToText to allow setting different cfg_scale values per diffusion step.
* Adding first attempt at float param easing node, using Penner easing functions.
* Core implementation of ControlNet and MultiControlNet.
* Added support for ControlNet and MultiControlNet to legacy non-nodal Txt2Img in backend/generator. Although backend/generator will likely disappear by v3.x, right now they are very useful for testing core ControlNet and MultiControlNet functionality while node codebase is rapidly evolving.
* Added example of using ControlNet with legacy Txt2Img generator
* Resolving rebase conflict
* Added first controlnet preprocessor node for canny edge detection.
* Initial port of controlnet node support from generator-based TextToImageInvocation node to latent-based TextToLatentsInvocation node
* Switching to ControlField for output from controlnet nodes.
* Resolving conflicts in rebase to origin/main
* Refactored ControlNet nodes so they subclass from PreprocessedControlInvocation, and only need to override run_processor(image) (instead of reimplementing invoke())
* changes to base class for controlnet nodes
* Added HED, LineArt, and OpenPose ControlNet nodes
* Added an additional "raw_processed_image" output port to controlnets, mainly so could route ImageField to a ShowImage node
* Added more preprocessor nodes for:
MidasDepth
ZoeDepth
MLSD
NormalBae
Pidi
LineartAnime
ContentShuffle
Removed pil_output options, ControlNet preprocessors should always output as PIL. Removed diagnostics and other general cleanup.
* Prep for splitting pre-processor and controlnet nodes
* Refactored controlnet nodes: split out controlnet stuff into separate node, stripped controlnet stuff form image processing/analysis nodes.
* Added resizing of controlnet image based on noise latent. Fixes a tensor mismatch issue.
* More rebase repair.
* Added support for using multiple control nets. Unfortunately this breaks direct usage of Control node output port ==> TextToLatent control input port -- passing through a Collect node is now required. Working on fixing this...
* Fixed use of ControlNet control_weight parameter
* Fixed lint-ish formatting error
* Core implementation of ControlNet and MultiControlNet.
* Added first controlnet preprocessor node for canny edge detection.
* Initial port of controlnet node support from generator-based TextToImageInvocation node to latent-based TextToLatentsInvocation node
* Switching to ControlField for output from controlnet nodes.
* Refactored controlnet node to output ControlField that bundles control info.
* changes to base class for controlnet nodes
* Added more preprocessor nodes for:
MidasDepth
ZoeDepth
MLSD
NormalBae
Pidi
LineartAnime
ContentShuffle
Removed pil_output options, ControlNet preprocessors should always output as PIL. Removed diagnostics and other general cleanup.
* Prep for splitting pre-processor and controlnet nodes
* Refactored controlnet nodes: split out controlnet stuff into separate node, stripped controlnet stuff form image processing/analysis nodes.
* Added resizing of controlnet image based on noise latent. Fixes a tensor mismatch issue.
* Cleaning up TextToLatent arg testing
* Cleaning up mistakes after rebase.
* Removed last bits of dtype and and device hardwiring from controlnet section
* Refactored ControNet support to consolidate multiple parameters into data struct. Also redid how multiple controlnets are handled.
* Added support for specifying which step iteration to start using
each ControlNet, and which step to end using each controlnet (specified as fraction of total steps)
* Cleaning up prior to submitting ControlNet PR. Mostly turning off diagnostic printing. Also fixed error when there is no controlnet input.
* Added dependency on controlnet-aux v0.0.3
* Commented out ZoeDetector. Will re-instate once there's a controlnet-aux release that supports it.
* Switched CotrolNet node modelname input from free text to default list of popular ControlNet model names.
* Fix to work with current stable release of controlnet_aux (v0.0.3). Turned of pre-processor params that were added post v0.0.3. Also change defaults for shuffle.
* Refactored most of controlnet code into its own method to declutter TextToLatents.invoke(), and make upcoming integration with LatentsToLatents easier.
* Cleaning up after ControlNet refactor in TextToLatentsInvocation
* Extended node-based ControlNet support to LatentsToLatentsInvocation.
* chore(ui): regen api client
* fix(ui): add value to conditioning field
* fix(ui): add control field type
* fix(ui): fix node ui type hints
* fix(nodes): controlnet input accepts list or single controlnet
* Moved to controlnet_aux v0.0.4, reinstated Zoe controlnet preprocessor. Also in pyproject.toml had to specify downgrade of timm to 0.6.13 _after_ controlnet-aux installs timm >= 0.9.2, because timm >0.6.13 breaks Zoe preprocessor.
* Core implementation of ControlNet and MultiControlNet.
* Added first controlnet preprocessor node for canny edge detection.
* Switching to ControlField for output from controlnet nodes.
* Resolving conflicts in rebase to origin/main
* Refactored ControlNet nodes so they subclass from PreprocessedControlInvocation, and only need to override run_processor(image) (instead of reimplementing invoke())
* changes to base class for controlnet nodes
* Added HED, LineArt, and OpenPose ControlNet nodes
* Added more preprocessor nodes for:
MidasDepth
ZoeDepth
MLSD
NormalBae
Pidi
LineartAnime
ContentShuffle
Removed pil_output options, ControlNet preprocessors should always output as PIL. Removed diagnostics and other general cleanup.
* Prep for splitting pre-processor and controlnet nodes
* Refactored controlnet nodes: split out controlnet stuff into separate node, stripped controlnet stuff form image processing/analysis nodes.
* Added resizing of controlnet image based on noise latent. Fixes a tensor mismatch issue.
* Added support for using multiple control nets. Unfortunately this breaks direct usage of Control node output port ==> TextToLatent control input port -- passing through a Collect node is now required. Working on fixing this...
* Fixed use of ControlNet control_weight parameter
* Core implementation of ControlNet and MultiControlNet.
* Added first controlnet preprocessor node for canny edge detection.
* Initial port of controlnet node support from generator-based TextToImageInvocation node to latent-based TextToLatentsInvocation node
* Switching to ControlField for output from controlnet nodes.
* Refactored controlnet node to output ControlField that bundles control info.
* changes to base class for controlnet nodes
* Added more preprocessor nodes for:
MidasDepth
ZoeDepth
MLSD
NormalBae
Pidi
LineartAnime
ContentShuffle
Removed pil_output options, ControlNet preprocessors should always output as PIL. Removed diagnostics and other general cleanup.
* Prep for splitting pre-processor and controlnet nodes
* Refactored controlnet nodes: split out controlnet stuff into separate node, stripped controlnet stuff form image processing/analysis nodes.
* Added resizing of controlnet image based on noise latent. Fixes a tensor mismatch issue.
* Cleaning up TextToLatent arg testing
* Cleaning up mistakes after rebase.
* Removed last bits of dtype and and device hardwiring from controlnet section
* Refactored ControNet support to consolidate multiple parameters into data struct. Also redid how multiple controlnets are handled.
* Added support for specifying which step iteration to start using
each ControlNet, and which step to end using each controlnet (specified as fraction of total steps)
* Cleaning up prior to submitting ControlNet PR. Mostly turning off diagnostic printing. Also fixed error when there is no controlnet input.
* Commented out ZoeDetector. Will re-instate once there's a controlnet-aux release that supports it.
* Switched CotrolNet node modelname input from free text to default list of popular ControlNet model names.
* Fix to work with current stable release of controlnet_aux (v0.0.3). Turned of pre-processor params that were added post v0.0.3. Also change defaults for shuffle.
* Refactored most of controlnet code into its own method to declutter TextToLatents.invoke(), and make upcoming integration with LatentsToLatents easier.
* Cleaning up after ControlNet refactor in TextToLatentsInvocation
* Extended node-based ControlNet support to LatentsToLatentsInvocation.
* chore(ui): regen api client
* fix(ui): fix node ui type hints
* fix(nodes): controlnet input accepts list or single controlnet
* Added Mediapipe image processor for use as ControlNet preprocessor.
Also hacked in ability to specify HF subfolder when loading ControlNet models from string.
* Fixed bug where MediapipFaceProcessorInvocation was ignoring max_faces and min_confidence params.
* Added nodes for float params: ParamFloatInvocation and FloatCollectionOutput. Also added FloatOutput.
* Added mediapipe install requirement. Should be able to remove once controlnet_aux package adds mediapipe to its requirements.
* Added float to FIELD_TYPE_MAP ins constants.ts
* Progress toward improvement in fieldTemplateBuilder.ts getFieldType()
* Fixed controlnet preprocessors and controlnet handling in TextToLatents to work with revised Image services.
* Cleaning up from merge, re-adding cfg_scale to FIELD_TYPE_MAP
* Making sure cfg_scale of type list[float] can be used in image metadata, to support param easing for cfg_scale
* Fixed math for per-step param easing.
* Added option to show plot of param value at each step
* Just cleaning up after adding param easing plot option, removing vestigial code.
* Modified control_weight ControlNet param to be polistmorphic --
can now be either a single float weight applied for all steps, or a list of floats of size total_steps, that specifies weight for each step.
* Added more informative error message when _validat_edge() throws an error.
* Just improving parm easing bar chart title to include easing type.
* Added requirement for easing-functions package
* Taking out some diagnostic prints.
* Added option to use both easing function and mirror of easing function together.
* Fixed recently introduced problem (when pulled in main), triggered by num_steps in StepParamEasingInvocation not having a default value -- just added default.
---------
Co-authored-by: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
2023-06-11 16:27:44 +10:00
Sergey Borisov
738ba40f51
Fixes
2023-06-11 06:12:21 +03:00
Sergey Borisov
3ce3a7ee72
Rewrite model configs, separate models
2023-06-11 04:49:09 +03:00
Lincoln Stein
74b43c9bdf
fix incorrect variable/typenames in model_cache
2023-06-10 10:41:48 -04:00
Lincoln Stein
3d2ff7755e
resolve conflicts
2023-06-10 10:13:54 -04:00
Lincoln Stein
a87d52a389
resolve conflicts between lstein & sttalker changes
2023-06-10 09:59:19 -04:00
Lincoln Stein
959e64c9b3
start removing repo_id support
2023-06-10 09:57:23 -04:00
Sergey Borisov
2c056ead42
New models structure draft
2023-06-10 03:14:10 +03:00
Lincoln Stein
1bca32ed16
Merge branch 'main' into lstein/fix-logger-reconfiguration
2023-06-09 06:27:26 -07:00
psychedelicious
7f91139e21
fix(ui): fix crash when using dropdown on certain device resolutions
2023-06-09 22:19:30 +10:00
psychedelicious
93f3658a4a
fix(ui): blur tab on click
...
Fixes issue where after clicking a tab, using the arrow keys changes tab instead of changing selected image
2023-06-09 18:20:52 +10:00
psychedelicious
68be95acbb
fix(ui): fix canvas not filling screen on first load
2023-06-09 17:55:11 +10:00
psychedelicious
813f79f0f9
feat(ui): remove clear temp folder canvas button
...
This button is nonfunctional.
Soon we will introduce a different way to handle clearing out intermediate images (likely automated).
2023-06-09 17:33:17 +10:00
psychedelicious
05a19753c6
feat(ui): remove controlnet model descriptions
...
These are not yet exposed on the UI - somebody who understands what they do better can add them when we have a place to expose them
2023-06-09 16:20:30 +10:00
psychedelicious
a33327c651
feat(ui): enhance IAICustomSelect
...
Now accepts an array of strings or array of `IAICustomSelectOption`s. This supports custom labels and tooltips within the select component.
2023-06-09 16:00:17 +10:00
psychedelicious
c506355b8b
feat(ui): decrease delay on dnd to 150ms
2023-06-09 15:53:17 +10:00
psychedelicious
c91b071c47
fix(nodes): use DFS with preorder traversal
2023-06-09 14:53:45 +10:00
psychedelicious
9c57b18008
fix(nodes): update Invoker.invoke() docstring
2023-06-09 14:53:45 +10:00
psychedelicious
69539a0472
feat(nodes): depth-first execution
...
There was an issue where for graphs w/ iterations, your images were output all at once, at the very end of processing. So if you canceled halfway through an execution of 10 nodes, you wouldn't get any images - even though you'd completed 5 images' worth of inference.
## Cause
Because graphs executed breadth-first (i.e. depth-by-depth), leaf nodes were necessarily processed last. For image generation graphs, your `LatentsToImage` will be leaf nodes, and be the last depth to be executed.
For example, a `TextToLatents` graph w/ 3 iterations would execute all 3 `TextToLatents` nodes fully before moving to the next depth, where the `LatentsToImage` nodes produce output images, resulting in a node execution order like this:
1. TextToLatents
2. TextToLatents
3. TextToLatents
4. LatentsToImage
5. LatentsToImage
6. LatentsToImage
## Solution
This PR makes a two changes to graph execution to execute as deeply as it can along each branch of the graph.
### Eager node preparation
We now prepare as many nodes as possible, instead of just a single node at a time.
We also need to change the conditions in which nodes are prepared. Previously, nodes were prepared only when all of their direct ancestors were executed.
The updated logic prepares nodes that:
- are *not* `Iterate` nodes whose inputs have *not* been executed
- do *not* have any unexecuted `Iterate` ancestor nodes
This results in graphs always being maximally prepared.
### Always execute the deepest prepared node
We now choose the next node to execute by traversing from the bottom of the graph instead of the top, choosing the first node whose inputs are all executed.
This means we always execute the deepest node possible.
## Result
Graphs now execute depth-first, so instead of an execution order like this:
1. TextToLatents
2. TextToLatents
3. TextToLatents
4. LatentsToImage
5. LatentsToImage
6. LatentsToImage
... we get an execution order like this:
1. TextToLatents
2. LatentsToImage
3. TextToLatents
4. LatentsToImage
5. TextToLatents
6. LatentsToImage
Immediately after inference, the image is decoded and sent to the gallery.
fixes #3400
2023-06-09 14:53:45 +10:00
blessedcoolant
7bce455d16
Merge branch 'main' into diffusers-upgrade
2023-06-09 16:27:52 +12:00
psychedelicious
fd03c7eebe
feat(ui): restore reset button for init image
2023-06-09 14:00:23 +10:00
psychedelicious
8c688f8e29
feat(ui): skip resize on img2img if not needed
2023-06-09 13:54:23 +10:00
Lincoln Stein
887576d217
add directory scanning for loras, controlnets and textual_inversions
2023-06-08 23:11:53 -04:00
Lincoln Stein
6652f3405b
merge with main
2023-06-08 21:08:43 -04:00
Lincoln Stein
3d13167d32
Merge branch 'main' into lstein/fix-logger-reconfiguration
2023-06-08 13:41:24 -07:00
Lincoln Stein
27b5e43ea4
add messages to the user to tell them to enlarge window
2023-06-08 16:37:10 -04:00
Lincoln Stein
f2bb507ebb
allow logger to be reconfigured after startup
2023-06-08 09:23:11 -04:00
Lincoln Stein
2a6d11e645
create databases directory on startup
2023-06-08 07:17:54 -04:00
Lincoln Stein
01f46d3c7d
Merge branch 'main' into lstein/fix-logger-reconfiguration
2023-06-07 19:50:44 -07:00
Lincoln Stein
4bbe3b0d00
Merge branch 'main' into release/make-web-dist-startable
2023-06-07 19:21:01 -07:00
Lincoln Stein
9ed86a08f1
multiple small fixes
...
1. Contents of autoscan directory field are restored after doing an installation.
2. Activate dialogue to choose V2 parameterization when importing from a directory.
3. Remove autoscan directory from init file when its checkbox is unselected.
4. Add widget cycling behavior to install models form.
2023-06-07 17:32:00 -04:00
blessedcoolant
68405910ba
Upgrade to Diffusers 0.17.0
2023-06-08 04:42:52 +12:00
psychedelicious
fc7c5da4dd
fix(ui): default controlnet autoprocess to true
...
I had accidentally defaulted it to false
2023-06-07 23:55:24 +10:00
Lincoln Stein
a3357e073c
refactor exception handling
2023-06-07 07:35:34 -04:00
Lincoln Stein
d114833a12
pause after printing exception
2023-06-07 07:26:14 -04:00
Lincoln Stein
96038bd075
print exception on TUI crash
2023-06-07 07:23:14 -04:00
psychedelicious
0a8390356f
feat(ui): enhance autoprocessing
...
The processor is automatically selected when model is changed.
But if the user manually changes the processor, processor settings, or disables the new `Auto configure processor` switch, auto processing is disabled.
The user can enable auto configure by turning the switch back on.
When auto configure is enabled, a small dot is overlaid on the expand button to remind the user that the system is not auto configuring the processor for them.
If auto configure is enabled, the processor settings are reset to the default for the selected model.
2023-06-07 18:25:30 +10:00
psychedelicious
844058c0a5
feat(ui): make prompt not required
...
- also change the placeholder text
2023-06-07 18:25:30 +10:00
psychedelicious
7d74cbe29c
fix(ui): make progress image not draggable
2023-06-07 18:25:30 +10:00
psychedelicious
62ac0ed2dc
feat(ui): tweak cnet model change
...
If there is no control image, and the model does not have a default processor, set the processor to `none`.
2023-06-07 18:25:30 +10:00
psychedelicious
ae14adec2a
feat(ui): add reset button for control image
2023-06-07 18:25:30 +10:00
psychedelicious
6c2b39d1df
feat(ui): improve controlnet image style
...
css is terrible
2023-06-07 18:25:30 +10:00
psychedelicious
0843028e6e
fix(ui): improve dragging activation
...
- delay of 250ms
- prevent gallery images from accidentally activating native drag and drop
2023-06-07 18:25:30 +10:00
psychedelicious
de0fd87035
fix(ui): when a session errors, reset controlnet processing spinner
2023-06-07 18:25:30 +10:00
psychedelicious
8b6c0be259
feat(ui): fix IAIDndImage button styles when upload disabled
2023-06-07 18:25:30 +10:00
psychedelicious
58fec84858
feat(ui): add upload to IAIDndImage
...
Add uploading to IAIDndImage
- add `postUploadAction` arg to `imageUploaded` thunk, with several current valid options (set control image, set init, set nodes image, set canvas, or toast)
- updated IAIDndImage to optionally allow click to upload
2023-06-07 18:25:30 +10:00
psychedelicious
f223ad7776
fix(ui): only show loading indicator on processing control images
2023-06-07 18:25:30 +10:00
psychedelicious
00eabf630d
fix(ui): fix control image not used if processor type is none
2023-06-07 18:25:30 +10:00
psychedelicious
6245a27650
feat(ui): auto-select controlnet processor
...
- when the controlnet model is changed, if there is a default processor for the model set, the processor is changed.
- once a control image is selected (and processed), changing the model does not change the processor - must be manually changed
2023-06-07 18:25:30 +10:00
mickr777
0f16b1c98d
Remove Shadow
2023-06-07 15:51:37 +10:00
mickr777
08e66c5451
Update NodeGraphOverlay.tsx
...
Graph overlay was expanding off the screen to the size of the prompt
2023-06-07 14:49:03 +10:00
Lincoln Stein
563bf70c95
fix CI failure in configure non-interactive mode; merged with main
2023-06-06 23:24:40 -04:00
Lincoln Stein
49d29420c4
Merge branch 'main' into release/make-web-dist-startable
2023-06-06 23:24:16 -04:00
Lincoln Stein
ae9d0c6c1b
fix logger behavior so that it is initialized after command line parsed
2023-06-06 23:19:10 -04:00
Lincoln Stein
04f9757f8d
prevent crash when trying to calculate size of missing safety_checker
...
- Also fixed up order in which logger is created in invokeai-web
so that handlers are installed after command-line options are
parsed (and not before!)
2023-06-06 22:57:49 -04:00
Lincoln Stein
1f9e1eb964
merge with main
2023-06-06 22:18:41 -04:00
Lincoln Stein
d8d11f9bbb
quench fp16 rev id not found warning
2023-06-06 22:01:05 -04:00
Lincoln Stein
13fa0d3bc0
make log message textbox deeper
2023-06-06 17:23:13 -04:00
Lincoln Stein
5eeb4b8e06
allow user to abort conversion of V2 models from within TUI
2023-06-06 17:21:50 -04:00
Lincoln Stein
f5044c290d
fix crash during model conversion
2023-06-06 17:05:29 -04:00
Lincoln Stein
1b43276e5d
make widget selection wrap around
2023-06-06 13:53:11 -07:00
Lincoln Stein
294f086857
configure/install working correctly on windows11
2023-06-06 12:51:34 -07:00
Lincoln Stein
e5024bf5e9
fix conhost launch-with args
2023-06-06 15:17:15 -04:00
blessedcoolant
1a2f0984db
Merge branch 'main' into feat/ui/fix-stale-imageUsage
2023-06-07 04:35:16 +12:00
psychedelicious
454683e6eb
feat(ui): update image urls on connect ( #3507 )
...
* feat(ui): update image urls on connect
Add `updateImageUrlsOnConnect` RTK listener:
- requests URLs for *every* image the app knows about, on connect: gallery, selectedImage, initialImage, canvas images, nodes images, controlnet images
- only fires when `shouldUpdateImagesOnConnect` config is enabled
* remove prop
---------
Co-authored-by: Mary Hipp <maryhipp@Marys-MacBook-Air.local>
2023-06-06 10:23:51 -04:00
psychedelicious
bbb2a08e8f
feat(ui): fix bugs with image deletion
...
- `imageUsage` object was always stale due to react component lifecycle, fixed this
- cleaned up the deletion listener and context
2023-06-06 20:01:27 +10:00
psychedelicious
bf116927e1
feat(ui): clear features if image used by them is deleted
...
This handles the case when an image is deleted but is still in use in as eg an init image on canvas, or a control image. If we just delete the image, canvas/controlnet/etc may break (the image would just fail to load).
When an image is deleted, the app checks to see if it is in use in:
- Image to Image
- ControlNet
- Unified Canvas
- Node Editor
The delete dialog will always open if the image is in use anywhere, and the user is advised that deleting the image will reset the feature(s).
Even if the user has ticked the box to not confirm on delete, the dialog will still show if the image is in use somewhere.
2023-06-06 14:35:07 +10:00
psychedelicious
3d249c4fa3
feat(ui): refactor image deletion
...
Add `DeleteImageContext`:
- provide a single function to delete an image
- opens the modal or immediately deletes, if confirm is off
2023-06-06 14:35:07 +10:00
psychedelicious
fa338ddb6a
feat(ui): add useGetIsImageInUse
...
Checks if an image is currently being used eg in canvas, nodes, controlnet, init image.
2023-06-06 14:35:07 +10:00
psychedelicious
b200451330
feat(ui): add nodesSelector
2023-06-06 14:35:07 +10:00
psychedelicious
8283d23b74
feat(ui): remove shouldTransformUrls
...
This is no longer used.
2023-06-06 14:35:07 +10:00
psychedelicious
2fc0a4d53b
feat(ui): improve handling for urls/metadata received
...
Update images everywhere when urls or metadata is received:
- control images
- init images
- canvas
- nodes
- init image
Also renamed the variable.
2023-06-06 14:35:07 +10:00
psychedelicious
3ff732d583
feat(ui): clear controlnet image when image deleted
2023-06-06 14:35:07 +10:00
psychedelicious
840c632c0a
feat(ui): sort images by updated_at instead of created_at
...
fixes issue where saved staging area images are sorted as expected in gallery.
2023-06-06 14:30:53 +10:00
psychedelicious
40d6e4f287
fix(ui): fix canvas auto-save not working
2023-06-06 14:30:53 +10:00
psychedelicious
fc5f9c30a6
fix(ui): fix metadata viewer not working for canvas images
2023-06-06 14:30:53 +10:00
psychedelicious
229de2dbb8
feat(ui): fix canvas saving
...
- fix "bounding box region only" not being respected when saving
- add toasts for each action
- improve workflow `take()` predicates to use the requestId
2023-06-06 14:30:53 +10:00
psychedelicious
cc22427f25
feat(ui): improve UI on smaller screens
...
- responsive changes were causing a lot of weird layout issues, had to remove the rest of them
- canvas (non-beta) toolbar now wraps
- reduces minH for prompt boxes a bit
2023-06-06 14:29:57 +10:00
Lincoln Stein
90333c0074
merge with main
2023-06-05 22:03:44 -04:00
Lincoln Stein
54e5301b35
Multiple fixes
...
1. Model installer works correctly under Windows 11 Terminal
2. Fixed crash when configure script hands control off to installer
3. Kill install subprocess on keyboard interrupt
4. Command-line functionality for --yes configuration and model installation
restored.
5. New command-line features:
- install/delete lists of diffusers, LoRAS, controlnets and textual inversions
using repo ids, paths or URLs.
Help:
```
usage: invokeai-model-install [-h] [--diffusers [DIFFUSERS ...]] [--loras [LORAS ...]] [--controlnets [CONTROLNETS ...]] [--textual-inversions [TEXTUAL_INVERSIONS ...]] [--delete] [--full-precision | --no-full-precision]
[--yes] [--default_only] [--list-models {diffusers,loras,controlnets,tis}] [--config_file CONFIG_FILE] [--root_dir ROOT]
InvokeAI model downloader
options:
-h, --help show this help message and exit
--diffusers [DIFFUSERS ...]
List of URLs or repo_ids of diffusers to install/delete
--loras [LORAS ...] List of URLs or repo_ids of LoRA/LyCORIS models to install/delete
--controlnets [CONTROLNETS ...]
List of URLs or repo_ids of controlnet models to install/delete
--textual-inversions [TEXTUAL_INVERSIONS ...]
List of URLs or repo_ids of textual inversion embeddings to install/delete
--delete Delete models listed on command line rather than installing them
--full-precision, --no-full-precision
use 32-bit weights instead of faster 16-bit weights (default: False)
--yes, -y answer "yes" to all prompts
--default_only only install the default model
--list-models {diffusers,loras,controlnets,tis}
list installed models
--config_file CONFIG_FILE, -c CONFIG_FILE
path to configuration file to create
--root_dir ROOT path to root of install directory
```
2023-06-05 21:45:35 -04:00
Lincoln Stein
9bcf0b2251
Merge branch 'main' into lstein/config-management-fixes
2023-06-05 15:10:33 -07:00
Lincoln Stein
d4bc98c383
revert to conhost method
2023-06-05 11:46:01 -07:00
psychedelicious
099e1e7c08
feat(ui): fix image fit
...
- Prevent init, current & control images from overflowing
2023-06-05 17:16:30 +10:00
psychedelicious
b1000e30c1
feat(ui): disable keyboard dnd
...
Need to fix a bug w/ collision detection before enabling it. Will pursue later.
2023-06-05 15:24:24 +10:00
psychedelicious
7bd94eac0e
feat(ui): support image dnd to canvas
2023-06-05 15:24:24 +10:00
psychedelicious
2c77563dcc
feat(ui): move DropOverlay into its own IAIDropOverlay component
2023-06-05 15:24:24 +10:00
Lincoln Stein
603c9a587e
open Windows Terminal maximized
2023-06-05 00:24:13 -04:00
Lincoln Stein
1a5a2dfda9
increased window size
2023-06-04 23:54:52 -04:00
Lincoln Stein
090b7eeaf3
workaround to get adequate window size on Windows Terminal
2023-06-04 23:44:07 -04:00
Lincoln Stein
117536324c
the "restore" env variable in .bat launcher confuses pydantic
2023-06-04 22:53:46 -04:00
Lincoln Stein
999c092b6a
fix mouse and window resizing issues
2023-06-04 22:00:11 -04:00
Lincoln Stein
9e31b1f387
Merge branch 'main' into lstein/config-management-fixes
2023-06-04 18:17:43 -04:00
Lincoln Stein
cb157ea530
fix crash when install-models launched from config script
2023-06-04 14:55:51 -04:00
Lincoln Stein
5f6f38074d
merge with main
2023-06-04 13:59:31 -04:00
blessedcoolant
fb06f5b892
Merge branch 'main' into feat_compel_longprompts_and_concat
2023-06-05 04:34:39 +12:00
Lincoln Stein
1a7fb601dc
ask user for v2 variant when model manager can't infer it
2023-06-04 11:27:44 -04:00
Damian Stewart
cdcfda164d
enable long prompts, upgrade compel to enable .and() (concatenating prompts)
2023-06-04 15:30:54 +02:00
psychedelicious
95fa66661c
dummy commit to make github actions run
2023-06-04 22:55:35 +10:00
psychedelicious
6247b79111
docs(ui): update API_CLIENT
2023-06-04 22:46:53 +10:00
psychedelicious
5831364f9c
Update web README.md
2023-06-04 22:44:18 +10:00
psychedelicious
919b81cff1
fix(ui): fix rebase issue
2023-06-04 22:34:58 +10:00
psychedelicious
065fff7db5
fix(ui): fix wonkiness with image dnd
2023-06-04 22:34:58 +10:00
psychedelicious
a664ee30a2
feat(ui): do not change images if the dropped image is the same image
2023-06-04 22:34:58 +10:00
psychedelicious
03f3ad435a
feat(ui): updated controlnet logic/ui
2023-06-04 22:34:58 +10:00
psychedelicious
2270c270ef
feat(ui): add tooltip to IAISwitch
2023-06-04 22:34:58 +10:00
psychedelicious
4f7820719b
feat(ui): add ellipsis direction to IAICustomSelect
2023-06-04 22:34:58 +10:00
psychedelicious
fa285883ad
feat(ui): make OverlayDragImage translucent
2023-06-04 22:34:58 +10:00
psychedelicious
474fca8e6a
feat(ui): add controlNetDenylist
2023-06-04 22:34:58 +10:00
psychedelicious
5dc0250b00
feat(ui): ControlNet layout tweaks
2023-06-04 22:34:58 +10:00
psychedelicious
f269377a01
feat(ui): "ProcessorOptionsContainer" -> "ProcessorWrapper", organise
2023-06-04 22:34:58 +10:00
psychedelicious
d0406024e3
feat(ui): IAICustomSelect tweak styles
2023-06-04 22:34:58 +10:00
blessedcoolant
aa3a969bd2
feat: Update ControlNet Model List & Map
2023-06-04 22:34:58 +10:00
blessedcoolant
73a95973a8
wip: Add Wrapper Container for Preprocessor Options
...
For fast altering of the layout across all pre-preocessors.
2023-06-04 22:34:58 +10:00
blessedcoolant
bf4fe3c1ac
wip: Fixing layout shifts with the ControlNet tab
2023-06-04 22:34:58 +10:00
psychedelicious
d6c08ba469
feat(ui): add mini/advanced controlnet ui
2023-06-04 22:34:58 +10:00
psychedelicious
69f0ba65f1
chore(ui): bump react-icons
2023-06-04 22:34:58 +10:00
psychedelicious
828c86964d
feat(ui): IAICustomSelect prevent label wrap
2023-06-04 22:34:58 +10:00
psychedelicious
54b7ddd63f
feat(ui): IAIDndImage cursor: 'grab'
2023-06-04 22:34:58 +10:00
psychedelicious
a0dde66b5d
feat(ui): more work on controlnet mini
2023-06-04 22:34:58 +10:00
psychedelicious
b6b3b9f99c
feat(ui): make scrollbar less bright
2023-06-04 22:34:58 +10:00
psychedelicious
faa69f8a47
feat(ui): add alpha colors
2023-06-04 22:34:58 +10:00
psychedelicious
d92c7f5483
feat(ui): organize IAIDndImage component
2023-06-04 22:34:58 +10:00
psychedelicious
6b824eb112
feat(ui): initial mini controlnet UI, dnd improvements
2023-06-04 22:34:58 +10:00
psychedelicious
72b4371804
feat(ui): control image auto-process
2023-06-04 22:34:58 +10:00
psychedelicious
fa290aff8d
feat(ui): add defaults for all processors
2023-06-04 22:34:58 +10:00
psychedelicious
3d99d7ae8b
feat(ui): update handling of inProgess, do not allow cnet process when processing
2023-06-04 22:34:58 +10:00
psychedelicious
2eb367969c
feat(ui): do not autoprocess control if invocation in progress
2023-06-04 22:34:58 +10:00
psychedelicious
9cdad95f48
feat(ui): add rest of controlnet processors
2023-06-04 22:34:58 +10:00
psychedelicious
707ed39300
chore(ui): regen api client
2023-06-04 22:34:58 +10:00
psychedelicious
6bbb5f061a
feat(nodes): update controlnet names/descriptions
2023-06-04 22:34:58 +10:00
psychedelicious
6896e69e95
fix(ui): fix multiple controlnets
2023-06-04 22:34:58 +10:00
psychedelicious
b17f4c1650
feat(ui): more tweaking controlnet ui
2023-06-04 22:34:58 +10:00
psychedelicious
98493ed9e2
feat(ui): reorg parameter panel to make room for controlnet
2023-06-04 22:34:58 +10:00
psychedelicious
94c953deab
feat(ui): get processed images back into controlnet ui
2023-06-04 22:34:58 +10:00
psychedelicious
fa4d88e163
feat(ui): improve drag and drop ux
2023-06-04 22:34:58 +10:00
psychedelicious
b1e1e3efc7
fix(ui): fix IAISelectableImage fallback
2023-06-04 22:34:58 +10:00
psychedelicious
3b9426eb72
feat(ui): controlnet/image dnd wip
...
Implement `dnd-kit` for image drag and drop
- vastly simplifies logic bc we can drag and drop non-serializable data (like an `ImageDTO`)
- also much prettier
- also will fix conflicts with file upload via OS drag and drop, bc `dnd-kit` does not use native HTML drag and drop API
- Implemented for Init image, controlnet, and node editor so far
More progress on the ControlNet UI
2023-06-04 22:34:58 +10:00
psychedelicious
e2e07696fc
feat(ui): wip controlnet ui
2023-06-04 22:34:58 +10:00
psychedelicious
d6a959b000
feat(nodes): tidy controlnet processor nodes & improve descriptions
2023-06-04 22:34:58 +10:00
Lincoln Stein
31e97ead2a
move invokeai.db to ~/invokeai/databases
...
- The invokeai.db database file has now been moved into
`INVOKEAIROOT/databases`. Using plural here for possible
future with more than one database file.
- Removed a few dangling debug messages that appeared during
testing.
- Rebuilt frontend to test web.
2023-06-03 20:25:34 -04:00
Lincoln Stein
0b49995659
merge with main
2023-06-03 20:06:27 -04:00
Lincoln Stein
f74f3d6a3a
many TUI improvements:
...
1. Separated the "starter models" and "more models" sections. This
gives us room to list all installed diffuserse models, not just
those that are on the starter list.
2. Support mouse-based paste into the textboxes with either middle
or right mouse buttons.
3. Support terminal-style cursor movement:
^A to move to beginning of line
^E to move to end of line
^K kill text to right and put in killring
^Y yank text back
4. Internal code cleanup.
2023-06-03 16:17:53 -04:00
Lincoln Stein
713fb061e8
Merge branch 'main' into release/make-web-dist-startable
2023-06-02 23:19:33 -04:00
Lincoln Stein
77b7680b32
slight refactoring of code; configure --yes should work now
2023-06-02 23:19:14 -04:00
Lincoln Stein
ff63433591
Merge branch 'main' into lstein/config-management-fixes
2023-06-02 22:56:43 -04:00
Lincoln Stein
31281d7181
Merge branch 'main' into lstein/logging-improvements
2023-06-02 22:56:13 -04:00
Lincoln Stein
44a6623094
Merge branch 'main' into lstein/new-model-manager
2023-06-02 22:40:51 -04:00
Lincoln Stein
72d1e4e404
fix bug in model_manager that prevented import of inpainting models
2023-06-02 22:39:26 -04:00
Lincoln Stein
91918e648b
dynamic display of log messages now working
2023-06-02 22:24:46 -04:00
Lincoln Stein
1390b65a9c
new TUI is fully functional; needs some polishing
2023-06-02 17:20:50 -04:00
blessedcoolant
7620bacc01
feat: Add temporary NodeInvokeButton
2023-06-02 17:55:15 +12:00
blessedcoolant
ea9cf04765
fix: Remove progress bg instead of altering button bg
2023-06-02 17:36:14 +12:00
blessedcoolant
47301e6f85
fix: Do the same without zIndex
2023-06-02 17:33:38 +12:00
blessedcoolant
f143fb7254
feat: Make Invoke Button also the progress bar
2023-06-02 17:24:40 +12:00
mickr777
2bdb655375
Change to absolute
2023-06-02 14:59:10 +10:00
Lincoln Stein
41f7758977
listing, downloading and deleting LoRAs working; TI support pending
2023-06-02 00:40:15 -04:00
mickr777
8ae1eaaccc
Add Progress bar under invoke Button
...
Find on some screens the progress bar at top of screen gets cut off
2023-06-02 14:19:02 +10:00
Lincoln Stein
98773b20ac
merge with main
2023-06-01 18:09:49 -04:00
Mary Hipp
d66979073b
add optional config for settings modal
2023-06-02 00:36:45 +10:00
psychedelicious
c9e621093e
fix(ui): fix looping gallery images fetch
...
The gallery could get in a state where it thought it had just reached the end of the list and endlessly fetches more images, if there are no more images to fetch (weird I know).
Add some logic to remove the `end reached` handler when there are no more images to load.
2023-06-02 00:34:03 +10:00
psychedelicious
e06ba40795
fix(ui): do not allow dpmpp_2s to be used ever
...
it doesn't work for the img2img pipelines, but the implemented conditional display could break the scheduler selection dropdown.
simple fix until diffusers merges the fix - never use this scheduler.
2023-06-02 00:30:01 +10:00
psychedelicious
6571e4c2fd
feat(ui): refactor parameter recall
...
- use zod to validate parameters before recalling
- update recall params hook to handle all validation and UI feedback
2023-06-02 00:30:01 +10:00
Lincoln Stein
ff9240b51d
slight code cleanup
2023-06-01 00:45:07 -04:00
Lincoln Stein
18466e01fd
tab selection seems very natural; not wired to backend yet
2023-06-01 00:43:28 -04:00
Lincoln Stein
e9821ab711
implemented tabbed model selection; not wired to backend yet
2023-06-01 00:31:46 -04:00
Lincoln Stein
d6530df635
rename invokeai.backend.config to invokeai.backend.install
2023-05-31 21:34:20 -04:00
Sergey Borisov
b47786e846
First working TI draft
2023-05-31 02:12:27 +03:00
psychedelicious
062b2cf46f
fix(ui): fix width and height not working on txt2img tab
...
I missed a spot when working on the graph logic yesterday.
2023-05-30 18:41:09 -04:00
Lincoln Stein
082ecf6f25
minor formatting improvements
2023-05-30 13:59:32 -04:00
Lincoln Stein
1632ac6b9f
add controlnet model downloading
2023-05-30 13:49:43 -04:00
Sergey Borisov
69ccd3a0b5
Fixes for checkpoint models
2023-05-30 19:12:47 +03:00
psychedelicious
877959b413
fix(ui): ensure download image opens in new tab
2023-05-30 09:22:54 -04:00
psychedelicious
6e60f7517b
feat(ui): add model description tooltips
2023-05-30 09:06:13 -04:00
psychedelicious
296ee6b7ea
feat(ui): tidy ParamScheduler component
2023-05-30 09:06:13 -04:00
psychedelicious
7c7ffddb2b
feat(ui): upgrade IAICustomSelect to optionally display tooltips for each item
2023-05-30 09:06:13 -04:00
psychedelicious
e1ae7842ff
feat(ui): add defaultModel to config
2023-05-30 09:06:13 -04:00
psychedelicious
9687fe7bac
fix(ui): set default model to first model (alpha sort)
2023-05-30 09:06:13 -04:00
psychedelicious
a9a2bd90c2
fix(nodes): set min and max for l2l strength
2023-05-30 09:06:13 -04:00
psychedelicious
47ca71a7eb
fix(nodes): set cfg_scale min to 1 in latents
2023-05-30 09:06:13 -04:00
psychedelicious
a9c47237b1
fix(ui): mark img2img resize node intermediate
2023-05-30 09:06:13 -04:00
psychedelicious
33bbae2f47
fix(ui): fix missing init image when fit disabled
2023-05-30 09:06:13 -04:00
psychedelicious
fab7a1d337
fix(ui): fix bug with staging bbox not resetting
2023-05-30 09:06:13 -04:00
psychedelicious
cffcf80977
fix(ui): remove w/h from canvas params, add bbox w/h
2023-05-30 09:06:13 -04:00
psychedelicious
1a3fd05b81
fix(ui): fix canvas bbox autoscale
2023-05-30 09:06:13 -04:00
psychedelicious
c22c6ca135
fix(ui): fix img2img fit
2023-05-30 09:06:13 -04:00
psychedelicious
3afb6a387f
chore(ui): regen api
2023-05-30 09:06:13 -04:00
psychedelicious
33e5ed7180
fix(ui): fix edge case in nodes graph building
...
Inputs with explicit values are validated by pydantic even if they also
have a connection (which is the actual value that is used).
Fix this by omitting explicit values for inputs that have a connection.
2023-05-30 09:06:13 -04:00
psychedelicious
2067757fab
feat(ui): enable progress images by default
2023-05-30 09:06:13 -04:00
user1
b1b94a3d56
Fixed problem with inpainting after controlnet support added to main.
...
Problem was that controlnet support involved adding **kwargs to method calls down in denoising loop, and AddsMaskLatents didn't accept **kwarg arg. So just changed to accept and pass on **kwargs.
2023-05-30 08:01:21 -04:00
Lincoln Stein
c9ee42450e
added controlnet models to frontend; backend needs to be done
2023-05-30 00:38:37 -04:00
Lincoln Stein
10fe31c2a1
Merge branch 'main' into lstein/config-management-fixes
2023-05-29 21:03:03 -04:00
Sergey Borisov
420a76ecdd
Add lora loader node
2023-05-30 02:12:33 +03:00
Sergey Borisov
79de9047b5
First working lora implementation
2023-05-30 01:11:00 +03:00
Lincoln Stein
dc54cbb1fc
Merge branch 'main' into release/make-web-dist-startable
2023-05-29 14:16:10 -04:00
psychedelicious
070218aba7
feat(ui): add progress image toggle to current image buttons
2023-05-29 09:07:46 -04:00
psychedelicious
f1c226b171
fix(ui): remove console.log()
2023-05-29 09:07:46 -04:00
psychedelicious
7004430380
feat(ui): gallery filter dropdown -> Images/Assets toggle
2023-05-29 09:07:46 -04:00
psychedelicious
1ddc620192
feat(ui): only cancel on staging commit if processing
2023-05-29 09:07:46 -04:00
psychedelicious
a7cebbd970
feat(ui): cancel session when staging image accepted
2023-05-29 09:07:46 -04:00
psychedelicious
d97438b0b3
fix(ui): fix typo in actionsDenylist
2023-05-29 09:07:46 -04:00
psychedelicious
4522f3f4c9
fix(ui): fix progress images in canvas
2023-05-29 09:07:46 -04:00
psychedelicious
6fe28980b0
feat(ui): revert in-gallery progress
...
wasn't fully baked. will revisist in the future.
2023-05-29 09:07:46 -04:00
psychedelicious
4aec5d8ffc
fix(ui): typo
2023-05-29 09:07:46 -04:00
psychedelicious
bbb4e8f5ef
feat(nodes): add resize image and scale image nodes
2023-05-29 09:07:46 -04:00
psychedelicious
bce33ea62e
fix(ui): when session is complete, null out progress image
...
This may cause minor gallery jumpiness at the very end of processing, but is necessary to prevent the progress image from sticking around if the last node in a session did not have an image output.
2023-05-29 09:07:46 -04:00
psychedelicious
e4705d5ce7
fix(ui): add additional socket event layer to gate handling socket events
...
Some socket events should not be handled by the slice reducers. For example generation progress should not be handled for a canceled session.
Added another layer of socket actions.
Example:
- `socketGeneratorProgress` is dispatched when the actual socket event is received
- Listener middleware exclusively handles this event and determines if the application should also handle it
- If so, it dispatches `appSocketGeneratorProgress`, which the slices can handle
Needed to fix issues related to canceling invocations.
2023-05-29 09:07:46 -04:00
psychedelicious
6764b2a854
fix(ui): fix save to gallery without bounding box
2023-05-29 09:07:46 -04:00
psychedelicious
970340cf62
fix(ui): infill and scaling options label
2023-05-29 09:07:46 -04:00
psychedelicious
043f9d9ba4
fix(ui): fix auto-switch to new images
2023-05-29 09:07:46 -04:00
psychedelicious
6f82801d07
fix(ui): fix canvas save to gallery incorrect is_intermediate flag
2023-05-28 20:19:56 -04:00
psychedelicious
3e3dd39ae4
fix(nodes): fix images service update() for is_intermediate
2023-05-28 20:19:56 -04:00
psychedelicious
89aa06e014
feat(ui): consolidate images slice
...
Now that images are in a database and we can make filtered queries, we can do away with the cumbersome `resultsSlice` and `uploadsSlice`.
- Remove `resultsSlice` and `uploadsSlice` entirely
- Add `imagesSlice` fills the same role
- Convert the application to use `imagesSlice`, reducing a lot of messy logic where we had to check which category was selected
- Add a simple filter popover to the gallery, which lets you select any number of image categories
2023-05-28 20:19:56 -04:00
psychedelicious
6cc00ef4b7
chore(ui): regen api client
2023-05-28 20:19:56 -04:00
psychedelicious
f31e62afad
feat(nodes): make list images route use offset pagination
...
Because we dynamically insert images into the DB and UI's images state, `page`/`per_page` pagination makes loading the images awkward.
Using `offset`/`limit` pagination lets us query for images with an offset equal to the number of images already loaded (which match the query parameters).
The result is that we always get the correct next page of images when loading more.
2023-05-28 20:19:56 -04:00
psychedelicious
38fd2ad45d
fix(ui): fix metadata viewer crash
2023-05-28 20:19:56 -04:00
psychedelicious
05b99b5377
fix(ui): fix erroneously displays is_intermediate field on nodes
2023-05-28 20:19:56 -04:00
psychedelicious
08a14ee6d5
fix(nodes): fix conflicts with controlnet
2023-05-28 20:19:56 -04:00
psychedelicious
29fcc92da9
feat(ui): handle new image origin/category setup
...
- Update all thunks & network related things
- Update gallery
What I have not done yet is rename the gallery tabs and the relevant slices, but I believe the functionality is all there.
Also I fixed several bugs along the way but couldn't really commit them separately bc I was refactoring. Can't remember what they were, but related to the gallery image switching.
2023-05-28 20:19:56 -04:00
psychedelicious
d78e3572e3
chore(ui): regen api client
2023-05-28 20:19:56 -04:00
psychedelicious
160267c71a
feat(nodes): refactor image types
...
- Remove `ImageType` entirely, it is confusing
- Create `ResourceOrigin`, may be `internal` or `external`
- Revamp `ImageCategory`, may be `general`, `mask`, `control`, `user`, `other`. Expect to add more as time goes on
- Update images `list` route to accept `include_categories` OR `exclude_categories` query parameters to afford finer-grained querying. All services are updated to accomodate this change.
The new setup should account for our types of images, including the combinations we couldn't really handle until now:
- Canvas init and masks
- Canvas when saved-to-gallery or merged
2023-05-28 20:19:56 -04:00
psychedelicious
fd47e70c92
feat(nodes): use higher precision timestamps in db
2023-05-28 20:19:56 -04:00
psychedelicious
9317b42e5f
feat(nodes, ui): wip image types
2023-05-28 20:19:56 -04:00
psychedelicious
bdab73701f
fix(ui): canvas images not added to staging
2023-05-28 20:19:56 -04:00
psychedelicious
3ea5e78322
fix(nodes): fix list images route param descriptions
2023-05-28 20:19:56 -04:00
psychedelicious
f609ee21a2
fix(ui): handle intermediates when fetching gallery
2023-05-28 20:19:56 -04:00
psychedelicious
f51defeeb3
chore(ui): regen api client
2023-05-28 20:19:56 -04:00
psychedelicious
ee0225f4ba
fix(nodes): handle intermediates during images.get_many()
2023-05-28 20:19:56 -04:00
psychedelicious
33a0af4637
feat(nodes): add nameservice
...
Currenly only used to make names for images, but when latents, conditioning, etc are managed in DB, will do the same for them.
Intended to eventually support custom naming schemes.
2023-05-28 20:19:56 -04:00
Lincoln Stein
d37b08a7dd
Merge branch 'main' into release/make-web-dist-startable
2023-05-28 19:46:09 -04:00
user1
9a796364da
Fixed controlnet preprocessors and controlnet handling in TextToLatents to work with revised Image services.
2023-05-26 21:44:00 -04:00
user1
1ad4eb3a7b
Progress toward improvement in fieldTemplateBuilder.ts getFieldType()
2023-05-26 21:44:00 -04:00
user1
3767a453bb
Added float to FIELD_TYPE_MAP ins constants.ts
2023-05-26 21:44:00 -04:00
user1
d9b1e4a98c
Added nodes for float params: ParamFloatInvocation and FloatCollectionOutput. Also added FloatOutput.
2023-05-26 21:44:00 -04:00
user1
a4dec8c1d6
Fixed bug where MediapipFaceProcessorInvocation was ignoring max_faces and min_confidence params.
2023-05-26 21:44:00 -04:00
user1
8960ceb98b
Added Mediapipe image processor for use as ControlNet preprocessor.
...
Also hacked in ability to specify HF subfolder when loading ControlNet models from string.
2023-05-26 21:44:00 -04:00
psychedelicious
be79d088c0
fix(nodes): controlnet input accepts list or single controlnet
2023-05-26 21:44:00 -04:00
psychedelicious
009407ea3f
fix(ui): fix node ui type hints
2023-05-26 21:44:00 -04:00
psychedelicious
6999d28c7f
chore(ui): regen api client
2023-05-26 21:44:00 -04:00
user1
324e9eb74b
Extended node-based ControlNet support to LatentsToLatentsInvocation.
2023-05-26 21:44:00 -04:00
user1
56cff40362
Cleaning up after ControlNet refactor in TextToLatentsInvocation
2023-05-26 21:44:00 -04:00
user1
2ba40c5e52
Refactored most of controlnet code into its own method to declutter TextToLatents.invoke(), and make upcoming integration with LatentsToLatents easier.
2023-05-26 21:44:00 -04:00
user1
3ab147204c
Fix to work with current stable release of controlnet_aux (v0.0.3). Turned of pre-processor params that were added post v0.0.3. Also change defaults for shuffle.
2023-05-26 21:44:00 -04:00
user1
e4c89cba9c
Switched CotrolNet node modelname input from free text to default list of popular ControlNet model names.
2023-05-26 21:44:00 -04:00
user1
322ea84c4e
Commented out ZoeDetector. Will re-instate once there's a controlnet-aux release that supports it.
2023-05-26 21:44:00 -04:00
user1
f2b41c60ff
Cleaning up prior to submitting ControlNet PR. Mostly turning off diagnostic printing. Also fixed error when there is no controlnet input.
2023-05-26 21:44:00 -04:00
user1
754acec92f
Added support for specifying which step iteration to start using
...
each ControlNet, and which step to end using each controlnet (specified as fraction of total steps)
2023-05-26 21:44:00 -04:00
user1
11fc7e40a5
Refactored ControNet support to consolidate multiple parameters into data struct. Also redid how multiple controlnets are handled.
2023-05-26 21:44:00 -04:00
user1
d15bb88eb2
Removed last bits of dtype and and device hardwiring from controlnet section
2023-05-26 21:44:00 -04:00
user1
70ba36eefc
Cleaning up mistakes after rebase.
2023-05-26 21:44:00 -04:00
user1
7e70391c2b
Cleaning up TextToLatent arg testing
2023-05-26 21:44:00 -04:00
user1
e2a94be336
Added resizing of controlnet image based on noise latent. Fixes a tensor mismatch issue.
2023-05-26 21:44:00 -04:00
user1
63a86eefb4
Refactored controlnet nodes: split out controlnet stuff into separate node, stripped controlnet stuff form image processing/analysis nodes.
2023-05-26 21:44:00 -04:00
user1
b0727b9d47
Prep for splitting pre-processor and controlnet nodes
2023-05-26 21:44:00 -04:00
user1
d96e727dd5
Added more preprocessor nodes for:
...
MidasDepth
ZoeDepth
MLSD
NormalBae
Pidi
LineartAnime
ContentShuffle
Removed pil_output options, ControlNet preprocessors should always output as PIL. Removed diagnostics and other general cleanup.
2023-05-26 21:44:00 -04:00
user1
fe480886dc
changes to base class for controlnet nodes
2023-05-26 21:44:00 -04:00
user1
8031d1827b
Refactored controlnet node to output ControlField that bundles control info.
2023-05-26 21:44:00 -04:00
user1
b5acdb322d
Switching to ControlField for output from controlnet nodes.
2023-05-26 21:44:00 -04:00
user1
a4d1fe8819
Initial port of controlnet node support from generator-based TextToImageInvocation node to latent-based TextToLatentsInvocation node
2023-05-26 21:44:00 -04:00
user1
10b7a58887
Added first controlnet preprocessor node for canny edge detection.
2023-05-26 21:44:00 -04:00
user1
901a277959
Core implementation of ControlNet and MultiControlNet.
2023-05-26 21:44:00 -04:00
user1
aaa093bef1
Fixed use of ControlNet control_weight parameter
2023-05-26 21:44:00 -04:00
user1
bb96543d66
Added support for using multiple control nets. Unfortunately this breaks direct usage of Control node output port ==> TextToLatent control input port -- passing through a Collect node is now required. Working on fixing this...
2023-05-26 21:44:00 -04:00
user1
a2a2cfa765
Added resizing of controlnet image based on noise latent. Fixes a tensor mismatch issue.
2023-05-26 21:44:00 -04:00
user1
18e6a2b410
Refactored controlnet nodes: split out controlnet stuff into separate node, stripped controlnet stuff form image processing/analysis nodes.
2023-05-26 21:44:00 -04:00
user1
db27263bc2
Prep for splitting pre-processor and controlnet nodes
2023-05-26 21:44:00 -04:00
user1
0e027ec3ef
Added more preprocessor nodes for:
...
MidasDepth
ZoeDepth
MLSD
NormalBae
Pidi
LineartAnime
ContentShuffle
Removed pil_output options, ControlNet preprocessors should always output as PIL. Removed diagnostics and other general cleanup.
2023-05-26 21:44:00 -04:00
user1
5acbbeecaa
Added HED, LineArt, and OpenPose ControlNet nodes
2023-05-26 21:44:00 -04:00
user1
6ef2168b67
changes to base class for controlnet nodes
2023-05-26 21:44:00 -04:00
user1
6d958a214c
Refactored ControlNet nodes so they subclass from PreprocessedControlInvocation, and only need to override run_processor(image) (instead of reimplementing invoke())
2023-05-26 21:44:00 -04:00
user1
4ae4bf4ff9
Resolving conflicts in rebase to origin/main
2023-05-26 21:44:00 -04:00
user1
fdef53b2de
Switching to ControlField for output from controlnet nodes.
2023-05-26 21:44:00 -04:00
user1
11bd038b9d
Added first controlnet preprocessor node for canny edge detection.
2023-05-26 21:44:00 -04:00
user1
768cfe3aab
Core implementation of ControlNet and MultiControlNet.
2023-05-26 21:44:00 -04:00
user1
c4277b0662
Moved to controlnet_aux v0.0.4, reinstated Zoe controlnet preprocessor. Also in pyproject.toml had to specify downgrade of timm to 0.6.13 _after_ controlnet-aux installs timm >= 0.9.2, because timm >0.6.13 breaks Zoe preprocessor.
2023-05-26 21:44:00 -04:00
psychedelicious
020f3ccf07
fix(nodes): controlnet input accepts list or single controlnet
2023-05-26 21:44:00 -04:00
psychedelicious
7467fa5e57
fix(ui): fix node ui type hints
2023-05-26 21:44:00 -04:00
psychedelicious
e19ef7ed2f
fix(ui): add control field type
2023-05-26 21:44:00 -04:00
psychedelicious
71003be6b8
fix(ui): add value to conditioning field
2023-05-26 21:44:00 -04:00
user1
c1dbafc2df
chore(ui): regen api client
2023-05-26 21:44:00 -04:00
user1
dcebd71381
Extended node-based ControlNet support to LatentsToLatentsInvocation.
2023-05-26 21:44:00 -04:00
user1
d855a65e73
Cleaning up after ControlNet refactor in TextToLatentsInvocation
2023-05-26 21:44:00 -04:00
user1
a9007c7e0f
Refactored most of controlnet code into its own method to declutter TextToLatents.invoke(), and make upcoming integration with LatentsToLatents easier.
2023-05-26 21:44:00 -04:00
user1
af60304f97
Fix to work with current stable release of controlnet_aux (v0.0.3). Turned of pre-processor params that were added post v0.0.3. Also change defaults for shuffle.
2023-05-26 21:44:00 -04:00
user1
6de241eead
Switched CotrolNet node modelname input from free text to default list of popular ControlNet model names.
2023-05-26 21:44:00 -04:00
user1
51032dc0b2
Commented out ZoeDetector. Will re-instate once there's a controlnet-aux release that supports it.
2023-05-26 21:44:00 -04:00
user1
297931f5d9
Cleaning up prior to submitting ControlNet PR. Mostly turning off diagnostic printing. Also fixed error when there is no controlnet input.
2023-05-26 21:44:00 -04:00
user1
f613c073c1
Added support for specifying which step iteration to start using
...
each ControlNet, and which step to end using each controlnet (specified as fraction of total steps)
2023-05-26 21:44:00 -04:00
user1
63d248622c
Refactored ControNet support to consolidate multiple parameters into data struct. Also redid how multiple controlnets are handled.
2023-05-26 21:44:00 -04:00
user1
48485fe92f
Removed last bits of dtype and and device hardwiring from controlnet section
2023-05-26 21:44:00 -04:00
user1
07726af703
Cleaning up mistakes after rebase.
2023-05-26 21:44:00 -04:00
user1
ad1004b485
Cleaning up TextToLatent arg testing
2023-05-26 21:44:00 -04:00
user1
0096fb2790
Added resizing of controlnet image based on noise latent. Fixes a tensor mismatch issue.
2023-05-26 21:44:00 -04:00
user1
9c8c2e49d6
Refactored controlnet nodes: split out controlnet stuff into separate node, stripped controlnet stuff form image processing/analysis nodes.
2023-05-26 21:44:00 -04:00
user1
2005a96847
Prep for splitting pre-processor and controlnet nodes
2023-05-26 21:44:00 -04:00
user1
00a8d60c1b
Added more preprocessor nodes for:
...
MidasDepth
ZoeDepth
MLSD
NormalBae
Pidi
LineartAnime
ContentShuffle
Removed pil_output options, ControlNet preprocessors should always output as PIL. Removed diagnostics and other general cleanup.
2023-05-26 21:44:00 -04:00
user1
3aa182390a
changes to base class for controlnet nodes
2023-05-26 21:44:00 -04:00
user1
e44f1d6d4e
Refactored controlnet node to output ControlField that bundles control info.
2023-05-26 21:44:00 -04:00
user1
dfdf8e2ead
Switching to ControlField for output from controlnet nodes.
2023-05-26 21:44:00 -04:00
user1
3a645c4e80
Initial port of controlnet node support from generator-based TextToImageInvocation node to latent-based TextToLatentsInvocation node
2023-05-26 21:44:00 -04:00
user1
113129daf9
Added first controlnet preprocessor node for canny edge detection.
2023-05-26 21:44:00 -04:00
user1
940e3b6635
Core implementation of ControlNet and MultiControlNet.
2023-05-26 21:44:00 -04:00
user1
7fb29dabff
Fixed lint-ish formatting error
2023-05-26 21:44:00 -04:00
user1
714ad6dbb8
Fixed use of ControlNet control_weight parameter
2023-05-26 21:44:00 -04:00
user1
c0863fa20f
Added support for using multiple control nets. Unfortunately this breaks direct usage of Control node output port ==> TextToLatent control input port -- passing through a Collect node is now required. Working on fixing this...
2023-05-26 21:44:00 -04:00
user1
78b0b37ba6
More rebase repair.
2023-05-26 21:44:00 -04:00
user1
5d5cdc7716
Added resizing of controlnet image based on noise latent. Fixes a tensor mismatch issue.
2023-05-26 21:44:00 -04:00
user1
93cd818f6a
Refactored controlnet nodes: split out controlnet stuff into separate node, stripped controlnet stuff form image processing/analysis nodes.
2023-05-26 21:44:00 -04:00
user1
598a628790
Prep for splitting pre-processor and controlnet nodes
2023-05-26 21:44:00 -04:00
user1
f3666eda63
Added more preprocessor nodes for:
...
MidasDepth
ZoeDepth
MLSD
NormalBae
Pidi
LineartAnime
ContentShuffle
Removed pil_output options, ControlNet preprocessors should always output as PIL. Removed diagnostics and other general cleanup.
2023-05-26 21:44:00 -04:00
user1
754017b59e
Added an additional "raw_processed_image" output port to controlnets, mainly so could route ImageField to a ShowImage node
2023-05-26 21:44:00 -04:00
user1
21251ce12c
Added HED, LineArt, and OpenPose ControlNet nodes
2023-05-26 21:44:00 -04:00
user1
dc12fa6cd6
changes to base class for controlnet nodes
2023-05-26 21:44:00 -04:00
user1
f2f4c37f19
Refactored ControlNet nodes so they subclass from PreprocessedControlInvocation, and only need to override run_processor(image) (instead of reimplementing invoke())
2023-05-26 21:44:00 -04:00
user1
0864fca641
Resolving conflicts in rebase to origin/main
2023-05-26 21:44:00 -04:00
user1
5e4c0217c7
Switching to ControlField for output from controlnet nodes.
2023-05-26 21:44:00 -04:00
user1
78cd106c23
Initial port of controlnet node support from generator-based TextToImageInvocation node to latent-based TextToLatentsInvocation node
2023-05-26 21:44:00 -04:00
user1
6ed0efa938
Added first controlnet preprocessor node for canny edge detection.
2023-05-26 21:44:00 -04:00
user1
ca0669c337
Resolving rebase conflict
2023-05-26 21:44:00 -04:00
user1
a91dee87d0
Added support for ControlNet and MultiControlNet to legacy non-nodal Txt2Img in backend/generator. Although backend/generator will likely disappear by v3.x, right now they are very useful for testing core ControlNet and MultiControlNet functionality while node codebase is rapidly evolving.
2023-05-26 21:44:00 -04:00
user1
5ff98a4179
Core implementation of ControlNet and MultiControlNet.
2023-05-26 21:44:00 -04:00
Lincoln Stein
5c0f0d1808
Merge branch 'main' into lstein/logging-improvements
2023-05-26 08:57:17 -04:00
Lincoln Stein
951900a86a
Merge branch 'main' into lstein/config-management-fixes
2023-05-26 08:56:41 -04:00
psychedelicious
582f516fef
Merge branch 'main' into release/make-web-dist-startable
2023-05-26 18:06:38 +10:00
psychedelicious
a25bae2545
fix(ui): tweak log levels
2023-05-26 18:06:08 +10:00
psychedelicious
0ea35b1e3d
feat(ui): improve session canceled handling
2023-05-26 18:06:08 +10:00
psychedelicious
c6f935bf1a
feat(ui): improve gallery page handling
2023-05-26 18:06:08 +10:00
