Brandon Rising
8935ae0ea3
Fix issues caused by merge
2023-07-28 14:00:32 -04:00
ZachNagengast
31e5f4bb0e
Merge branch 'main' into set-timestep-mps-fix
2023-07-28 08:58:12 -07:00
ZachNagengast
2164674b01
Black format
2023-07-28 07:49:29 -07:00
blessedcoolant
8f2a646286
fix: Lint errors
2023-07-29 02:37:59 +12:00
blessedcoolant
5ff4dd26bb
fix: Concat Link Styling
2023-07-29 02:30:10 +12:00
Lincoln Stein
e342ca872f
fix to work on non-MPS systems
2023-07-28 10:27:49 -04:00
Brandon Rising
a2aa66f43a
Run Python black
2023-07-28 10:00:09 -04:00
Brandon Rising
da751da3dd
Merge branch 'main' into feat/onnx
2023-07-28 09:59:35 -04:00
Brandon Rising
2b7b3dd4ba
Run python black
2023-07-28 09:46:44 -04:00
psychedelicious
e4a2f56ad1
feat(ui): tweak link colors
...
- make the `SDXLConcatLink` icon match existing colors in light mode
- make the link toggle button accent color when active (its not super obvious but at least there is *some* visual difference for the button)
2023-07-28 19:57:05 +10:00
blessedcoolant
1df30f7260
feat: Pulse Animate SDXL Concat Link
2023-07-28 20:45:39 +12:00
blessedcoolant
14c4650801
fix: Lint Errors (returning possible null component)
2023-07-28 19:03:29 +12:00
blessedcoolant
f155b03eee
feat: New animation for Concat Link
2023-07-28 18:55:59 +12:00
ZachNagengast
ddaf753f7b
Merge branch 'set-timestep-mps-fix' of ssh://github.com/ZachNagengast/InvokeAI into set-timestep-mps-fix
2023-07-27 23:40:44 -07:00
ZachNagengast
e6d14c708c
Fix variable name
2023-07-27 23:40:23 -07:00
Millun Atluri
7f81a95b20
Merge branch 'main' into set-timestep-mps-fix
2023-07-28 16:12:07 +10:00
blessedcoolant
6a49eec606
feat: Add Concat Link Animation
...
Might remove the lines. Just pushing to save changes for now.
2023-07-28 15:01:40 +12:00
blessedcoolant
fd67b18c9a
Merge branch 'main' into unify-prompt
2023-07-28 14:48:13 +12:00
psychedelicious
9affdbbaad
chore: black
2023-07-28 11:38:52 +10:00
psychedelicious
8d300bddd0
feat(ui): alias existing type for UpdateLoRAModelResponse
2023-07-28 11:38:52 +10:00
Lincoln Stein
aa2c94be9e
make LoRAs editable
2023-07-28 11:38:52 +10:00
Lincoln Stein
4c79350300
persist LoRA model info in models.yaml
2023-07-28 11:38:52 +10:00
Alexandre Macabies
10e1d623c3
Add LoRAs to the model manager.
2023-07-28 11:38:52 +10:00
ZachNagengast
aa1f827271
Fix unet_info location, can have no device prop
2023-07-27 14:47:09 -07:00
ZachNagengast
6edeb4e072
Pass device to set_timestep to avoid float64 error
2023-07-27 12:52:18 -07:00
Lincoln Stein
4a30773d09
Merge branch 'main' into feat/unify-logging
2023-07-27 15:25:56 -04:00
Brandon Rising
1ea9ba84f5
Release session if applying ti or lora
2023-07-27 15:20:38 -04:00
Lincoln Stein
64bd11541a
Merge branch 'main' into feat/unify-logging
2023-07-27 15:20:07 -04:00
Lincoln Stein
0d8f9cbe55
resolved conflicts with main
2023-07-27 15:11:25 -04:00
Lincoln Stein
fd75a1dd10
reformat with black
2023-07-27 15:01:00 -04:00
Brandon Rising
bfdc8c80f3
Testing caching onnx sessions
2023-07-27 14:13:29 -04:00
blessedcoolant
3bb81bedbd
Merge branch 'main' into unify-prompt
2023-07-28 05:36:04 +12:00
Mary Hipp Rogers
e191f6d4b2
prevent resize error ( #4031 )
...
* add upper bound for minWidth to prevent crash with cypress
* add fallback so UI doesnt crash when backend isnt running
---------
Co-authored-by: Mary Hipp <maryhipp@Marys-MacBook-Air.local>
2023-07-27 17:30:31 +00:00
blessedcoolant
b8b46aec09
Revert "fix: Lint Errors"
...
This reverts commit f057d5c85b
.
2023-07-28 04:34:41 +12:00
psychedelicious
4d2b87ea01
fix(ui): fix types for controlnet models
...
`ControlNetModelConfig` was split into `ControlNetModelCheckpointConfig` and `ControlNetModelDiffusersConfig`, need to update the UI types
2023-07-28 04:34:29 +12:00
Lincoln Stein
8023a23cec
beat uvicorn access log into submission
2023-07-27 12:05:17 -04:00
Lincoln Stein
e4c0102b3c
unified uvicorn access log entries too
2023-07-27 11:59:29 -04:00
Lincoln Stein
c4a2808a4b
use same logging infrastructure for uvicorn and backend
2023-07-27 11:24:07 -04:00
Brandon Rising
59716938bf
Remove TensorRT support at the current time until we validate it works, remove time step recorder
2023-07-27 11:18:50 -04:00
blessedcoolant
611f31c057
fix: Adjust embedding button on PositivePrompt for new changes
2023-07-28 03:07:50 +12:00
blessedcoolant
b60adc31d0
feat: Unify Prompt Area Design Between SDXL and Regular Models
2023-07-28 03:07:50 +12:00
blessedcoolant
a98ed3a5ba
fix: TextArea Resizer styling when disabled
2023-07-28 03:06:31 +12:00
blessedcoolant
f057d5c85b
fix: Lint Errors
2023-07-28 03:06:31 +12:00
Martin Kristiansen
218b6d0546
Apply black
2023-07-27 10:54:01 -04:00
Brandon Rising
a491e326c5
This is no longer needed
2023-07-27 10:52:36 -04:00
Brandon Rising
f7bb4c3f05
Remove more files no longer needed in main
2023-07-27 10:49:43 -04:00
Brandon Rising
33245b37ad
Removed things no longer needed in main
2023-07-27 10:23:55 -04:00
Brandon Rising
81d8fb8762
Removed things no longer needed in main
2023-07-27 10:14:55 -04:00
Brandon Rising
989d3d7f3c
Remove onnx changes from canvas img2img, inpaint, and linear image2image
2023-07-27 10:08:45 -04:00
Brandon Rising
d2a46b4308
Fix dist and schema after merge
2023-07-27 09:55:28 -04:00
Brandon Rising
eb1ba8d74b
Merge branch 'main' into feat/onnx
2023-07-27 09:54:30 -04:00
Brandon Rising
4ebde013ea
Allow deleting onnx models in model manager ui
2023-07-27 09:50:20 -04:00
Brandon Rising
024f92f9a9
Add onnx models to the model manager UI
2023-07-27 09:37:37 -04:00
psychedelicious
6f54fe9003
fix(ui): fix types for controlnet models
...
`ControlNetModelConfig` was split into `ControlNetModelCheckpointConfig` and `ControlNetModelDiffusersConfig`, need to update the UI types
2023-07-27 15:46:50 +10:00
Lincoln Stein
be00a837cc
hotfix to remove duplicate key in INITIAL_MODELS
2023-07-27 00:38:18 -04:00
Lincoln Stein
dcb85b0097
rebuild frontend; bump version
2023-07-27 00:37:23 -04:00
Lincoln Stein
b67041dd29
Merge branch 'main' into bugfix/convert-sdxl-models
2023-07-27 00:24:37 -04:00
Lincoln Stein
c02b9db064
Merge branch 'main' into bugfix/convert-sdxl-models
2023-07-27 00:08:15 -04:00
Lincoln Stein
2e19b23eed
Merge branch 'main' into feat/install-finetune-sdxl-vae
2023-07-27 00:06:00 -04:00
Lincoln Stein
61aff8540c
fix refiner conversion
2023-07-27 00:02:10 -04:00
Lincoln Stein
2b7807e6a0
Merge branch 'main' into fix/yaml-file-delete
2023-07-26 23:45:43 -04:00
Lincoln Stein
77946bfea5
restore ability to convert SDXL checkpoints to diffusers
2023-07-26 23:28:58 -04:00
Lincoln Stein
d4d4d749f2
Merge branch 'release/invokeai-3-0-1'
2023-07-26 23:15:26 -04:00
Lincoln Stein
43fe8b1dda
Merge branch 'main' into fix/reduce-configure-vertical
2023-07-26 23:12:25 -04:00
Lincoln Stein
3e441f773f
Documentation updates for SDXL license terms, invisible watermark ( #4012 )
...
## What type of PR is this? (check all applicable)
- [ ] Refactor
- [ ] Feature
- [ ] Bug Fix
- [ ] Optimization
- [X ] Documentation Update
- [ ] Community Node Submission
## Have you discussed this change with the InvokeAI team?
- [ ] Yes
- [X ] No, because they trust me
## Have you updated all relevant documentation?
- [ X] Yes
- [ ] No
## Description
* Added the RAIL++ license for SDXL
* Updated configure script with URLs for both the original RAIL-M and
RAIL++ licenses
* Added invisible watermark documentation and renamed doc file
* Updated documentation for installation
* Updated documentation on settings in invokeai.yaml
2023-07-26 23:11:58 -04:00
Lincoln Stein
9c4acb9d3f
install SDXL "fixed" VAE
2023-07-26 23:06:27 -04:00
Lincoln Stein
451b8c96e5
do not overwrite models.yaml if it is well formed
2023-07-26 22:29:39 -04:00
Lincoln Stein
b8376a4932
Merge branch 'main' into fix/reduce-configure-vertical
2023-07-26 22:16:38 -04:00
psychedelicious
4bfbdb0d97
chore(ui): lint
2023-07-27 11:58:59 +10:00
psychedelicious
049e666412
fix(ui): revise metadata edges in linear graphs
...
- always add metadata to l2i nodes
- no metadata handling for inpaint, removed
2023-07-27 09:43:45 +10:00
Lincoln Stein
83a981b585
merge with main; fix SDXL repo_ids
2023-07-26 17:38:06 -04:00
Lincoln Stein
049645d66e
updated LICENSE files and added information about watermarking
2023-07-26 17:27:33 -04:00
Brandon Rising
4d732e06de
Remove onnx models from img2img and unified canvas
2023-07-26 16:30:02 -04:00
blessedcoolant
c90c4a32ee
Merge branch 'main' into metadata-fix
2023-07-27 08:08:11 +12:00
Brandon Rising
f26a423e95
Fix merge issue
2023-07-26 15:32:28 -04:00
Lincoln Stein
0100ac8f2d
Merge branch 'main' into release/invokeai-3-0-1
2023-07-26 15:27:06 -04:00
Lincoln Stein
020031f376
add all legacy model .yaml files to configs directory unconditionally
2023-07-26 15:17:00 -04:00
blessedcoolant
7053347559
fix: Metadata Not Being Saved
2023-07-27 07:09:51 +12:00
Lincoln Stein
bf1f6619df
fix conversion for sd1 and sd2 models
2023-07-26 15:02:32 -04:00
Lincoln Stein
6bdcc32414
rebuild frontend for rc1 release (again)
2023-07-26 13:36:42 -04:00
Lincoln Stein
4f39c81dec
Merge branch 'main' into release/invokeai-3-0-1
2023-07-26 13:33:15 -04:00
blessedcoolant
3376968cbb
fix: Prompt Drawer Unpinned not having SDXL UI
2023-07-26 13:30:43 -04:00
blessedcoolant
0420d75d2b
fix: Improve Styling of SDXL Prompt Area
2023-07-26 13:30:43 -04:00
blessedcoolant
3bd9c27a79
feat: Add SDXL Style Prompt Concat Toggle
2023-07-26 13:30:43 -04:00
blessedcoolant
b6522cf2cf
fix: SDXL - Concat Prompt and Style for Style Prompt
2023-07-26 13:30:43 -04:00
Brandon Rising
861c0fe76b
Correct issues caused by merging main
2023-07-26 12:25:46 -04:00
Lincoln Stein
af8fc6ff82
final polish before release candidate
...
- Fix issue that prevented web ui from starting if
ROOT/databases/invokeai.db not found.
- Rebuild front end
2023-07-26 10:59:23 -04:00
Mary Hipp
f86d0d1b69
hide localization toggle
2023-07-26 10:55:38 -04:00
Brandon Rising
c16da75ac7
Merge branch 'main' into feat/onnx
2023-07-26 10:42:31 -04:00
Lincoln Stein
575ebaeb75
Merge PR #3944
2023-07-26 10:25:59 -04:00
Lincoln Stein
c7f883d22a
Merge branch 'main' into patch
2023-07-26 10:19:02 -04:00
Lincoln Stein
58ff5d3f5b
Merge branch 'main' into release/invokeai-3-0-1
...
- this includes the final set of PRs going into 3.0.1
2023-07-26 10:17:32 -04:00
Lincoln Stein
f060e321eb
NSFW checker and watermark nodes ( #3923 )
...
## What type of PR is this? (check all applicable)
- [ ] Refactor
- [ X] Feature
- [ ] Bug Fix
- [ ] Optimization
- [ ] Documentation Update
- [ ] Community Node Submission
## Have you discussed this change with the InvokeAI team?
- [ X] Yes
- [ ] No, because:
## Have you updated all relevant documentation?
- [X ] Yes
- [] No
## Description
This PR adds NSFW checker and invisible watermark fields. The NSFW
checker takes an image input and produces an image output. If NSFW
content is detected, the output image will be blurred and a "caution"
icon pasted into its upper left corner. A boolean `active` field
controls whether the checker is active. If turned off it simply returns
a copy of the image.
The invisible watermark node adds an invisible text to the image,
defaulting to "InvokeAI". To decode the watermark use the
`invisible-watermark` command, which is part of the
`invisible-watermark` library:
```
$ invisible-watermark -v -a decode -t bytes -m dwtDct -l 64 ./bluebird-watermark.png
decode time ms: 14.129877090454102
InvokeAI
```
Note that the `-l` (length) argument is mandatory. It is set to 64 here
because the watermark `InvokeAI` is 8 bytes/64 bits long. The length
must match in order for the watermark to be decoded correctly.
Both nodes are now incorporated into the linear Text2Image and
Image2Image UIs, including the canvas. They are not implemented for
inpaint currently.
The nodes can be disabled with configuration options:
```
invisible_watermark: false
nsfw_checker: false
```
or at launch time with `--no-invisible_watermark` and
`--no-nsfw_checker`.
2023-07-26 10:14:10 -04:00
psychedelicious
dc8c3d8073
feat(ui): tweak menu style, increase icon size
...
feat(ui) use `as` for menuitem links
I had requested this be done with the chakra `Link` component, but actually using `as` is correct according to the docs. For other components, you are supposed to use `Link` but looks like `MenuItem` has this built in.
Fixed in all places where we use it.
Also:
- fix github icon
- give menu hamburger button padding
- add menu motion props so it animates the same as other menus
feat(ui): restore ColorModeButton
@maryhipp
chore(ui): lint
feat(ui): remove colormodebutton again
sry
2023-07-27 00:12:23 +10:00
psychedelicious
819136c345
chore(ui): bump chakra versions
...
exposes more menu theming config
2023-07-27 00:12:23 +10:00
blessedcoolant
989b68c772
fix: Remove menu tooltip and fix incorrect issues page link
2023-07-27 00:12:23 +10:00
blessedcoolant
a6347a1d3c
revert: Translation strings
...
These needs to be done through weblate. Only en.json needs to updated via the repo
2023-07-27 00:12:23 +10:00
blessedcoolant
a00d1e87e4
fix: Update Links to Links from Menu Items
2023-07-27 00:12:23 +10:00
blessedcoolant
c7d24081e2
fix: Scheduler list in Settings not displaying labels
2023-07-27 00:12:23 +10:00
blessedcoolant
17900e5140
fix: Fix Settings dropdown menu icons being too small
2023-07-27 00:12:23 +10:00