Commit Graph

3227 Commits

Author SHA1 Message Date
AUTOMATIC1111
a42a8e9112
Merge pull request #5547 from Ju1-js/master
Make "# settings changed" grammatically correct
2022-12-10 08:20:22 +03:00
AUTOMATIC1111
feeca1954e
Merge pull request #5542 from JaySmithWpg/depth2img
Depth2Img model support: resolves #5372, partially addresses #5011
2022-12-10 07:52:20 +03:00
ywx9
9539c2045a Bug fix 2022-12-09 23:03:06 +09:00
Ju1-js
ce04ba71b8 Make # settings changed message grammatically correct
Make the ": " in the settings changed message not show if 0 settings were changed.
"0 settings changed: ." -> "0 settings changed."
2022-12-08 22:47:45 -08:00
Jay Smith
1ed4f0e228 Depth2img model support 2022-12-08 20:50:08 -06:00
Andrew Ryan
358a8628f6 Add latent upscale option to img2img
Recently, the option to do latent upscale was added to txt2img highres
fix. This feature runs by scaling the latent sample of the image, and
then running a second pass of img2img.

But, in this edition of highres fix, the image and parameters cannot be
changed between the first pass and second pass. We might want to do a
fixup in img2img before doing the second pass, or might want to run the
second pass at a different resolution.

