soaska/my-sd
soaska/my-sd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Activity
5,695 Commits 1 Branch 0 Tags 45 MiB
4e8690906c
Commit Graph

3593 Commits

Author SHA1 Message Date
AUTOMATIC
4697def235 bump gradio to 3.23 
fix broken image dragging
 2023-03-25 09:00:37 +03:00
AUTOMATIC
ff216820fd fix extra networks ui 2023-03-25 09:00:37 +03:00
AUTOMATIC
af2db25c84 enable queue by default 
more stylistic changes
 2023-03-25 09:00:37 +03:00
AUTOMATIC
43a0912a07 hide delete button for single-item dropdown 
more stylistic changes
 2023-03-25 09:00:37 +03:00
AUTOMATIC
9b2f205400 fix ctrl+up/down attention edit 
fix dropdown obscured by live preview
stylistic changes
 2023-03-25 09:00:36 +03:00
AUTOMATIC
9f0da9f6ed initial gradio 3.22 support 2023-03-25 09:00:36 +03:00
FNSpd
a9eab236d7
Update devices.py 2023-03-24 23:08:30 +04:00
butaixianran
803d44c474
Fix None type error for TI module 
When user using model_name.png as a preview image, textural_inversion.py still treat it as an embeding, and didn't handle its error, just let python throw out an None type error like following:
```bash
  File "D:\Work\Dev\AI\stable-diffusion-webui\modules\textual_inversion\textual_inversion.py", line 155, in load_from_file
    name = data.get('name', name)
AttributeError: 'NoneType' object has no attribute 'get'
```

With just a simple `if data:` checking as following, there will be no error, breaks nothing, and now this module can works fine with user's preview images.
Old code:  
```python
                data = extract_image_data_embed(embed_image)
                name = data.get('name', name)
```
New code:  
```python
                data = extract_image_data_embed(embed_image)
                if data:
                    name = data.get('name', name)
                else:
                    # if data is None, means this is not an embeding, just a preview image
                    return
```

Also, since there is no more errors on textual inversion module, from now on, extra network can set "model_name.png" as preview image for embedings.
 2023-03-25 02:05:00 +08:00
FNSpd
280ed8f00f
Update sd_hijack_optimizations.py 2023-03-24 16:29:16 +04:00
FNSpd
beb7dda5d6
Update sd_hijack_unet.py 2023-03-24 16:25:42 +04:00
brkirch
27fe3eb6a9 Add workaround for MPS layer_norm on PyTorch 2.0 
On PyTorch 2.0, with MPS layer_norm only accepts float32 inputs. This was fixed shortly after 2.0 was finalized so the workaround can be applied with an exact version match.
 2023-03-24 04:04:22 -04:00
