Lincoln Stein
2fbc6dc315
Merge branch 'main' into bugfix/ImageToLatentsInvocation_fp32_precision
2023-07-19 12:08:04 -04:00
psychedelicious
0724eb9e0a
feat(ui): another go at gallery ( #3791 )
...
* feat(ui): migrate listImages to RTK query using createEntityAdapter
- see comments in `endpoints/images.ts` for explanation of the caching
- so far, only manually updating `all` images when new image is generated. no other manual cache updates are implemented, but will be needed.
- fixed some weirdness with loading state components (like the spinners in gallery)
- added `useThumbnailFallback` for `IAIDndImage`, this displays the tiny webp thumbnail while the full-size images load
- comment out some old thunk related stuff in gallerySlice, which is no longer needed
* feat(ui): add manual cache updates for board changes (wip)
- update RTK Query caches when adding/removing single image to/from board
- work more on migrating all image-related operations to RTK Query
* update AddImagesToBoardContext so that it works when user uses context menu + modal
* handle case where no image is selected
* get assets working for main list and boards - dnd only
* feat(ui): migrate image uploads to RTK Query
- minor refactor of `ImageUploader` and `useImageUploadButton` hooks, simplify some logic
- style filesystem upload overlay to match existing UI
- replace all old `imageUploaded` thunks with `uploadImage` RTK Query calls, update associated logic including canvas related uploads
- simplify `PostUploadAction`s that only need to display user input
* feat(ui): remove `receivedPageOfImages` thunks
* feat(ui): remove `receivedImageUrls` thunk
* feat(ui): finish removing all images thunks
stuff now broken:
- image usage
- delete board images
- on first load, no image selected
* feat(ui): simplify `updateImage` cache manipulation
- we don't actually ever change categories, so we can remove a lot of logic
* feat(ui): simplify canvas autosave
- instead of using a network request to set the canvas generation as not intermediate, we can just do that in the graph
* feat(ui): simplify & handle edge cases in cache updates
* feat(db, api): support `board_id='none'` for `get_many` images queries
This allows us to get all images that are not on a board.
* chore(ui): regen types
* feat(ui): add `All Assets`, `No Board` boards
Restructure boards:
- `all images` is all images
- `all assets` is all assets
- `no board` is all images/assets without a board set
- user boards may have images and assets
Update caching logic
- much simpler without every board having sub-views of images and assets
- update drag and drop operations for all possible interactions
* chore(ui): regen types
* feat(ui): move download to top of context menu
* feat(ui): improve drop overlay styles
* fix(ui): fix image not selected on first load
- listen for first load of all images board, then select the first image
* feat(ui): refactor board deletion
api changes:
- add route to list all image names for a board. this is required to handle board + image deletion. we need to know every image in the board to determine the image usage across the app. this is fetched only when the delete board and images modal is opened so it's as efficient as it can be.
- update the delete board route to respond with a list of deleted `board_images` and `images`, as image names. this is needed to perform accurate clientside state & cache updates after deleting.
db changes:
- remove unused `board_images` service method to get paginated images dtos for a board. this is now done thru the list images endpoint & images service. needs a small logic change on `images.delete_images_on_board`
ui changes:
- simplify the delete board modal - no context, just minor prop drilling. this is feasible for boards only because the components that need to trigger and manipulate the modal are very close together in the tree
- add cache updates for `deleteBoard` & `deleteBoardAndImages` mutations
- the only thing we cannot do directly is on `deleteBoardAndImages`, update the `No Board` board. we'd need to insert image dtos that we may not have loaded. instead, i am just invalidating the tags for that `listImages` cache. so when you `deleteBoardAndImages`, the `No Board` will re-fetch the initial image limit. i think this is more efficient than e.g. fetching all image dtos to insert then inserting them.
- handle image usage for `deleteBoardAndImages`
- update all (i think/hope) the little bits and pieces in the UI to accomodate these changes
* fix(ui): fix board selection logic
* feat(ui): add delete board modal loading state
* fix(ui): use thumbnails for board cover images
* fix(ui): fix race condition with board selection
when selecting a board that doesn't have any images loaded, we need to wait until the images haveloaded before selecting the first image.
this logic is debounced to ~1000ms.
* feat(ui): name 'No Board' correctly, change icon
* fix(ui): do not cache listAllImageNames query
if we cache it, we can end up with stale image usage during deletion.
we could of course manually update the cache as we are doing elsewhere. but because this is a relatively infrequent network request, i'd like to trade increased cache mgmt complexity here for increased resource usage.
* feat(ui): reduce drag preview opacity, remove border
* fix(ui): fix incorrect queryArg used in `deleteImage` and `updateImage` cache updates
* fix(ui): fix doubled open in new tab
* fix(ui): fix new generations not getting added to 'No Board'
* fix(ui): fix board id not changing on new image when autosave enabled
* fix(ui): context menu when selection is 0
need to revise how context menu is triggered later, when we approach multi select
* fix(ui): fix deleting does not update counts for all images and all assets
* fix(ui): fix all assets board name in boards list collapse button
* fix(ui): ensure we never go under 0 for total board count
* fix(ui): fix text overflow on board names
---------
Co-authored-by: Mary Hipp <maryhipp@Marys-MacBook-Air.local>
2023-07-19 12:06:38 -04:00
Martin Kristiansen
6a4440e52b
Merge branch 'main' into bugfix/ImageToLatentsInvocation_fp32_precision
2023-07-19 11:56:07 -04:00
Martin Kristiansen
07c48b2fd1
Moving detected precision to DEFAULT_PRECISION constant
2023-07-19 11:55:37 -04:00
Mary Hipp
055f5b2d4b
clear canvas alongside intermediates
2023-07-19 11:39:24 -04:00
Martin Kristiansen
fface339ae
Same fix for ImageToLatentsInvocation
2023-07-19 11:38:13 -04:00
Martin Kristiansen
2ec9dab595
Changing ImageToLatentsInvocation node to default to detected precision instead of fp16
2023-07-19 11:16:00 -04:00
Mary Hipp Rogers
9f00e055ac
Maryhipp/clear intermediates ( #3820 )
...
* new route to clear intermediates
* UI to clear intermediates from settings modal
* cleanup
* PR feedback
---------
Co-authored-by: Mary Hipp <maryhipp@Marys-MacBook-Air.local>
2023-07-19 10:55:29 -04:00
Lincoln Stein
9c3a556813
Merge branch 'main' into fix/transformers_4_31_0
2023-07-19 09:35:52 -04:00
Lincoln Stein
0b6ef7eb7d
make the convert VAE available to model manager for use in UI
2023-07-19 09:05:24 -04:00
mickr777
23f0c7035c
Tweaks to Image Progress Node ( #3833 )
...
* Update nodesSlice.ts
* Update ProgressImageNode.tsx
* remove unused code
* Remove Fixed Ratio
I was causing issues
* fix: Progress Image Node Size
---------
Co-authored-by: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
2023-07-19 20:54:50 +12:00
mickr777
d8db618de0
import choose_torch_device from ...backend.util.devices
2023-07-19 16:43:02 +10:00
mickr777
19d67b29e7
Remove not needed text
2023-07-19 15:20:40 +10:00
mickr777
52e7e0b31b
Missing def choose_torch_device
2023-07-19 15:15:55 +10:00
Sergey Borisov
2e7fc055c4
Support both pre and post 4.31.0 transformers
2023-07-19 06:15:17 +03:00
Lincoln Stein
0f7e329e76
restore access token-saving code
2023-07-18 22:58:56 -04:00
Lincoln Stein
a690cca5b5
make convert work with both 4.30.2 and 4.31.0
2023-07-18 22:18:13 -04:00
Lincoln Stein
f29bafd6ec
fix Object of type PosixPath is not JSON serializable error
2023-07-18 22:10:12 -04:00
Lincoln Stein
700131fab2
Pin to transformers 4.30.2
...
bump version
2023-07-18 21:43:40 -04:00
Sergey Borisov
0aa7193d3b
Load text_model.embeddings.position_ids outsude state_dict
2023-07-19 04:18:43 +03:00
Lincoln Stein
2fbf245c3d
Merge branch 'main' into release/invokeai-3-0-beta
...
-- this adds the upscaling support
2023-07-18 21:17:15 -04:00
Lincoln Stein
39c14eb2ac
fix pretrained model download to work with xl
2023-07-18 21:10:33 -04:00
Lincoln Stein
e943913f58
Merge branch 'main' into release/invokeai-3-0-beta
2023-07-18 20:42:10 -04:00
Lincoln Stein
893e199677
Merge branch 'main' into feat/ui/upscale
2023-07-18 19:18:55 -04:00
blessedcoolant
71a07ee5a7
Merge branch 'main' into maryhipp/optional-version
2023-07-19 11:02:24 +12:00
Lincoln Stein
ec08151009
add correct requirements for installing SDXL models
2023-07-18 18:15:37 -04:00
blessedcoolant
186e98da5e
Merge branch 'main' into fix/mem_cleanup
2023-07-19 10:10:32 +12:00
Eugene Brodsky
dea9a5da7a
Avoid crash if unable to modify the model config file ( #3824 )
...
* fix whitespace; remove invisible characters
* log error and proceed if unable to modify the model config
2023-07-18 16:33:19 -04:00
Sergey Borisov
bda0000acd
Cleanup vram after models offloading, tweak to cleanup local variable references on ram offload
2023-07-18 23:21:18 +03:00
Mary Hipp
4b678f2416
add toggle to not show version on logo
2023-07-18 16:16:35 -04:00
Lincoln Stein
43fbbfb848
revert python version requirement
2023-07-18 16:15:47 -04:00
Lincoln Stein
c364c85915
Merge branch 'main' into release/invokeai-3-0-beta
2023-07-18 13:27:15 -04:00
Lincoln Stein
3773bfbc74
add yarn.lock back in
2023-07-18 13:05:53 -04:00
Lincoln Stein
949437b4f0
Merge branch 'release/invokeai-3-0-beta' of github.com:invoke-ai/InvokeAI into release/invokeai-3-0-beta
2023-07-18 12:45:57 -04:00
Lincoln Stein
efcb3a9d08
documentation fixes
2023-07-18 12:45:47 -04:00
blessedcoolant
54bd7c7f04
Merge branch 'main' into release/invokeai-3-0-beta
2023-07-19 03:59:10 +12:00
Sergey Borisov
3240f98f4e
Rename clip1 to clip
2023-07-18 18:58:17 +03:00
Lincoln Stein
3fa7170566
tell user that they can import a model URL in the Import Models UI
2023-07-18 11:31:31 -04:00
blessedcoolant
7fde1f93ea
fix: Missing context on string param node
2023-07-19 02:49:09 +12:00
Lincoln Stein
9685760fac
Merge branch 'main' into release/invokeai-3-0-beta
2023-07-18 10:41:57 -04:00
blessedcoolant
3f1d5000c0
Merge branch 'main' into nodes-stuff
2023-07-19 02:37:50 +12:00
blessedcoolant
0c18c5d603
feat: Add titles and tags to all Nodes
2023-07-19 02:26:45 +12:00
blessedcoolant
7d49c727a0
feat: Add String Param & types to other params
2023-07-19 02:26:33 +12:00
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
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
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
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
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