This change adds the option for img2img to perform its upscale in latent
space, rather than image space, giving very similar results to highres
fix with latent upscale.  The result is not exactly the same because
there is an additional latent -> decoder -> image -> encoder -> latent
that won't happen in highres fix, but this conversion has relatively
small losses
2022-12-08 07:09:09 +00:00
Bwin4L
02f566f684
Add bracket checking functionality to the txt2img/img2img prompts and negative prompts. 2022-12-07 16:14:05 +01:00
brkirch
8bc16b7582 Add psutil if using macOS to requirements.txt 2022-12-06 19:54:01 -05:00
brkirch
a7b1ab28d5 Set install_dir (per Ephil012's suggestion)
Set install_dir to a correct value for macOS. Thanks to @Ephil012 for pointing out this is needed.
2022-12-06 19:49:30 -05:00
apolinario
8eb638cdd3
style change 2022-12-06 15:14:22 +01:00
apolinario
1075819b16
Use shadowRoot if inside of an iframe and don't use it if outside
This makes sure it will work everywhere
2022-12-06 15:13:41 +01:00
Zac Liu
9a5c689c49
Merge pull request #4 from 920232796/master
add hash and fix undo hijack bug
2022-12-06 16:16:29 +08:00
zhaohu xing
965fc5ac5a delete a file
Signed-off-by: zhaohu xing <920232796@qq.com>
2022-12-06 16:15:15 +08:00
zhaohu xing
5dcc22606d add hash and fix undo hijack bug
Signed-off-by: zhaohu xing <920232796@qq.com>
2022-12-06 16:04:50 +08:00
Zac Liu
a25dfebeed
Merge pull request #3 from 920232796/master
fix device support for mps
update the support for SD2.0
2022-12-06 09:17:57 +08:00
Zac Liu
3ebf977a6e
Merge branch 'AUTOMATIC1111:master' into master 2022-12-06 09:16:15 +08:00
zhaohu xing
4929503258 fix bugs
Signed-off-by: zhaohu xing <920232796@qq.com>
2022-12-06 09:03:55 +08:00
brkirch
760a7836eb Use python3.10 for python_cmd if available 2022-12-05 18:36:31 -05:00
apolinario
2eb5f103ab
Fix WebUI not working inside of iframes 2022-12-05 16:30:15 +01:00
timntorres
7057c72ae3 Add opt. to avoid sending size between interfaces. 2022-12-05 03:41:36 -08:00
David Vorick
fa6478796a
allow randomized seeds in prompt_matrix 2022-12-05 00:21:37 -05:00
Pi Esposito
fcf372e5d0
set default to avoid breaking stuff 2022-12-04 14:13:31 -03:00
Pi Esposito
12ade469c8
add queuing by default to avoid timeout on client side when share=True 2022-12-04 12:33:15 -03:00
Mackerel
681c450ecd extras.py: use as little RAM as possible, misc fixes
maximum of 2 models loaded at once. delete unneeded model before next
step. fix 'teritary' -> 'tertiary'. gracefully fail when "add
difference" is selected without a tertiary model
2022-12-04 10:31:06 -05:00
wywywywy
a8ae263c69 Reinstate DDPM V1 to LDSR 2022-12-04 13:42:19 +00:00
AUTOMATIC
44c46f0ed3 make it possible to merge inpainting model with non-inpainting one 2022-12-04 12:30:44 +03:00
AUTOMATIC
8504db5170 fix #4459 breaking inpainting when the option is not specified. 2022-12-04 01:04:24 +03:00
AUTOMATIC
cefb5d6d7d fix accessing options when they are not ready for SwinIR. 2022-12-03 20:40:29 +03:00
AUTOMATIC1111
8fba733c09
Merge pull request #5286 from brkirch/launch-py-mac
Add macOS (Darwin) installation defaults
2022-12-03 18:51:22 +03:00
AUTOMATIC
60bd4d52a6 fix incorrect file extension filter for deepdanbooru models 2022-12-03 18:46:09 +03:00
AUTOMATIC
4b0dc206ed use modelloader for #4956 2022-12-03 18:45:51 +03:00
AUTOMATIC1111
2a649154ec
Merge pull request #4956 from TiagoSantos81/offline_BLIP
[CLIP interrogator] use local file, if available
2022-12-03 18:17:56 +03:00
AUTOMATIC
0d21624cee move #5216 to the extension 2022-12-03 18:16:19 +03:00
AUTOMATIC
89e1df013b Merge remote-tracking branch 'wywywywy/autoencoder-hijack' 2022-12-03 18:08:10 +03:00
AUTOMATIC
b6e5edd746 add built-in extension system
add support for adding upscalers in extensions
move LDSR, ScuNET and SwinIR to built-in extensions
2022-12-03 18:06:33 +03:00
Vladimir Repin
cf3e844d1d add noise strength parameter similar to NAI 2022-12-03 18:05:47 +03:00
AUTOMATIC
46b0d230e7 add comment for #4407 and remove seemingly unnecessary cudnn.enabled 2022-12-03 16:01:23 +03:00
AUTOMATIC
2651267e3a fix #4407 breaking UI entirely for card other than ones related to the PR 2022-12-03 15:57:52 +03:00
brkirch
5ec8981df4 Revert most launch.py changes, add mac user script
Adds an addition file to read environment variables from when the webui.sh is run from macOS.
2022-12-03 06:44:59 -05:00
Hsiang-Cheng Yang
b7ef99634c
Update launch.py
fix a typo
2022-12-03 17:35:17 +08:00
AUTOMATIC1111
ce049c471b
Merge pull request #4368 from byzod/master
fix #3451 scripts ignores file format settings for grids
2022-12-03 10:31:08 +03:00
AUTOMATIC1111
681c0003df
Merge pull request #4407 from yoinked-h/patch-1
Fix issue with 16xx cards
2022-12-03 10:30:34 +03:00
AUTOMATIC1111
37fc1fa401
Merge pull request #5229 from lolsuffocate/master
Slightly improve page scroll jumping with focus
2022-12-03 10:23:24 +03:00
AUTOMATIC1111
d2e5b4edfa
Merge pull request #5251 from adieyal/bug/negative-prompt-infotext
Fixed incorrect negative prompt text in infotext
2022-12-03 10:21:43 +03:00
AUTOMATIC1111
5267414319
Merge pull request #4271 from MarkovInequality/racecond_fix
Fixes #4137 caused by race condition in training when VAE is unloaded
2022-12-03 10:20:17 +03:00
AUTOMATIC1111
c9a2cfdf2a
Merge branch 'master' into racecond_fix 2022-12-03 10:19:51 +03:00
AUTOMATIC1111
5cd5a672f7
Merge pull request #4459 from kavorite/color-sketch-inpainting
add `--gradio-inpaint-tool` and option to specify `color-sketch`
2022-12-03 10:06:27 +03:00
AUTOMATIC1111
a2feaa95fc
Merge pull request #5194 from brkirch/autocast-and-mps-randn-fixes
Use devices.autocast() and fix MPS randn issues
2022-12-03 09:58:08 +03:00
AUTOMATIC
c7af672186 more simple config option name plus mouseover hint for clip skip 2022-12-03 09:41:39 +03:00
AUTOMATIC1111
c67d8bca4f
Merge pull request #5304 from space-nuko/fix/clip-skip-application
Fix clip skip of 1 not being restored from prompts
2022-12-03 09:37:10 +03:00