brkirch
c5142e2fbe Add workaround for broken nn.Linear on macOS 13.2 
Credit to danieldk (https://github.com/explosion/curated-transformers/pull/124) for the workaround this is based on.
 2023-03-24 04:04:20 -04:00
pieresimakp
771ea212de added button to grab the width and height from the loaded image in img2img 2023-03-24 12:41:17 +08:00
space-nuko
d86beb8228 Remove "do not add watermark to images" option 2023-03-23 17:09:59 -04:00
pieresimakp
252f15e046 added search textbox to filter available extensions 2023-03-23 23:43:00 +08:00
carat-johyun
92e173d414 fix variable typo 2023-03-23 14:28:08 +09:00
catboxanon
caf84e8233 Expose inpainting mask and composite 
For inpainting, this exposes the mask and masked composite and gives
the user the ability to display these in the web UI,
save to disk, or both.
 2023-03-22 17:51:40 +00:00
sumof2primes
cd3cd0fca0 Fix scripts load order 
- 1st webui, 2nd extensions-builtin, 3rd extensions
 - to load scripts independent of --data-dir
 - change load order key [x.basedir, x.filename, x.path] to [orderby(x.basedir), x.filename, x.path]

e.g., scripts/xyz_grid.py dependent extentions should loaded later
extensions\sd-webui-controlnet\scripts\xyz_grid_support.py
extensions\sd-webui-additional-networks\scripts\xyz_grid_support.py
 2023-03-23 01:28:09 +09:00
sumof2primes
64b7e83823 Fix scripts load order 
- 1st webui, 2nd extensions-builtin, 3rd extensions
 - to load scripts independent of --data-dir
 - change load order key [x.basedir, x.filename, x.path] to [orderby(x.basedir), x.filename, x.path]

e.g., scripts/xyz_grid.py dependent extentions should loaded later
extensions\sd-webui-controlnet\scripts\xyz_grid_support.py
extensions\sd-webui-additional-networks\scripts\xyz_grid_support.py
 2023-03-22 18:24:11 +09:00
ArrowM
00bd271faf Move load_file_from_url 
Why?
one of the internal calls of `load_file_from_url` import cv2, which locks the cv2 site-package, which extensions may (and in our case, is) breaking the installation of some libraries. The base project should be limiting its import of unnecessary libraries when possible during the installation phase.
 2023-03-21 21:13:30 -05:00
missionfloyd
1d096ed145 Lazy load extra network images 2023-03-21 16:07:24 -06:00
Rucadi
a80d7d090c
Update script_callbacks.py 2023-03-21 18:47:05 +01:00
FNSpd
c84c9df737
Update sd_hijack_optimizations.py 2023-03-21 14:50:22 +04:00
FNSpd
91cfa9718c
Update sd_hijack_unet.py 2023-03-21 14:47:43 +04:00
FNSpd
254d994643
Update devices.py 2023-03-21 14:45:39 +04:00
Φφ
4cbbb881ee Unload checkpoints on Request 
…to free VRAM.

New Action buttons in the settings to manually free and reload checkpoints, essentially
juggling models between RAM and VRAM.
 2023-03-21 09:28:50 +03:00
missionfloyd
8e3ced73a8 Add event.stopPropagation() to extraNetworksShowMetadata() 
Prevent bubbling the same way "replace preview" does
 2023-03-20 18:04:22 -06:00
missionfloyd
64fc936738
Don't bubble when metadata_button is clicked 2023-03-19 19:30:28 -06:00
Ftps
147d2922ff Cross device link 2023-03-16 12:35:48 +09:00
Vespinian
f04bd037a5 Comment fix 2023-03-15 22:27:54 -04:00
Vespinian
dfa258de5f Made copies of global scriptrunners, now we clear the copied scriptrunner of alwayson_scripts and only add back the ones that that were requested 2023-03-15 22:17:32 -04:00
Vladimir Mandic
5387576c59
api error handler 2023-03-15 15:11:04 -04:00
Ftps
79ed567b12 remove unused library 
I'm sorry I forgot.
 2023-03-15 22:42:53 +09:00
Ftps
4845db4e32 Update ui_extensions.py 
Add git submodule and Fix WinError
 2023-03-15 20:29:50 +09:00
bluelovers
fd672a79af fix: remove cmp 
by ChatGPT
 2023-03-15 13:17:09 +08:00
InvincibleDude
f5e4436453
Merge branch 'master' into improved-hr-conflict-test 2023-03-14 16:55:59 +03:00
AUTOMATIC1111
a9fed7c364
Merge pull request #8503 from mcmonkey4eva/filename-length-limit-fix 
Add correction file filename length limits on *nix systems
 2023-03-14 11:28:13 +03:00
AUTOMATIC
6a04a7f20f fix an error loading Lora with empty values in metadata 2023-03-14 11:22:29 +03:00
AUTOMATIC1111
8b35b64e11
Merge pull request #8589 from vladmandic/unipc 
add progressbar to unipc sampler
 2023-03-14 11:19:21 +03:00
AUTOMATIC1111
f9b0465c8b
Merge pull request #8588 from hananbeer/fix/undefined_extra_network_data 
initialize extra_network_data before use
 2023-03-14 11:18:30 +03:00
willtakasan
4281432594
Update ui_extra_networks.py 
I updated it so that no error message is displayed when setting a webp for the preview image.
 2023-03-14 15:36:08 +09:00
AUTOMATIC
c19530f1a5 Add view metadata button for Lora cards. 2023-03-14 09:10:26 +03:00
Vladimir Mandic
03a80f198e
add pbar to unipc 2023-03-13 12:35:30 -04:00
high_byte
4d26c7da57 initialize extra_network_data before use 2023-03-13 17:37:29 +02:00
missionfloyd
9e23bacfbc Make extra networks button togglable 2023-03-12 17:07:03 -06:00
Alex "mcmonkey" Goodwin
af9158a8c7 update fullfn properly 2023-03-12 12:36:04 -07:00
Alex "mcmonkey" Goodwin
48df6d66ea add safety check in case of short extensions 
so eg if a two-letter or empty extension is used, `.txt` would break, this `max` call protects that.
 2023-03-12 12:33:29 -07:00
Alex "mcmonkey" Goodwin
a71b7b5ec0 relocate filename length limit to better spot 2023-03-12 12:30:31 -07:00
AUTOMATIC
dfeee786f9 display correct timings after restarting UI 2023-03-12 21:25:22 +03:00
AUTOMATIC
a00cd8b9c1 attempt to fix memory monitor with multiple CUDA devices 2023-03-12 21:04:17 +03:00
AUTOMATIC
27eedb6966 change extension index link to the new dedicated repo instead of wiki 2023-03-12 17:20:17 +03:00
Vladimir Mandic
bd67c41f54
force refresh tqdm before close 2023-03-12 09:19:23 -04:00
AUTOMATIC1111
adf723a9b2
Merge pull request #8492 from zhanghua000/absolute-path 
fix: gradio's ValueError about fetching extensions files
 2023-03-12 08:55:15 +03:00
AUTOMATIC1111
6106f6d0a0
Merge pull request #7965 from Kilvoctu/extranet-buttons 
Use emojis for extra network buttons
 2023-03-12 08:25:03 +03:00
AUTOMATIC1111
beb96bd115
Merge pull request #8515 from EllangoK/unipc-typo 
Fix dims typo in unipc
 2023-03-12 08:24:17 +03:00
AUTOMATIC1111
bbc4b0478a
Merge pull request #8518 from brkirch/remove-bool-test 
Fix image generation on macOS 13.3 betas
 2023-03-12 08:14:26 +03:00
bluelovers
0492424121 feat: try sort as ignore-case 
https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/8368
 2023-03-12 10:18:33 +08:00
brkirch
a4cb96d4ae Remove test, use bool tensor fix by default 
The test isn't working correctly on macOS 13.3 and the bool tensor fix for cumsum is currently always needed anyway, so enable the fix by default.
 2023-03-11 17:35:17 -05:00
EllangoK
48f4abd2e6 fix dims typo in unipc 2023-03-11 15:52:14 -05:00
Vespinian
64efb3d9e0 Merge branch 'master' of https://github.com/AUTOMATIC1111/stable-diffusion-webui 2023-03-11 14:35:20 -05:00
Vespinian
49bbdbe447 small diff whitespace cleanup 2023-03-11 14:34:56 -05:00
Kilvoctu
247a34498b restore text, remove 'close' 
don't use emojis for extra network buttons; remove 'close'
 2023-03-11 13:11:26 -06:00
AUTOMATIC
27e319dc4f alternative solution for #8089 2023-03-11 21:22:52 +03:00
Vespinian
5546e71a10 Fixed whitespace 2023-03-11 12:35:20 -05:00
Vespinian
46f9fe3cd6 Merge branch 'master' of https://github.com/AUTOMATIC1111/stable-diffusion-webui 2023-03-11 12:33:35 -05:00
Vespinian
2174f58dae Changed alwayson_script_name and alwayson_script_args api params to 1 alwayson_scripts param dict 2023-03-11 12:21:33 -05:00
Alex "mcmonkey" Goodwin
7fd19fa4e7 initial fix for filename length limits on *nix systems 2023-03-11 07:22:22 -08:00
AUTOMATIC1111
e0ca78509a
Merge pull request #8118 from adam-huganir/8116-gitpython-api-breaking-change 
git 3.1.30 api change, issue #8116
 2023-03-11 17:47:51 +03:00
AUTOMATIC1111
d3dd6cc01c
Merge pull request #8175 from vladmandic/image_size 
adds checks for resulting image size to avoid memory issues
 2023-03-11 16:45:35 +03:00
AUTOMATIC1111
76bc72116e
Merge pull request #7818 from space-nuko/extension-paste-field-names 
Allow extensions to declare paste fields for "Send to X" buttons
 2023-03-11 16:44:20 +03:00
AUTOMATIC1111
b9fd9c81de
Merge pull request #7963 from xSinStarx/patch-1 
Bug Fix: Fixes img2img Negative Token Counter
 2023-03-11 16:34:34 +03:00
AUTOMATIC1111
f968270fec
Merge pull request #7812 from vladmandic/hide_ui_tabs 
allow configurable hiding of ui tabs
 2023-03-11 16:00:43 +03:00
AUTOMATIC
6da2027213 save previews for extra networks in the selected format 2023-03-11 15:46:20 +03:00
AUTOMATIC
9320139bd8 support three extensions for preview instead of one: png, jpg, webp 2023-03-11 15:33:24 +03:00
AUTOMATIC
ce68ab8d0d remove underscores from function names in #8366 
remove LRU from #8366 because I don't know why it's there
 2023-03-11 15:27:42 +03:00
AUTOMATIC1111
c239b3d7a8
Merge pull request #8366 from akx/extra-net-descs 
Extra network description files
 2023-03-11 15:20:34 +03:00
AUTOMATIC1111
e15c4f31e3 Merge pull request #8042 from fkunn1326/master 
Add .mjs support for extensions
 2023-03-11 15:18:05 +03:00
Zhang Hua
8e0d16e746
modules/sd_vae_approx.py: fix VAE-approx path 2023-03-11 20:00:12 +08:00
Zhang Hua
8106117a47
models/ui.py: make the path of script.js absolute 2023-03-11 20:00:11 +08:00
AUTOMATIC1111
98695c1885
Merge pull request #8050 from Tpinion/master 
Bugfix: Filter out temporary files that will be generated if the download fails.
 2023-03-11 14:58:45 +03:00
AUTOMATIC
7f2005127f rename CFGDenoiserParams fields for #8064 2023-03-11 14:52:29 +03:00
AUTOMATIC1111
af416a2dbd
Merge pull request #8064 from laksjdjf/master 
Add cond and uncond hidden states to CFGDenoiserParams
 2023-03-11 14:48:55 +03:00
AUTOMATIC1111
45905b92a9
Merge pull request #8100 from missionfloyd/webp-lossless 
Add lossless webp option
 2023-03-11 14:35:53 +03:00
AUTOMATIC1111
da3f942ab2
Merge pull request #8017 from space-nuko/before-process-batch 
Add `before_process_batch` script callback
 2023-03-11 14:33:38 +03:00
AUTOMATIC
aaa367e35c new setting: Extra text to add before <...> when adding extra network to prompt 2023-03-11 14:18:18 +03:00
AUTOMATIC1111
6705b1764a
Merge pull request #8092 from infinitewarp/sort-upscalers 
sort upscalers by name
 2023-03-11 13:44:41 +03:00
AUTOMATIC1111
8ec0442dcd
Merge pull request #8322 from yeataro/master 
add: /sdapi/v1/scripts in API
 2023-03-11 13:43:34 +03:00
AUTOMATIC
3531a50080 rename fields for API for saving/sending images 
save images to correct directories
 2023-03-11 13:22:59 +03:00
AUTOMATIC1111
bb3ecc3285
Merge pull request #8287 from vladmandic/save-images 
Allow saving of images generated via API
 2023-03-11 13:03:23 +03:00
AUTOMATIC1111
d81c503918
Merge pull request #8367 from pamparamm/scaled-dot-product-attention 
Add scaled dot product attention
 2023-03-11 12:24:03 +03:00
AUTOMATIC
58b5b7c2f1 add UniPC options to infotext 2023-03-11 12:09:36 +03:00
AUTOMATIC
f261a4a53c use selected device instead of always cuda for UniPC sampler 2023-03-11 11:56:05 +03:00
space-nuko
5fef67f6ee Requested changes 2023-03-10 19:56:14 -05:00
space-nuko
ac38ad7e60 Merge remote-tracking branch 'origin/master' into unipc 2023-03-10 19:42:46 -05:00
Pam
8d7fa2f67c sdp_attnblock_forward hijack 2023-03-10 22:48:41 +05:00
InvincibleDude
f6e2737840
Negative prompt fix 2023-03-10 12:13:55 +00:00
Pam
0981dea948 sdp refactoring 2023-03-10 12:58:10 +05:00
Pam
37acba2633 argument to disable memory efficient for sdp 2023-03-10 12:19:36 +05:00
Yea Chen
f85a192f99
Update modules/api/api.py 
Suggested change by @akx

Co-authored-by: Aarni Koskela <akx@iki.fi>
 2023-03-07 04:04:35 +08:00
Pam
fec0a89511 scaled dot product attention 2023-03-07 00:33:13 +05:00
Aarni Koskela
06f167da37 Extra networks: support .txt description sidecar file 2023-03-06 21:15:33 +02:00
Aarni Koskela
49b1dc5e07 Deduplicate extra network preview-search code 2023-03-06 21:00:34 +02:00
Brad Smith
d118cb6ea3
use lowercase name for sorting; keep UpscalerLanczos and UpscalerNearest at the start of the list with UpscalerNone 
Co-authored-by: catboxanon <122327233+catboxanon@users.noreply.github.com>
 2023-03-06 13:21:42 -05:00
Vladimir Mandic
b012d70f15
update using original defaults 2023-03-04 17:51:37 -05:00
InvincibleDude
b9fdb9f701
Fix crash when hr is disabled 2023-03-04 18:09:05 +00:00
Yea chen
c48bbccf12 add: /sdapi/v1/scripts in API 
API for get scripts list
 2023-03-04 11:46:07 +08:00
InvincibleDude
e97b83bdbb
Merge branch 'master' into improved-hr-conflict-test 2023-03-03 19:49:24 +03:00
InvincibleDude
51f81efb02 Image processing changes 
Image processing changes
 2023-03-03 19:45:33 +03:00
Vladimir Mandic
f8e219bad9
allow api requests to specify do not send images in response 2023-03-03 09:00:52 -05:00
Vladimir Mandic
23d4fb5bf2
allow saving of images via api 2023-03-03 08:29:10 -05:00
Vespinian
c6c2a59333 comment clarification 2023-02-27 23:45:59 -05:00
Vespinian
a39c4cf766 small refactor of api.py 2023-02-27 23:27:33 -05:00
Vespinian
3b6de96467 Added alwayson_script_name and alwayson_script_args to api 
Added 2 additional possible entries in the api request: alwayson_script_name, a string list, and, alwayson_script_args, a list of list containing the args of each script. This allows us to send args to always on script and keep backwards compatibility with old script_name and script_arg api params
 2023-02-27 21:51:20 -05:00
Vladimir Mandic
3c6459154f
add check for resulting image size 2023-02-27 17:28:04 -05:00
Adam Huganir
6d92d95a33 git 3.1.30 api change 2023-02-25 19:15:06 +00:00
missionfloyd
aa108bd02a Add lossless webp option 2023-02-24 20:57:18 -07:00
Brad Smith
b15bc73c99
sort upscalers by name 2023-02-24 14:45:08 -05:00
laksjdjf
534cf60afb
Update script_callbacks.py 2023-02-24 14:26:55 +09:00
laksjdjf
9a1435946c
Update sd_samplers_kdiffusion.py 2023-02-24 14:04:23 +09:00
laksjdjf
327186b484
Update script_callbacks.py 2023-02-24 14:03:46 +09:00
Tpinion
ac4c7f05cd Filter out temporary files that will be generated if the download fails. 2023-02-24 00:42:29 +08:00
fkunn1326@users.noreply.github.com
b90cad7f31 Add .mjs support for extensions 2023-02-23 03:29:22 +00:00
space-nuko
a2d635ad13 Add before_process_batch script callback 2023-02-22 01:52:53 -08:00
Kilvoctu
32a4c8d961 use emojis for extra network buttons 
🔄 for refresh
❌ for close
 2023-02-20 15:14:06 -06:00
xSinStarx
b0f2653541
Fixes img2img Negative Token Counter 
The img2img negative token counter is counting the txt2img negative prompt.
 2023-02-20 12:39:38 -08:00
w-e-w
f71a3c9c3a convert resolution to int using round() 2023-02-20 17:47:20 +09:00
EllangoK
ca2b8faa83 custom height, width settings for extra networks 2023-02-19 14:38:22 -05:00
Vladimir Mandic
83829471de
make ui as multiselect instead of string list 2023-02-19 09:21:44 -05:00
Vladimir Mandic
8affa42588
Merge branch 'AUTOMATIC1111:master' into hide_ui_tabs 2023-02-19 09:19:25 -05:00
w-e-w
014e7323f6 when exists 2023-02-19 20:49:07 +09:00
w-e-w
c77f01ff31 fix auto sd download issue 2023-02-19 20:37:40 +09:00
AUTOMATIC1111
c3d5a6ed37
Merge pull request #7300 from Ju1-js/master 
Gradio Auth - Read from External File
 2023-02-19 13:02:05 +03:00
AUTOMATIC
11183b4d90 fix for #6700 2023-02-19 12:44:56 +03:00
AUTOMATIC1111
dfb3b8f398
Merge branch 'master' into weighted-learning 2023-02-19 12:41:29 +03:00
AUTOMATIC1111
4313777322
Merge pull request #7703 from minux302/hotfix/fix_hn_api_arg 
fix arg for train_hypernetwork api
 2023-02-19 12:36:01 +03:00
AUTOMATIC1111
09835363ab
Merge pull request #7572 from CurtisDS/fix-id-handle-in-extra-networks 
Update ui_extra_networks.py to fix div id's that have spaces in them
 2023-02-19 12:26:11 +03:00
AUTOMATIC
b908bed883 remove unneeded return from #7583 2023-02-19 12:23:40 +03:00
AUTOMATIC1111
563724f6e9
Merge pull request #7583 from EllangoK/master 
Calls modules.sd_vae.refresh_vae_list(), fixes VAE list not updating
 2023-02-19 12:23:06 +03:00
AUTOMATIC1111
b63a13c5ed
Merge pull request #7651 from vladmandic/missing-imports 
Add missing imports
 2023-02-19 12:16:58 +03:00
AUTOMATIC1111
e287d9b294
Merge pull request #7650 from vladmandic/img2img-fix 
Convert image from RGBA to RGB before saving
 2023-02-19 12:15:27 +03:00
AUTOMATIC
fe46a08f52 add slash to non-empty dirs in extra networks interface 2023-02-19 12:09:25 +03:00
AUTOMATIC1111
226bc04653
Merge pull request #7637 from brkirch/fix-hypernetworks-pix2pix 
Fix hypernetworks and instruct pix2pix not working with `--upcast-sampling`
 2023-02-19 11:15:41 +03:00
AUTOMATIC1111
3fcc087317
Merge pull request #7731 from opparco/master 
Add cfg_denoised_callback
 2023-02-19 11:09:47 +03:00
AUTOMATIC1111
fd4ac5187a
Revert "Aspect ratio sliders" 2023-02-19 10:55:39 +03:00
AUTOMATIC1111
b20f28eea9
Merge pull request #7601 from Gerschel/aspect_ratio_sliders 
Aspect ratio sliders
 2023-02-19 10:53:18 +03:00
AUTOMATIC1111
9c4eaac61f
Merge pull request #7691 from missionfloyd/16bit-convert 
Convert 16-bit greyscale to 8-bit when saving as JPEG
 2023-02-19 10:15:49 +03:00
AUTOMATIC1111
2a4f893570
Merge pull request #7727 from missionfloyd/face-restore-setting 
Fix face restorers setting
 2023-02-19 10:14:42 +03:00
AUTOMATIC
fb2354cb2a reword settings for 4chan export, remove unneded try/excepts, add try/except for actually saving JPG 2023-02-19 10:12:45 +03:00
AUTOMATIC1111
e572c3ed38
Merge pull request #7564 from w-e-w/configurable_image_downscale 
Configurable JPG downscale threshold
 2023-02-19 10:01:42 +03:00
AUTOMATIC
1646991637 display 8 (rather than 7) characters of the extension commit hash in the installed extensions table 2023-02-19 09:54:04 +03:00
AUTOMATIC1111
d023532c55
Merge pull request #7798 from vladmandic/extensions 
add version to extensions table
 2023-02-19 09:52:19 +03:00
AUTOMATIC
15f4b217b1 fix the a merge conflict resolve i did that entirely breaks image generation 2023-02-19 09:50:14 +03:00
AUTOMATIC1111
a77ac2eeaa
Merge pull request #7730 from CCRcmcpe/fix-dpm-sde-batch 
Fix DPM++ SDE not deterministic across different batch sizes (#5210)
 2023-02-19 09:38:15 +03:00
AUTOMATIC
a742facd95 make PNG info tab work properly with parameter overrides 2023-02-19 09:30:57 +03:00
AUTOMATIC1111
6911deb242
Merge branch 'master' into fix-save-params-2 2023-02-19 09:15:45 +03:00
AUTOMATIC1111
c69494673d
Merge pull request #7824 from missionfloyd/download-model 
Download model if none are found
 2023-02-19 09:00:48 +03:00
AUTOMATIC1111
b66b6829aa
Merge pull request #7789 from space-nuko/extra-networks-per-batch 
Apply extra networks per-batch instead of per-session (fixes wildcards)
 2023-02-19 08:44:40 +03:00
AUTOMATIC
b5f69ad6af simply long version display for torch in UI 2023-02-19 08:38:38 +03:00
Vladimir Mandic
9c7e6d5bba
store and print real torch version 2023-02-18 11:31:02 -05:00
space-nuko
b20737815a Fix params.txt saving for infotexts modified by process_batch 2023-02-16 21:44:46 -08:00
missionfloyd
c4ea16a03f Add ".vae.ckpt" to ext_blacklist 2023-02-15 19:47:30 -07:00
Shondoit
edb10092de Add ability to choose using weighted loss or not 2023-02-15 10:03:59 +01:00
Shondoit
bc50936745 Call weighted_forward during training 2023-02-15 10:03:59 +01:00
Shondoit
21642000b3 Add PNG alpha channel as weight maps to data entries 2023-02-15 10:03:59 +01:00
Shondoit
c4bfd20f31 Hijack to add weighted_forward to model: return loss * weight map 2023-02-15 10:03:59 +01:00
RcINS
f55a7e04d8 Fix error when batch count > 1 2023-02-15 16:57:18 +08:00
missionfloyd
1615f786ee Download model if none are found 2023-02-14 20:54:02 -07:00
space-nuko
7df7e4d227 Allow extensions to declare paste fields for "Send to X" buttons 2023-02-14 03:55:42 -08:00
Vladimir Mandic
a320d157ec
all hiding of ui tabs 2023-02-13 20:26:47 -05:00
Vladimir Mandic
7893533674
add version to extensions table 2023-02-13 11:04:34 -05:00
space-nuko
0a4917ac40 Apply extra networks per-batch instead of per-session (fixes wildcards) 2023-02-13 03:33:28 -08:00
space-nuko
716a69237c support SD2.X models 2023-02-11 06:18:34 -08:00
opparco
b78c5e87ba Add cfg_denoised_callback 2023-02-11 11:18:38 +09:00
RcINS
9e27af76d1 Fix DPM++ SDE not deterministic across different batch sizes (#5210) 2023-02-11 10:12:16 +08:00
space-nuko
fb274229b2 bug fix 2023-02-10 14:30:35 -08:00
missionfloyd
bf9b1d64a3 Fix face restorers setting 2023-02-10 15:27:08 -07:00
space-nuko
06cb0dc920 Fix UniPC order 2023-02-10 05:36:41 -08:00
space-nuko
79ffb9453f Add UniPC sampler settings 2023-02-10 05:27:05 -08:00
space-nuko
c88dcc20d4 UniPC does not support img2img (for now) 2023-02-10 05:00:54 -08:00
space-nuko
21880eb9e5 Fix logspam and live previews 2023-02-10 04:47:08 -08:00
space-nuko
1253199889 Working UniPC (for batch size 1) 2023-02-10 03:30:20 -08:00
minux302
33947a3c66 fix arg for hypernetwork train api 2023-02-10 17:58:35 +09:00
missionfloyd
73a97cac11
Use RGB for webp 
Doesn't support greyscale (L)
 2023-02-09 17:04:55 -07:00
missionfloyd
463ab84180 Convert 16-bit greyscale to 8-bit when saving as JPEG 2023-02-09 02:13:49 -07:00
Gerschel
374fe636b8 Squashed commit of the following: 
commit b030b67ad005bfe29bcda692238a00042dcae816
Author: Gerschel <Gerschel_Payne@hotmail.com>
Date:   Wed Feb 8 16:38:56 2023 -0800

    styling adjustements

commit 80a2acb0230dd77489b0eb466f2efe827a053f6d
Author: Gerschel <Gerschel_Payne@hotmail.com>
Date:   Wed Feb 8 10:49:47 2023 -0800

    badge indicator toggles visibility by selection

commit 898922e025a6422ac947fb45c1fa4f1109882f0a
Merge: 745382a0 31bbfa72
Author: Gerschel <9631031+Gerschel@users.noreply.github.com>
Date:   Wed Feb 8 08:35:26 2023 -0800

    Merge pull request #1 from w-e-w/Rounding-Method

    Rounding Method

commit 31bbfa729a15ef35fa1f905345d3ba2b17b26ab9
Author: w-e-w <40751091+w-e-w@users.noreply.github.com>
Date:   Wed Feb 8 19:41:45 2023 +0900

    use switch

commit 85dbe511c33521d3ac62224bf0e0f3a48194ce63
Author: w-e-w <40751091+w-e-w@users.noreply.github.com>
Date:   Wed Feb 8 16:47:52 2023 +0900

    Rounding Method

commit 745382a0f4b8d16241545a3460d5206915959255
Author: Gerschel <Gerschel_Payne@hotmail.com>
Date:   Tue Feb 7 21:19:20 2023 -0800

    default set to round

commit 728579c618af30ec98a5af0991bd3f28bdaca399
Author: Gerschel <Gerschel_Payne@hotmail.com>
Date:   Tue Feb 7 21:17:03 2023 -0800

    cleaned some commented code out; added indicator

commit 5b288c24a1edd8a5c2f35214b9634316d05b8dae
Author: Gerschel <Gerschel_Payne@hotmail.com>
Date:   Tue Feb 7 18:19:00 2023 -0800

    needs cleaning; attempt at rounding

commit d9f18ae92b929576b0b8c5f1ef8b3b38e441e381
Author: Gerschel <Gerschel_Payne@hotmail.com>
Date:   Tue Feb 7 15:46:25 2023 -0800

    add rounding option in setting for aspect ratio

commit af22106802c9e42205649e4c71c23fcf5b8c62f6
Author: Gerschel <Gerschel_Payne@hotmail.com>
Date:   Tue Feb 7 13:18:45 2023 -0800

    added some ratios, sorted ratios by commonality

commit 11e2fba73cffe8cdbf4cd0860641b94428ca0e74
Author: Gerschel <Gerschel_Payne@hotmail.com>
Date:   Tue Feb 7 10:46:53 2023 -0800

    snaps to mulitples of 8 and along ratio

commit fa00387e07460b10ee82671a1bfa8687e00ee60b
Author: Gerschel <Gerschel_Payne@hotmail.com>
Date:   Mon Feb 6 14:54:59 2023 -0800

    updated slidercomponentcontroller

commit 8059bc111c3e2d1edb3314e05ab21b65120fa1dd
Author: Gerschel <Gerschel_Payne@hotmail.com>
Date:   Mon Feb 6 14:29:11 2023 -0800

    added step size adjustment on number field

commit 641157b9f27a874a24ee7b0a854a092e9eac3eec
Author: Gerschel <Gerschel_Payne@hotmail.com>
Date:   Mon Feb 6 14:12:03 2023 -0800

    added return step size to default when ratio is disabled

commit 5fb75ad28f2476f36100ec93922a8199adbd2a68
Author: Gerschel <Gerschel_Payne@hotmail.com>
Date:   Mon Feb 6 14:09:34 2023 -0800

    added step size adjustment

commit e33532883bc4709cd41c3775cbb646d1d5ab0584
Author: Gerschel <Gerschel_Payne@hotmail.com>
Date:   Mon Feb 6 11:56:15 2023 -0800

    adjusted dropdown size, padding, text-align

commit 81937329cee77f466c5a5b23c268d0c810128f84
Author: Gerschel <Gerschel_Payne@hotmail.com>
Date:   Mon Feb 6 11:39:57 2023 -0800

    added positioning and styling

commit 86eb4583782d92880a9a113a54ffbac9d92f3753
Author: Gerschel <Gerschel_Payne@hotmail.com>
Date:   Mon Feb 6 08:54:45 2023 -0800

    fix typo in defaults; added preventDefault in event
 2023-02-08 18:57:32 -08:00
Vladimir Mandic
3ca41dbded
add missing import 
used later in line 70
 2023-02-08 07:10:13 -05:00
Vladimir Mandic
3ee9ca5cb0
add missing import 
used later in line 418
 2023-02-08 07:08:09 -05:00
Vladimir Mandic
4c562a9832
convert rgba to rgb 
some image format (e.g. jpg) do not support rgba
 2023-02-08 07:03:36 -05:00
brkirch
2016733814 Apply hijacks in ddpm_edit for upcast sampling 
To avoid import errors, ddpm_edit hijacks are done after an instruct pix2pix model is loaded.
 2023-02-07 22:53:45 -05:00
brkirch
4738486d8f Support for hypernetworks with --upcast-sampling 2023-02-06 18:10:55 -05:00
Gerschel
5d483bf307 aspect ratio for dim's; sliders adjust by ratio 
Default choices added to settings in user interface section
Choices are editable by user

User selects from dropdown.
When you move one slider, the other adjusts according to the ratio
chosen.
Vice versa for the other slider.

Number fields for changes work as well.

For disabling ratio, an unlock pad "🔓" is available as a default.
This string can be changed to anything to serve as a disable,
as long as there is no colon ":".

Ratios are entered in this format, floats or ints with a colon "1:1".
The string is split at the colon, parses left and right as floats to
perform the math.
 2023-02-06 08:18:04 -08:00
EllangoK
9a22c63f47 call modules.sd_vae.refresh_vae_list() 2023-02-06 00:52:31 -05:00
CurtisDS
584f782391
Update ui_extra_networks.py 
update the string used to build the ID handle to replace spaces with underscore
 2023-02-05 16:42:45 -05:00
InvincibleDude
c3bd113a0b
Image info fix 2023-02-05 15:24:41 +00:00
InvincibleDude
f4b78e73a4
Merge branch 'AUTOMATIC1111:master' into improved-hr-conflict-test 2023-02-05 18:02:44 +03:00
w-e-w
fe33be6cac use Default if ValueError 2023-02-05 23:33:05 +09:00
w-e-w
6d11cda418 configurable image downscale 
allowing the user to configure the image downscale parameters in setting
 2023-02-05 23:12:42 +09:00
EllangoK
0ca1a64cfc adds grid margins to xyz plot and prompt matrix 2023-02-05 03:44:56 -05:00
AUTOMATIC1111
3993aa43e9
Merge pull request #7535 from mcmonkey4eva/fix-symlink-extra-network 
fix symlinks in extra networks ui
 2023-02-05 11:28:30 +03:00
AUTOMATIC1111
27a50d4b38
Merge pull request #7554 from techneconn/feature/prompt_hash_option 
Add prompt_hash option for file/dir name pattern
 2023-02-05 11:27:05 +03:00
AUTOMATIC1111
475095f50a
Merge pull request #7528 from spezialspezial/patch-1 
Catch broken model symlinks early | Quickfix modelloader.py
 2023-02-05 11:24:32 +03:00
AUTOMATIC
668d7e9b9a make it possible to load SD1 checkpoints without CLIP 2023-02-05 11:21:00 +03:00
techneconn
5a1b62e9f8 Add prompt_hash option for file/dir name pattern 2023-02-05 15:48:51 +09:00
Alex "mcmonkey" Goodwin
88a46e8427 fix symlinks in extra networks ui 
'absolute' and 'resolve' are equivalent, but 'resolve' resolves symlinks (which is an obscure specialty behavior usually not wanted) whereas 'absolute' treats symlinks as folders (which is the expected behavior). This commit allows you to symlink folders within your models/embeddings/etc. dirs and have preview images load as expected without issue.
 2023-02-04 09:10:00 -08:00
spezialspezial
6524478850
Update modelloader.py 
os.path.getmtime(filename) throws exception later in codepath when meeting broken symlink. For now catch it here early but more checks could be added for robustness.
 2023-02-04 16:52:15 +01:00
AUTOMATIC
3e0f9a7543 fix issue with switching back to checkpoint that had its checksum calculated during runtime mentioned in #7506 2023-02-04 15:23:16 +03:00
AUTOMATIC
40e51fd6ef add margin parameter to draw_grid_annotations 2023-02-04 13:29:04 +03:00
AUTOMATIC1111
21593c8082
Merge pull request #7466 from ctwrs/master 
Add .jpg to allowed thumb formats
 2023-02-04 12:07:45 +03:00
AUTOMATIC1111
c0e0b5844d
Merge pull request #7470 from cbrownstein-lambda/update-error-message-no-checkpoint 
Update error message WRT missing checkpoint file
 2023-02-04 12:07:12 +03:00
AUTOMATIC
81823407d9 add --no-hashing 2023-02-04 11:38:56 +03:00
AUTOMATIC1111
30228c67ca
Merge pull request #7461 from brkirch/mac-fixes 
Move Mac related code to separate file
 2023-02-04 11:22:52 +03:00
AUTOMATIC
c4b9ed1a27 make Image CFG Scale only show if instrutpix2pix model is loaded 2023-02-04 11:18:44 +03:00
AUTOMATIC
72dd5785d9 merge CFGDenoiserEdit and CFGDenoiser into single object 2023-02-04 11:06:17 +03:00
brkirch
4306659c4d Remove unused code 2023-02-04 01:22:06 -05:00
Kyle
ba6a4e7e94 Use original CFGDenoiser if image_cfg_scale = 1 
If image_cfg_scale is =1 then the original image is not used for the output. We can then use the original CFGDenoiser to get the same result to support AND functionality.

Maybe in the future AND can be supported with "Image CFG Scale"
 2023-02-03 19:46:13 -05:00
Kyle
c27c0de0f7 txt2img Hires Fix 2023-02-03 19:15:32 -05:00
Kyle
6c6c6636bb Image CFG Added (Full Implementation) 
Uses separate denoiser for edit (instruct-pix2pix) models

No impact to txt2img or regular img2img

"Image CFG Scale" will only apply to instruct-pix2pix models and metadata will only be added if using such model
 2023-02-03 18:19:56 -05:00
Kyle
3b2ad20ac1 Processing only, no CFGDenoiser change 
Allows instruct-pix2pix
 2023-02-02 19:19:45 -05:00
Kyle
cf0cfefe91 Revert "instruct-pix2pix support" 
This reverts commit 269833067d.
 2023-02-02 19:15:38 -05:00
rucadi
5ca4230524 Merge branch 'master' of https://github.com/Rucadi/stable-diffusion-webui-polling 2023-02-02 20:12:08 +01:00
rucadi
eb5eb8aa11 Add a callback called before reloading the server 2023-02-02 20:10:47 +01:00
rucadi
3662a274e2 Add polling callback 2023-02-02 20:10:47 +01:00
Kyle
269833067d instruct-pix2pix support 2023-02-02 09:37:01 -05:00
Cody Brownstein
fb97acef63 Update error message WRT missing checkpoint file 
The Safetensors format is also supported.
 2023-02-01 14:51:06 -08:00
ctwrs
92bae77b88 Add .jpg to allowed thumb formats 2023-02-01 22:28:39 +01:00
brkirch
1b8af15f13 Refactor Mac specific code to a separate file 
Move most Mac related code to a separate file, don't even load it unless web UI is run under macOS.
 2023-02-01 14:05:56 -05:00
AUTOMATIC1111
07edf57409
Merge pull request #7357 from EllangoK/btn-fix 
Fixes switch height/width btn unbound error
 2023-02-01 16:29:58 +03:00
AUTOMATIC1111
30a64504b1
Merge pull request #7414 from joecodecreations/master 
Changes use_original_name_batch to default to True
 2023-02-01 16:22:16 +03:00
brkirch
2217331cd1 Refactor MPS fixes to CondFunc 2023-02-01 06:36:22 -05:00
brkirch
7738c057ce MPS fix is still needed :( 
Apparently I did not test with large enough images to trigger the bug with torch.narrow on MPS
 2023-02-01 05:23:58 -05:00
Joey Sanchez
0426b34789 Adding default true to use_original_name_batch as images should by default hold the same name to help keep sequenced images in their correct order 2023-01-30 21:46:52 -05:00
InvincibleDude
3ec2eb8bf1
Merge branch 'master' into improved-hr-conflict-test 2023-01-30 15:35:13 +03:00
AUTOMATIC
ee9fdf7f62 Add --skip-version-check to disable messages asking users to upgrade torch. 2023-01-30 14:56:28 +03:00
AUTOMATIC
ab059b6e48 make the program read Discard penultimate sigma from generation parameters 2023-01-30 10:52:15 +03:00
AUTOMATIC
040ec7a80e make the program read Eta and Eta DDIM from generation parameters 2023-01-30 10:47:09 +03:00
AUTOMATIC
4df63d2d19 split samplers into one more files for k-diffusion 2023-01-30 10:11:30 +03:00
Andrey
274474105a Split history sd_samplers.py to sd_samplers_kdiffusion.py 2023-01-30 09:51:23 +03:00
Andrey
95916e3777 Split history sd_samplers.py to sd_samplers_kdiffusion.py 2023-01-30 09:51:23 +03:00
Andrey
2db8ed32cd Split history sd_samplers.py to sd_samplers_kdiffusion.py 2023-01-30 09:51:23 +03:00
Andrey
f4d0538bf2 Split history sd_samplers.py to sd_samplers_kdiffusion.py 2023-01-30 09:51:23 +03:00
AUTOMATIC
aa54a9d416 split compvis sampler and shared sampler stuff into their own files 2023-01-30 09:51:06 +03:00
Andrey
f8fcad502e Split history sd_samplers.py to sd_samplers_common.py 2023-01-30 09:37:51 +03:00
Andrey
58ae93b954 Split history sd_samplers.py to sd_samplers_common.py 2023-01-30 09:37:50 +03:00
Andrey
6e78f6a896 Split history sd_samplers.py to sd_samplers_common.py 2023-01-30 09:37:50 +03:00
Andrey
5feae71dd2 Split history sd_samplers.py to sd_samplers_common.py 2023-01-30 09:37:50 +03:00
Andrey
449531a6c5 Split history sd_samplers.py to sd_samplers_compvis.py 2023-01-30 09:35:53 +03:00
Andrey
9b8ed7f8ec Split history sd_samplers.py to sd_samplers_compvis.py 2023-01-30 09:35:53 +03:00
Andrey
9118b08606 Split history sd_samplers.py to sd_samplers_compvis.py 2023-01-30 09:35:52 +03:00
Andrey
0c7c36a6c6 Split history sd_samplers.py to sd_samplers_compvis.py 2023-01-30 09:35:52 +03:00
AUTOMATIC
c81b52ffbd add override settings component to img2img 2023-01-30 02:40:26 +03:00
AUTOMATIC
847ceae1f7 make it possible to search checkpoint by its hash 2023-01-30 01:41:23 +03:00
AUTOMATIC
399720dac2 update prompt token counts after using the paste params button 2023-01-30 01:03:31 +03:00
AUTOMATIC
f91068f426 change disable_weights_auto_swap to true by default 2023-01-30 00:37:26 +03:00
AUTOMATIC
938578e8a9 make it so that setting options in pasted infotext (like Clip Skip and ENSD) do not get applied directly and instead are added as temporary overrides 2023-01-30 00:25:30 +03:00
invincibledude
425eab3464 Extra network in hr abomination fix 2023-01-29 19:26:31 +03:00
invincibledude
9beeef6267 Extra networks loading fix 2023-01-29 19:16:17 +03:00
invincibledude
6127d2ff1b Extra networks loading fix 2023-01-29 19:13:27 +03:00
invincibledude
c92ec3a925 Extra networks loading fix 2023-01-29 19:07:00 +03:00
InvincibleDude
ee3d63b6be
Merge branch 'master' into master 2023-01-29 14:36:10 +03:00
AUTOMATIC
00dab8f10d remove Batch size and Batch pos from textinfo (goodbye) 2023-01-29 11:53:24 +03:00
AUTOMATIC
aa6e55e001 do not display the message for TI unless the list of loaded embeddings changed 2023-01-29 11:53:05 +03:00
EllangoK
920fe8057c fixes #7284 btn unbound error 2023-01-29 03:36:16 -05:00
AUTOMATIC
8d7382ab24 add buttons for auto-search in subdirectories for extra tabs 2023-01-29 11:34:58 +03:00
AUTOMATIC1111
e8efd2ec47
Merge pull request #7353 from EllangoK/preview-fix 
Fixes thumbnail cards not loading the preview image
 2023-01-29 10:41:36 +03:00
EllangoK
659d602dce only returns ckpt directories if they are not none 2023-01-29 02:32:53 -05:00
AUTOMATIC
f6b7768f84 support for searching subdirectory names for extra networks 2023-01-29 10:20:19 +03:00
glop102
09a142a05a Reduce grid rows if larger than number of images available 
When a set number of grid rows is specified in settings, then it leads
to situations where an entire row in the grid is empty.
The most noticable example is the processing preview when the row count
is set to 2, where it shows the preview just fine but with a black
rectangle under it.
 2023-01-28 19:25:52 -05:00
AUTOMATIC
1d8e06d542 add checkpoints tab for extra networks UI 2023-01-28 22:52:27 +03:00
AUTOMATIC1111
91c8d0dcfc
Merge pull request #7231 from EllangoK/master 
Fixes X/Y/Z Plot parameters not being restored from images
 2023-01-28 18:45:38 +03:00
AUTOMATIC1111
fecb990deb
Merge pull request #7309 from brkirch/fix-embeddings 
Fix embeddings, upscalers, and refactor `--upcast-sampling`
 2023-01-28 18:44:36 +03:00
AUTOMATIC
e2c71a4bd4 make prevent the browser from using cached version of scripts when they change 2023-01-28 18:13:03 +03:00
EllangoK
591b68e56c uses autos new regex, checks len of re_param 2023-01-28 10:04:09 -05:00
AUTOMATIC1111
cd7e8fb42b
Merge pull request #7319 from Thurion/img2img_batch_fix 
Fix error when using img2img batch without masks
 2023-01-28 17:31:39 +03:00
AUTOMATIC
b7d2af8c7f add dropdowns in settings for hypernets and loras 2023-01-28 17:18:47 +03:00
Thurion
1421e95960
allow empty mask dir 2023-01-28 14:42:24 +01:00
AUTOMATIC
5d14f282c2 fixed a bug where after switching to a checkpoint with unknown hash, you'd get empty space instead of checkpoint name in UI 
fixed a bug where if you update a selected checkpoint on disk and then restart the program, a different checkpoint loads, but the name is shown for the the old one.
 2023-01-28 16:23:49 +03:00
AUTOMATIC
f8feeaaedb add progressbar to extension update check; do not check for updates for disabled extensions 2023-01-28 15:57:56 +03:00
AUTOMATIC
d04e3e921e automatically detect v-parameterization for SD2 checkpoints 2023-01-28 15:24:41 +03:00
AUTOMATIC
4aa7f5b5b9 update image parameters regex for #7231 2023-01-28 15:24:40 +03:00
brkirch
f9edd578e9 Remove MPS fix no longer needed for PyTorch 
The torch.narrow fix was required for nightly PyTorch builds for a while to prevent a hard crash, but newer nightly builds don't have this issue.
 2023-01-28 04:16:27 -05:00
brkirch
ada17dbd7c Refactor conditional casting, fix upscalers 2023-01-28 04:16:25 -05:00
AUTOMATIC1111
bea31e849a
Merge pull request #7240 from Unstackd/master 
Allow users to convert models to Instruct-pix2pix models by supporting merging Instruct-pix2pix models with regular ones in the merge tab
 2023-01-28 10:52:28 +03:00
Mackerel
3752aad23d don't replace regular --help with new paths.py parser help 2023-01-28 02:44:12 -05:00
Ju1-js
dc25a31d1a Gradio Auth Read from External File 
Usage: `--gradio-auth-path {PATH}`
It adds the credentials to the already existing `--gradio-auth` credentials. It can also handle line breaks.
The file should look like:
`{u1}:{p1},{u2}:{p2}`
or
```
{u1}:{p1},
{u2}:{p2}
```
Will gradio handle duplicate credentials if it happens?
 2023-01-27 22:43:10 -08:00
AUTOMATIC1111
ce72af87d3
Merge pull request #7199 from maxaudron/feature/configurable-data-dir 
Add flag to store user data sepperate from source code
 2023-01-28 09:24:40 +03:00
AUTOMATIC
0834d4ce37 simplify #7284 2023-01-28 08:41:15 +03:00
AUTOMATIC1111
c99d705e57
Merge pull request #7284 from Gazzoo-byte/patch-1 
Add button to switch width and height
 2023-01-28 08:33:43 +03:00
AUTOMATIC
4c52dfe4ac make the detection for -v models less broad 2023-01-28 08:30:17 +03:00
AUTOMATIC1111
41975c375c
Merge pull request #7294 from MrCheeze/model-detection 
add v2-inpainting model detection, and broaden v-model detection to include anything with 768 in the name
 2023-01-28 08:29:01 +03:00
Andrii Skaliuk
2aac1d9778 Basic inpainting batch support 
Modifies batch UI to add optional inpainting support
 2023-01-27 17:32:31 -08:00
MrCheeze
6b82efd737 add v2-inpainting model detection, and broaden v-model detection to include anything with 768 in the name 2023-01-27 20:06:19 -05:00
AUTOMATIC
cc8c9b7474 fix broken calls to find_checkpoint_config 2023-01-27 22:43:08 +03:00
Gazzoo-byte
eafaf14167
Add button to switch width and height 
Adds a button to switch width and height, allowing quick and easy switching between landscape and portrait.
 2023-01-27 18:34:41 +00:00
Max Audron
23a9d5e273 create user extensions directory if not exists 2023-01-27 14:44:34 +01:00
Max Audron
6b3981c068 clean up unused script_path imports 2023-01-27 14:44:34 +01:00
Max Audron
14c0884fd0 use python importlib to load and execute extension modules 
previously module attributes like __file__ where not set correctly,
leading to scripts getting the directory of the stable-diffusion repo
location instead of their own script.

This causes problem when loading user data from an external location
using the --data-dir flag, as extensions would look for their own code
in the stable-diffusion repo location instead of the data dir location.

Using pythons importlib functions sets the modules specs correctly and
executes them. But this will break extensions if they build paths based
on the previously incorrect __file__ attribute.
 2023-01-27 14:44:34 +01:00
Max Audron
5eee2ac398 add data-dir flag and set all user data directories based on it 2023-01-27 14:44:30 +01:00
AUTOMATIC
9beb794e0b clarify the option to disable NaN check. 2023-01-27 13:08:00 +03:00
AUTOMATIC
6f31d2210c support detecting midas model 
fix broken api for checkpoint list
 2023-01-27 11:54:19 +03:00
AUTOMATIC
d2ac95fa7b remove the need to place configs near models 2023-01-27 11:28:12 +03:00
AUTOMATIC
7a14c8ab45 add an option to enable sections from extras tab in txt2img/img2img 
fix some style inconsistenices
 2023-01-26 23:31:32 +03:00
ULTRANOX\Chris
cdc2fa209a Changed filename addition from "instrpix2pix" to the more readable ".instruct-pix2pix" for newly generated instruct pix2pix models. 2023-01-26 11:27:07 -05:00
brkirch
c4b9b07db6 Fix embeddings dtype mismatch 2023-01-26 09:00:15 -05:00
ULTRANOX\Chris
9e72dc7434 Changed all references to "pix2pix" to the more precise name "instruct pix2pix". Also changed extension to instrpix2pix at least for now. 2023-01-26 06:05:40 -05:00
ULTRANOX\Chris
f90798c6b6 Added error check for the rare case a user merges a pix2pix model with a normal model using weighted sum. Also removed bad print message that interfered with merging progress bar. 2023-01-26 04:38:04 -05:00
ULTRANOX\Chris
f4ec411f2c Allow checkpoint merger to merge pix2pix models in the same way that it currently supports inpainting models. 2023-01-26 03:45:16 -05:00
brkirch
10421f93c3 Fix full previews, --no-half-vae 2023-01-26 01:43:35 -05:00
EllangoK
4d634dc592 adds components to infotext_fields 
allows for loading script params
 2023-01-26 00:18:41 -05:00
EllangoK
e57b5f7c55 re_param captures quotes with commas properly 
and removes unnecessary regex
 2023-01-25 22:36:14 -05:00
AUTOMATIC
6cff440182 fix prompt editing break after first batch in img2img 2023-01-25 23:25:40 +03:00
AUTOMATIC
d1d6ce2983 add edit_image_conditioning from my earlier edits in case there's an attempt to inegrate pix2pix properly 
this allows to use pix2pix model in img2img though it won't work well this way
 2023-01-25 23:25:25 +03:00
AUTOMATIC1111
3cead6983e
Merge pull request #7197 from mcmonkey4eva/fix-ti-symlinks 
allow symlinks in the textual inversion embeddings folder
 2023-01-25 22:59:12 +03:00
AUTOMATIC
15e89ef0f6 fix for unet hijack breaking the train tab 2023-01-25 20:11:01 +03:00
AUTOMATIC
789d47f832 make clicking extra networks button one more time close the extra networks UI 2023-01-25 19:55:31 +03:00
Alex "mcmonkey" Goodwin
e179b6098a allow symlinks in the textual inversion embeddings folder 2023-01-25 08:48:40 -08:00
AUTOMATIC1111
1574e96729
Merge pull request #6510 from brkirch/unet16-upcast-precision 
Add upcast options, full precision sampling from float16 UNet and upcasting attention for inference using SD 2.1 models without --no-half
 2023-01-25 19:12:29 +03:00
AUTOMATIC
57c1baa774 change to code for live preview fix on OSX to be bit more obvious 2023-01-25 18:56:23 +03:00
AUTOMATIC1111
23dafe6d86
Merge pull request #7151 from brkirch/fix-approx-nn 
Fix Approx NN previews changing first generation result
 2023-01-25 18:48:25 +03:00
Kyle
ee0a0da324 Add instruct-pix2pix hijack 
Allows loading instruct-pix2pix models via same method as inpainting models in sd_models.py and sd_hijack_ip2p.py

Adds ddpm_edit.py necessary for instruct-pix2pix
 2023-01-25 08:53:23 -05:00
AUTOMATIC1111
d5ce044bcd
Merge pull request #7146 from EllangoK/master 
Adds X/Y/Z Grid Script
 2023-01-25 11:56:26 +03:00
brkirch
e3b53fd295 Add UI setting for upcasting attention to float32 
Adds "Upcast cross attention layer to float32" option in Stable Diffusion settings. This allows for generating images using SD 2.1 models without --no-half or xFormers.

In order to make upcasting cross attention layer optimizations possible it is necessary to indent several sections of code in sd_hijack_optimizations.py so that a context manager can be used to disable autocast. Also, even though Stable Diffusion (and Diffusers) only upcast q and k, unfortunately my findings were that most of the cross attention layer optimizations could not function unless v is upcast also.
 2023-01-25 01:13:04 -05:00
brkirch
84d9ce30cb Add option for float32 sampling with float16 UNet 
This also handles type casting so that ROCm and MPS torch devices work correctly without --no-half. One cast is required for deepbooru in deepbooru_model.py, some explicit casting is required for img2img and inpainting. depth_model can't be converted to float16 or it won't work correctly on some systems (it's known to have issues on MPS) so in sd_models.py model.depth_model is removed for model.half().
 2023-01-25 01:13:02 -05:00
AUTOMATIC
5228ec8bda remove fairscale requirement, add fake fairscale to make BLIP not complain about it mk2 2023-01-24 20:30:43 +03:00
AUTOMATIC
28189985e6 remove fairscale requirement, add fake fairscale to make BLIP not complain about it 2023-01-24 20:24:27 +03:00
InvincibleDude
44c0e6b993
Merge branch 'AUTOMATIC1111:master' into master 2023-01-24 15:44:09 +03:00
EllangoK
e46bfa5a9e handling sub grids and merging into one 2023-01-24 02:24:32 -05:00
AUTOMATIC
602a1864b0 also return the removed field to sdapi/v1/upscalers because someone might have relied on it existing 2023-01-24 10:09:30 +03:00
AUTOMATIC
42a70d7477 repair sdapi/v1/upscalers returning bogus results 2023-01-24 10:05:45 +03:00
brkirch
f64af77adc Fix different first gen with Approx NN previews 
The loading of the model for approx nn live previews can change the internal state of PyTorch, resulting in a different image. This can be avoided by preloading the approx nn model in advance.
 2023-01-23 22:49:20 -05:00
Vladimir Mandic
45e270dfc8
add image decod exception handling 2023-01-23 17:11:22 -05:00
AUTOMATIC
5c1cb9263f fix BLIP failing to import depending on configuration 2023-01-24 00:24:17 +03:00
AUTOMATIC1111
7ba7f4ed6e
Merge pull request #7113 from vladmandic/interrogate 
Add selector to interrogate categories
 2023-01-24 00:09:14 +03:00
AUTOMATIC
7b1c7ba87b add support for apostrophe in extra network names 2023-01-23 23:11:34 +03:00
Vladimir Mandic
04a561c11c
add option to skip interrogate categories 2023-01-23 12:29:23 -05:00
Vladimir Mandic
efa7287be0
Merge branch 'AUTOMATIC1111:master' into interrogate 2023-01-23 12:25:07 -05:00
AUTOMATIC1111
171a5b3bb9
Merge pull request #7032 from gmq/extra-network-styles 
Extra network view style
 2023-01-23 18:46:37 +03:00
Vladimir Mandic
6e1b296baf
api-image-format 2023-01-23 10:10:59 -05:00
AUTOMATIC
e8c3d03f7d a possible fix for broken image upscaling 2023-01-23 17:59:58 +03:00
Vladimir Mandic
925dd09c91
improve interrogate 2023-01-23 09:03:17 -05:00
AUTOMATIC
59146621e2 better support for xformers flash attention on older versions of torch 2023-01-23 16:40:20 +03:00
AUTOMATIC
3fa482076a Merge remote-tracking branch 'takuma104/xformers-flash-attention' 2023-01-23 16:01:53 +03:00
AUTOMATIC
194cbd065e fix open directory button failing 2023-01-23 15:50:32 +03:00
AUTOMATIC1111
663353098e
Merge pull request #7031 from EllangoK/master 
Fixes various button overflowing UI and compact checkbox
 2023-01-23 15:22:06 +03:00
AUTOMATIC1111
74608300d1
Merge pull request #7093 from Shondoit/fix-dark-mode 
Fix dark mode
 2023-01-23 15:09:26 +03:00
AUTOMATIC
41265a026d third time's the charm 2023-01-23 14:50:20 +03:00
AUTOMATIC
fabdae089e add missing import to previous commit 2023-01-23 14:42:49 +03:00
Shondoit
669dbd9725 Fix dark mode 
Fixes #7048

Co-Authored-By: J.J. Tolton <jjtolton@gmail.com>
 2023-01-23 09:54:42 +01:00
AUTOMATIC
b5230197a6 rework extras tab to use script system 2023-01-23 09:24:43 +03:00
Guillermo Moreno
f80ff3c1e4 feat(extra-networks): remove view dropdown 2023-01-22 22:01:24 -03:00
Guillermo Moreno
66eef11ce7 feat(extra-networks): add default view setting 2023-01-22 12:18:21 -03:00
Guillermo Moreno
985c0b8e9a feat(extra-networks): add thumbs view style 2023-01-22 12:18:21 -03:00
invincibledude
3bc8ee998d Gen params paste improvement 2023-01-22 16:35:42 +03:00
invincibledude
7f62300f7d Gen params paste improvement 2023-01-22 16:29:08 +03:00
invincibledude
fccc39834a Gen params paste improvement 2023-01-22 16:17:55 +03:00
invincibledude
d261bec1ec Gen params paste improvement 2023-01-22 16:14:28 +03:00
invincibledude
1fa777c1d7 Gen params paste improvement 2023-01-22 16:03:42 +03:00
invincibledude
2aaee73633 Gen params paste improvement 2023-01-22 16:00:35 +03:00
invincibledude
a5c2b5ed89 UI and PNG info improvements 2023-01-22 15:50:20 +03:00
invincibledude
bbb1e35ea2 UI and PNG info improvements 2023-01-22 15:44:59 +03:00
invincibledude
b0ae92d605 UI improvements 2023-01-22 15:43:12 +03:00
AUTOMATIC
68303c96e5 split oversize extras.py to postprocessing.py 2023-01-22 15:38:39 +03:00
invincibledude
34f6d66742 hr conditioning 2023-01-22 15:32:47 +03:00
invincibledude
125d5c8d96 hr conditioning 2023-01-22 15:31:11 +03:00
invincibledude
2ab2bce74d hr conditioning 2023-01-22 15:28:38 +03:00
Andrey
c56b367122 Split history extras.py to postprocessing.py 2023-01-22 15:26:41 +03:00
Andrey
d63340a485 Split history extras.py to postprocessing.py 2023-01-22 15:26:40 +03:00
Andrey
b238b14ee4 Split history extras.py to postprocessing.py 2023-01-22 15:26:40 +03:00
Andrey
43ac9ff205 Split history extras.py to postprocessing.py 2023-01-22 15:26:40 +03:00
invincibledude
c5d4c87c02 hr conditioning 2023-01-22 15:17:43 +03:00
invincibledude
4e0cf7d4ed hr conditioning 2023-01-22 15:15:08 +03:00
invincibledude
a9f0e7d536 hr conditioning 2023-01-22 15:12:00 +03:00
invincibledude
f774a8d24e Hr-fix separate prompt experimentation 2023-01-22 14:52:01 +03:00
invincibledude
81e0723d65 Logging for debugging 2023-01-22 14:41:41 +03:00
invincibledude
b331ca784a Fix 2023-01-22 14:35:34 +03:00
invincibledude
8114959e7e Hr separate prompt test 2023-01-22 14:28:53 +03:00
AUTOMATIC
c98cb0f8ec amend previous commit to work in a proper fashion when saving previews 2023-01-22 11:04:02 +03:00
AUTOMATIC
35419b2746 add an option to reorder tabs for extra networks 2023-01-22 11:00:05 +03:00
AUTOMATIC
112416d041 add option to discard weights in checkpoint merger UI 2023-01-22 10:17:12 +03:00
AUTOMATIC
0792fae078 fix missing field for aesthetic embedding extension 2023-01-22 08:20:48 +03:00
AUTOMATIC
2621566153 attention ctrl+up/down enhancements 2023-01-22 08:07:18 +03:00
EllangoK
bf457b30fb compact checkbox and fix copy image btn overflow 
also fixes type for #tab_extensions in style.css
 2023-01-21 16:21:33 -05:00
invincibledude
f7b38c4841 Style fix 2023-01-22 00:18:26 +03:00
AUTOMATIC
f2eae6127d fix broken textual inversion extras tab 2023-01-22 00:16:26 +03:00
invincibledude
0f6862ef30 PLMS edge-case handling fix 5 2023-01-22 00:11:05 +03:00
invincibledude
6cd7bf9f86 PLMS edge-case handling fix 3 2023-01-22 00:08:58 +03:00
invincibledude
3ffe2e768b PLMS edge-case handling fix 2 2023-01-22 00:07:46 +03:00
invincibledude
9e1f49c4e5 PLMS edge-case handling fix 2023-01-22 00:03:16 +03:00
AUTOMATIC
fe7a623e6b add a slider for default value of added extra networks 2023-01-22 00:02:52 +03:00
AUTOMATIC
78f59a4e01 enable compact view for train tab 
prevent  previews from ruining hypernetwork training
 2023-01-22 00:02:51 +03:00
invincibledude
8bec3a2aa1 Index fix 2023-01-21 23:31:36 +03:00
invincibledude
6c0566f937 Type mismatch fix 2023-01-21 23:25:36 +03:00
AUTOMATIC1111
abf11215e0
Merge pull request #6955 from EllangoK/master 
Adds descriptions for merging methods in UI
 2023-01-21 23:17:06 +03:00
invincibledude
3bd898b6ce First test of different sampler for hi-res fix 2023-01-21 23:14:59 +03:00
AUTOMATIC
4a8fe09652 remove the double loading text 2023-01-21 23:06:18 +03:00
AUTOMATIC
e4e0918f58 remove timestamp for js files, reformat code 2023-01-21 22:57:19 +03:00
AUTOMATIC1111
7c8852b8e7
Merge pull request #7015 from jjtolton/serve-static-js 
Compile and serve js files via `src` instead of embedded inline scripts
 2023-01-21 22:43:18 +03:00
James Tolton
035459c9a2 remove dead import 2023-01-21 14:11:13 -05:00
James Tolton
50059ea661 server individually listed javascript files vs single compiled file 2023-01-21 14:07:48 -05:00
James Tolton
17af0fb955 remove commented out lines 2023-01-21 13:27:05 -05:00
James Tolton
f726df8a2f Compile and serve js from /statica instead of inline in html 2023-01-21 12:59:05 -05:00
AUTOMATIC
f53527f778 make it run on gradio < 3.16.2 2023-01-21 20:07:14 +03:00
AUTOMATIC
3deea34135 extract extra network data from prompt earlier 2023-01-21 19:36:08 +03:00
AUTOMATIC
63b824376c add --gradio-queue option to enable gradio queue 2023-01-21 18:47:54 +03:00
AUTOMATIC
424cefe118 add search box to extra networks 2023-01-21 17:20:24 +03:00
AUTOMATIC
92fb1096db make it so that extra networks are not removed from infotext 2023-01-21 16:41:25 +03:00
AUTOMATIC
855b9e3d1c Lora support! 
update readme to reflect some recent changes
 2023-01-21 16:15:53 +03:00
Takuma Mori
3262e825cc add --xformers-flash-attention option & impl 2023-01-21 17:42:04 +09:00
AUTOMATIC
184e23eb89 relocate tool buttons next to generate button 
prevent extra network tabs from putting images into wrong prompts
prevent settings leaking into prompt
 2023-01-21 09:58:57 +03:00
AUTOMATIC
6d805b669e make CLIP interrogator download original text files if the directory does not exist 
remove random artist built-in extension (to re-added as a normal extension on demand)
remove artists.csv (but what does it mean????????????????????)
make interrogate buttons show Loading... when you click them
 2023-01-21 09:14:27 +03:00
AUTOMATIC
40ff6db532 extra networks UI 
rework of hypernets: rather than via settings, hypernets are added directly to prompt as <hypernet:name:weight>
 2023-01-21 08:36:07 +03:00
AUTOMATIC
20a59ab3b1 move token counter to the location of the prompt, add token counting for the negative prompt 2023-01-20 10:18:41 +03:00
EllangoK
98466da4bc adds descriptions for merging methods in ui 2023-01-20 00:48:15 -05:00
AUTOMATIC
6c7a50d783 remove some unnecessary logging to javascript console 2023-01-20 08:36:37 +03:00
AUTOMATIC
6073456c83 write a comment for fix_checkpoint function 2023-01-19 20:39:10 +03:00
AUTOMATIC1111
51517f3ea6
Merge pull request #6936 from EllangoK/master 
Fixes minor typos around run_modelmerger
 2023-01-19 19:58:16 +03:00
AUTOMATIC
c1928cdd61 bring back short hashes to sd checkpoint selection 2023-01-19 18:58:08 +03:00
EllangoK
f2ae252987 fixes minor typos around run_modelmerger 2023-01-19 10:24:17 -05:00
AUTOMATIC
d1ea518dea remember the list of checkpoints after you press refresh button and reload the page 2023-01-19 18:07:37 +03:00
vt-idiot
b271e22f7a
Update shared.py 
`Witdth/Height` was driving me insane. -> `Width/Height`
 2023-01-19 06:12:19 -05:00
AUTOMATIC1111
aa60fc6660
Merge pull request #6922 from brkirch/cumsum-fix 
Improve cumsum fix for MPS
 2023-01-19 13:18:34 +03:00
AUTOMATIC1111
0f9cacaa0e
Merge pull request #6844 from guaneec/crop-ui 
Add auto-sized cropping UI
 2023-01-19 13:11:05 +03:00
dan
2985b317d7 Fix of fix 2023-01-19 17:39:30 +08:00
dan
18a09c7e00 Simplification and bugfix 2023-01-19 17:36:23 +08:00
AUTOMATIC
54674674b8 allow having at half precision when there is only one checkpoint in merger tab 2023-01-19 12:12:09 +03:00
AUTOMATIC
0f5dbfffd0 allow baking in VAE in checkpoint merger tab 
do not save config if it's the default for checkpoint merger tab
change file naming scheme for checkpoint merger tab
allow just saving A without any merging for checkpoint merger tab
some stylistic changes for UI in checkpoint merger tab
 2023-01-19 10:39:51 +03:00
AUTOMATIC
c7e50425f6 add progress bar to modelmerger 2023-01-19 09:25:37 +03:00
AUTOMATIC
7cfc645030 eliminate repetition of code in #6910 2023-01-19 08:53:50 +03:00
AUTOMATIC1111
01b1061a0b
Merge pull request #6910 from EllangoK/master 
Check model name values are set before merging
 2023-01-19 08:48:27 +03:00
AUTOMATIC
308b51012a fix an unlikely division by 0 error 2023-01-19 08:41:37 +03:00
EllangoK
26a6a78b16 only lookup tertiary model if theta_func1 is set 2023-01-18 21:21:52 -05:00
EllangoK
99207bc816 check model name values are set before merging 2023-01-18 19:13:15 -05:00
AUTOMATIC
bb0978ecfd fix hires fix ui weirdness caused by gradio update 2023-01-19 00:44:51 +03:00
AUTOMATIC1111
a8322ad75b
Merge pull request #6854 from EllangoK/master 
Saves Extra Generation Parameters to params.txt
 2023-01-18 23:25:56 +03:00
AUTOMATIC1111
43fd6eaab8
Merge pull request #6851 from ddPn08/master 
Add `--vae-dir` argument
 2023-01-18 23:23:09 +03:00
AUTOMATIC
b186d44dcd use DDIM in hires fix is the sampler is PLMS 2023-01-18 23:20:23 +03:00
AUTOMATIC1111
c94abc8862
Merge pull request #6895 from mezotaken/interrogate-all-tabs 
Process interrogation on all img2img subtabs
 2023-01-18 23:07:41 +03:00
AUTOMATIC
924e222004 add option to show/hide warnings 
removed hiding warnings from LDSR
fixed/reworked few places that produced warnings
 2023-01-18 23:04:24 +03:00
Vladimir Repin
8683427bd9 Process interrogation on all img2img subtabs 2023-01-18 20:25:52 +03:00
AUTOMATIC
6faae23239 repair broken quicksettings when some form-requiring options are added to it 2023-01-18 14:33:09 +03:00
AUTOMATIC
26fd444811 bump gradio to 3.16.2 
change style selection to multiselect dropdown
 2023-01-18 13:59:45 +03:00
brkirch
a255dac4f8 Fix cumsum for MPS in newer torch 
The prior fix assumed that testing int16 was enough to determine if a fix is needed, but a recent fix for cumsum has int16 working but not bool.
 2023-01-17 20:54:18 -05:00
ddPn08
d906f87043
fix typo 2023-01-18 07:52:10 +09:00
AUTOMATIC
3a0d6b7729 make it so that PNG images with EXIF do not lose parameters in PNG info tab 2023-01-17 23:54:23 +03:00
EllangoK
5e15a0b422 Changed params.txt save to after manual init call 2023-01-17 11:42:44 -05:00
ddPn08
6e08da2c31
Add --vae-dir argument 2023-01-17 23:50:41 +09:00
AUTOMATIC
aede265f1d Fix unable to find Real-ESRGAN model info error (AttributeError: 'NoneType' object has no attribute 'data_path') #6841 #5170 2023-01-17 13:57:55 +03:00
dan
4688bfff55 Add auto-sized cropping UI 2023-01-17 17:16:43 +08:00
AUTOMATIC
c361b89026 disable the new NaN check for the CI 2023-01-17 11:05:01 +03:00
fuggy
eb2223340c
Fix typo 2023-01-16 21:50:30 -06:00
AUTOMATIC
e0e8005009 make StableDiffusionProcessing class not hold a reference to shared.sd_model object 2023-01-16 23:09:08 +03:00
AUTOMATIC
9991967f40 Add a check and explanation for tensor with all NaNs. 2023-01-16 22:59:46 +03:00
AUTOMATIC
064983c0ad return an option to hide progressbar 2023-01-16 12:56:30 +03:00
AUTOMATIC
ff6a5bcec1 bugfix for previous commit 2023-01-16 01:28:20 +03:00
AUTOMATIC
3f887f7f61 support old configs that say "auto" for ssd_vae 
change sd_vae_as_default to True by default as it's a more sensible setting
 2023-01-16 00:44:52 +03:00
AUTOMATIC
3db22e6ee4 rename masking to inpaint in UI 
make inpaint go to the right place for users who don't have it in config string
 2023-01-15 23:32:38 +03:00
AUTOMATIC1111
30cfe4ed9b
Merge pull request #6758 from Poktay/allow_reorder_masking_controls 
allow reordering of inpaint masking controls (like the other sections can be reordered)
 2023-01-15 23:24:09 +03:00
AUTOMATIC
89314e79da fix an error that happens when you send an empty image from txt2img to img2img 2023-01-15 23:23:24 +03:00
AUTOMATIC1111
f3167b10ce
Merge pull request #6780 from vladmandic/train-logging 
add fields to settings file
 2023-01-15 22:55:45 +03:00
AUTOMATIC1111
d6fa8e92ca
Merge pull request #6782 from aria1th/fix-hypernetwork-loss 
Fix tensorboard-hypernetwork integration correctly
 2023-01-15 22:55:06 +03:00
AUTOMATIC1111
4385449933
Merge pull request #6778 from pangbo13/master 
Fix unexpected behavior when show_progress_every_n_steps is set to -1
 2023-01-15 22:54:14 +03:00
AUTOMATIC
8e2aeee4a1 add BREAK keyword to end current text chunk and start the next 2023-01-15 22:29:53 +03:00
aria1th
13445738d9 Fix tensorboard related functions 2023-01-16 03:02:54 +09:00
aria1th
598f7fcd84 Fix loss_dict problem 2023-01-16 02:46:21 +09:00
Vladimir Mandic
110d1a2d59
add fields to settings file 2023-01-15 12:41:00 -05:00
AUTOMATIC
205991df78 Merge remote-tracking branch 'origin/fix-mean-loss' 2023-01-15 20:30:42 +03:00
AUTOMATIC
b6ce041cdf put interrupt and skip buttons back where they were 2023-01-15 20:29:55 +03:00
AUTOMATIC
a534bdfc80 add setting for progressbar update period 2023-01-15 20:29:55 +03:00
AngelBottomless
16f410893e
fix missing 'mean loss' for tensorboard integration 2023-01-16 02:08:47 +09:00
pangbo13
388708f7b1 fix when show_progress_every_n_steps == -1 2023-01-16 00:56:24 +08:00
AUTOMATIC1111
ce13ced5dc
Merge pull request #6772 from vladmandic/sha-calc-optimization 
increase block size
 2023-01-15 19:09:46 +03:00
AUTOMATIC1111
006997d180
Merge pull request #6770 from brkirch/approx-nn-fix 
Fix Approx NN not working on torch devices other than CUDA
 2023-01-15 19:09:06 +03:00
AUTOMATIC
d8b90ac121 big rework of progressbar/preview system to allow multiple users to prompts at the same time and do not get previews of each other 2023-01-15 18:51:04 +03:00
Vladimir Mandic
f0312565e5
increase block size 2023-01-15 09:42:34 -05:00
brkirch
eef1990a5e Fix Approx NN on devices other than CUDA 2023-01-15 08:13:33 -05:00
Josh R
9ef41df6f9 add inpaint masking controls to orderable section that the settings can order 2023-01-14 15:26:45 -08:00
Vladimir Mandic
ce9827a7c5
Merge pull request #6731 from vladmandic/state_server_start 
Add server start time to state info
 2023-01-14 16:03:29 -05:00
AUTOMATIC1111
beeec2b598
Merge pull request #6728 from bbc-mc/exclude_clip_index_from_merge_target 
Exclude clip index from merge
 2023-01-14 23:12:31 +03:00
AUTOMATIC
86359535d6 add buttons to copy images between img2img tabs 2023-01-14 22:43:01 +03:00
AUTOMATIC
f8c5124785 typo? 2023-01-14 20:00:12 +03:00
AUTOMATIC
a5bbcd2153 fix bug with "Ignore selected VAE for..." option completely disabling VAE election 
rework VAE resolving code to be more simple
 2023-01-14 19:56:09 +03:00
Vladimir Mandic
fad850fc3d
add server_start to shared.state 2023-01-14 11:18:05 -05:00
AUTOMATIC
f94a215abe add an option to choose what you want to see in live preview (Live preview subject) and moves live preview settings to its own tab 2023-01-14 16:29:23 +03:00
AUTOMATIC
08c6f009a5 load hashes from cache for checkpoints that have them 
add checkpoint hash to footer
 2023-01-14 15:55:40 +03:00
AUTOMATIC
865228a837 change style dropdowns to multiselect 2023-01-14 14:56:39 +03:00
bbc_mc
5f8685237e Exclude clip index from merge 2023-01-14 20:09:32 +09:00
AUTOMATIC
6eb72fd13f bump gradio to 3.16.1 2023-01-14 13:38:10 +03:00
AUTOMATIC
febd2b722e update key to use with checkpoints' sha256 in cache 2023-01-14 13:37:55 +03:00
AUTOMATIC
f9ac3352cb change hypernets to use sha256 hashes 2023-01-14 10:25:37 +03:00
AUTOMATIC
a95f135308 change hash to sha256 2023-01-14 09:56:59 +03:00
AUTOMATIC
82725f0ac4 fix a bug caused by merge 2023-01-13 15:04:37 +03:00
AUTOMATIC1111
9cd7716753
Merge branch 'master' into tensorboard 2023-01-13 14:57:38 +03:00
AUTOMATIC1111
544e7a233e
Merge pull request #6689 from Poktay/add_gradient_settings_to_logging_file 
add gradient settings to training settings log files
 2023-01-13 14:45:32 +03:00
AUTOMATIC1111
3ad1fdd99b
Merge pull request #6684 from space-nuko/save-extension-params-to-last-params 
Fix extension parameters not being saved to last used parameters
 2023-01-13 14:44:39 +03:00
AUTOMATIC1111
7bf3cfc427
Merge pull request #6685 from space-nuko/script-callback-fix-infotext 
Add script callback for fixing infotext parameters
 2023-01-13 14:43:42 +03:00
AUTOMATIC
a176d89487 print bucket sizes for training without resizing images #6620 
fix an error when generating a picture with embedding in it
 2023-01-13 14:32:15 +03:00
AUTOMATIC1111
486bda9b33
Merge pull request #6620 from guaneec/varsize_batch 
Enable batch_size>1 for mixed-sized training
 2023-01-13 14:03:31 +03:00
Josh R
0b262802b8 add gradient settings to training settings log files 2023-01-12 17:31:05 -08:00
space-nuko
6c88eaed4f Add script callback for fixing infotext parameters 2023-01-12 13:50:09 -08:00
space-nuko
88416ab5ff Fix extension parameters not being saved to last used parameters 2023-01-12 13:46:59 -08:00
Shondoit
d52a80f7f7 Allow creation of zero vectors for TI 2023-01-12 09:22:29 +01:00
AUTOMATIC
0b8911d883 img2img UI rework: obsolete --gradio-img2img-tool --gradio-inpaint-tool and always show all tools each in own tab 2023-01-11 20:33:24 +03:00
AUTOMATIC1111
590ff5ce5b
Merge pull request #6647 from vladmandic/update-progress-api 
add textinfo to progress api response
 2023-01-11 19:06:08 +03:00
AUTOMATIC1111
6d7f3d1072
Merge pull request #6648 from vladmandic/progress-description 
Set TQDM progress bar and state textinfo description
 2023-01-11 19:04:54 +03:00
AUTOMATIC1111
97ff69eff3
Merge pull request #6628 from catboxanon/fix/alternating-words-emphasis 
Fix prompt parser default step transformer
 2023-01-11 18:56:24 +03:00
AUTOMATIC
4bd490727e fix for an error caused by skipping initialization, for realsies this time: TypeError: expected str, bytes or os.PathLike object, not NoneType 2023-01-11 18:54:13 +03:00
Vladimir Mandic
3f43d8a966
set descriptions 2023-01-11 10:28:55 -05:00
Vladimir Mandic
39ea251945
add textinfo to progress response 2023-01-11 10:23:51 -05:00
catboxanon
0b38b72d31
Remove compat option for prompt parser 2023-01-11 09:01:37 -05:00
catboxanon
ab388d6f8b
Remove compat option check for prompt parser 2023-01-11 08:59:47 -05:00
catboxanon
035f2af050
Merge branch 'AUTOMATIC1111:master' into fix/alternating-words-emphasis 2023-01-11 08:58:43 -05:00
AUTOMATIC
1a23dc32ac possible fix for fallback for fast model creation from config, attempt 2 2023-01-11 10:34:36 +03:00
AUTOMATIC
4fdacd31e4 possible fix for fallback for fast model creation from config 2023-01-11 10:24:56 +03:00
AUTOMATIC
954091697f add an option to copy config from one of models in checkpoint merger 2023-01-11 09:10:07 +03:00
AUTOMATIC1111
3e20244b0f
Merge pull request #6625 from PlasmaPower/textual-inversion-safetensors 
Support loading textual inversion embeddings from safetensors files
 2023-01-11 08:21:22 +03:00
space-nuko
37a2301121 Expose the compiled class module of scripts to extensions 2023-01-10 20:30:09 -08:00
catboxanon
7e45fba55b
Fix prompt parser default step transformer w/ test 2023-01-10 21:47:03 -05:00
catboxanon
5830095b73
Add old prompt parser compat option 2023-01-10 21:43:24 -05:00
Lee Bousfield
f9706acf43
Support loading textual inversion embeddings from safetensors files 2023-01-10 18:40:34 -07:00
dan
6be644fa04 Enable batch_size>1 for mixed-sized training 2023-01-11 05:31:58 +08:00
AUTOMATIC
29fb532764 change color selector in settings to be part of form 2023-01-10 23:47:07 +03:00
AUTOMATIC
0f8603a559 add support for transformers==4.25.1 
add fallback for when quick model creation fails
 2023-01-10 17:46:59 +03:00
AUTOMATIC
ce3f639ec8 add more stuff to ignore when creating model from config 
prevent .vae.safetensors files from being listed as stable diffusion models
 2023-01-10 16:51:04 +03:00
AUTOMATIC
0c3feb202c disable torch weight initialization and CLIP downloading/reading checkpoint to speedup creating sd model from config 2023-01-10 14:08:29 +03:00
AUTOMATIC
ef75c98053 Split history ui.py to ui_progress.py 2023-01-10 12:29:45 +03:00
Andrey
54dd5d6634 Split history ui.py to ui_progress.py 2023-01-10 11:54:49 +03:00
Andrey
f9c2147dfb Split history ui.py to ui_progress.py 2023-01-10 11:54:49 +03:00
Andrey
27ea6949d3 Split history ui.py to ui_progress.py 2023-01-10 11:54:48 +03:00
Andrey
e9f8292a3a Split history ui.py to ui_progress.py 2023-01-10 11:54:48 +03:00
aria1th
a4a5475cfa Variable dropout rate 
Implements variable dropout rate from #4549

Fixes hypernetwork multiplier being able to modified during training, also fixes user-errors by setting multiplier value to lower values for training.

Changes function name to match torch.nn.module standard

Fixes RNG reset issue when generating previews by restoring RNG state
 2023-01-10 14:56:57 +09:00
AUTOMATIC1111
bd4587d2f5
Merge pull request #6578 from vladmandic/fix-model-load 
allow model load if previous model failed
 2023-01-10 08:22:44 +03:00
Vladimir Mandic
2275f130bf
relax reponse type check enforcement 2023-01-09 21:23:58 -05:00
Vladimir Mandic
552d7b90bf
allow model load if previous model failed 2023-01-09 18:34:26 -05:00
AUTOMATIC
3fe9e9e54d fix broken resolution detection when pasting parameters with old hires fix enabled 2023-01-10 02:17:42 +03:00
AUTOMATIC1111
b1d976dca2
Merge pull request #6466 from vladmandic/api-get-memory 
Implement API get-memory
 2023-01-10 02:02:19 +03:00
Vladimir Mandic
95727312ca
remove bytes -> gb conversion 2023-01-09 16:54:12 -05:00
AUTOMATIC
1fbb6f9ebe make a dropdown for prompt template selection 2023-01-09 23:35:40 +03:00
AUTOMATIC
43bb5190fc remove/simplify some changes from #6481 2023-01-09 22:52:23 +03:00
AUTOMATIC1111
18c001792a
Merge branch 'master' into varsize 2023-01-09 22:45:39 +03:00
AUTOMATIC
cdfcbd9959 Remove fallback for Protocol import and remove Protocol import and remove instances of Protocol in code 
add some whitespace between functions to be in line with other code in the repo
 2023-01-09 20:08:48 +03:00
AUTOMATIC1111
89c3663080
Merge pull request #6482 from ProGamerGov/patch-6 
Add fallback for Protocol import
 2023-01-09 20:06:50 +03:00
AUTOMATIC
49c4509ce2 use existing function for loading VAE weights from file 2023-01-09 19:58:35 +03:00
AUTOMATIC1111
99da2c5af6
Merge pull request #6528 from PlasmaPower/vae-safetensors 
Add support for loading VAEs from safetensors files
 2023-01-09 19:40:28 +03:00
AUTOMATIC
d4fd2418ef add an option to use old hiresfix width/height behavior 
add a visual effect to inactive hires fix elements
 2023-01-09 14:57:47 +03:00
Lee Bousfield
cb255faec6
Add support for loading VAEs from safetensor files 2023-01-08 10:17:50 -07:00
AUTOMATIC1111
0d194e4ecc
Merge pull request #6465 from brkirch/fix-training 
Fix training for newer PyTorch builds
 2023-01-08 16:16:31 +03:00
AUTOMATIC
137ce534b2 remove some code duplication 
remove calls to locals()
add a test for img2img with script
 2023-01-08 16:14:38 +03:00
AUTOMATIC1111
e7f2f1e1b6
Merge pull request #6469 from noodleanon/scripts-from-api 
Run scripts from API
 2023-01-08 15:47:19 +03:00
noodleanon
6d0cc1e239
Corrected is_img2img param 2023-01-08 11:03:48 +00:00
AUTOMATIC
085427de0e make it possible for extensions/scripts to add their own embedding directories 2023-01-08 09:37:33 +03:00
AUTOMATIC
a0c87f1fdf skip images in embeddings dir if they have a second .preview extension 2023-01-08 08:52:26 +03:00
ProGamerGov
984b86dd0a
Add fallback for Protocol import 2023-01-07 13:08:21 -07:00
dan
72497895b9 Move batchsize check 2023-01-08 02:57:36 +08:00
dan
669fb18d52 Add checkbox for variable training dims 2023-01-08 02:31:40 +08:00
dan
448b9cedab Allow variable img size 2023-01-08 02:14:36 +08:00
noodleanon
d38ede71d5
Added script support in txt2img endpoint 2023-01-07 14:21:31 +00:00
noodleanon
50e2536279
Merge branch 'AUTOMATIC1111:master' into img2img-api-scripts 2023-01-07 14:18:09 +00:00
Vladimir Mandic
47534577ed
api-get-memory 2023-01-07 07:51:35 -05:00
brkirch
df3b31eb55 In-place operations can break gradient calculation 2023-01-07 07:04:59 -05:00
AUTOMATIC
fdfce47110 add "from" resolution for hires fix to be less confusing. 2023-01-07 13:29:47 +03:00
AUTOMATIC1111
983167e621
Merge pull request #6448 from aednzxy/patch-2 
increase upscale api validation limit
 2023-01-07 12:34:42 +03:00
AUTOMATIC1111
c295e4a244
Merge pull request #6055 from brkirch/sub-quad_attn_opt 
Add Birch-san's sub-quadratic attention implementation
 2023-01-07 12:26:55 +03:00
AUTOMATIC
1a5b86ad65 rework hires fix preview for #6437: movie it to where it takes less place, make it actually account for all relevant sliders and calculate dimensions correctly 2023-01-07 09:56:37 +03:00
AUTOMATIC
de97380445 this breaks on default config because width, height, hr_scale are None at that point. 2023-01-07 08:53:53 +03:00
AUTOMATIC1111
01cc07b81a
Merge pull request #6437 from Mitchell1711/show-target-resolution 
Show upscaled resolution on hires fix
 2023-01-07 08:43:28 +03:00
AUTOMATIC
c4a221c405 Merge branch 'clip_hijack_rework' 2023-01-07 08:43:08 +03:00
AUTOMATIC
1740c33547 more comments 2023-01-07 07:48:44 +03:00
AUTOMATIC
08066676a4 make it not break on empty inputs; thank you tarded, we are 2023-01-07 07:22:07 +03:00
Mitchell Boot
f94cfc563b Changed HTML to textbox instead 
Using HTML caused an issue where the row would expand for a frame when changing the sliders because of the loading animation. This solution also doesn't use any additional HTML padding
 2023-01-07 01:15:22 +01:00
AUTOMATIC
79e39fae61 CLIP hijack rework 2023-01-07 01:46:13 +03:00
Dean Hopkins
82c1f10b14 increase upscale api validation limit 2023-01-06 22:10:03 +00:00
brkirch
c18add68ef Added license 2023-01-06 16:42:47 -05:00
Mitchell Boot
991368c8d5 remove camelcase 2023-01-06 18:24:29 +01:00
Mitchell Boot
3992ecbe6e Added UI elements 
Added a new row to hires fix that shows the new resolution after scaling
 2023-01-06 18:02:46 +01:00
Kuma
50194de93f
typo UI fixes #6391 2023-01-06 16:12:45 +01:00
AUTOMATIC
3246a2d6b8 remove restriction for saving dropdowns to ui-config.json 2023-01-06 16:03:53 +03:00
AUTOMATIC
65ed4421e6 add callback for when the script is unloaded 2023-01-06 13:55:50 +03:00
AUTOMATIC
c9bded39ee sort extensions by date and add an option to sort by other columns 2023-01-06 12:32:44 +03:00
brkirch
5deb2a19cc Allow Doggettx's cross attention opt without CUDA 2023-01-06 01:33:15 -05:00
brkirch
b95a4c0ce5 Change sub-quad chunk threshold to use percentage 2023-01-06 01:01:51 -05:00
AUTOMATIC
683287d87f rework saving training params to file #6372 2023-01-06 08:52:06 +03:00
brkirch
b119815333 Use narrow instead of dynamic_slice 2023-01-06 00:15:24 -05:00
brkirch
3bfe2bb549 Merge remote-tracking branch 'upstream/master' into sub-quad_attn_opt 2023-01-06 00:15:22 -05:00
brkirch
f6ab5a39d7 Merge branch 'AUTOMATIC1111:master' into sub-quad_attn_opt 2023-01-06 00:14:20 -05:00
brkirch
d782a95967 Add Birch-san's sub-quadratic attention implementation 2023-01-06 00:14:13 -05:00
AUTOMATIC1111
88e01b237e
Merge pull request #6372 from timntorres/save-ti-hypernet-settings-to-txt-revised 
Save hypernet and textual inversion settings to text file, revised.
 2023-01-06 07:59:44 +03:00
AUTOMATIC1111
143ed5a42d
Merge pull request #6384 from faber6/loads-ti-from-subdirs 
allow loading embeddings from subdirectories
 2023-01-06 07:56:48 +03:00
AUTOMATIC1111
8a13afd216
Merge pull request #6401 from acncagua/wsl-open 
wsl-open
 2023-01-06 07:56:15 +03:00
AUTOMATIC1111
85fa4eacea
Merge pull request #6402 from brkirch/work-with-nightly-local-builds 
Add support for using PyTorch nightly and local builds
 2023-01-06 07:51:45 +03:00
AUTOMATIC1111
3ea354f274
Merge pull request #6364 from 0xb8/master 
hires-fix: add "nearest-exact" latent upscale mode.
 2023-01-06 07:49:11 +03:00
acncagua
d61a5aa4f6
Add files via upload 2023-01-06 10:58:22 +09:00
brkirch
8111b5569d Add support for PyTorch nightly and local builds 2023-01-05 20:54:52 -05:00
noodleanon
b5253f0dab
allow img2img api to run scripts 2023-01-05 21:21:48 +00:00
Faber
81133d4168
allow loading embeddings from subdirectories 2023-01-06 03:38:37 +07:00
AUTOMATIC1111
310b71f669
Merge pull request #6376 from KumiIT/master 
typo in TI
 2023-01-05 22:10:07 +03:00
AUTOMATIC
847f869c67 experimental optimization 2023-01-05 21:00:52 +03:00
Kuma
fda04e620d
typo in TI 2023-01-05 18:44:19 +01:00
timntorres
b6bab2f052 Include model in log file. Exclude directory. 2023-01-05 09:14:56 -08:00
timntorres
b85c2b5cf4 Clean up ti, add same behavior to hypernetwork. 2023-01-05 08:14:38 -08:00
cat
19a81ac287 hires-fix: add "nearest-exact" latent upscale mode. 2023-01-05 20:25:02 +05:00
timntorres
eea8fc40e1 Add option to save ti settings to file. 2023-01-05 07:24:22 -08:00
AUTOMATIC
f8d0cf6a6e rework #6329 to remove duplicate code and add prevent tab names for showing in ids for scripts that only exist on one tab 2023-01-05 12:08:11 +03:00
AUTOMATIC
997461d3dd add footer with versions 2023-01-05 11:57:14 +03:00
AUTOMATIC1111
01a1fee874
Merge pull request #6329 from Kryptortio/add_even_more_element_ids 
Add additional elem_id/HTML ids (again)
 2023-01-05 11:56:13 +03:00
AUTOMATIC
42fcc79bd3 add Discard penultimate sigma to infotext 2023-01-05 10:43:21 +03:00
AUTOMATIC1111
c53852e257
Merge pull request #6044 from hentailord85ez/discard-penultimate-sigma 
Allow always discarding of penultimate sigma and fix doing 1 less step than specified
 2023-01-05 10:33:51 +03:00
AUTOMATIC1111
24e21c0710
Merge pull request #6328 from lolsuffocate/fix-png-info-api 
Make pnginfoapi return all image info
 2023-01-05 10:23:59 +03:00
AUTOMATIC
2e30997450 move sd_model assignment to the place where we change the sd_model 2023-01-05 10:21:17 +03:00
Philpax
83ca8dd0c9
Merge branch 'AUTOMATIC1111:master' into fix-sd-arch-switch-in-override-settings 2023-01-05 05:00:58 +01:00
AUTOMATIC
99b67cff0b make hires fix not do anything if the user chooses the second pass resolution to be the same as first pass resolution 2023-01-05 01:25:52 +03:00
me
5851bc839b Add element ids for script components and a few more in ui.py 2023-01-04 22:14:30 +01:00
AUTOMATIC
bc43293c64 fix incorrect display/calculation for number of steps for hires fix in progress bars 2023-01-04 23:56:43 +03:00
Suffocate
1288a3bb7d Use the read_info_from_image function directly 2023-01-04 20:36:30 +00:00
AUTOMATIC
8149078094 added the option to specify target resolution with possibility of truncating for hires fix; also sampling steps 2023-01-04 22:04:40 +03:00
AUTOMATIC
24d4a0841d train tab visual updates 
allow setting train tab values from ui-config.json
 2023-01-04 20:10:40 +03:00
AUTOMATIC1111
eeb1de4388
Merge branch 'master' into gradient-clipping 2023-01-04 19:56:35 +03:00
AUTOMATIC1111
e9911391ca
Merge pull request #6305 from vladmandic/fix-jpeg 
fix jpeg handling
 2023-01-04 19:22:51 +03:00
AUTOMATIC
097a90b88b add XY plot parameters to grid image and do not add them to individual images 2023-01-04 19:19:11 +03:00
AUTOMATIC
3dae545a03 rename weirdly named variables from #3176 2023-01-04 18:42:51 +03:00
AUTOMATIC1111
37aafdb059
Merge branch 'master' into master 2023-01-04 18:39:57 +03:00
AUTOMATIC
a8eb9e3bf8 Revert "Merge pull request #3791 from shirayu/fix/filename" 
This reverts commit eed58279e7, reversing
changes made to 4ae960b01c.
 2023-01-04 18:20:38 +03:00
AUTOMATIC1111
eed58279e7
Merge pull request #3791 from shirayu/fix/filename 
Truncate too long filename (Fix #705)
 2023-01-04 18:17:50 +03:00
AUTOMATIC
525cea9245 use shared function from processing for creating dummy mask when training inpainting model 2023-01-04 17:58:07 +03:00
Vladimir Mandic
590c5ae016
update pillow 2023-01-04 09:48:54 -05:00
AUTOMATIC
184e670126 fix the merge 2023-01-04 17:45:01 +03:00
AUTOMATIC1111
da5c1e8a73
Merge branch 'master' into inpaint_textual_inversion 2023-01-04 17:40:19 +03:00
AUTOMATIC1111
47df084901
Merge pull request #6304 from vladmandic/add-cross-attention-info 
add cross-attention info
 2023-01-04 17:30:43 +03:00
AUTOMATIC
4d66bf2c0d add infotext to "-before-highres-fix" images 2023-01-04 17:24:46 +03:00
Vladimir Mandic
79c682ad4f
fix jpeg 2023-01-04 08:20:42 -05:00
AUTOMATIC
1cfd8aec4a make it possible to work with opts.show_progress_every_n_steps = -1 with medvram 2023-01-04 16:05:42 +03:00
Vladimir Mandic
21ee77db31
add cross-attention info 2023-01-04 08:04:38 -05:00
AUTOMATIC1111
c923de0e05
Merge pull request #5969 from philpax/include-job-timestamp-in-progress-api 
feat(api): include job_timestamp in progress
 2023-01-04 15:28:51 +03:00
AUTOMATIC
642142556d use commandline-supplied cuda device name instead of cuda:0 for safetensors PR that doesn't fix anything 2023-01-04 15:09:53 +03:00
AUTOMATIC
68fbf4558f Merge remote-tracking branch 'Narsil/fix_safetensors_load_speed' 2023-01-04 14:53:03 +03:00
Vladimir Mandic
11b8160a08
fix typo 2023-01-04 06:36:57 -05:00
AUTOMATIC
0cd6399b8b fix broken inpainting model 2023-01-04 14:29:13 +03:00
AUTOMATIC
3bd737767b disable broken API logging 2023-01-04 14:20:32 +03:00
AUTOMATIC1111
7bbd984dda
Merge pull request #6253 from Shondoit/ti-optim 
Save Optimizer next to TI embedding
 2023-01-04 14:09:13 +03:00
AUTOMATIC1111
545ae8cb1c
Merge pull request #6264 from vladmandic/add-state-info 
add missing state info
 2023-01-04 14:04:50 +03:00
AUTOMATIC1111
a8ad8666cd
Merge pull request #6261 from vladmandic/api-logging 
add api logging
 2023-01-04 14:04:11 +03:00
AUTOMATIC1111
6281c1bdb4
Merge pull request #6299 from stysmmaker/feat/latent-upscale-modes 
Add more latent upscale modes
 2023-01-04 13:47:36 +03:00
AUTOMATIC1111
77c3bc7747
Merge pull request #6298 from stysmmaker/fix/intermediate-step-full-res 
Save full resolution of intermediate step
 2023-01-04 13:46:21 +03:00
MMaker
b2151b934f
Rename bicubic antialiased option 
Comma was causing the the value in PNG info to be quoted, which causes the upscaler dropdown option to be blank when sending to UI
 2023-01-04 05:36:18 -05:00
MMaker
f49f917cdd
Merge branch 'AUTOMATIC1111:master' into feat/latent-upscale-modes 2023-01-04 04:27:52 -06:00
AUTOMATIC
4ec6470a1a fix checkpoint list API 2023-01-04 13:26:23 +03:00
MMaker
15fd0b8bc4
Update processing.py 2023-01-04 05:12:54 -05:00
MMaker
96cf15bede
Add new latent upscale modes 2023-01-04 05:12:06 -05:00
AUTOMATIC
8d8a05a3bb find configs for models at runtime rather than when starting 2023-01-04 12:47:42 +03:00
AUTOMATIC
02d7abf514 helpful error message when trying to load 2.0 without config 
failing to load model weights from settings won't break generation for currently loaded model anymore
 2023-01-04 12:35:07 +03:00
MMaker
e5b7ee910e
fix: Save full res of intermediate step 2023-01-04 04:22:01 -05:00
Max Weber
917b5bd8d0
ui: save dropdown sampling method to the ui-config 2023-01-03 18:19:56 -07:00
AUTOMATIC
3e22e29413 fix broken send to extras button 2023-01-03 21:49:24 +03:00
AUTOMATIC
82cfc227d7 added licenses screen to settings 
added footer
removed unused inpainting code
 2023-01-03 20:23:17 +03:00
Vladimir Mandic
d8d206c168
add state to interrogate 2023-01-03 11:01:04 -05:00
Vladimir Mandic
cec209981e
log only sdapi 2023-01-03 10:58:52 -05:00
AUTOMATIC
8f96f92899 call script callbacks for reloaded model after loading embeddings 2023-01-03 18:39:14 +03:00
AUTOMATIC
2d5a5076bb Make it so that upscalers are not repeated when restarting UI. 2023-01-03 18:38:21 +03:00
Vladimir Mandic
192ddc04d6
add job info to modules 2023-01-03 10:34:51 -05:00
Vladimir Mandic
1d9dc48efd
init job and add info to model merge 2023-01-03 10:21:51 -05:00
Vladimir Mandic
aaa4c2aacb
add api logging 2023-01-03 09:45:16 -05:00
AUTOMATIC
e9fb9bb0c2 fix hires fix not working in API when user does not specify upscaler 2023-01-03 17:40:20 +03:00
Shondoit
bddebe09ed Save Optimizer next to TI embedding 
Also add check to load only .PT and .BIN files as embeddings. (since we add .optim files in the same directory)
 2023-01-03 13:30:24 +01:00
AUTOMATIC
c0ee148870 add support for running with gradio 3.9 installed 2023-01-03 14:18:48 +03:00
AUTOMATIC
a1cf55a9d1 add option to reorder items in main UI 2023-01-03 10:39:21 +03:00
AUTOMATIC
9d4eff097d add a button to show all setting pages 2023-01-03 10:01:06 +03:00
AUTOMATIC
2bc86712ec make quicksettings UI elements appear in same order as they are listed in the setting 2023-01-03 09:13:35 +03:00
AUTOMATIC
18c03cdeac styling rework to make things more compact 2023-01-03 09:04:29 +03:00
AUTOMATIC
269f6e8676 change settings UI to use vertical tabs 2023-01-03 07:20:20 +03:00
AUTOMATIC
251ecee694 make "send to" buttons send actual dimension of the sent image rather than fields 2023-01-02 22:44:46 +03:00
AUTOMATIC
8d12a729b8 fix possible error with accessing nonexistent setting 2023-01-02 20:46:51 +03:00
AUTOMATIC
84dd7e8e24 error out with a readable message in chwewckpoint merger for incompatible tensor shapes (ie when trying to merge SD1.5 with SD2.0) 2023-01-02 20:30:02 +03:00
AUTOMATIC
4dbde228ff make it possible to use fractional values for SD upscale. 2023-01-02 20:01:16 +03:00
AUTOMATIC
ef27a18b6b Hires fix rework 2023-01-02 19:42:10 +03:00
AUTOMATIC1111
fd4461d44c
Merge pull request #6196 from philpax/add-embeddings-api 
feat(api): add /sdapi/v1/embeddings
 2023-01-02 06:11:10 +03:00
AUTOMATIC1111
f39a79d143
Merge pull request #6183 from Kryptortio/add_more_element_ids 
Add additional elem_id/HTML ids
 2023-01-02 06:10:26 +03:00
Philpax
c65909ad16 feat(api): return more data for embeddings 2023-01-02 12:21:48 +11:00
Philpax
b5819d9bf1 feat(api): add /sdapi/v1/embeddings 2023-01-02 10:18:11 +11:00
AUTOMATIC
311354c0bb fix the issue with training on SD2.0 2023-01-02 00:38:09 +03:00
me
a005fccddd Add a lot more elem_id/HTML id, modified some that were duplicates for seed section 2023-01-01 20:06:52 +01:00
AUTOMATIC
e672cfb074 rework of callback for #6094 2023-01-01 18:37:55 +03:00
AUTOMATIC1111
6062c85d4d
Merge pull request #6094 from AlUlkesh/master 
Adding image numbers on grids
 2023-01-01 18:31:01 +03:00
AUTOMATIC
524d532b38 moved roll artist to built-in extensions 2023-01-01 14:07:40 +03:00
AlUlkesh
5f12b23b8b Adding image numbers on grids 
New grid option in settings enables adding of image numbers on grids. This makes identifying the images, especially in larger batches, much easier.

Revert "Adding image numbers on grids"

This reverts commit 3530c283b4b1d3a3cab40efbffe4cf2697938b6f.

Implements Callback for image grid loop

Necessary to make "Add image's number to its picture in the grid" extension possible.
 2023-01-01 11:21:50 +01:00
AUTOMATIC
e5f1a37cb9 make refresh buttons look more nice 2023-01-01 13:08:40 +03:00
AUTOMATIC
b46b97fa29 more fixes for gradio update 2023-01-01 11:38:17 +03:00
AUTOMATIC
76f256fe8f Bump gradio version #YOLO 2023-01-01 11:08:39 +03:00
AUTOMATIC
11d432d92d add refresh buttons to checkpoint merger 2023-01-01 10:35:38 +03:00
AUTOMATIC
16b9661d27 change karras scheduler sigmas to values recommended by SD from old 0.1 to 10 with an option to revert to old 2023-01-01 09:51:37 +03:00
AUTOMATIC
210449b374 fix 'RuntimeError: Expected all tensors to be on the same device' error preventing models from loading on lowvram/medvram. 2023-01-01 02:41:15 +03:00
AUTOMATIC
29a3a7eb13 show sampler selection in dropdown, add option selection to revert to old radio group 2023-01-01 01:19:10 +03:00
AUTOMATIC
360feed9b5 HAPPY NEW YEAR 
make save to zip into its own button instead of a checkbox
 2023-01-01 00:38:58 +03:00
AUTOMATIC
f4535f6e4f make it so that memory/embeddings info is displayed in a separate UI element from generation parameters, and is preserved when you change the displayed infotext by clicking on gallery images 2022-12-31 23:40:55 +03:00
AUTOMATIC
bdbe09827b changed embedding accepted shape detection to use existing code and support the new alt-diffusion model, and reformatted messages a bit #6149 2022-12-31 22:49:09 +03:00
AUTOMATIC1111
c24a314c5e
Merge pull request #6149 from vladmandic/validate-embeddings 
validate textual inversion embeddings
 2022-12-31 22:33:12 +03:00
AUTOMATIC1111
f378b8d53a
Merge pull request #6143 from vladmandic/fix-interrogate 
fix interrogate
 2022-12-31 22:20:56 +03:00
Vladimir Mandic
f55ac33d44
validate textual inversion embeddings 2022-12-31 11:27:02 -05:00
AUTOMATIC
f34c734172 alt-diffusion integration 2022-12-31 18:06:35 +03:00
Vladimir Mandic
65be1df7bb
initialize result so not to cause exception on empty results 2022-12-31 07:46:04 -05:00
AUTOMATIC
3f401cdb64 Merge remote-tracking branch 'baai-open-internal/master' into alt-diffusion 2022-12-31 13:02:28 +03:00
AUTOMATIC
fef98723b2 set sd_model for API later, inside the lock, to prevent multiple requests with different models ending up with incorrect results #5877 #6012 2022-12-31 12:44:26 +03:00
AUTOMATIC1111
26522c7dc8
Merge pull request #6015 from philpax/api-begin-end-in-queue 
fix(api): only begin/end state in lock
 2022-12-31 12:23:39 +03:00
AUTOMATIC1111
3d8256e40c
Merge pull request #6017 from hitomi/master 
Add memory cache for VAE weights
 2022-12-31 12:22:59 +03:00
AUTOMATIC1111
d81636a091
Merge pull request #6037 from vladmandic/master 
fix rgba to rgb when using jpeg output
 2022-12-31 12:14:41 +03:00
AUTOMATIC1111
03cb43c3c8
Merge pull request #6133 from vladmandic/memmon-stats 
add additional memory states
 2022-12-31 10:52:58 +03:00
AUTOMATIC1111
38f5787e67
Merge pull request #6134 from vladmandic/remove-console-message 
remove unnecessary console message
 2022-12-31 10:52:30 +03:00
Vladimir Mandic
463048344f
fix shared state dictionary 2022-12-30 19:41:47 -05:00
Vladimir Mandic
d3aa2a48e1
remove unnecessary console message 2022-12-30 19:38:53 -05:00
Vladimir Mandic
5958bbd244
add additional memory states 2022-12-30 19:36:36 -05:00
Nicolas Patry
5ba04f9ec0
Attempting to solve slow loads for safetensors. 
Fixes #5893
 2022-12-27 11:27:19 +01:00
hentailord85ez
03f486a239
Update shared.py 2022-12-26 20:49:33 +00:00
hentailord85ez
4df5009acb
Update sd_samplers.py 2022-12-26 20:49:13 +00:00
Vladimir Mandic
ae955b0146 fix rgba to rgb when using jpeg output 2022-12-26 09:56:19 -05:00
AUTOMATIC
4af3ca5393 make it so that blank ENSD does not break image generation 2022-12-26 10:11:28 +03:00
hitomi
893933e05a Add memory cache for VAE weights 2022-12-25 20:49:25 +08:00
Philpax
5be9387b23 fix(api): only begin/end state in lock 2022-12-25 21:45:44 +11:00
Philpax
fa931733f6 fix(api): assign sd_model after settings change 2022-12-25 20:17:49 +11:00
AUTOMATIC1111
7b7f7e9361
Merge pull request #6003 from eaglgenes101/settings-css-classes 
Add CSS classes for the settings panels
 2022-12-25 09:17:34 +03:00
AUTOMATIC1111
b12de850ae
Merge pull request #5992 from yuvalabou/F541 
Fix F541: f-string without any placeholders
 2022-12-25 09:16:08 +03:00
AUTOMATIC1111
a66514e1a3
Merge pull request #6005 from allenbenz/patch-1 
Fix clip interrogate from the webui
 2022-12-25 09:12:29 +03:00
AUTOMATIC1111
c1512ef9ae
Merge pull request #5999 from vladmandic/trainapi 
implement train api
 2022-12-25 09:11:42 +03:00
AUTOMATIC
8eef9d8e78 a way to add an exception to unpickler without explicitly calling load_with_extra 2022-12-25 09:03:56 +03:00
Allen Benz
61a273236f
Fix clip interrogate from the webui 
A recent change made the image RGBA, which makes the clip interrogator unhappy.
deepbooru and calling the interrogator from the api already do the conversion so this is the only place that needed it.
 2022-12-24 20:23:12 -08:00
eaglgenes101
f60c24f812 Add CSS classes for the settings panels 2022-12-24 22:16:01 -05:00
Vladimir Mandic
5f1dfbbc95 implement train api 2022-12-24 18:02:22 -05:00
AUTOMATIC
c5bdba2089 change wording a bit 2022-12-24 22:41:35 +03:00
AUTOMATIC
56e557c6ff added cheap NN approximation for VAE 2022-12-24 22:39:10 +03:00
Yuval Aboulafia
3bf5591efe fix F541 f-string without any placeholders 2022-12-24 21:35:29 +02:00
AUTOMATIC1111
5927d3fa95
Merge pull request #5977 from philpax/api-dont-save-extras-output 
fix(api): don't save extras output to disk
 2022-12-24 18:50:45 +03:00
AUTOMATIC1111
a6a54a7529
Merge pull request #5976 from AbstractQbit/fast_preview 
Add an option for faster low quality previews
 2022-12-24 18:38:42 +03:00
AUTOMATIC
0b8acce6a9 separate part of denoiser code into a function to make it easier for extensions to override it 2022-12-24 18:38:16 +03:00
AUTOMATIC
03d7b39453 added an option to filter out deepbooru tags 2022-12-24 16:22:47 +03:00
linuxmobile ( リナックス )
5a650055de
Removed lenght in sd_model at line 115 
Commit eba60a4 is what is causing this error, delete the length check in sd_model starting at line 115 and it's fine.

https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/5971#issuecomment-1364507379
 2022-12-24 09:25:35 -03:00
Philpax
6247f21a63 fix(api): don't save extras output to disk 2022-12-24 22:04:53 +11:00
AbstractQbit
11dd79e346 Add an option for faster low quality previews 2022-12-24 14:00:17 +03:00
Philpax
f23a822f1c feat(api): include job_timestamp in progress 2022-12-24 20:45:16 +11:00
AUTOMATIC1111
eba60a42eb
Merge pull request #5627 from deanpress/patch-1 
fix: fallback model_checkpoint if it's empty
 2022-12-24 12:20:31 +03:00
AUTOMATIC1111
adab48cb1b
Merge pull request #5637 from aednzxy/patch-1 
API endpoint to refresh checkpoints
 2022-12-24 12:19:43 +03:00
AUTOMATIC1111
8c9e6d3c7d
Merge pull request #5131 from uservar/inpainting-detection 
Better should_hijack_inpainting detection
 2022-12-24 12:19:06 +03:00
AUTOMATIC1111
064f7b8fd2
Merge pull request #5718 from space-nuko/feature/save-hypernetwork-hash 
Save hypernetwork hash and fix hypernetwork parameter restoring
 2022-12-24 11:14:19 +03:00
AUTOMATIC
c0a8401b5a rename the option for img2img latent upscale 2022-12-24 11:12:17 +03:00
AUTOMATIC1111
b2dbd4d698
Merge pull request #5521 from AndrewRyanChama/ryan/img2imglatentscale 
Add latent upscale option to img2img
 2022-12-24 11:10:35 +03:00
AUTOMATIC1111
34bc3616ec
Merge pull request #5838 from aliencaocao/fix_gradio_pil 
Dirty fix for missing PIL supported file extensions
 2022-12-24 10:24:33 +03:00
AUTOMATIC1111
ee65237d69
Merge pull request #5747 from yuvalabou/singleton-comparison 
Format singleton comparisons
 2022-12-24 10:17:38 +03:00
AUTOMATIC1111
7578b50ba6
Merge pull request #5873 from philpax/override-settings-restore-afterwards 
feat(api): add override_settings_restore_afterwards
 2022-12-24 10:15:04 +03:00
AUTOMATIC1111
fac92610d2
Merge pull request #5753 from calvinballing/master 
Fix various typos
 2022-12-24 09:58:28 +03:00
AUTOMATIC1111
94450b8877
Merge pull request #5589 from MrCheeze/better-special-model-support 
Better support for 2.0-inpainting and 2.0-depth special models
 2022-12-24 09:53:44 +03:00
AUTOMATIC
9441c28c94 add an option for img2img background color 2022-12-24 09:46:35 +03:00
AUTOMATIC1111
b81fa1e7f1
Merge pull request #5644 from ThereforeGames/master 
Improve img2img color correction by performing a luminosity blend
 2022-12-24 09:17:40 +03:00
AUTOMATIC1111
684d7059bc
Merge pull request #5808 from stysmmaker/patch/fix-fnt-size 
Prevent overlapping in X/Y plot by changing font size
 2022-12-24 09:13:05 +03:00
AUTOMATIC1111
55f3ef876b
Merge pull request #5814 from timntorres/5802-save-upscaler-to-filename 
Add option to save upscaler to filename suffix in extras tab.
 2022-12-24 09:07:00 +03:00
AUTOMATIC1111
992a877a4a
Merge pull request #4684 from simcop2387/fix-extension-docker 
Fix docker tmp/ and extensions/ handling for docker.
 2022-12-24 09:06:10 +03:00
AUTOMATIC
399b229783 eliminate duplicated code 
add an option to samplers for skipping next to last sigma
 2022-12-24 09:03:45 +03:00
AUTOMATIC1111
5667ec4ca7
Merge pull request #5797 from mcmonkey4eva/dpm2-a-fix 
Add a workaround patch for DPM2 a issue
 2022-12-24 08:51:43 +03:00
AUTOMATIC1111
3bfc6c07ae
Merge pull request #5810 from brkirch/fix-training-mps 
Training fixes for MPS
 2022-12-24 08:34:46 +03:00
AUTOMATIC1111
f0dfed2a17
Merge pull request #5796 from brkirch/invoke-fix 
Improve InvokeAI cross attention reliability and speed when using MPS for large images
 2022-12-24 08:21:19 +03:00
AUTOMATIC
0c747d4013 add a comment for disable xformers hack 2022-12-24 07:57:56 +03:00
Akiba
13e0295ab6
fix: xformers use importlib 2022-12-24 11:17:21 +08:00
brkirch
35b1775b32 Use other MPS optimization for large q.shape[0] * q.shape[1] 
Check if q.shape[0] * q.shape[1] is 2**18 or larger and use the lower memory usage MPS optimization if it is. This should prevent most crashes that were occurring at certain resolutions (e.g. 1024x1024, 2048x512, 512x2048).

Also included is a change to check slice_size and prevent it from being divisible by 4096 which also results in a crash. Otherwise a crash can occur at 1024x512 or 512x1024 resolution.
 2022-12-20 21:30:00 -05:00
Philpax
22f1527fa7 feat(api): add override_settings_restore_afterwards 2022-12-20 20:36:49 +11:00
Alex "mcmonkey" Goodwin
7ba9bc2fdb fix dpm2 in img2img as well 2022-12-18 19:16:42 -08:00
Billy Cao
c02ef0f428 Fix PIL being imported before its installed (for new users only) 2022-12-18 20:51:59 +08:00
timntorres
6fd91c9179 Update OptionInfo to match preexisting option. 2022-12-17 08:59:02 -08:00
timntorres
a7a039d53a Add option to include upscaler name in filename. 2022-12-17 08:50:20 -08:00
timntorres
a26fe85056 Add upscaler name as a suffix. 2022-12-17 05:11:06 -08:00
brkirch
cca16373de Add attributes used by MPS 2022-12-17 04:23:08 -05:00
brkirch
16b4509fa6 Add numpy fix for MPS on PyTorch 1.12.1 
When saving training results with torch.save(), an exception is thrown:
"RuntimeError: Can't call numpy() on Tensor that requires grad. Use tensor.detach().numpy() instead."

So for MPS, check if Tensor.requires_grad and detach() if necessary.
 2022-12-17 04:22:58 -05:00
MMaker
b7c478c3eb
fix: Modify font size when unable to fit in plot 
This prevents scenarios where text without line breaks will start overlapping with each other when generating X/Y plots. This is most evident when generating X/Y plots with checkpoints, as most don't contain spaces and sometimes include extra information such as the epoch, making it extra long.
 2022-12-17 00:45:43 -05:00
rucadi
0c8825b2be Add a callback called before reloading the server 2022-12-16 18:31:20 +01:00
Alex "mcmonkey" Goodwin
180fdf7809 apply to DPM2 (non-ancestral) as well 2022-12-16 08:42:00 -08:00
Alex "mcmonkey" Goodwin
8b0703b8fc Add a workaround patch for DPM2 a issue 
DPM2 a and DPM2 a Karras samplers are both affected by an issue described by https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/3483 and can be resolved by a workaround suggested by the k-diffusion author at https://github.com/crowsonkb/k-diffusion/issues/43#issuecomment-1305195666
 2022-12-16 08:18:29 -08:00
rucadi
1742c04bab Add polling callback 2022-12-16 17:10:13 +01:00
Akiba
35e1017e3e
fix: xformers 2022-12-16 20:43:09 +08:00
Jim Hays
c0355caefe Fix various typos 2022-12-14 21:01:32 -05:00
Yuval Aboulafia
957e15c464 Correct singleton comparisons 2022-12-14 20:59:33 +02:00
space-nuko
5f407ebd61 Fix comment 2022-12-13 14:32:26 -08:00
space-nuko
1fcb959514 Correctly restore default hypernetwork strength 2022-12-13 14:30:54 -08:00
space-nuko
9d5948e5f7 Correctly restore hypernetwork from hash 2022-12-13 14:25:16 -08:00
space-nuko
7077428209 Save hypernetwork hash in infotext 2022-12-13 13:05:40 -08:00
ThereforeGames
2e8b5418e3
Improve color correction with luminosity blend 2022-12-11 18:03:36 -05:00
Dean Hopkins
960293d6b2
API endpoint to refresh checkpoints 
API endpoint to refresh checkpoints
 2022-12-11 19:16:44 +00:00
MrCheeze
ec0a48826f unconditionally set use_ema=False if value not specified (True never worked, and all configs except v1-inpainting-inference.yaml already correctly set it to False) 2022-12-11 11:18:34 -05:00
Dean van Dugteren
59c6511494
fix: fallback model_checkpoint if it's empty 
This fixes the following error when SD attempts to start with a deleted checkpoint:

```
Traceback (most recent call last):
  File "D:\Web\stable-diffusion-webui\launch.py", line 295, in <module>
    start()
  File "D:\Web\stable-diffusion-webui\launch.py", line 290, in start
    webui.webui()
  File "D:\Web\stable-diffusion-webui\webui.py", line 132, in webui
    initialize()
  File "D:\Web\stable-diffusion-webui\webui.py", line 62, in initialize
    modules.sd_models.load_model()
  File "D:\Web\stable-diffusion-webui\modules\sd_models.py", line 283, in load_model
    checkpoint_info = checkpoint_info or select_checkpoint()
  File "D:\Web\stable-diffusion-webui\modules\sd_models.py", line 117, in select_checkpoint
    checkpoint_info = checkpoints_list.get(model_checkpoint, None)
TypeError: unhashable type: 'list'
```
 2022-12-11 17:08:51 +01:00
MrCheeze
bd81a09eac fix support for 2.0 inpainting model while maintaining support for 1.5 inpainting model 2022-12-10 11:29:26 -05:00
MrCheeze
a1c8ad8828 unload depth model if medvram/lowvram enabled 2022-12-10 11:02:47 -05:00
AUTOMATIC1111
94a35ca9d6
Merge pull request #5191 from aliencaocao/enable_checkpoint_switching_in_override_settings 
Support changing checkpoint and vae through override_settings
 2022-12-10 16:29:40 +03:00
AUTOMATIC
713c48ddd7 add an 'installed' tag to extensions 2022-12-10 15:05:22 +03:00
AUTOMATIC
991e2dcee9 remove NSFW filter and its dependency; if you still want it, find it in the extensions section 2022-12-10 14:54:16 +03:00
AUTOMATIC
d06592267c use less javascript for this non-js-only implementation of the clear prompt button. 2022-12-10 13:46:18 +03:00
AUTOMATIC1111
2028aa06c0
Merge pull request #3198 from papuSpartan/master 
Add Clear Prompt button to roll_col
 2022-12-10 13:35:51 +03:00
AUTOMATIC1111
89237852f4
Merge pull request #5119 from 0xb8/master 
Atomically rename saved image to avoid race condition with other processes
 2022-12-10 13:26:07 +03:00
AUTOMATIC1111
cce306cb67
Merge pull request #5441 from timntorres/add-5433-avoid-sending-size-option 
Add option to avoid sending size between interfaces.
 2022-12-10 11:07:16 +03:00
papuSpartan
6387043fd2
Merge branch 'AUTOMATIC1111:master' into master 2022-12-10 00:02:39 -08:00
AUTOMATIC1111
ec5e072124
Merge pull request #4841 from R-N/vae-fix-none 
Fix None option of VAE selector
 2022-12-10 09:58:20 +03:00
AUTOMATIC
bab91b1279 add Noise multiplier option to infotext 2022-12-10 09:51:26 +03:00
AUTOMATIC1111
8ee1acc1e4
Merge pull request #5373 from mezotaken/master 
add noise strength parameter similar to NAI
 2022-12-10 09:36:24 +03:00
AUTOMATIC1111
e5e557fa5d
Merge pull request #5404 from szhublox/merger-ram-usage 
Merger ram usage
 2022-12-10 09:33:39 +03:00
AUTOMATIC
505ec7e4d9 cleanup some unneeded imports for hijack files 2022-12-10 09:17:39 +03:00
AUTOMATIC
7dbfd8a7d8 do not replace entire unet for the resolution hack 2022-12-10 09:14:45 +03:00
AUTOMATIC1111
2641d1b83b
Merge pull request #4978 from aliencaocao/support_any_resolution 
Patch UNet Forward to support resolutions that are not multiples of 64
 2022-12-10 08:45:41 +03:00
AUTOMATIC1111
4d5fe3bfc0
Merge pull request #5555 from ywx9/master 
Bug fix (a few lines in modules/api/api.py)
 2022-12-10 08:27:44 +03:00
AUTOMATIC1111
a42a8e9112
Merge pull request #5547 from Ju1-js/master 
Make "# settings changed" grammatically correct
 2022-12-10 08:20:22 +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
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
timntorres
7057c72ae3 Add opt. to avoid sending size between interfaces. 2022-12-05 03:41:36 -08: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
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
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
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
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
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
AUTOMATIC1111
28c79b8f05
Merge pull request #5328 from jcowens/fix-typo 
fix typo
 2022-12-03 09:20:39 +03:00
AUTOMATIC1111
eb0b8f92bc
Merge pull request #5331 from smirkingface/openaimodel_fix 
Fixed AttributeError where openaimodel is not found
 2022-12-03 09:18:36 +03:00
AUTOMATIC1111
bab6ea6b22
Merge pull request #5340 from PhytoEpidemic/master 
Fix divide by 0 error
 2022-12-03 09:17:54 +03:00
AUTOMATIC
b2f17dd367 prevent include_init_images from being passed to StableDiffusionProcessingImg2Img in API #4989 2022-12-03 09:15:24 +03:00
AUTOMATIC1111
ae81b377d4
Merge pull request #5165 from klimaleksus/fix-sequential-vae 
Make VAE step sequential to prevent VRAM spikes, will fix #3059, #2082, #2561, #3462
 2022-12-03 08:29:56 +03:00
PhytoEpidemic
119a945ef7
Fix divide by 0 error 
Fix of the edge case 0 weight that occasionally will pop up in some specific situations. This was crashing the script.
 2022-12-02 12:16:29 -06:00
SmirkingFace
da698ca92e Fixed AttributeError where openaimodel is not found 2022-12-02 13:47:02 +01:00
jcowens
99b19b1a8f fix typo 2022-12-02 02:53:26 -08:00
SmirkingFace
e461477869 Fixed safe.py for pytorch 1.13 ckpt files 2022-12-02 11:12:13 +01:00
zhaohu xing
9c86fb8cac fix bug 
Signed-off-by: zhaohu xing <920232796@qq.com>
 2022-12-02 16:08:46 +08:00
space-nuko
be2e6de94a Fix clip skip of 1 not being restored from prompts 2022-12-01 11:34:16 -08:00
brkirch
0fddb4a1c0 Rework MPS randn fix, add randn_like fix 
torch.manual_seed() already sets a CPU generator, so there is no reason to create a CPU generator manually. torch.randn_like also needs a MPS fix for k-diffusion, but a torch hijack with randn_like already exists so it can also be used for that.
 2022-11-30 10:33:42 -05:00
brkirch
4d5f1691dd Use devices.autocast instead of torch.autocast 2022-11-30 10:33:42 -05:00
brkirch
21effd629d Add workaround for using MPS with torchsde 2022-11-30 10:33:39 -05:00
Adi Eyal
a44994e2c9 Fixed incorrect negative prompt text in infotext 
Previously only the first negative prompt in all_negative_prompts was
being used for infotext. This fixes that by selecting the index-th
negative prompt
 2022-11-30 15:23:53 +02:00
Billy Cao
3a724e91a2 Change to steps of 8 2022-11-30 20:52:32 +08:00
zhaohu xing
52cc83d36b fix bugs 
Signed-off-by: zhaohu xing <920232796@qq.com>
 2022-11-30 14:56:12 +08:00
zhaohu xing
0831ab476c
Merge branch 'master' into master 2022-11-30 10:13:17 +08:00
wywywywy
7193814cf7
Added purpose of this hijack to comments 2022-11-29 19:22:53 +00:00
wywywywy
36c3613d16
Add autoencoder to sd_hijack 2022-11-29 17:40:02 +00:00
wywywywy
241cbc4d2f
Hijack VQModelInterface back to AutoEncoder 2022-11-29 17:38:16 +00:00
AUTOMATIC
4b3c5bc24b Merge remote-tracking branch 'pattontim/safetensors' 2022-11-29 17:06:15 +03:00
Billy Cao
9a8678f61e Support changing checkpoint and vae through override_settings 2022-11-29 11:11:29 +08:00
zhaohu xing
75c4511e6b add AltDiffusion to webui 
Signed-off-by: zhaohu xing <920232796@qq.com>
 2022-11-29 10:28:41 +08:00
brkirch
98ca437edf Refactor and instead check if mps is being used, not availability 2022-11-28 21:18:51 -05:00
klimaleksus
67efee33a6
Make VAE step sequential to prevent VRAM spikes 2022-11-28 16:29:43 +05:00
AUTOMATIC
0b5dcb3d7c fix an error that happens when you type into prompt while switching model, put queue stuff into separate file 2022-11-28 09:00:10 +03:00
AUTOMATIC
0376da180c make it possible to save nai model using safetensors 2022-11-28 08:39:59 +03:00
AUTOMATIC
bb11bee22a if image on disk was deleted between being generated and request being completed, do use temporary dir to store it for the browser 2022-11-27 23:14:13 +03:00
AUTOMATIC
aa12dfada0 fix the bug that makes it impossible to send images to other tabs 2022-11-27 23:04:42 +03:00
AUTOMATIC1111
39827a3998
Merge pull request #4688 from parasi22/resolve-embedding-name-in-filewords 
resolve [name] after resolving [filewords] in training
 2022-11-27 22:46:49 +03:00
uservar
9146a5884c
Better should hijack inpainting detection 2022-11-27 19:11:50 +00:00
AUTOMATIC1111
9e78d2c419
Merge pull request #4416 from Keavon/cors-regex 
Add CORS-allow policy launch argument using regex
 2022-11-27 18:50:12 +03:00
AUTOMATIC1111
ef567b083c
Merge pull request #4919 from brkirch/deepbooru-fix 
Fix support for devices other than CUDA in DeepBooru
 2022-11-27 16:59:22 +03:00
AUTOMATIC1111
554787231a
Merge pull request #5117 from aliencaocao/fix_api_sampler_name 
Fix api ignoring sampler_name settings
 2022-11-27 16:51:47 +03:00
AUTOMATIC1111
b24aed0b69
Merge pull request #4960 from Hugo-Matias/master 
fix null negative_prompt on get requests
 2022-11-27 16:36:29 +03:00
AUTOMATIC
8c13f3a2a5 cherrypick from #4971 2022-11-27 16:35:35 +03:00
AUTOMATIC1111
c33b9a6da7
Merge pull request #4583 from NoCrypt/patch-1 
Forcing HTTPS instead of HTTP for ngrok
 2022-11-27 16:30:23 +03:00
AUTOMATIC
506d529d19 rework #5012 to also work for pictures dragged into the prompt and also add Clip skip + ENSD to parameters 2022-11-27 16:28:32 +03:00
cat
185ab3cbd1 Atomically rename saved image to avoid race condition with other processes. 2022-11-27 18:23:08 +05:00
Billy Cao
06ada734c7 Prevent warning on sampler_index if sampler_name is being used 2022-11-27 21:19:47 +08:00
Billy Cao
3cf93de24f Fix sampler_name for API requests are being ignored 2022-11-27 21:12:37 +08:00
AUTOMATIC1111
488f831d52
Merge pull request #5012 from Nandaka/master 
Support NAI style exif in PNG Info for Send... buttons
 2022-11-27 15:57:50 +03:00
AUTOMATIC1111
9ec0a41a58
Merge pull request #4977 from sena-nana/master 
Fix API img2img not accepting bare base64 strings
 2022-11-27 15:54:39 +03:00
AUTOMATIC
dac9b6f15d add safetensors support for model merging #4869 2022-11-27 15:51:29 +03:00
AUTOMATIC
6074175faa add safetensors to requirements 2022-11-27 14:46:40 +03:00
AUTOMATIC1111
f108782e30
Merge pull request #4930 from Narsil/allow_to_load_safetensors_file 
Supporting `*.safetensors` format.
 2022-11-27 14:36:55 +03:00
AUTOMATIC1111
a89d7f4f38
Merge pull request #4913 from dtlnor/deprecated-deepdanbooru-patch 
Remove cmd args requirement for deepdanbooru
 2022-11-27 14:19:32 +03:00
AUTOMATIC1111
eb08550108
Merge pull request #4663 from xucj98/draft 
fix the model name error of Real-ESRGAN in the opts default value
 2022-11-27 14:16:45 +03:00
AUTOMATIC1111
ca8c764af8
Merge pull request #4986 from mcmonkey4eva/add-model-name 
add model_name pattern for saving
 2022-11-27 13:58:34 +03:00
AUTOMATIC1111
8de897b3da
Merge pull request #5085 from MrCheeze/sd-2.0-automatic-2 
no-half support for SD 2.0
 2022-11-27 13:54:08 +03:00
AUTOMATIC1111
01f2ed6844
Merge pull request #5065 from JaySmithWpg/vram-leak 
#3449 - VRAM leak when switching to/from inpainting checkpoint
 2022-11-27 13:52:14 +03:00
AUTOMATIC1111
151e2cc627
Merge pull request #4461 from brkirch/face-restoration-device-fix 
Fix setting device for GFPGAN and CodeFormer
 2022-11-27 13:48:25 +03:00
AUTOMATIC1111
cc90dcc933
Merge pull request #4918 from brkirch/pytorch-fixes 
Fixes for PyTorch 1.12.1 when using MPS
 2022-11-27 13:47:01 +03:00
AUTOMATIC
10923f9b3a calculate dictionary for sampler names only once 2022-11-27 13:43:10 +03:00
AUTOMATIC
40ca34b837 fix for broken sampler selection in img2img and xy plot #4860 #4909 2022-11-27 13:17:39 +03:00
AUTOMATIC
5b2c316890 eliminate duplicated code from #5095 2022-11-27 13:08:54 +03:00
AUTOMATIC1111
997ac57020
Merge pull request #5095 from mlmcgoogan/master 
torch.cuda.empty_cache() defaults to cuda:0 device unless explicitly …
 2022-11-27 12:56:02 +03:00
AUTOMATIC1111
6df4945718
Merge branch 'master' into DPM++SDE 2022-11-27 12:54:45 +03:00
AUTOMATIC
b48b7999c8 Merge remote-tracking branch 'flamelaw/master' 2022-11-27 12:19:59 +03:00
AUTOMATIC
b006382784 serve images from where they are saved instead of a temporary directory 
add an option to choose a different temporary directory in the UI
add an option to cleanup the selected temporary directory at startup
 2022-11-27 11:52:53 +03:00
Billy Cao
349f0461ec
Merge branch 'master' into support_any_resolution 2022-11-27 12:39:31 +08:00
Matthew McGoogan
c67c40f983 torch.cuda.empty_cache() defaults to cuda:0 device unless explicitly set otherwise first. Updating torch_gc() to use the device set by --device-id if specified to avoid OOM edge cases on multi-GPU systems. 2022-11-26 23:25:16 +00:00
MrCheeze
1e506657e1 no-half support for SD 2.0 2022-11-26 13:28:44 -05:00
AUTOMATIC
b5050ad207 make SD2 compatible with --medvram setting 2022-11-26 20:52:16 +03:00
flamelaw
755df94b2a set TI AdamW default weight decay to 0 2022-11-27 00:35:44 +09:00
AUTOMATIC
64c7b7975c restore hypernetworks to seemingly working state 2022-11-26 16:45:57 +03:00
AUTOMATIC
1123f52cad add 1024 module for hypernets for the new open clip 2022-11-26 16:37:37 +03:00
AUTOMATIC
ce6911158b Add support Stable Diffusion 2.0 2022-11-26 16:10:46 +03:00
Jay Smith
c833d5bfaa fixes #3449 - VRAM leak when switching to/from inpainting model 2022-11-25 20:15:11 -06:00
xucj98
263b323de1
Merge branch 'AUTOMATIC1111:master' into draft 2022-11-25 17:07:00 +08:00
Tiago F. Santos
a2ae5a6555 [interrogator] mkdir check 2022-11-24 13:04:45 +00:00
Sena
fcd75bd874
Fix other apis 2022-11-24 13:10:40 +08:00
Nandaka
904121fecc Support NAI exif for PNG Info 2022-11-24 02:39:09 +00:00
Alex "mcmonkey" Goodwin
ffcbbcf385 add filename santization 
Probably redundant, considering the model name *is* a filename, but I suppose better safe than sorry.
 2022-11-23 06:44:20 -08:00
Alex "mcmonkey" Goodwin
6001684be3 add model_name pattern for saving 2022-11-23 06:35:44 -08:00
flamelaw
1bd57cc979 last_layer_dropout default to False 2022-11-23 20:21:52 +09:00
flamelaw
d2c97fc3fe fix dropout, implement train/eval mode 2022-11-23 20:00:00 +09:00
Billy Cao
adb6cb7619 Patch UNet Forward to support resolutions that are not multiples of 64 
Also modifed the UI to no longer step in 64
 2022-11-23 18:11:24 +08:00
Sena
75b67eebf2
Fix bare base64 not accept 2022-11-23 17:43:58 +08:00
flamelaw
89d8ecff09 small fixes 2022-11-23 02:49:01 +09:00
Tim Patton
ac90cf38c6 safetensors optional for now 2022-11-22 10:13:07 -05:00
uservar
0a01f50891
Add DPM++ SDE sampler 2022-11-22 14:24:50 +00:00
Rogerooo
c27a973c82 fix null negative_prompt on get requests 
Small typo that causes a bug when returning negative prompts from the get request.
 2022-11-22 14:02:59 +00:00
Tiago F. Santos
745f1e8f80 [CLIP interrogator] use local file, if available 2022-11-22 12:48:25 +00:00
Tim Patton
210cb4c128 Use GPU for loading safetensors, disable export 2022-11-21 16:40:18 -05:00
Tim Patton
162fef394f Patch line ui endings 2022-11-21 10:50:57 -05:00
Nicolas Patry
0efffbb407 Supporting *.safetensors format. 
If a model file exists with extension `.safetensors` then we can load it
more safely than with PyTorch weights.
 2022-11-21 14:04:25 +01:00
brkirch
563ea3f6ff Change .cuda() to .to(devices.device) 2022-11-21 02:56:00 -05:00
brkirch
e247b7400a Add fixes for PyTorch 1.12.1 
Fix typo "MasOS" -> "macOS"

If MPS is available and PyTorch is an earlier version than 1.13:
* Monkey patch torch.Tensor.to to ensure all tensors sent to MPS are contiguous
* Monkey patch torch.nn.functional.layer_norm to ensure input tensor is contiguous (required for this program to work with MPS on unmodified PyTorch 1.12.1)
 2022-11-21 02:07:19 -05:00
dtlnor
9ae30b3450 remove cmd args requirement for deepdanbooru 2022-11-21 12:53:55 +09:00
flamelaw
5b57f61ba4 fix pin_memory with different latent sampling method 2022-11-21 10:15:46 +09:00
Tim Patton
637815632f Generalize SD torch load/save to implement safetensor merging compat 2022-11-20 13:36:05 -05:00
AUTOMATIC1111
828438b4a1
Merge pull request #4120 from aliencaocao/enable-override-hypernet 
Enable override_settings to take effect for hypernetworks
 2022-11-20 16:49:06 +03:00
AUTOMATIC
c81d440d87 moved deepdanbooru to pure pytorch implementation 2022-11-20 16:39:20 +03:00
flamelaw
2d22d72cda fix random sampling with pin_memory 2022-11-20 16:14:27 +09:00
flamelaw
a4a5735d0a remove unnecessary comment 2022-11-20 12:38:18 +09:00
flamelaw
bd68e35de3 Gradient accumulation, autocast fix, new latent sampling method, etc 2022-11-20 12:35:26 +09:00
Tim Patton
ac7ecd2d84 Label and load SD .safetensors model files 2022-11-19 14:49:22 -05:00
Keavon Chambers
2f90496b19
Merge branch 'master' into cors-regex 2022-11-19 10:34:31 -08:00
AUTOMATIC
3596af0749 Add API for scripts to add elements anywhere in UI. 2022-11-19 19:10:28 +03:00
AUTOMATIC1111
ccd73fc186
Merge pull request #4717 from papuSpartan/security 
Add --server-name to the list of arguments considered insecure
 2022-11-19 15:31:09 +03:00
AUTOMATIC1111
41e242b220
Merge pull request #4733 from MaikoTan/api-authorization 
feat: add http basic authentication for api
 2022-11-19 15:20:03 +03:00
AUTOMATIC
5a6387e189 make it possible to change models etc by editing options using API 2022-11-19 15:15:24 +03:00
Maiko Tan
336c341a7c
Merge branch 'master' into api-authorization 2022-11-19 20:13:07 +08:00
AUTOMATIC1111
84a6f211d4
Merge pull request #4358 from bamarillo/master 
[API][Feature] Add Skip endpoint
 2022-11-19 14:50:02 +03:00
AUTOMATIC1111
4b22ec4138
Merge pull request #4759 from dtlnor/kill-gradio-progress-bar 
Hide Gradio progress again
 2022-11-19 13:49:21 +03:00
AUTOMATIC
413c077969 prevent StableDiffusionProcessingImg2Img changing image_mask field as an alternative solution to #4765 2022-11-19 13:48:59 +03:00
AUTOMATIC1111
89daf778fb
Merge pull request #4812 from space-nuko/feature/interrupt-preprocessing 
Add interrupt button to preprocessing
 2022-11-19 13:26:33 +03:00
AUTOMATIC1111
fe03f9903c
Merge pull request #4819 from killfrenzy96/master 
Cleanly undo circular hijack to fix tiling getting stuck on #4818
 2022-11-19 13:26:03 +03:00
AUTOMATIC
617c5b486f make it possible for StableDiffusionProcessing to accept multiple different negative prompts in a batch 2022-11-19 13:23:25 +03:00
AUTOMATIC1111
e35d8b493f
Merge pull request #4778 from leppie/fix_unbounded_prompt_growth 
Fix unbounded prompt growth/determinism in scripts that loop
 2022-11-19 12:52:55 +03:00
AUTOMATIC
0d702930b0 renamed Inpainting strength infotext to Conditional mask weight, made it only appear if using inpainting model, made it possible to read the setting from it using the blue arrow button 2022-11-19 12:47:52 +03:00
Muhammad Rizqi Nur
8662b5e57f Merge branch 'a1111' into vae-fix-none 2022-11-19 16:38:21 +07:00
AUTOMATIC1111
ff35ae9abb
Merge pull request #4679 from Eugenii10/inpaint-strength-to-infotext 
Add 'Inpainting strength' to the 'generation_params' of 'infotext' (params.txt or png chunks)
 2022-11-19 12:24:44 +03:00
AUTOMATIC1111
aee611adb8
Merge pull request #4646 from mrauhu/force-update-extensions 
Fix: `error: Your local changes to the following files would be overwritten by merge` when trying to update extensions in WSL2 Docker
 2022-11-19 12:22:51 +03:00
AUTOMATIC1111
5bfef6e063
Merge pull request #4844 from R-N/vae-misc 
Remove no longer necessary code from VAE selector, fix #4651
 2022-11-19 12:21:22 +03:00
AUTOMATIC
cdc8020d13 change StableDiffusionProcessing to internally use sampler name instead of sampler index 2022-11-19 12:01:51 +03:00
Muhammad Rizqi Nur
45dca0562e Merge branch 'a1111' into vae-fix-none 2022-11-19 15:21:00 +07:00
Muhammad Rizqi Nur
f1bdf2b15f Merge branch 'a1111' into vae-misc 2022-11-19 15:20:07 +07:00
AUTOMATIC
d9fd4525a5 change text for sd_vae_as_default that makes more sense to me 2022-11-19 11:09:44 +03:00
AUTOMATIC1111
3951806058
Merge pull request #4842 from R-N/vae-as-default 
Option to use selected VAE as default fallback instead of primary option
 2022-11-19 10:59:42 +03:00
Muhammad Rizqi Nur
c8f7b5cdd7 Misc 
Misc
 2022-11-19 12:04:12 +07:00
Muhammad Rizqi Nur
271fd2d700 More verbose messages 2022-11-19 12:02:50 +07:00
Muhammad Rizqi Nur
2c5ca706a7 Remove no longer necessary parts and add vae_file safeguard 2022-11-19 12:01:41 +07:00
Muhammad Rizqi Nur
0663706d44 Option to use selected VAE as default fallback instead of primary option 2022-11-19 11:49:06 +07:00
Muhammad Rizqi Nur
028b67b635 Use underscore naming for "private" functions in sd_vae 2022-11-19 11:47:54 +07:00
Muhammad Rizqi Nur
9fdc343dca Fix model caching requiring deepcopy 2022-11-19 11:44:37 +07:00
Muhammad Rizqi Nur
c7be83bf02 Misc 
Misc
 2022-11-19 11:44:37 +07:00
Muhammad Rizqi Nur
abc1e79a5d Fix base VAE caching was done after loading VAE, also add safeguard 2022-11-19 11:41:41 +07:00
Muhammad Rizqi Nur
8ab4927452 Fix model wasn't restored even when choosing "None" 2022-11-19 11:41:21 +07:00
killfrenzy96
17e4432820 cleanly undo circular hijack #4818 2022-11-18 21:22:55 +11:00
space-nuko
c8c40c8a64 Add interrupt button to preprocessing 2022-11-17 18:05:29 -08:00
brkirch
a5106a7cdc Remove extra .to(device) 2022-11-17 00:08:45 -05:00
brkirch
abfa22c16f Revert "MPS Upscalers Fix" 
This reverts commit 768b95394a8500da639b947508f78296524f1836.
 2022-11-17 00:08:21 -05:00
Llewellyn Pritchard
9bbe1e3c2e Fix unbounded prompt growth scripts that loop 2022-11-16 19:19:00 +02:00
dtlnor
72b52fbb77 add css override 2022-11-16 13:08:03 +09:00
Maiko Sinkyaet Tan
8f2ff861d3
feat: add http basic authentication for api 2022-11-15 16:12:34 +08:00
papuSpartan
3405acc6a4 Give --server-name priority over --listen and add check for --server-name in addition to --share and --listen 2022-11-14 14:07:13 -06:00
KEV
40ae95d532 Fix retrieving value for 'x/y plot' script. 2022-11-14 18:05:59 +10:00
parasi
9a1aff645a resolve [name] after resolving [filewords] in training 2022-11-13 13:49:28 -06:00
Ryan Voots
671c0e42b4 Fix docker tmp/ and extensions/ handling for docker. might also work for symlinks 2022-11-13 13:39:41 -05:00
KEV
6fa891b934 Add 'Inpainting strength' to the 'generation_params' dictionary of 'infotext' which is saved into the 'params.txt' or png chunks. 
Value appears only if 'Denoising strength' appears too.
 2022-11-14 00:25:38 +10:00
Xu Cuijie
d20dbe47e0 fix the model name error of Real-ESRGAN in the opts default value 2022-11-13 10:31:03 +08:00
Mrau Hu
d671d1d45d Fix: error: Your local changes to the following files would be overwritten by merge when run pull() method, 
because WSL2 Docker set 755 file permissions instead of 644, this results to the error.

Updated `Extension` class: replaced `pull()` with `fetch_and_reset_hard()` method.

Updated `apply_and_restart()` function: replaced `ext.pull()` with `ext.fetch_and_reset_hard()` function.
 2022-11-12 21:44:42 +03:00
brkirch
f4a488f585 Set device for facelib/facexlib and gfpgan 
* FaceXLib/FaceLib doesn't pass the device argument to RetinaFace but instead chooses one itself and sets it to a global - in order to use a device other than its internally chosen default it is necessary to manually replace the default value
* The GFPGAN constructor needs the device argument to work with MPS or a CUDA device ID that differs from the default
 2022-11-12 03:34:13 -05:00
AUTOMATIC
98947d173e run installers for newly installed extensions 2022-11-12 11:11:47 +03:00
AUTOMATIC
a1a376331c make existing script loading and new preload code use same code for loading modules 
limit extension preload scripts to just one file named preload.py
 2022-11-12 10:56:06 +03:00
AUTOMATIC1111
e5690d0bf2
Merge pull request #4488 from d8ahazard/ExtensionPreload 
Add option to preload extensions
 2022-11-12 10:29:15 +03:00
AUTOMATIC
0ab0a50f9a change formatting to match the main program in devices.py 2022-11-12 10:00:49 +03:00
AUTOMATIC
c62d17aee3 use the new devices.has_mps() function in register_buffer for DDIM/PLMS fix for OSX 2022-11-12 10:00:22 +03:00
源文雨
1130d5df66
Update devices.py 2022-11-12 11:09:28 +08:00
源文雨
76ab31e188 Fix wrong mps selection below MasOS 12.3 2022-11-12 11:02:40 +08:00
AUTOMATIC
7ba3923d5b move DDIM/PLMS fix for OSX out of the file with inpainting code. 2022-11-11 18:20:18 +03:00
AUTOMATIC1111
bb2e2c82ce
Merge pull request #4233 from thesved/patch-1 
Make DDIM and PLMS work on Mac OS
 2022-11-11 18:01:58 +03:00
AUTOMATIC1111
b8a2e38758
Merge pull request #4543 from tong-zeng/master 
Fix a bug in list_files_with_name
 2022-11-11 18:00:13 +03:00
NoCrypt
6165f07e74
Merge branch 'master' into patch-1 2022-11-11 21:14:10 +07:00
AUTOMATIC1111
e666220ee4
Merge pull request #4514 from cluder/4448_fix_ckpt_cache 
#4448 fix checkpoint cache usage
 2022-11-11 16:04:17 +03:00
AUTOMATIC1111
6a2044f566
Merge pull request #4563 from JingShing/master 
Add username and password in ngrok
 2022-11-11 15:57:24 +03:00
AUTOMATIC1111
ec95ced6fb
Merge pull request #4573 from liamkerr/4415-update-generation-info 
4415 update generation info
 2022-11-11 15:51:14 +03:00
AUTOMATIC1111
73776907ec
Merge pull request #4117 from TinkTheBoush/master 
Adding optional tag shuffling for training
 2022-11-11 15:46:20 +03:00
AUTOMATIC1111
6585cba200
Merge pull request #4395 from snowmeow2/master 
Add DeepDanbooru to the interrogate API
 2022-11-11 15:41:30 +03:00
KyuSeok Jung
a1e271207d
Update dataset.py 2022-11-11 10:56:53 +09:00
NoCrypt
c556d34523
Forcing HTTPS instead of HTTP for ngrok 
For security reason.
 2022-11-11 08:54:51 +07:00
KyuSeok Jung
b19af67d29
Update dataset.py 2022-11-11 10:54:19 +09:00
KyuSeok Jung
0959907f87
adding tag dropout option 2022-11-11 10:31:14 +09:00
KyuSeok Jung
13a2f1dca3
adding tag drop out option 2022-11-11 10:29:55 +09:00
KyuSeok Jung
6f8a807fe4
Update shared.py 2022-11-11 09:22:49 +09:00
Liam
b98740129c added event listener for the image gallery modal; moved js to separate file 2022-11-10 13:14:04 -05:00
JingShing
1a01191e27
Add username and password in ngrok. 2022-11-10 20:42:41 +08:00
JingShing
2505f39e28
Add username and password in ngrok. 2022-11-10 20:39:20 +08:00
Tong Zeng
893191cab2 fix a bug in list_files_with_name 2022-11-10 10:34:03 +08:00
Liam
81f2575df9 updating the displayed generation info when user clicks images in the gallery. feature request 4415 2022-11-09 15:24:31 -05:00
Muhammad Rizqi Nur
d85c2cb2d5 Merge branch 'master' into gradient-clipping 2022-11-09 16:29:37 +07:00
cluder
eebf49592a restore #4035 behavior 
- if checkpoint cache is set to 1, keep 2 models in cache (current +1 more)
 2022-11-09 07:17:09 +01:00
cluder
f37cce0e3d Merge branch 'master' of https://github.com/cluder/stable-diffusion-webui into 4448_fix_ckpt_cache 2022-11-09 05:50:43 +01:00
cluder
3b51d239ac - do not use ckpt cache, if disabled 
- cache model after is has been loaded from file
 2022-11-09 05:43:57 +01:00
kavorite
59bb1d36ea blur mask with color-sketch + add paint transparency slider 2022-11-08 22:06:29 -05:00
pepe10-gpu
62e9fec3df
actual better fix 
thanks C43H66N12O12S2
 2022-11-08 15:19:09 -08:00
d8ahazard
cfcadeae9a Add option to preload extensions 
By creating a file called "preload.py" in an extension folder and declaring a preload(parser) method, we can add extra command-line args for an extension.
 2022-11-08 10:03:56 -06:00
kavorite
c34542a483 add new color-sketch state to img2img invocation 2022-11-08 03:25:59 -05:00
AUTOMATIC
1610b32584 add callback for creating a tab in train UI 2022-11-08 08:38:10 +03:00
AUTOMATIC
8011be33c3 move functions out of main body for image preprocessing for easier hijacking 2022-11-08 08:37:05 +03:00
AUTOMATIC
c5334fc56b fix javascript duplication bug after pressing the restart UI button 2022-11-08 08:35:01 +03:00
pepe10-gpu
29eff4a194
terrible hack 2022-11-07 18:06:48 -08:00
kavorite
9ed4a126bd add gradio-inpaint-tool; color-sketch 2022-11-07 19:58:49 -05:00
Muhammad Rizqi Nur
cabd4e3b3b Merge branch 'master' into gradient-clipping 2022-11-07 22:43:38 +07:00
Keavon Chambers
a258fd60db Add CORS-allow policy launch argument using regex 2022-11-07 00:13:58 -08:00
papuSpartan
00ebc26c4e
Merge branch 'AUTOMATIC1111:master' into master 2022-11-06 21:05:28 -06:00
pepe10-gpu
cd6c55c1ab
16xx card fix 
cudnn
 2022-11-06 17:05:51 -08:00
snowmeow2
67c8e11be7 Adding DeepDanbooru to the interrogation API 2022-11-07 02:32:06 +08:00
AUTOMATIC
32c0eab895 load all settings in one call instead of one by one when the page loads 2022-11-06 14:39:41 +03:00
Billy Cao
c13e234444
Merge branch 'master' into enable-override-hypernet 2022-11-06 16:33:08 +08:00
Billy Cao
55ca040958 Resolve conflict 2022-11-06 16:31:44 +08:00
AUTOMATIC1111
07d1bd4267
Merge branch 'master' into roy.add_simple_interrogate_api 2022-11-06 11:27:54 +03:00
AUTOMATIC
6e4de5b442 add load_with_extra function for modules to load checkpoints with extended whitelist 2022-11-06 11:20:23 +03:00
AUTOMATIC
e5b4e3f820 add tags to extensions, and ability to filter out tags 
list changed Settings keys in UI
do not print VRAM/etc stats everywhere but in calls that use GPU
 2022-11-06 10:12:53 +03:00
AUTOMATIC
a2a1a2f727 add ability to create extensions that add localizations 2022-11-06 09:02:35 +03:00
Han Lin
6603f63b7b Fixes LDSR upscaler producing black bars 2022-11-06 11:08:20 +08:00
Bruno Seoane
7f63980e47 Remove unnecesary return 2022-11-05 19:09:13 -03:00
Bruno Seoane
3c72055c22 Add skip endpoint 2022-11-05 19:05:15 -03:00
Bruno Seoane
0ebf66b575 Fix set config endpoint 2022-11-05 19:00:47 -03:00
Bruno Seoane
99b05addb1 Fix options endpoint not showing the full list of options 2022-11-05 18:46:47 -03:00
KyuSeok Jung
9b7289c349
Merge branch 'master' into master 2022-11-06 03:08:45 +09:00
AUTOMATIC
159475e072 tweak names a bit for new samplers 2022-11-05 18:32:22 +03:00
AUTOMATIC1111
bbfdfa52c5
Merge pull request #4304 from hentailord85ez/k-diffusion-update 
Add support for the new DPM-Solver++ samplers added to k-diffusion
 2022-11-05 18:28:25 +03:00
AUTOMATIC1111
2e604233fd
Merge pull request #4329 from Blucknote/patch-1 
Python 3.8 typing compatibility
 2022-11-05 17:23:22 +03:00
evshiron
b6cfaaa20b Merge branch 'master' into fix/encode-pnginfo 2022-11-05 22:12:20 +08:00
AUTOMATIC
62e3d71aa7 rework the code to not use the walrus operator because colab's 3.7 does not support it 2022-11-05 17:09:42 +03:00
Evgeniy
a170e3d222
Python 3.8 typing compatibility 
Solves problems with

```Traceback (most recent call last):
  File "webui.py", line 201, in <module>
    webui()
  File "webui.py", line 178, in webui
    create_api(app)
  File "webui.py", line 117, in create_api
    from modules.api.api import Api
  File "H:\AIart\stable-diffusion\stable-diffusion-webui\modules\api\api.py", line 9, in <module>
    from modules.api.models import *
  File "H:\AIart\stable-diffusion\stable-diffusion-webui\modules\api\models.py", line 194, in <module>
    class SamplerItem(BaseModel):
  File "H:\AIart\stable-diffusion\stable-diffusion-webui\modules\api\models.py", line 196, in SamplerItem
    aliases: list[str] = Field(title="Aliases")
TypeError: 'type' object is not subscriptable```

and

```Traceback (most recent call last):
  File "webui.py", line 201, in <module>
    webui()
  File "webui.py", line 178, in webui
    create_api(app)
  File "webui.py", line 117, in create_api
    from modules.api.api import Api
  File "H:\AIart\stable-diffusion\stable-diffusion-webui\modules\api\api.py", line 9, in <module>
    from modules.api.models import *
  File "H:\AIart\stable-diffusion\stable-diffusion-webui\modules\api\models.py", line 194, in <module>
    class SamplerItem(BaseModel):
  File "H:\AIart\stable-diffusion\stable-diffusion-webui\modules\api\models.py", line 197, in SamplerItem
    options: dict[str, str] = Field(title="Options")
TypeError: 'type' object is not subscriptable```
 2022-11-05 17:06:56 +03:00
AUTOMATIC1111
b8f2dfed3c
Merge pull request #4297 from AUTOMATIC1111/aria1th-patch-1 
Fix errors from commit f2b697 with --hide-ui-dir-config
 2022-11-05 16:22:50 +03:00
AUTOMATIC1111
37ba0070ec
Merge branch 'master' into feat/allow-origins 2022-11-05 16:20:40 +03:00
AUTOMATIC1111
c9b2eef6a3
Merge pull request #4293 from AUTOMATIC1111/innovaciones-patch-1 
Open extensions links in new tab
 2022-11-05 16:18:29 +03:00
AUTOMATIC1111
cb84a304f0
Merge pull request #4273 from Omegastick/ordered_hypernetworks 
Sort hypernetworks list
 2022-11-05 16:16:18 +03:00
AUTOMATIC1111
e96c434495
Merge pull request #3975 from aria1th/force-push-patch-13 
Save/loading AdamW optimizer (for hypernetworks)
 2022-11-05 16:15:00 +03:00
AUTOMATIC1111
477c09f4e7
Merge pull request #4311 from aliencaocao/fix_typing_compat_for_brlow_python3.10 
Use typing.Optional instead of | to add support for Python 3.9 and below
 2022-11-05 16:06:22 +03:00
AUTOMATIC1111
c71691933c
Merge pull request #4320 from papuSpartan/tls 
Add support for SSL/TLS (provide Gradio TLS options)
 2022-11-05 16:05:51 +03:00
AUTOMATIC
03b08c4a6b do not die when an extension's repo has no remote 2022-11-05 15:04:48 +03:00
papuSpartan
e9a5562b9b add support for tls (gradio tls options) 2022-11-05 04:06:51 -05:00
Muhammad Rizqi Nur
bb832d7725 Simplify grad clip 2022-11-05 11:48:38 +07:00
Billy Cao
ebce0c57c7 Use typing.Optional instead of | to add support for Python 3.9 and below. 2022-11-05 11:38:24 +08:00
hentailord85ez
1b6c2fc749
Reorder samplers 2022-11-04 23:28:13 +00:00
hentailord85ez
f92dc505a0
Fix name 2022-11-04 23:12:48 +00:00
hentailord85ez
6008c0773e
Add support for new DPM-Solver++ samplers 2022-11-04 23:03:05 +00:00
AUTOMATIC
30b1bcc64e fix upscale loop erroneously applied multiple times 2022-11-04 22:56:18 +03:00
AUTOMATIC
822210bae5 Merge remote-tracking branch 'origin/master' 2022-11-04 22:47:59 +03:00
AngelBottomless
467d8b967b
Fix errors from commit f2b697 with --hide-ui-dir-config 
f2b69709ea
 2022-11-05 04:24:42 +09:00
evshiron
b8435e632f add --cors-allow-origins cmd opt 2022-11-05 02:36:47 +08:00
innovaciones
0d7e01d995
Open extensions links in new tab 
Fixed for "Available" tab
 2022-11-04 12:14:32 -06:00
evshiron
73e1cd6f53 Merge branch 'master' into fix/encode-pnginfo 2022-11-05 01:43:02 +08:00
AUTOMATIC1111
8eb0a97278
Merge pull request #4179 from AUTOMATIC1111/callback-structure 
Convert callbacks into a private map, add utility functions
 2022-11-04 19:27:54 +03:00
DepFA
5844ef8a9a
remove private underscore indicator 2022-11-04 16:02:25 +00:00
Isaac Poulton
08feb4c364
Sort straight out of the glob 2022-11-04 20:53:11 +07:00
AUTOMATIC
116bcf730a disable setting options via API until it is fixed by the author 2022-11-04 16:49:05 +03:00
AUTOMATIC
f316280ad3 fix the error that prevents from setting some options 2022-11-04 16:49:04 +03:00
DepFA
c3cd0d7a86
Should be one underscore for module privates not two 2022-11-04 12:19:16 +00:00
Muhammad Rizqi Nur
3277f90e93 Merge branch 'master' into gradient-clipping 2022-11-04 18:47:28 +07:00
Isaac Poulton
fd62727893
Sort hypernetworks 2022-11-04 18:34:35 +07:00
TinkTheBoush
45b65e87e0 remove ui option 2022-11-04 19:48:28 +09:00
TinkTheBoush
821e2b883d change option position to Training setting 2022-11-04 19:39:03 +09:00
Fampai
39541d7725 Fixes race condition in training when VAE is unloaded 
set_current_image can attempt to use the VAE when it is unloaded to
the CPU while training
 2022-11-04 04:50:22 -04:00
AUTOMATIC
eeb0733013 change process_one virtual function for script to process_batch, add extra args and docs 2022-11-04 11:21:40 +03:00
AUTOMATIC
99043f3360 fix one of previous merges breaking the program 2022-11-04 11:20:42 +03:00
AngelBottomless
7278897982
Update shared.py 2022-11-04 17:12:28 +09:00
AUTOMATIC1111
c250d2a08f
Merge pull request #4182 from macrosoft/process_one 
Process one
 2022-11-04 11:07:05 +03:00
AUTOMATIC1111
1b9faaa1c3
Merge pull request #4196 from cobryan05/extras_no_rehash 
extras - skip unnecessary second hash of image
 2022-11-04 11:04:01 +03:00
AUTOMATIC1111
faa79b0850
Merge pull request #4199 from Ju1-js/patch-1 
Make extension manager remote links open a new tab
 2022-11-04 11:03:19 +03:00
AUTOMATIC1111
e9c767d8db
Merge branch 'master' into 7flash/fix-api-compatibility 2022-11-04 11:00:32 +03:00
AUTOMATIC1111
2913b9f025
Merge pull request #4178 from HeyImKyu/PreviewOnBatchCompletion 
Added option to preview Created images on batch completion.
 2022-11-04 10:59:27 +03:00
AUTOMATIC1111
24fc05cf57
Merge branch 'master' into fix-ckpt-cache 2022-11-04 10:54:17 +03:00
AUTOMATIC1111
371c4b990e
Merge pull request #4218 from bamarillo/utils-endpoints 
[API][Feature] Utils endpoints
 2022-11-04 10:46:51 +03:00
AUTOMATIC
f674c488d9 bugfix: save image for hires fix BEFORE upscaling latent space 2022-11-04 10:45:34 +03:00
AUTOMATIC
321e13ca17 produce a readable error message when setting an option fails on the settings screen 2022-11-04 10:35:30 +03:00
AUTOMATIC
ccf1a15412 add an option to enable installing extensions with --listen or --share 2022-11-04 10:16:19 +03:00
aria1th
1ca0bcd3a7 only save if option is enabled 2022-11-04 16:09:19 +09:00
aria1th
f5d394214d split before declaring file name 2022-11-04 16:04:03 +09:00
aria1th
283249d239 apply 2022-11-04 15:57:17 +09:00
AngelBottomless
179702adc4
Merge branch 'AUTOMATIC1111:master' into force-push-patch-13 2022-11-04 15:51:09 +09:00
AngelBottomless
0d07cbfa15
I blame code autocomplete 2022-11-04 15:50:54 +09:00
aria1th
0abb39f461 resolve conflict - first revert 2022-11-04 15:47:19 +09:00
AUTOMATIC
f2b69709ea move option access checking to options class out of various places scattered through code 2022-11-04 09:42:25 +03:00
AUTOMATIC1111
4918eb6ce4
Merge branch 'master' into hn-activation 2022-11-04 09:02:15 +03:00
AUTOMATIC1111
2cf3d2ac15
Merge pull request #3923 from random-thoughtss/master 
Fix weighted mask for highres fix
 2022-11-04 08:59:12 +03:00
AUTOMATIC1111
3f0f3284b6
Merge pull request #4249 from digburn/fix-cache-vae 
Fix loading a model without a VAE from the cache
 2022-11-04 08:57:18 +03:00
AUTOMATIC1111
1ca4dd44c9
Merge pull request #4191 from digburn/fix-api-upscaling 
Fix API Upscaling: Add required parameter to API extras route
 2022-11-04 08:56:34 +03:00
AUTOMATIC1111
f12576fd6d
Merge pull request #4260 from timntorres/4246-lift-extras-generate-button 
Lift extras "Generate" button.
 2022-11-04 08:41:29 +03:00
AUTOMATIC
4dd898b8c1 do not mess with components' visibility for scripts; instead create group components and show/hide those; this will break scripts that create invisible components and rely on UI but the earlier i make this change the better 2022-11-04 08:38:19 +03:00
timntorres
e533ff61c1 Lift extras generate button a la #4246. 2022-11-03 22:28:22 -07:00
digburn
3780ad3ad8 fix: loading models without vae from cache 2022-11-04 00:43:00 +00:00
digburn
8eb64dab3e
fix: correct default val of upscale_first to False 2022-11-04 00:35:18 +00:00
random-thoughtss
243253ff4a
Merge branch 'AUTOMATIC1111:master' into master 2022-11-03 15:55:54 -07:00