Mirror/stable-diffusion-webui
1
0
Fork 0
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git synced 2024-06-07 21:20:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,988 Commits 35 Branches 33 Tags 305 MiB
8e355fbd75
Commit Graph

3772 Commits

Author SHA1 Message Date
AUTOMATIC1111
ae74b44c69
Merge pull request #11596 from akx/use-read-info 
postprocessing: use read_info_from_image
 2023-07-08 14:14:12 +03:00
AUTOMATIC1111
9be8903ca9
Merge pull request #11567 from AUTOMATIC1111/seed_resize_to_0 
Don't add "Seed Resize: -1x-1" to API image metadata
 2023-07-08 13:58:31 +03:00
AUTOMATIC1111
d12ccb91a8
Merge pull request #11631 from AUTOMATIC1111/gif-preview 
Allow gif for extra network previews
 2023-07-08 13:47:57 +03:00
AUTOMATIC1111
2151a9881f
Merge pull request #11492 from semjon00/dev 
Fix throwing exception when trying to resize image with I;16 mode
 2023-07-08 13:46:08 +03:00
AUTOMATIC1111
19772c3c97 fix problem with extra network saving images as previews losing generation info 
add a description for save_image_with_geninfo
 2023-07-08 13:43:42 +03:00
AUTOMATIC1111
16045d0877
Merge pull request #11637 from Hao-Wu/fix-has-mps-deprecated 
Fix warning of 'has_mps' deprecated from PyTorch
 2023-07-08 13:11:52 +03:00
AUTOMATIC1111
5ed1ae5003
Merge pull request #11656 from jovijovi/dev 
fix(api): convert to "RGB" if image mode is "RGBA" #11655
 2023-07-08 13:10:50 +03:00
AUTOMATIC1111
46c2b1e202
Merge pull request #11660 from neilmahaseth/patch-1 
Fix UnicodeEncodeError when writing to file CLIP Interrogator Batch Mode
 2023-07-08 13:10:03 +03:00
Neil Mahseth
c258dd34a8
Fix UnicodeEncodeError when writing to file CLIP Interrogator Batch Mode 
The code snippet print(interrogation_function(img), file=open(os.path.join(ii_output_dir, f"{left}.txt"), 'a')) raises a UnicodeEncodeError with the message "'charmap' codec can't encode character '\u016b' in position 129". This error occurs because the default encoding used by the open() function cannot handle certain Unicode characters.

To fix this issue, the encoding parameter needs to be explicitly specified when opening the file. By using an appropriate encoding, such as 'utf-8', we can ensure that Unicode characters are properly encoded and written to the file.

The updated code should be modified as follows:

python
Copy code
print(interrogation_function(img), file=open(os.path.join(ii_output_dir, f"{left}.txt"), 'a', encoding='utf-8'))
By making this change, the code will no longer raise the UnicodeEncodeError and will correctly handle Unicode characters during the file write operation.
 2023-07-06 22:02:47 +05:30
jovijovi
259967b7c6 fix(api): convert to "RGB" if image mode is "RGBA" 2023-07-06 18:43:17 +08:00
Hao-Wu
daf41a2734 Fix warning of 'has_mps' is deprecated from PyTorch 2023-07-06 15:37:10 +08:00
semjon00
fb661e089f Fix throwing exception when trying to resize image with I;16 mode 2023-07-05 15:39:04 +03:00
missionfloyd
c602471b85
Allow gif for extra network previews 2023-07-05 03:19:26 -06:00
missionfloyd
f731a728c6
Check seed_resize_from <= 0 2023-07-03 11:41:10 -06:00
ramyma
c1c0492859 Use contextlib for closing the generation process 2023-07-03 20:17:47 +03:00
ramyma
3278887317 Handle cleanup in case there's an exception thrown 2023-07-03 20:02:30 +03:00
Aarni Koskela
5c6a33b3e1 read_info_from_image: don't mutate info in passed-in image 2023-07-03 13:10:42 +03:00
Aarni Koskela
96f0593c8f read_info_from_image: add type 2023-07-03 13:10:20 +03:00
Aarni Koskela
b2c574891f read_info_from_image: add photoshop to ignored 2023-07-03 13:09:37 +03:00
Aarni Koskela
08f9b705cd Use read_info_from_image in postprocessing 
Avoids bad keys such as `exif` ending up in the "PNG info" passed forward
 2023-07-03 13:08:28 +03:00
Aarni Koskela
522a8b9f62 Add a status logger in modules.shared 2023-07-03 11:07:57 +03:00
Aarni Koskela
e430344347 API: use finally: for state.end() 2023-07-03 11:03:41 +03:00
Aarni Koskela
f44feb6a10 Add job argument to State.begin() 2023-07-03 11:03:41 +03:00
ramyma
74d001bc68 Hotfix: call processing close to cleanup API generation calls 2023-07-02 04:59:59 +03:00
missionfloyd
7f46f81dd7
Change default seed_resize to 0 2023-07-01 17:20:56 -06:00
w-e-w
2ccc832b33 add extensions Update Created dates with sorting 2023-06-29 22:46:59 +09:00
Akiba
0416a7bfba
fix can't get current hash 2023-06-29 18:46:52 +08:00
w-e-w
d47324b898 add stars 2023-06-29 19:25:18 +09:00
hunshcn
0bc0e652a3 sync default value of process_focal_crop_entropy_weight between ui and api 2023-06-29 18:12:55 +08:00
w-e-w
cc9c171978 rename --add-stop-route to --api-server-stop 2023-06-29 14:21:28 +09:00
w-e-w
9c2a7f1e8b add callback after_extra_networks_activate 2023-06-29 02:08:21 +09:00
NoCrypt
f74fb50495 Move change colors options to Saving images/grids 2023-06-28 20:24:57 +07:00
NoCrypt
d22eb8a17f Fix lint 2023-06-28 17:57:34 +07:00
NoCrypt
45ab7475d6 Revision 2023-06-28 17:55:58 +07:00
hako-mikan
b0ec69b360
add 'before_hr callback' script callback 2023-06-28 18:37:08 +09:00
NoCrypt
da14f6a663 Add options to change colors in grid 2023-06-28 10:16:44 +07:00
AUTOMATIC1111
fab73f2e7d
Merge pull request #11325 from stablegeniusdiffuser/dev-batch-grid-metadata 
Add parameter to differentiate between batch run grids or ordinary images to write proper metadata
 2023-06-27 14:23:39 +03:00
AUTOMATIC1111
1bf01b73f4
Merge pull request #11046 from akx/ded-code 
Remove a bunch of unused/vestigial code
 2023-06-27 11:25:55 +03:00
AUTOMATIC
d06af4e517 fix and rework #11113 2023-06-27 09:26:18 +03:00
AUTOMATIC1111
0b97ae2832
Merge branch 'dev' into master 2023-06-27 09:23:15 +03:00
AUTOMATIC1111
3cd4fd51ef
Merge pull request #10823 from akx/model-loady 
Upscaler model loading cleanup
 2023-06-27 09:20:49 +03:00
AUTOMATIC1111
d4f9250c5a
Merge pull request #11201 from akx/ruff-upg 
Upgrade Ruff to 0.0.272
 2023-06-27 09:19:55 +03:00
AUTOMATIC
24129368f1 send tensors to the correct device when loading from safetensors file with memmap disabled for #11260 2023-06-27 09:19:04 +03:00
AUTOMATIC1111
14196548c5
Merge pull request #11260 from dhwz/dev 
fix very slow loading speed of .safetensors files
 2023-06-27 09:11:08 +03:00
AUTOMATIC1111
4147fd6b2f
Merge branch 'dev' into 10141-gradio-user-exif 2023-06-27 09:05:53 +03:00
AUTOMATIC1111
58a9a261c4
Merge branch 'dev' into meta_class 2023-06-27 09:02:38 +03:00
AUTOMATIC1111
2c43dd766d
Merge pull request #11226 from AUTOMATIC1111/git-clone-progress 
show Git clone progress
 2023-06-27 09:01:04 +03:00
AUTOMATIC
9bb1fcfad4 alternate fix for catch errors when retrieving extension index #11290 2023-06-27 08:59:35 +03:00
AUTOMATIC1111
fa31dd80f5
Merge pull request #11315 from guming3d/master 
fix: adding elem_id for img2img resize to and resize by tabs
 2023-06-27 08:53:10 +03:00
AUTOMATIC1111
2b247f3533
Merge pull request #11415 from netux/extensions-toggle-all 
Add checkbox to check/uncheck all extensions in the Installed tab
 2023-06-27 08:44:37 +03:00
AUTOMATIC1111
3e76ae5f50
Merge pull request #11146 from AUTOMATIC1111/api-quit-restart 
api quit restart
 2023-06-27 08:41:36 +03:00
AUTOMATIC1111
cd7c03e1f6
Merge pull request #11136 from arch-fan/typo 
fixed typos
 2023-06-27 06:40:43 +03:00
AUTOMATIC1111
a9e7a3db3e
Merge pull request #11199 from akx/makedirs 
Use os.makedirs(..., exist_ok=True)
 2023-06-27 06:39:51 +03:00
AUTOMATIC1111
820bbb5b7b
Merge pull request #11408 from wfjsw/patch-1 
Strip whitespaces from URL and dirname prior to extension installation
 2023-06-27 06:20:59 +03:00
AUTOMATIC
4bd490c28d add missing infotext entry for the pad cond/uncond option 2023-06-27 06:18:43 +03:00
Martín (Netux) Rodríguez
dd268c48c9 feat(extensions): add toggle all checkbox to Installed tab 
Small QoL addition.

While there is the option to disable all extensions with the radio buttons at the top, that only acts as an added flag and doesn't really change the state of the extensions in the UI.

An use case for this checkbox is to disable all extensions except for a few, which is important for debugging extensions.
You could do that before, but you'd have to uncheck and recheck every extension one by one.
 2023-06-25 00:48:46 -03:00
Jabasukuriputo Wang
d5a5f2f29f
Strip whitespaces from URL and dirname prior to extension installation 
This avoid some cryptic errors brought by accidental spaces around urls
 2023-06-25 01:31:02 +08:00
Ferdinand Weynschenk
c4c63dd5e4 resolve linter 2023-06-20 14:03:42 +02:00
Ferdinand Weynschenk
7ad48120d4 use ui params when retreiving png info fails 
Don't want to interrupt the process since batches can be huge. This makes more sense to me than using the previous images parameters
 2023-06-20 13:50:02 +02:00
Ferdinand Weynschenk
928bd42da4 PNG info support at img2img batch 2023-06-20 13:33:36 +02:00
stablegeniusdiffuser
27e9e3f6fa Add use_main_prompt parameter to use proper metadata for batch run grids or individual images 2023-06-19 20:36:44 +02:00
George Gu
d2ccdcdc97 fix: adding elem_id for img2img resize to and resize by tabs 2023-06-19 10:16:18 +08:00
w-e-w
2e1710d88e update the description of --add-stop-rout 2023-06-18 14:07:41 +09:00
huchenlei
373ff5a217 🐛 Allow Script to have metaclass 2023-06-16 15:17:17 -04:00
dhwz
41363e0d27 fix very slow loading speed of .safetensors files 2023-06-16 18:10:15 +02:00
XiaoMeng Mai
e9bd18c57b Update call method 2023-06-16 00:09:54 +08:00
Jared Deckard
f603275d84 Add an opt-in infotext user name setting 2023-06-15 11:00:20 -05:00
Jared Deckard
8f18e67243 Add a user pattern to the filename generator 2023-06-15 11:00:11 -05:00
XiaoMeng Mai
de022c4c80 Update code style 2023-06-15 22:59:46 +08:00
XiaoMeng Mai
9ec2ba2d28 Add github mirror for the download extension 2023-06-15 22:43:09 +08:00
Jared Deckard
d3c86e5178 Note the Gradio user in the Exif data 2023-06-14 17:15:52 -05:00
w-e-w
376f793bde git clone show progress 2023-06-15 04:23:52 +09:00
Jared Deckard
fa9d2ac2ff Fix gradio special args in the call queue 2023-06-14 13:53:13 -05:00
w-e-w
6091c4e4aa terminate -> stop 2023-06-14 19:53:08 +09:00
w-e-w
49fb2a3376 response 501 if not a able to restart 2023-06-14 19:52:12 +09:00
w-e-w
5be6c026f5 rename routes 2023-06-14 18:51:47 +09:00
Aarni Koskela
d807164776 textual_inversion/logging.py: clean up duplicate key from sets (and sort them) (Ruff B033) 2023-06-13 13:07:39 +03:00
Aarni Koskela
bf67a5dcf4 Upscaler.load_model: don't return None, just use exceptions 2023-06-13 12:44:25 +03:00
Aarni Koskela
e3a973a68d Add TODO comments to sus model loads 2023-06-13 12:38:29 +03:00
Aarni Koskela
0afbc0c235 Fix up if "http" in ...: to be more sensible startswiths 2023-06-13 12:38:29 +03:00
Aarni Koskela
89352a2f52 Move load_file_from_url to modelloader 2023-06-13 12:38:28 +03:00
Aarni Koskela
165ab44f03 Use os.makedirs(..., exist_ok=True) 2023-06-13 12:35:43 +03:00
w-e-w
b9664ab615 move _stop route to api 2023-06-12 18:15:27 +09:00
Su Wei
7e2d39a2d1 update model checkpoint switch code 2023-06-12 15:22:49 +08:00
w-e-w
9142be0a0d quit restart 2023-06-10 23:36:34 +09:00
arch-fan
5576a72322 fixed typos 2023-06-09 19:59:27 +00:00
AUTOMATIC
cfdd1b9418 linter 2023-06-09 22:47:27 +03:00
AUTOMATIC1111
d00139eea8
Merge pull request #11087 from AUTOMATIC1111/persistent_conds_cache 
persistent conds cache
 2023-06-09 22:32:49 +03:00
Splendide Imaginarius
1503af60b0 Split mask blur into X and Y components 
Prequisite to fixing Outpainting MK2 mask blur bug.
 2023-06-09 08:36:33 +00:00
Su Wei
8ca34ad6d8 add model exists status check to modeuls/api/api.py , /sdapi/v1/options [POST] 2023-06-09 13:14:20 +08:00
w-e-w
7f2214aa2b persistent conds cache 
Update shared.py
 2023-06-08 14:27:22 +09:00
AUTOMATIC1111
cf28aed1a7
Merge pull request #11058 from AUTOMATIC1111/api-wiki 
link footer API to Wiki when API is not active
 2023-06-07 07:49:59 +03:00
AUTOMATIC1111
806ea639e6
Merge pull request #11066 from aljungberg/patch-1 
Fix upcast attention dtype error.
 2023-06-07 07:48:52 +03:00
Alexander Ljungberg
d9cc0910c8
Fix upcast attention dtype error. 
Without this fix, enabling the "Upcast cross attention layer to float32" option while also using `--opt-sdp-attention` breaks generation with an error:

```
  File "/ext3/automatic1111/stable-diffusion-webui/modules/sd_hijack_optimizations.py", line 612, in sdp_attnblock_forward
    out = torch.nn.functional.scaled_dot_product_attention(q, k, v, dropout_p=0.0, is_causal=False)
RuntimeError: Expected query, key, and value to have the same dtype, but got query.dtype: float key.dtype: float and value.dtype: c10::Half instead.
```

The fix is to make sure to upcast the value tensor too.
 2023-06-06 21:45:30 +01:00
w-e-w
96e446218c link footer API to Wiki when API is not active 2023-06-06 18:58:44 +09:00
AUTOMATIC1111
a009fe15fd
Merge pull request #11047 from AUTOMATIC1111/parse_generation_parameters_with_error 
handles exception when parsing generation parameters from png info
 2023-06-06 00:13:27 +03:00
w-e-w
851bf43520 print error and continue 
print error and continue
 2023-06-06 05:50:43 +09:00
Aarni Koskela
ba70a220e3 Remove a bunch of unused/vestigial code 
As found by Vulture and some eyes
 2023-06-05 22:43:57 +03:00
AUTOMATIC1111
0895c2369c
Merge pull request #11037 from AUTOMATIC1111/restart-autolaunch 
fix rework-disable-autolaunch for new restart method
 2023-06-05 20:57:31 +03:00
w-e-w
c2808f3040 SD_WEBUI_RESTARTING 2023-06-06 02:52:05 +09:00
AUTOMATIC1111
1dd8d571a4
Merge pull request #11043 from akx/restart-envvar 
Restart: only do restart if running via the wrapper script
 2023-06-05 20:06:40 +03:00
Aarni Koskela
46a5bd64ed Restart: only do restart if running via the wrapper script 2023-06-05 20:04:28 +03:00
w-e-w
1411a6e74b rework-disable-autolaunch 2023-06-06 01:09:30 +09:00
AUTOMATIC
18acc0b30d revert the message to how it was 2023-06-05 11:08:57 +03:00
AUTOMATIC1111
7a7a201d81
Merge pull request #10956 from akx/len 
Simplify a bunch of `len(x) > 0`/`len(x) == 0` style expressions
 2023-06-05 11:06:37 +03:00
ramyma
4faaf3e723 Add endpoint to get latent_upscale_modes for hires fix 2023-06-04 17:05:29 +03:00
AUTOMATIC
fbf88343de prevent calculating cons for second pass of hires fix when they are the same as for the first pass 2023-06-04 16:29:02 +03:00
AUTOMATIC
1ca5e76f7b fix for conds of second hires fox pass being calculated using first pass's networks, and add an option to revert to old behavior 2023-06-04 13:07:31 +03:00
AUTOMATIC1111
1c6dca9383
Merge pull request #10997 from AUTOMATIC1111/fix-conds-caching-with-extra-network 
fix conds caching with extra network
 2023-06-04 12:07:41 +03:00
AUTOMATIC1111
56bf522913
Merge pull request #10990 from vkage/sd_hijack_optimizations_bugfix 
torch.cuda.is_available() check for SdOptimizationXformers
 2023-06-04 11:34:32 +03:00
AUTOMATIC
2e23c9c568 fix the broken line for #10990 2023-06-04 11:33:51 +03:00
AUTOMATIC1111
0819383de0
Merge pull request #10975 from AUTOMATIC1111/restart3 
A yet another method to restart webui.
 2023-06-04 11:17:20 +03:00
AUTOMATIC1111
efc4c79b5e
Merge pull request #10980 from AUTOMATIC1111/sysinfo 
Added sysinfo tab to settings
 2023-06-04 11:16:32 +03:00
AUTOMATIC
aeba3cadd5 add whitelist for environment in the report 
add extra link to view the report instead of downloading it
 2023-06-04 11:16:00 +03:00
AUTOMATIC1111
7f28e8c445
Merge pull request #11006 from Vesnica/patch-1 
Make save_pil_to_file to have same parameters with gradio's function
 2023-06-04 10:58:14 +03:00
AUTOMATIC
f98f4f73aa infer styles from prompts, and an option to control the behavior 2023-06-04 10:56:48 +03:00
Vesnica
08f93da17c
Update ui_tempdir.py 
Make override function have the same input parameters with original function
 2023-06-04 14:20:23 +08:00
w-e-w
0a277ab591 remove redone compare 2023-06-04 05:19:47 +09:00
w-e-w
1c9d1b0ee0 simplify self.extra_network_data 2023-06-04 05:19:34 +09:00
w-e-w
f098e726d3 fix conds caching with extra network 2023-06-04 04:24:44 +09:00
Vivek K. Vasishtha
b1a72bc7e2
torch.cuda.is_available() check for SdOptimizationXformers 2023-06-03 21:54:27 +05:30
Chanchana Sornsoontorn
68d8423288
Fix missing ext_filter kwarg 2023-06-03 22:28:00 +07:00
AUTOMATIC1111
b2fa0a921d
Merge pull request #10838 from breengles/img2img-batch-processing 
Img2img batch processing
 2023-06-03 17:23:41 +03:00
ramyma
8c8c3617a7 Use a more concise calculation for dest dims 2023-06-03 14:41:12 +03:00
ramyma
31f57455dd Round upscaled dimensions only when not divisible by 8 2023-06-03 14:36:10 +03:00
AUTOMATIC
cd7ec5f728 lint 2023-06-03 14:00:37 +03:00
AUTOMATIC
7393c1f99c Added sysinfo tab to settings 2023-06-03 13:55:35 +03:00
AUTOMATIC
333e63c091 a yet another method to restart webui 2023-06-03 09:59:56 +03:00
AUTOMATIC1111
b1fd2aaa8b
Merge pull request #10943 from catboxanon/sort 
Allow dynamically sorting extra networks in UI
 2023-06-03 09:05:22 +03:00
w-e-w
df5a3cbefe fallback version info form CHANGELOG.md 2023-06-03 13:33:23 +09:00
w-e-w
d1bfc86ffc
Update modules/launch_utils.py 
Co-authored-by: Aarni Koskela <akx@iki.fi>
 2023-06-03 13:07:07 +09:00
catboxanon
9009e25cb1
Apply suggestions from code review 
Co-authored-by: Aarni Koskela <akx@iki.fi>
 2023-06-02 16:12:24 -04:00
w-e-w
0dd6bca4f1 fallback version info form CHANGELOG.md 2023-06-02 22:02:21 +09:00
Aarni Koskela
51864790fd Simplify a bunch of len(x) > 0/len(x) == 0 style expressions 2023-06-02 15:07:10 +03:00
AUTOMATIC1111
6f754ab98b Merge pull request #10780 from akx/image-emb-fonts 
Mark caption_image_overlay's textfont as deprecated; fix #10778
 2023-06-02 14:36:22 +03:00
AUTOMATIC1111
cbc38a903b Merge pull request #10905 from AUTOMATIC1111/fix-10896-pnginfo-parameters 
fix 10896 pnginfo parameters
 2023-06-02 10:37:35 +03:00
catboxanon
7dca8e7698 Support dynamic sort of extra networks 2023-06-02 04:08:45 +00:00
AUTOMATIC
a9674359ca revert the erroneous change for model setting added in df02498d 2023-06-01 19:52:04 +03:00
Artem Kotov
ba110bf093
fallback to original file retrieving; skip img if mask not found 
usage of `shared.walk_files` breaks controlnet extension
images are processed in different order 
which leads to unmatched img file used for img2img and img file used for controlnet 
(if no folder is specified for control net
or the same as img2img input dir used for it)
 2023-06-01 15:44:55 +04:00
Artem Kotov
49f4b4be67
add subdir support for images, masks and output; search mask only in subdir 2023-06-01 11:29:56 +04:00
AUTOMATIC
a5e851028e add hiding and a colspans to startup profile table 2023-06-01 10:01:42 +03:00
AUTOMATIC
b3390a9840 Merge branch 'dev' into startup-profile 2023-06-01 08:42:50 +03:00
AUTOMATIC
3ee1238630 revert default cross attention optimization to Doggettx 
make --disable-opt-split-attention command line option work again
 2023-06-01 08:12:21 +03:00
AUTOMATIC
36888092af revert default cross attention optimization to Doggettx 
make --disable-opt-split-attention command line option work again
 2023-06-01 08:12:06 +03:00
AUTOMATIC
915d1da1cd assign devices.dtype early because it's needed before the model is loaded 2023-06-01 07:28:46 +03:00
AUTOMATIC
f1533de982 assign devices.dtype early because it's needed before the model is loaded 2023-06-01 07:28:20 +03:00
w-e-w
0bf09c30c6 remove redundant 2023-06-01 06:34:53 +09:00
w-e-w
72f6367b9b fix 10896 pnginfo parameters 2023-06-01 06:24:37 +09:00
AUTOMATIC
8a561d94e6 use ui_reorder_list rather than ui_reorder for UI reorder option to make the program not break when reverting to old version 2023-05-31 23:05:44 +03:00
AUTOMATIC
3690e4e82c fix [Bug]: LoRA don't apply on dropdown list sd_lora #10880 2023-05-31 22:57:27 +03:00
AUTOMATIC1111
6427ffde4d Merge pull request #10808 from AUTOMATIC1111/fix-disable-png-info 
fix disable png info
 2023-05-31 22:56:56 +03:00
AUTOMATIC1111
c63d46ceb8 Merge pull request #10804 from AUTOMATIC1111/fix-xyz-clip 
Fix get_conds_with_caching()
 2023-05-31 22:54:51 +03:00
AUTOMATIC1111
fae8bdfa48 Merge pull request #10785 from nyqui/fix-hires.fix 
fix "hires. fix" prompt sharing same labels with txt2img_prompt
 2023-05-31 22:54:24 +03:00
AUTOMATIC
10dbee0d59 add quoting for infotext values that have a colon in them 2023-05-31 22:54:00 +03:00
AUTOMATIC
48875af7a1 fix [Bug]: LoRA don't apply on dropdown list sd_lora #10880 2023-05-31 22:45:16 +03:00
AUTOMATIC
df02498d03 add an option to show selected setting in main txt2img/img2img UI 
split some code from ui.py into ui_settings.py ui_gradio_edxtensions.py
add before_process callback for scripts
add ability for alwayson scripts to specify section and let user reorder those sections
 2023-05-31 22:40:09 +03:00
AUTOMATIC
583fb9f066 change UI reorder setting to multiselect 2023-05-31 20:31:17 +03:00
AUTOMATIC
05933840f0 rename print_error to report, use it with together with package name 2023-05-31 19:56:37 +03:00
AUTOMATIC1111
d67ef01f62
Merge pull request #10780 from akx/image-emb-fonts 
Mark caption_image_overlay's textfont as deprecated; fix #10778
 2023-05-31 19:37:58 +03:00
AUTOMATIC1111
e72013ea67
Merge pull request #10638 from catboxanon/patch/revert-10586 
Revert discarding penultimate sigma for DPM-Solver++(2M) SDE
 2023-05-31 19:34:20 +03:00
AUTOMATIC1111
80583263a2
Merge pull request #10784 from AUTOMATIC1111/update-deps 
Update xformers to 0.0.20
 2023-05-31 19:32:13 +03:00
AUTOMATIC1111
881de0df38
Merge pull request #10803 from klimaleksus/refactoring-for-embedding-merge 
Refactor EmbeddingDatabase.register_embedding() to allow unregistering
 2023-05-31 19:29:47 +03:00
AUTOMATIC1111
670195d720
Merge pull request #10808 from AUTOMATIC1111/fix-disable-png-info 
fix disable png info
 2023-05-31 19:20:19 +03:00
AUTOMATIC1111
52b8752e62
Merge branch 'dev' into report-error 2023-05-31 19:15:21 +03:00
AUTOMATIC1111
78a602ae8c
Merge pull request #10796 from ramyma/round-upscale-result-dims 
Round down scale destination dimensions to nearest multiple of 8
 2023-05-31 19:06:07 +03:00
AUTOMATIC1111
2fcd64b9e8
Merge pull request #10805 from akx/gitpython-no-persistent-processes 
Patch GitPython to not use leaky persistent processes
 2023-05-31 19:05:03 +03:00
AUTOMATIC1111
741ab6bed1
Merge pull request #10788 from yoinked-h/patch-1 
typo
 2023-05-31 18:58:06 +03:00
AUTOMATIC1111
3e48f7d30c
Merge pull request #10804 from AUTOMATIC1111/fix-xyz-clip 
Fix get_conds_with_caching()
 2023-05-31 18:47:24 +03:00
AUTOMATIC1111
0b0f60f954
Merge pull request #10856 from akx/untamed 
Remove taming_transformers dependency
 2023-05-31 18:46:15 +03:00
AUTOMATIC1111
69f49a935a
Merge pull request #10845 from DragonHawkAlpha/master 
Added VAE listing to web API. Via: /sdapi/v1/sd-vae
 2023-05-31 18:44:46 +03:00
AUTOMATIC1111
fec089d8f1
Merge pull request #10878 from willfrey/patch-1 
Fix typo in `--update-check` help message
 2023-05-31 18:41:05 +03:00
AUTOMATIC1111
c3a61425b8
Merge pull request #10848 from DavidQChuang/master 
Fix s_min_uncond default type int
 2023-05-31 18:40:27 +03:00
AUTOMATIC1111
e7439b5cbe
Merge pull request #10785 from nyqui/fix-hires.fix 
fix "hires. fix" prompt sharing same labels with txt2img_prompt
 2023-05-31 18:40:00 +03:00
Will Frey
fb1cb6d364
Fix typo in --update-check help message 
Change `chck` to `check`
 2023-05-30 22:05:12 -04:00
Aarni Koskela
5fcdaa6a7f Vendor in the single module used from taming_transformers; remove taming_transformers dependency 
(and fix the two ruff complaints)
 2023-05-30 12:47:57 +03:00
David Chuang
3fc8aeb48d
Fix s_min_uncond default type int 2023-05-29 20:17:25 -04:00
James
42e020c1c1 Added VAE listing to web API. 2023-05-29 22:25:43 +01:00
Artem Kotov
23314a6e27 ruffed 2023-05-29 21:38:49 +04:00
Artem Kotov
6c610a8a95 add scale_by to batch processing 2023-05-29 20:47:20 +04:00
Artem Kotov
c8e67b6732 improve filename matching for mask 
we should not rely that mask filename will be of the same extension
as the image filename so better pattern matching is added
 2023-05-29 20:39:24 +04:00
w-e-w
4a449375a2 fix get_conds_with_caching() 2023-05-30 01:07:35 +09:00
Aarni Koskela
00dfe27f59 Add & use modules.errors.print_error where currently printing exception info by hand 2023-05-29 09:17:30 +03:00
Aarni Koskela
77a10c62c9 Patch GitPython to not use leaky persistent processes 2023-05-29 08:31:11 +03:00
w-e-w
2aca613a61 fix disable png info 2023-05-29 07:30:32 +09:00
klimaleksus
4635f31270
Refactor EmbeddingDatabase.register_embedding() to allow unregistering 2023-05-29 01:09:59 +05:00
ramyma
3539885f0e Round down scale destination dimensions to nearest multiple of 8 2023-05-28 21:41:54 +03:00
yoinked
905c3fe23e
typo 
vidocard -> videocard
 2023-05-28 08:39:00 -07:00
nyqui
bae2fca523
fix "hires. fix" prompt/neg sharing same labels as txt2img_prompt/negative_prompt 2023-05-28 22:59:29 +09:00
Sakura-Luna
cf07983a6e
Upgrade xformers 2023-05-28 20:42:19 +08:00
Aarni Koskela
1013758933 Mark caption_image_overlay's textfont as deprecated; fix #10778 2023-05-28 14:48:50 +03:00
AUTOMATIC
b957dcfece add quoting for infotext values that have a colon in them 2023-05-28 10:39:57 +03:00
AUTOMATIC
f9809e6e40 Merge branch 'master' into dev 2023-05-28 06:59:20 +03:00
AUTOMATIC
20ae71faa8 fix linter issue for 1.3.0 2023-05-27 20:23:16 +03:00
AUTOMATIC
6095ade147 fix serving images that have already been saved without temp files function that broke after updating gradio 2023-05-27 20:19:10 +03:00
AUTOMATIC1111
9bc037d045
Merge pull request #10655 from fumitakayano/fumitakayano 
Added format to specify VAE filename for generated image filenames
 2023-05-27 20:11:21 +03:00
AUTOMATIC1111
d0e8fa627d
Merge pull request #10569 from strelokhalfer/pr 
Change 'images.zip' to pattern settings
 2023-05-27 20:10:17 +03:00
AUTOMATIC1111
5d29672b32
Merge pull request #10697 from catboxanon/patch/image-info 
Cleaner image metadata read
 2023-05-27 20:07:51 +03:00
AUTOMATIC1111
d92a6acf0e
Merge pull request #10739 from linkoid/fix-ui-debug-mode-exit 
Fix --ui-debug-mode exit
 2023-05-27 20:02:07 +03:00
AUTOMATIC
e8e7fe11e9 updates for the noise schedule settings 2023-05-27 19:53:09 +03:00
AUTOMATIC
654234ec56 Merge remote-tracking branch 'KohakuBlueleaf/custom-k-sched-settings' into dev 2023-05-27 19:08:02 +03:00
AUTOMATIC
633867ecc6 fix serving images that have already been saved without temp files function that broke after updating gradio 2023-05-27 19:06:49 +03:00
AUTOMATIC
339b531570 custom unet support 2023-05-27 15:47:33 +03:00
linkoid
1f0fdede17 Show full traceback in get_sd_model() 
to reveal if an error is caused by an extension
 2023-05-26 15:25:31 -04:00
linkoid
3829afec36 Remove exit() from select_checkpoint() 
Raising a FileNotFoundError instead.
 2023-05-26 15:08:53 -04:00
missionfloyd
6645f23c4c
Merge branch 'dev' into reorder-hotkeys 2023-05-25 18:53:33 -06:00
missionfloyd
43bdaa2f0e Make ctrl+left/right optional 2023-05-25 18:49:28 -06:00
catboxanon
60062b51d8
Remove try/except in img metadata read 2023-05-25 08:33:40 -04:00
catboxanon
7a1bbf99da
Cleaner image metadata read 2023-05-24 16:41:22 -04:00
strelokhalfer
fb5d0ef209 Changed 'images.zip' to generation by pattern 2023-05-24 18:17:02 +03:00
Kohaku-Blueleaf
a69b71a37f use Schedule instead of Sched 2023-05-24 20:40:37 +08:00
Kohaku-Blueleaf
4b88e24ebe improvements 
See:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/10649#issuecomment-1561047723
 2023-05-24 20:35:58 +08:00
Kohaku-Blueleaf
1601fccebc Use automatic instead of None/default 2023-05-24 00:18:09 +08:00
AUTOMATIC
a6e653be26 possible fix for empty list of optimizations #10605 2023-05-23 18:49:15 +03:00
Kohaku-Blueleaf
72377b0251 Use type to determine if it is enable 2023-05-23 23:48:23 +08:00
AUTOMATIC
b186045fee possible fix for empty list of optimizations #10605 2023-05-23 18:02:09 +03:00
fumitaka.yano
1db7d21283 Subject:. 
Improvements to handle VAE filenames in generated image filenames

Body:.
1) Added new line 24 to import sd_vae module.
2) Added new method get_vae_filename at lines 340-349 to obtain the VAE filename to be used for image generation and further process it to extract only the filename by splitting it with a dot symbol.
3) Added a new lambda function 'vae_filename' at line 373 to handle VAE filenames.

Reason:.
A function was needed to get the VAE filename and handle it in the program.

Test:.
We tested whether we could use this new functionality to get the expected file names.
The correct behaviour was confirmed for the following commonly distributed VAE files.
vae-ft-mse-840000-ema-pruned.safetensors -> vae-ft-mse-840000-ema-pruned
anything-v4.0.vae.pt -> anything-v4.0

ruff response:.
There were no problems with the code I added.

There was a minor configuration error in a line I did not modify, but I did not modify it as it was not relevant to this modification.
Logged.
images.py:426:56: F841 [*] Local variable `_` is assigned to but never used
images.py:432:43: F841 [*] Local variable `_` is assigned to but never used

Impact:.
This change makes it easier to retrieve the VAE filename used for image generation and use it in the programme.
 2023-05-23 15:56:08 +09:00
Kohaku-Blueleaf
70650f87a4 Use better way to impl 2023-05-23 11:34:51 +08:00
Kohaku-Blueleaf
1846ad36a3 Use settings instead of main interface 2023-05-23 10:58:57 +08:00
Kohaku-Blueleaf
38aaad654b
Better hint for user 
Co-authored-by: catboxanon <122327233+catboxanon@users.noreply.github.com>
 2023-05-23 09:38:30 +08:00
ArthurHeitmann
e1c44267ea Fix for #10643 (pixel noise in webui inpainting canvas breaking inpainting, so that it behaves like plain img2img) 2023-05-22 21:56:26 +02:00
AUTOMATIC1111
d77ba18d5d
Merge pull request #10635 from prodialabs/master 
disable `timeout_keep_alive`: fixes #10625 #10510 #10474
 2023-05-22 22:17:25 +03:00
catboxanon
51d672890d
Revert #10586 2023-05-22 13:06:57 -04:00
Kohaku-Blueleaf
403b304162 use sigma_max/min in model if sigma_max/min is 0 2023-05-23 00:29:38 +08:00
Kohaku-Blueleaf
65a87ccc9b Add error information for recursion error 2023-05-23 00:09:49 +08:00
Kohaku-Blueleaf
302d95c726 Minor naming fixes 2023-05-22 23:43:06 +08:00
Kohaku-Blueleaf
4365c35bf9 Avoid loop import 2023-05-22 23:41:14 +08:00
Kohaku-Blueleaf
5dfb1f597b remove not related code 2023-05-22 23:36:16 +08:00
Kohaku-Blueleaf
7dc9d9e27e only add metadata when k_sched is actually been used 2023-05-22 23:34:16 +08:00
Kohaku-Blueleaf
7882f76da4 Replace karras by k_diffusion, fix gen info 2023-05-22 23:26:28 +08:00
Kohaku-Blueleaf
f821051443 Change karras to kdiffusion 2023-05-22 23:09:03 +08:00
Kohaku-Blueleaf
e6269cba7f Add dropdown for scheduler type 2023-05-22 23:02:05 +08:00
Monty Anderson
efc9853059 modules/api/api.py: disable timeout_keep_alive 2023-05-22 15:52:44 +01:00
Kohaku-Blueleaf
90ec557d60 remove debug print 2023-05-22 22:06:13 +08:00
Kohaku-Blueleaf
a104879869 Add custom karras scheduler 2023-05-22 21:52:46 +08:00
AUTOMATIC
ee65e72931 repair file paste for Firefox from #10615 
remove animation when pasting files into prompt
rework two dragdrop js files into one
 2023-05-22 09:49:59 +03:00
AUTOMATIC1111
0cbcc4d828
Merge pull request #10611 from akx/disable-token-counters 
Add option to disable token counters
 2023-05-22 08:09:48 +03:00
AUTOMATIC
3366e494a1 option to pad prompt/neg prompt to be same length 2023-05-22 00:13:53 +03:00
Aarni Koskela
618c59b01d Add option to disable prompt token counters 2023-05-21 23:25:06 +03:00
AUTOMATIC
8faac8b963 run basic torch calculation at startup in parallel to reduce the performance impact of first generation 2023-05-21 21:55:14 +03:00
AUTOMATIC
fe73d6439a Revert "change width/heights slider steps to 64 from 8" 
This reverts commit 9a86932c8b.
 2023-05-21 17:35:19 +03:00
AUTOMATIC
f9fe5e5f9d reworking launch.py: add references to renamed file 2023-05-21 16:27:34 +03:00
AUTOMATIC
4b07984d1b reworking launch.py: rename 2023-05-21 16:27:34 +03:00
AUTOMATIC1111
38a2324dc3
Merge pull request #10580 from akx/add-some-future-annotations 
Add some future annotations
 2023-05-21 13:43:29 +03:00
AUTOMATIC
696f16e901 revert git describe --always --tags for extensions because it seems to be causing issues 2023-05-21 13:30:09 +03:00
AUTOMATIC1111
8e9188aa5a
Merge pull request #10564 from AUTOMATIC1111/extensions-clone-depth-1 
extensions clone --filter=blob:none
 2023-05-21 11:06:26 +03:00
w-e-w
cd03317c05 --filter=blob:none 
Co-Authored-By: Aarni Koskela <akx@iki.fi>
Co-Authored-By: catboxanon <122327233+catboxanon@users.noreply.github.com>
 2023-05-21 16:42:54 +09:00
catboxanon
9a442702d1
Discard penultimate sigma for dpmpp_2m_sde 2023-05-21 01:01:59 -04:00
AUTOMATIC
31545abe14 add DPM-Solver++(2M) SDE from new k-diffusion 2023-05-21 07:31:51 +03:00
AUTOMATIC
0cc05fc492 work on startup profile display 2023-05-21 00:41:41 +03:00
Aarni Koskela
df004be2fc Add a couple from __future__ import annotationses for Py3.9 compat 2023-05-21 00:26:16 +03:00
AUTOMATIC1111
3605407033
Merge pull request #10576 from catboxanon/patch/hires-prompt-edit-attn 
Support edit attention keyboard shortcuts in hires fix prompts
 2023-05-20 23:23:53 +03:00
catboxanon
373903d851 hiresfix prompt: add classes, update css sel 2023-05-20 19:34:50 +00:00
AUTOMATIC
05e6fc9aa9 Merge branch 'ui-selection-for-cross-attention-optimization' into dev 2023-05-20 22:29:51 +03:00
AUTOMATIC1111
cc6c0fc70a
Merge pull request #10557 from akx/dedupe-webui-boot 
Refactor & deduplicate web UI boot code
 2023-05-20 22:24:15 +03:00
catboxanon
b2b06eee02
Support edit attn shortcut in hires fix prompts 2023-05-20 13:31:18 -04:00
w-e-w
bf5e5f4269 extensions clone depth 1 2023-05-20 15:08:08 +09:00
anonCantCode
0b6ca8e77b
preserve declarations 2023-05-20 11:13:03 +05:30
anonCantCode
3758744eb6
Use Optional[] to preserve Python 3.9 compatability 2023-05-20 06:27:12 +05:30
AUTOMATIC
39ec4f06ff calculate hashes for Lora 
add lora hashes to infotext
when pasting infotext, use infotext's lora hashes to find local loras for <lora:xxx:1> entries whose hashes match loras the user has
 2023-05-19 22:59:29 +03:00
AUTOMATIC
87702febe0 allow hiding buttons in ui-config.json 2023-05-19 19:04:20 +03:00
AUTOMATIC1111
0d84055eb6
Merge pull request #10291 from akx/test-overhaul 
Test overhaul
 2023-05-19 18:59:31 +03:00
AUTOMATIC
9a86932c8b change width/heights slider steps to 64 from 8 2023-05-19 18:49:39 +03:00
Aarni Koskela
793a491923 Overhaul tests to use py.test 2023-05-19 17:42:34 +03:00
Aarni Koskela
71f4a4afdf Deduplicate webui.py initial-load/reload code 2023-05-19 17:38:42 +03:00
Aarni Koskela
4897e5277b Make load_scripts create new runners (removes reload_scripts) 2023-05-19 15:49:53 +03:00
Aarni Koskela
21ee46eea7 Deduplicate default extra network registration 2023-05-19 15:35:16 +03:00
Aarni Koskela
de3abc29ae Fix typo "intialize" 2023-05-19 15:27:23 +03:00
lenankamp
ff6acd35d0
Update img2img.py 
Hopefully corrected the white space issue
 2023-05-19 03:20:19 -04:00
AUTOMATIC
2140bd1c10 make it actually work after suggestions 2023-05-19 10:05:07 +03:00
AUTOMATIC1111
1e5afd4fa9
Apply suggestions from code review 
Co-authored-by: Aarni Koskela <akx@iki.fi>
 2023-05-19 09:17:36 +03:00
AUTOMATIC
df6fffb054 change upscalers to download models into user-specified directory (from commandline args) rather than the default models/<...> 2023-05-19 09:09:18 +03:00
AUTOMATIC
379fd6204d make links to http://<...>.git git extensions work in the extension tab 2023-05-19 09:09:17 +03:00
AUTOMATIC
8a3d232839 fix linter issues 2023-05-19 00:03:27 +03:00
AUTOMATIC
a6bbc6aa8c set Navigate image viewer with gamepad option to false by default, by request 2023-05-18 23:59:31 +03:00
AUTOMATIC
3d959f5b49 Merge remote-tracking branch 'missionfloyd/extra-network-preview-lazyload' into dev 2023-05-18 23:23:13 +03:00
AUTOMATIC
bd877d7b5a rework #10519 2023-05-18 22:49:00 +03:00
AUTOMATIC
2582a0fd3b make it possible for scripts to add cross attention optimizations 
add UI selection for cross attention optimization
 2023-05-18 22:48:28 +03:00
AUTOMATIC1111
2e006fa500
Merge pull request #10519 from catboxanon/patch/hires-input-release-event 
Improve width/height slider responsiveness
 2023-05-18 20:32:21 +03:00
catboxanon
57275da903
Reorder variable assignment 2023-05-18 13:25:32 -04:00
AUTOMATIC
ff0e17174f rework hires prompts/sampler code to among other things support different extra networks in first/second pass 
rework quoting for infotext items that have commas in them to use json (should be backwards compatible except for cases where it didn't work previously)
add some locals from processing function into the Processing class as fields
 2023-05-18 20:16:09 +03:00
catboxanon
63c02314cc
.change -> .release for hires input 
Improves overall UI responsiveness.
 2023-05-18 13:06:13 -04:00
AUTOMATIC
5ec2c294ee Merge remote-tracking branch 'InvincibleDude/improved-hr-conflict-test' into hires-fix-ext 2023-05-18 17:57:16 +03:00
AUTOMATIC
44c37f94e1 add messages about Loras that failed to load to UI 2023-05-18 16:36:30 +03:00
AUTOMATIC
cd8a510ca9 if sd_model is None, do not always try to load it 2023-05-18 15:47:43 +03:00
AUTOMATIC
ae252cd5bc add --gradio-allowed-path commandline option 2023-05-18 10:37:25 +03:00
AUTOMATIC
bb431df52b python linter fixes 2023-05-18 10:16:33 +03:00
AUTOMATIC
f9be4dc498 keep old option for ngrok 2023-05-18 10:14:04 +03:00
AUTOMATIC1111
182330ae40
Merge branch 'dev' into ngrok-py 2023-05-18 10:12:17 +03:00
AUTOMATIC
3694379f26 rework #8863 to work with all img2img tabs 2023-05-18 00:03:16 +03:00
AUTOMATIC
973ae87309 Merge remote-tracking branch 'pieresimakp/img2img-detect-image-size' into dev 2023-05-17 23:49:39 +03:00
AUTOMATIC
61ee563df9 option to specify editor height for img2img 2023-05-17 23:42:01 +03:00
AUTOMATIC
e5dd4b4ebf remove some code duplication from #9348 2023-05-17 23:27:06 +03:00
AUTOMATIC1111
04b4508a66
Merge branch 'dev' into improve-frontend-responsiveness 2023-05-17 23:18:56 +03:00
AUTOMATIC
b397f63e00 add option to reorder tabs 
fix Reload UI not working
 2023-05-17 23:11:33 +03:00
AUTOMATIC
ad3a7f2ab9 alternative solution to fix styles load when edited by human #9765 as suggested by akx 2023-05-17 22:50:08 +03:00
AUTOMATIC
f6fc7916c4 add /sdapi/v1/script-info api 2023-05-17 22:43:24 +03:00
AUTOMATIC
8fe9ea7f4d add options to show/hide hidden files and dirs, and to not list models/files in hidden directories 2023-05-17 21:45:26 +03:00
AUTOMATIC
a6b618d072 use a single function for saving images with metadata both in extra networks and main mode for #10395 2023-05-17 21:03:41 +03:00
AUTOMATIC1111
9c91a86720
Merge pull request #10395 from wk5ovc/patch-4 
Fix extra networks save preview image geninfo
 2023-05-17 20:42:37 +03:00
AUTOMATIC1111
987c1f7d9f
Merge pull request #10483 from Iheuzio/syntax-search 
Fix typo in syntax
 2023-05-17 20:27:14 +03:00
AUTOMATIC
9fd6c1e343 move some settings to the new Optimization page 
add slider for token merging for img2img
rework StableDiffusionProcessing to have the token_merging_ratio field
fix a bug with applying png optimizations for live previews when they shouldn't be applied
 2023-05-17 20:22:54 +03:00
Iheuzio
f5092164e8 Fix typo in syntax 2023-05-17 12:51:54 -04:00
AUTOMATIC1111
f6c06e3ed2
Merge pull request #10458 from akx/graceful-stop 
Graceful server stopping
 2023-05-17 18:45:40 +03:00
AUTOMATIC
76ebf750a4 use a local variable instead of dictionary entry for sd_merge_models in merge model metadata code 2023-05-17 17:44:07 +03:00
AUTOMATIC1111
36c14831b3
Merge pull request #10473 from dongweiming/fix-10460 
Fix #10460
 2023-05-17 17:42:25 +03:00
Weiming
95cb492e41 Fixed: #10460 2023-05-17 22:35:59 +08:00
AUTOMATIC1111
b4703b788b
Merge pull request #10461 from akx/processed-s-min-uncond 
Copy s_min_uncond to Processed
 2023-05-17 15:08:14 +03:00
AUTOMATIC
1210548cba simplify single_sample_to_image 2023-05-17 14:53:39 +03:00
Sakura-Luna
7a13a3f4ba TAESD fix 2023-05-17 17:39:07 +08:00
Aarni Koskela
315f109427 Copy s_min_uncond to Processed 
Should fix #10416
 2023-05-17 10:26:32 +03:00
Aarni Koskela
875990a232 Add option for /_stop route (for graceful shutdown) 2023-05-17 10:15:08 +03:00
Aarni Koskela
85b4f89926 Replace state.need_restart with state.server_command + replace poll loop with signal 2023-05-17 10:15:03 +03:00
AUTOMATIC1111
85232a5b26
Merge branch 'dev' into taesd-a 2023-05-17 09:26:26 +03:00
AUTOMATIC
56a2672831 return live preview defaults to how they were 
only download TAESD model when it's needed
return calculations in single_sample_to_image to just if/elif/elif blocks
keep taesd model in its own directory
 2023-05-17 09:24:01 +03:00
AUTOMATIC1111
4071fa4a12
Merge pull request #10451 from dennissheng/master 
not clear checkpoints cache when config changes
 2023-05-17 08:24:56 +03:00
dennissheng
54f657ffbc not clear checkpoints cache when config changes 2023-05-17 10:47:02 +08:00
bobzilladev
0d31f20cbd Use ngrok-py library 2023-05-16 16:09:41 -04:00
lenankamp
bbce167305
Recursive batch img2img.py 
Searches sub directories and performs img2img batch processing, also limits inputs to jpg, webp, and png. Then saves to putput directory with relative paths.
 2023-05-16 14:37:45 -04:00
AUTOMATIC
ce38ee8f26 add info link for Negative Guidance minimum sigma 2023-05-16 15:41:49 +03:00
AUTOMATIC
6302978ff8 restore nqsp in footer that was lost during linting 2023-05-16 15:14:44 +03:00
AUTOMATIC
a61cbef02c add second_order field to sampler config 2023-05-16 12:36:15 +03:00
AUTOMATIC
cdac5ace14 suppress ENSD infotext for samplers that don't use it 2023-05-16 11:54:02 +03:00
AUTOMATIC
3d76eabbca add visual progress for extension installation from URL 2023-05-16 07:59:43 +03:00
AUTOMATIC
a47abe1b7b update extensions table: show branch, show date in separate column, and show version from tags if available 2023-05-15 21:22:35 +03:00
AUTOMATIC
0d2a4b608c load extensions' git metadata in parallel to loading the main program to save a ton of time during startup 2023-05-15 20:57:11 +03:00
AUTOMATIC
0d3a80e269 Show "Loading..." for extra networks when displaying for the first time 2023-05-15 20:33:44 +03:00
Keith
f517838c75
Fix extra networks save preview image geninfo 2023-05-15 10:47:01 +08:00
Sakura-Luna
742da31932
Minor changes 2023-05-15 03:04:34 +08:00
AUTOMATIC
1a43524018 fix model loading twice in some situations 2023-05-14 13:27:50 +03:00
AUTOMATIC1111
80adb6979d
Merge branch 'dev' into find_vae 2023-05-14 11:46:27 +03:00
AUTOMATIC1111
3ddc763422
Merge pull request #10367 from AUTOMATIC1111/jpeg-extra-network-preview 
allow jpeg for extra network preview
 2023-05-14 11:40:03 +03:00
AUTOMATIC
a58ae0b717 remove auto live previews format option, fix slow PNG generation 2023-05-14 11:15:15 +03:00
AUTOMATIC
a00e42556f add a bunch of descriptions and reword a lot of settings (sorry, localizers) 2023-05-14 11:04:21 +03:00
w-e-w
a423f23d28 allow jpeg for extra network preview 2023-05-14 16:22:40 +09:00
AUTOMATIC
ce515b81c5 set up a system to provide extra info for settings elements in python rather than js 
add a bit of spacing/styling to settings elements
add link info for token merging
 2023-05-14 10:02:51 +03:00
Sakura-Luna
bd9b9d425a Add live preview mode check 2023-05-14 14:06:02 +08:00
Sakura-Luna
e14b586d04 Add Tiny AE live preview 2023-05-14 14:06:01 +08:00
AUTOMATIC
2cfaffb239 updates for #9256 2023-05-14 08:30:37 +03:00
AUTOMATIC1111
7f6ef764b9
Merge pull request #9256 from papuSpartan/tomesd 
Integrate optional speed and memory improvements by token merging (via dbolya/tomesd)
 2023-05-14 08:21:02 +03:00
AUTOMATIC
005849331e remove output_altered flag from AfterCFGCallbackParams 2023-05-14 08:15:22 +03:00
Sakura-Luna
8abfc95013
Update script_callbacks.py 2023-05-14 12:56:34 +08:00
catboxanon
3078001439 Add/modify CFG callbacks 
Required by self-attn guidance extension
https://github.com/ashen-sensored/sd_webui_SAG
 2023-05-14 01:49:41 +00:00
AUTOMATIC1111
86ff43b930 Merge pull request #10335 from akx/l10n-dis-take-2 
Localization fixes
 2023-05-13 20:46:50 +03:00
AUTOMATIC1111
12c78138dd Merge pull request #10324 from catboxanon/offline 
Allow web UI to be ran fully offline
 2023-05-13 20:22:09 +03:00
AUTOMATIC1111
063848798c Merge pull request #10339 from catboxanon/bf16 
Allow bf16 in safe unpickler
 2023-05-13 20:21:39 +03:00
AUTOMATIC
7e3539df6f fix upscalers disappearing after the user reloads UI 2023-05-13 20:21:11 +03:00
AUTOMATIC1111
d70c3a807b
Merge pull request #10339 from catboxanon/bf16 
Allow bf16 in safe unpickler
 2023-05-13 19:45:18 +03:00
AUTOMATIC1111
cdb1ffb2f4
Merge pull request #10335 from akx/l10n-dis-take-2 
Localization fixes
 2023-05-13 19:44:55 +03:00
Aarni Koskela
1f57b948b7 Move localization to its own script block and load it first 2023-05-13 19:15:13 +03:00
papuSpartan
c2fdb44880 fix for img2img 2023-05-13 11:11:02 -05:00
papuSpartan
917faa5325 move to stable-diffusion tab 2023-05-13 10:26:09 -05:00
papuSpartan
ac83627a31 heavily simplify 2023-05-13 10:23:42 -05:00
catboxanon
cb5f61281a
Allow bf16 in safe unpickler 2023-05-13 11:04:26 -04:00
papuSpartan
55e52c878a remove command line option 2023-05-13 09:24:56 -05:00
catboxanon
5afc44aab1 Requested changes 2023-05-13 12:57:32 +00:00
catboxanon
867be74244 Define default fonts for Gradio theme 
Allows web UI to (almost) be ran fully offline.
The web UI will hang on load if offline when
these fonts are not manually defined, as it will attempt (and fail)
to pull from Google Fonts.
 2023-05-12 18:08:34 +00:00
w-e-w
681c16dd1e fix --data-dir for COMMANDLINE_ARGS 
move reading of COMMANDLINE_ARGS into paths_internal.py so --data-dir can be properly read
 2023-05-12 22:33:21 +09:00
papuSpartan
75b3692920 Merge branch 'dev' of https://github.com/AUTOMATIC1111/stable-diffusion-webui into tomesd 2023-05-11 22:40:17 -05:00
AUTOMATIC1111
abe32cefa3
Merge pull request #10285 from akx/ruff-spacing 
Indentation + ruff whitespace fixes
 2023-05-11 21:25:15 +03:00
AUTOMATIC1111
b4aaa339d5
Merge pull request #10290 from akx/smart-live-preview-format 
Make live previews use JPEG only for large images
 2023-05-11 21:24:44 +03:00
Aarni Koskela
da10de022f Make live previews use JPEG only when the image is lorge enough 2023-05-11 20:54:40 +03:00
Aarni Koskela
49a55b410b Autofix Ruff W (not W605) (mostly whitespace) 2023-05-11 20:29:11 +03:00
catboxanon
cb3f8ff59f Fix symlink scanning 2023-05-11 15:55:43 +00:00
Aarni Koskela
098d2fda52 Reindent autocrop with 4 spaces 2023-05-11 18:26:04 +03:00
AUTOMATIC
0bfaf613a8 put the star where it belongs 2023-05-11 13:31:56 +03:00
Aarni Koskela
1332c46b71 Drop fonts + font-roboto deps since we only use the single regular cut of Roboto 2023-05-11 10:07:28 +03:00
Aarni Koskela
df7070eca2 Deduplicate get_font code 2023-05-11 10:06:19 +03:00
Aarni Koskela
16e4d79122 paths_internal: deduplicate modules_path 2023-05-11 10:05:39 +03:00
Sakura-Luna
1dcd672324
Update sd_vae.py 
There is no need to use split.
 2023-05-11 14:29:52 +08:00
AUTOMATIC1111
fe5d988947
Merge pull request #10268 from Sakura-Luna/pbar 
UniPC progress bar adjustment
 2023-05-11 08:16:36 +03:00
AUTOMATIC
b7e160a87d change live preview format to jpeg to prevent unreasonably slow previews for large images, and add an option to let user select the format 2023-05-11 08:14:45 +03:00
AUTOMATIC
e334758ec2 repair #10266 2023-05-11 07:45:05 +03:00
Sakura-Luna
ae17e97898 UniPC progress bar adjustment 2023-05-11 12:28:26 +08:00
Louis Del Valle
c8732dfa6f
Update sub_quadratic_attention.py 
1. Determine the number of query chunks.
2. Calculate the final shape of the res tensor.
3. Initialize the tensor with the calculated shape and dtype, (same dtype as the input tensors, usually)

Can initialize the tensor as a zero-filled tensor with the correct shape and dtype, then compute the attention scores for each query chunk and fill the corresponding slice of tensor.
 2023-05-10 22:05:18 -05:00
AUTOMATIC
8aa87c564a add UI to edit defaults 
allow setting defaults for elements in extensions' tabs
fix a problem with ESRGAN upscalers disappearing after UI reload
implicit change: HTML element id for train tab from tab_ti to tab_train (will this break things?)
 2023-05-10 23:41:08 +03:00
AUTOMATIC
3ec7b705c7 suggestions and fixes from the PR 2023-05-10 21:21:32 +03:00
AUTOMATIC
d25219b7e8 manual fixes for some C408 2023-05-10 11:55:09 +03:00
AUTOMATIC
a5121e7a06 fixes for B007 2023-05-10 11:37:18 +03:00
AUTOMATIC
550256db1c ruff manual fixes 2023-05-10 11:19:16 +03:00
AUTOMATIC
028d3f6425 ruff auto fixes 2023-05-10 11:05:02 +03:00
AUTOMATIC
4b854806d9 F401 fixes for ruff 2023-05-10 09:02:23 +03:00
AUTOMATIC
f741a98bac imports cleanup for ruff 2023-05-10 08:43:42 +03:00
AUTOMATIC
96d6ca4199 manual fixes for ruff 2023-05-10 08:25:25 +03:00
AUTOMATIC
762265eab5 autofixes from ruff 2023-05-10 07:52:45 +03:00
AUTOMATIC
d50b95b5a3 fix an issue preventing the program from starting if the user specifies a bad gradio theme 2023-05-10 07:14:13 +03:00
AUTOMATIC1111
d6a9b22c19
Merge pull request #10232 from akx/eff 
Fix up string formatting/concatenation to f-strings where feasible
 2023-05-09 22:40:51 +03:00
AUTOMATIC1111
ccbb361845
Merge pull request #10209 from AUTOMATIC1111/quicksettings-migration 
1.1.1 quicksettings list migration
 2023-05-09 22:29:08 +03:00
Aarni Koskela
3ba6c3c83c Fix up string formatting/concatenation to f-strings where feasible 2023-05-09 22:25:39 +03:00
Micky Brunetti
749a93295e
remove logs 2023-05-09 15:43:58 +02:00
Micky Brunetti
7fd3a4e6d7
files in vae folder with same name as a checkpoint can be found too 2023-05-09 15:35:57 +02:00
Sakura-Luna
e7dbefc340
refresh fix 2023-05-09 19:06:00 +08:00
w-e-w
d1ff57e1cb 1.1.1 quicksettings list migration 2023-05-09 18:14:12 +09:00
AUTOMATIC
ad6ec02261 prevent Reload UI button/link from reloading the page when it's not yet ready 2023-05-09 11:42:47 +03:00
AUTOMATIC1111
ea05ddfec8
Merge pull request #10201 from brkirch/mps-nan-fixes 
Fix MPS on PyTorch 2.0.1, Intel Macs
 2023-05-09 10:28:24 +03:00
brkirch
de401d8ffb Fix generation with k-diffusion/UniPC on x64 Macs 2023-05-09 01:10:13 -04:00
brkirch
9efb809f7c Remove PyTorch 2.0 check 
Apparently the commit in the main branch of pytorch/pytorch that fixes this issue didn't make it into PyTorch 2.0.1, and since it is unclear exactly which release will have it we'll just always apply the workaround so a crash doesn't occur regardless.
 2023-05-09 01:10:13 -04:00
AUTOMATIC
2b96a7b694 add links to wiki for filename pattern settings 
add extended info for quicksettings setting
 2023-05-08 16:46:35 +03:00
AUTOMATIC
5edb0acfeb use multiselect for quicksettings (this also resets the existing setting) 2023-05-08 15:38:25 +03:00
AUTOMATIC
fc966c0299 do not show licenses page when user selects Show all pages in settings 2023-05-08 15:30:32 +03:00
AUTOMATIC
eabea24eb8 put infotext options into their own category in settings tab 2023-05-08 15:26:23 +03:00
AUTOMATIC
ab4ab4e595 add version to infotext, footer and console output when starting 2023-05-08 15:23:49 +03:00
brkirch
7aab389d6f Fix for Unet NaNs 2023-05-08 08:16:56 -04:00
AUTOMATIC
505a10ad92 use file modification time instead of current time for #9760 2023-05-08 15:09:20 +03:00
AUTOMATIC1111
879ed5422c
Merge pull request #9760 from Sakura-Luna/refresh 
Fix gallery not being refreshed correctly
 2023-05-08 15:06:02 +03:00
AUTOMATIC1111
b3a44385b1
Merge pull request #10025 from acncagua/Upscaler_initialization 
Initialize the upscalers
 2023-05-08 15:03:59 +03:00
AUTOMATIC
f62540b2d2 Revert "add mtime to served images in gallery to prevent cache from showing old images" 
This reverts commit 669b518cbd.
 2023-05-08 12:18:22 +03:00
AUTOMATIC
18fb2162a4 disable useless progress display when pasting infotext using the blur button 2023-05-08 12:17:36 +03:00
AUTOMATIC
083dc3c76a directory hiding for extra networks: dirs starting with . will hide their cards on extra network tabs unless specifically searched for 
create HTML for extra network pages only on demand
allow directories starting with . to still list their models for lora, checkpoints, etc
keep "search" filter for extra networks when user refreshes the page
 2023-05-08 11:33:45 +03:00
AUTOMATIC1111
855f83f92c
Merge pull request #10041 from AUTOMATIC1111/print-exception-#9219 
print PIL.UnidentifiedImageError
 2023-05-08 09:12:56 +03:00
AUTOMATIC
669b518cbd add mtime to served images in gallery to prevent cache from showing old images 2023-05-08 08:36:24 +03:00
AUTOMATIC1111
66428667c5
Merge pull request #10146 from missionfloyd/gamepad-option 
Fix gamepad navigation
 2023-05-08 08:09:12 +03:00
missionfloyd
99f3bf07d2 gamepad repeat option 2023-05-06 22:16:51 -06:00
missionfloyd
5cbc1c5d43
Fix spelling 2023-05-05 23:03:32 -06:00
missionfloyd
a46c23b10f Make gamepad navigation optional 2023-05-05 22:48:27 -06:00
w-e-w
cde0d642f3 add denoising strength filename pattern 2023-05-06 02:20:33 +09:00
Sakura-Luna
a3cdf9aaf8 Reopen image fix 2023-05-05 15:52:34 +08:00
Sakura-Luna
8bc4a3a2a8 Refresh fix 2023-05-04 15:59:42 +08:00
Sakura-Luna
91a15dca80 Use a new way to solve webpage refresh 2023-05-04 14:38:15 +08:00
Sakura-Luna
5c66fedb64 Revert "Fix gallery not being refreshed correctly" 
This reverts commit 2c24e09dfc.
 2023-05-04 14:08:22 +08:00
Sakura-Luna
35e5916af9 Revert "Add img2img refreshed correctly" 
This reverts commit 988dd02632.
 2023-05-04 14:08:21 +08:00
Sakura-Luna
29e13867bf Revert "Refresh bug fix" 
This reverts commit eff00413ae.
 2023-05-04 14:08:20 +08:00
Acncagua Slt
1bebb50da9
No double calls will be made 
Do not call load_upscalers in list_builtin_upscalers
 2023-05-04 11:59:22 +09:00
papuSpartan
f0efc8c211 not being cast properly every time, swap to ints 2023-05-03 21:10:31 -05:00
papuSpartan
e960781511 fix maximum downsampling option 2023-05-03 13:12:43 -05:00
papuSpartan
f08ae96115 resolve merge conflicts and swap to dev branch for now 2023-05-03 02:21:50 -05:00
w-e-w
14e55a3301 print PIL.UnidentifiedImageError 2023-05-03 14:28:59 +09:00
AUTOMATIC1111
4b6808f6ed
Merge pull request #9865 from catalpaaa/subpath-support 
add subpath support
 2023-05-02 11:01:27 +03:00
AUTOMATIC
4499bead4c Merge branch 'master' into dev 2023-05-02 09:25:47 +03:00
AUTOMATIC
5ab7f213be fix an error that prevents running webui on torch<2.0 without --disable-safe-unpickle 2023-05-02 09:20:35 +03:00
AUTOMATIC
b1717c0a48 do not load wait for shared.sd_model to load at startup 2023-05-02 09:08:00 +03:00
catalpaaa
9eb5b3e90f
Merge branch 'experimental' into subpath-support 2023-05-01 11:59:21 -07:00
AUTOMATIC
f15b7e52e3 Add a comment and partial fix for the issue when the inpaint UI is unresponsive after using it. 2023-05-01 13:47:46 +03:00
w-e-w
0d1ef296b9 checkpoint override enhancement 2023-05-01 05:22:53 +09:00
AUTOMATIC
c48ab36cb9 alternate restore progress button implementation 2023-04-29 22:16:54 +03:00
AUTOMATIC
bd9700405a Revert "Merge pull request #7595 from siutin/feature/restore-progress" 
This reverts commit 80987c36f9, reversing
changes made to 2e78e65a22.
 2023-04-29 22:15:20 +03:00
AUTOMATIC1111
15c4e78b44
Merge branch 'dev' into feature/restore-progress 2023-04-29 22:13:40 +03:00
AUTOMATIC1111
0d32cb2cf5
Merge branch 'dev' into master 2023-04-29 20:29:23 +03:00
AUTOMATIC
90e4659822 bump gradio to 3.28.1 2023-04-29 20:28:30 +03:00
AUTOMATIC
e40b2d947d change gradio callback from change to release in a bunch of places now that it's fixed in gradio 2023-04-29 19:39:22 +03:00
AUTOMATIC
a95dc02535 remove unwanted changes from #8789 2023-04-29 19:05:43 +03:00
AUTOMATIC1111
f96e6fbd0c
Merge pull request #8789 from Rucadi/master 
Add polling and reload callback for extensions.
 2023-04-29 19:03:10 +03:00
AUTOMATIC1111
0e0e70c273
Merge pull request #8924 from kurilee/master 
Add option "keep original size" to textual inversion images preprocess
 2023-04-29 18:51:12 +03:00
AUTOMATIC1111
b615a2ed11
Merge pull request #9108 from AUTOMATIC1111/img2img-scale-by 
add "resize by" and "resize to" tabs to img2img
 2023-04-29 18:21:28 +03:00
AUTOMATIC1111
eabecc21ec
Update modules/ui.py 
Co-authored-by: missionfloyd <missionfloyd@users.noreply.github.com>
 2023-04-29 18:20:11 +03:00
AUTOMATIC
1a50272e7c revert some questionable changes from #9159 2023-04-29 17:45:22 +03:00
AUTOMATIC1111
88c7debb02
Merge branch 'dev' into ui-config-tabs 2023-04-29 17:42:57 +03:00
AUTOMATIC1111
78d0ee3bba
Merge branch 'dev' into extension-settings-backup 2023-04-29 17:22:24 +03:00
AUTOMATIC1111
8987764395
Merge pull request #9312 from space-nuko/save-merge-recipe 
Embed model merge metadata in .safetensors file
 2023-04-29 17:15:01 +03:00
AUTOMATIC1111
3894609b52
Merge branch 'dev' into master 2023-04-29 17:02:14 +03:00
AUTOMATIC1111
17cce45613
Merge pull request #8948 from hitomi/master 
Fix --realesrgan-models-path and --ldsr-models-path not working
 2023-04-29 17:00:24 +03:00
AUTOMATIC1111
f2af6dad71
Merge pull request #9351 from nart4hire/fix-ngrok-recreate-tunnel 
Fix Ngrok recreating tunnels every reload
 2023-04-29 16:56:20 +03:00
AUTOMATIC1111
78b5bed374
Merge pull request #9407 from GoulartNogueira/master 
Fix orientation bug on preprocess
 2023-04-29 16:53:17 +03:00
AUTOMATIC1111
1142a87c6a
Merge pull request #9219 from Z-nonymous/master 
Fix #9185
 2023-04-29 16:52:39 +03:00
AUTOMATIC1111
263f0fb59c
Merge branch 'dev' into remove-watermark-option 2023-04-29 16:50:52 +03:00
AUTOMATIC
faff08f396 rework [batch_number]/[generation_number] filename patterns 2023-04-29 16:48:43 +03:00
AUTOMATIC1111
e7d624574d
Merge branch 'dev' into master 2023-04-29 16:41:01 +03:00
AUTOMATIC
7428fb5176 add is_hr_pass field for processing 2023-04-29 16:28:51 +03:00
AUTOMATIC1111
e10ee96272
Merge pull request #9334 from gmasil/prepare-simpler-docker-integration-for-styles-csv 
allow styles.csv to be symlinked or mounted in docker
 2023-04-29 16:14:55 +03:00
AUTOMATIC
8863b31d83 use correct images for previews when using AND (see #9491) 2023-04-29 16:06:20 +03:00
AUTOMATIC
737b73a820 some extra lines I forgot to add for previous commit 2023-04-29 16:05:20 +03:00
AUTOMATIC
1d11e89698 rework Negative Guidance minimum sigma to work with AND, add infotext and copypaste parameters support 2023-04-29 15:57:09 +03:00
AUTOMATIC1111
3591eefedf
Merge pull request #9177 from devNegative-asm/master 
(Optimization) Option to remove negative conditioning at low sigma values
 2023-04-29 14:38:25 +03:00
AUTOMATIC1111
fdac486835
Merge pull request #9484 from infinitewarp/sort-embeddings 
sort embeddings by name (case insensitive)
 2023-04-29 14:03:02 +03:00
AUTOMATIC
cb940a583d fix extension installation broken by #9518 2023-04-29 13:45:14 +03:00
AUTOMATIC1111
32c3b97669
Merge pull request #9628 from catboxanon/patch/9092 
Fix image mask/composite for weird resolutions
 2023-04-29 13:21:32 +03:00
AUTOMATIC1111
87535fcf29
Merge branch 'dev' into Branch_AddNewFilenameGen 2023-04-29 13:10:46 +03:00
AUTOMATIC1111
d6a3988b86
Merge pull request #9669 from catboxanon/patch/sampler-schedule-fix 
Fix prompt schedule for second order samplers
 2023-04-29 12:56:57 +03:00
AUTOMATIC1111
fc6eeda69c
Merge pull request #9130 from Vespinian/fix-api-alwayson_scripts-less-then-requiered-args 
[Fix] Prevent alwayson_scripts args param resizing script_arg list when they are inserted in it
 2023-04-29 12:55:19 +03:00
AUTOMATIC
b06205eaf6 Allow user input for gradio theme selection 2023-04-29 12:52:09 +03:00
AUTOMATIC1111
e6cbfcfe5b
Merge branch 'dev' into gradio-theme-support 2023-04-29 12:45:43 +03:00
AUTOMATIC1111
2c935d8eb0
Merge pull request #9518 from yike5460/master 
add branch support for extension installation
 2023-04-29 12:41:30 +03:00
AUTOMATIC
ee71eee181 stuff related to torch version change 2023-04-29 12:36:50 +03:00
AUTOMATIC1111
e55cb92067
Merge pull request #9737 from AdjointOperator/master 
add tiled inference support for ScuNET
 2023-04-29 11:34:35 +03:00
AUTOMATIC
5fe0dd79be rename CPU RNG to RNG source in settings, add infotext and parameters copypaste support to RNG source 2023-04-29 11:29:37 +03:00
AUTOMATIC1111
cb9571e37f
Merge pull request #9734 from deciare/cpu-randn 
Option to make images generated from a given manual seed consistent across CUDA and MPS devices
 2023-04-29 11:16:06 +03:00
AUTOMATIC1111
dda839f686
Merge pull request #9693 from racinmat/hidable_buttons 
adds label to buttons to make them hide
 2023-04-29 11:05:51 +03:00
AUTOMATIC1111
1f6aabbd55
Merge pull request #9839 from dennissheng/master 
fix ui img2img scripts
 2023-04-29 10:26:47 +03:00
AUTOMATIC1111
5b4bcea956
Merge pull request #9757 from missionfloyd/editattention-selectcurrentword 
Automatically select current word when adjusting weight with ctrl+up/down
 2023-04-29 10:05:37 +03:00
AUTOMATIC
642d96dcc8 use exist_ok=True instead of checking if directory exists 2023-04-29 10:04:01 +03:00
AUTOMATIC1111
39654cc905
Merge pull request #9867 from darnell8/master 
Fix CLIP FileExistsError
 2023-04-29 10:03:07 +03:00
AUTOMATIC1111
b0f55d374e
Merge pull request #9429 from forsurefr/save-init-images 
Add support for saving init images in img2img
 2023-04-29 10:01:33 +03:00
AUTOMATIC1111
cf5bd93200
Merge pull request #9657 from Filexor/master 
Add filename pattern for CLIP_stop_at_last_layers (clip skip).
 2023-04-29 09:43:43 +03:00
AUTOMATIC
1514add559 remove unneded imports and type signature 2023-04-29 09:42:49 +03:00
AUTOMATIC1111
37c59c2710
Merge pull request #9723 from missionfloyd/extra-network-none 
Add "None" option to extra networks dropdowns
 2023-04-29 09:42:07 +03:00
AUTOMATIC1111
a33d49cc57
Merge branch 'dev' into fix_batch_processing 2023-04-29 09:30:33 +03:00
AUTOMATIC
5a666f3904 bump gradio to 3.27 2023-04-29 09:21:31 +03:00
AUTOMATIC
101a18fc84 bump gradio to 3.27 2023-04-29 09:17:35 +03:00
Garrett Sutula
aac478cb9d Should be "utils" 2023-04-27 21:40:16 -04:00
Garrett Sutula
ed46abea35 fix for method moved to gradio_client 2023-04-27 21:30:55 -04:00
Garrett Sutula
d1e62b2961 Improve param semantics, 2023-04-27 21:30:19 -04:00
Garrett Sutula
43186ad084 Add tls_verify arg for use with self-signed certs 2023-04-27 20:29:21 -04:00
darnell8
bb426de1cd Fix CLIP FileExistsError 2023-04-25 22:53:06 +08:00
catalpaaa
b2f6e0704e add subpath support 2023-04-25 07:27:24 -07:00
missionfloyd
0e071ae504 Custom delimiters 2023-04-25 08:08:57 -06:00
dennissheng
bbc7a778d8 fix ui img2img scripts 2023-04-24 17:36:16 +08:00
Sakura-Luna
eff00413ae Refresh bug fix 2023-04-21 12:34:38 +08:00
Sakura-Luna
988dd02632 Add img2img refreshed correctly 2023-04-20 15:09:19 +08:00
Sakura-Luna
2c24e09dfc Fix gallery not being refreshed correctly 2023-04-20 14:53:37 +08:00
AdjointOperator
dec5cdd9b8
add tiled inference support for ScuNET 2023-04-19 15:35:50 +08:00
Deciare
d40e44ade4 Option to use CPU for random number generation. 
Makes a given manual seed generate the same images across different
platforms, independently of the GPU architecture in use.

Fixes #9613.
 2023-04-18 23:27:46 -04:00
missionfloyd
f4b332f041 Add "None" option to extra networks dropdowns 2023-04-18 17:01:46 -06:00
Matěj Račinský
eddcdb8061 adds label to buttons to make them hide 2023-04-17 23:48:28 +02:00
siutin
3e5b3c79e4 replace with #wrap_session_call 2023-04-17 13:53:41 +08:00
catboxanon
9de7298898
Update processing.py 2023-04-16 21:06:37 -04:00
catboxanon
234fa9a57d
Update shared.py 2023-04-16 21:06:22 -04:00
catboxanon
4d0c816303
Modify step multiplier flow 2023-04-16 20:39:45 -04:00
catboxanon
81b276a1ea
Add second order samplers compat option 2023-04-16 20:39:18 -04:00
catboxanon
56f8a6b081
Fix sampler schedules with step multiplier 2023-04-16 20:34:52 -04:00
siutin
984970068c multi users support 2023-04-17 01:06:28 +08:00
File_xor
acbec22554 Add self argument that is mandatory to [clip_skip] filename pattern. 2023-04-16 17:14:11 +09:00
File_xor
596556162e Add filename pattern for CLIP_stop_at_last_layers. 2023-04-16 16:49:21 +09:00
tqwuliao
02e3518807 Add new FilenameGenerator [hasprompt<prompt1|default><prompt2>..] 2023-04-15 23:20:08 +08:00
catboxanon
fbab3fc6d1
Only handle image mask if any option enabled 2023-04-14 17:24:55 -04:00
catboxanon
3af152d488
Fix image mask composite for weird resolutions 2023-04-14 17:17:14 -04:00
Brad Smith
dab5002c59
sort self.word_embeddings without instantiating it a new dict 2023-04-13 23:19:10 -04:00
papuSpartan
dff60e2e74
Update sd_models.py 2023-04-10 04:10:50 -05:00
papuSpartan
a9902ca331
Update generation_parameters_copypaste.py 2023-04-10 04:03:01 -05:00
papuSpartan
c510cfd24b
Update shared.py 
fix typo
 2023-04-10 03:43:56 -05:00
papuSpartan
1c11062603 add token merging options to infotext when necessary. Bump tomesd 
version
 2023-04-10 03:41:05 -05:00
yike5460
7c62bb2788 fix: support for default branch 2023-04-10 09:38:26 +08:00
Ilya Khadykin
c19618f370 fix(extras): fix batch image processing on 'Extras\Batch Process' tab 
This change fixes an issue where an incorrect type was passed to the PIL.Image.open() function that caused the whole process to fail.

Scope of this change is limited to only batch image processing, and it shouldn't affect other functionality.
 2023-04-09 21:33:09 +02:00
yike5460
1aba8d82cb feat: add branch support for extension installation 2023-04-09 22:22:43 +08:00
Brad Smith
27b9ec60e4
sort embeddings by name (case insensitive) 2023-04-08 15:58:00 -04:00
gk
d609f6030e Add [batch_number] and [generation_number] filename patterns 2023-04-07 21:04:46 +09:00
forsurefr
63a6f9b4d9
Do not save init image by default 2023-04-07 12:13:51 +03:00
For Sure
b3593d0997 Add support for saving init images in img2img 2023-04-06 19:42:26 +03:00
Andre Ubuntu
48c06af8dc Pythonic way to achieve it 2023-04-05 20:51:29 -03:00
Andre Ubuntu
52a8f286ef fix preprocess orientation 2023-04-05 20:28:00 -03:00
hitomi
539a69860b fix --realesrgan-models-path not working 2023-04-04 20:39:51 +08:00
Nathanael Santoso
3158d17ccf fixed an issue with using ngrok for other connections and also ngrok not using auth_token 2023-04-04 07:41:55 +00:00
papuSpartan
cf5a5773bf :p 2023-04-04 02:39:13 -05:00
papuSpartan
5c8e53d5e9 Allow different merge ratios to be used for each pass. Make toggle cmd flag work again. Remove ratio flag. Remove warning about controlnet being incompatible 2023-04-04 02:26:44 -05:00
Nathanael Santoso
2edf73b38f Improved message clarity 2023-04-04 06:57:39 +00:00
Nathanael Santoso
5ebe3b2504 Added guard clause to prevent multiple tunnel creations 2023-04-04 06:50:29 +00:00
space-nuko
7201d940a4 Improve frontend responsiveness for some buttons 2023-04-03 21:27:48 -05:00
gmasil
f7215906af
allow styles.csv to be symlinked or mounted in docker without moving the file around 2023-04-03 18:19:57 +02:00
space-nuko
fbaf6e4fd8 Namespace metadata fields 2023-04-02 21:41:23 -05:00
Pluventi
9a4e650800 Update postprocessing.py 
Solution for anyone getting an error when batching on extras, even with a clean install of "stable diffusion webui"
 2023-04-03 03:32:48 +02:00
space-nuko
7c016dd642 Calculate shorthash on merge if not exist 2023-04-02 19:06:39 -05:00
space-nuko
afc349c2c0 Add field for model merge type 
Incase this is supported by other merge extensions
 2023-04-02 18:40:33 -05:00
space-nuko
d132481058 Embed model merge metadata in .safetensors file 2023-04-02 17:41:55 -05:00
papuSpartan
c707b7df95 remove excess condition 2023-04-01 23:47:10 -05:00
papuSpartan
a609bd56b4 Transition to using settings through UI instead of cmd line args. Added feature to only apply to hr-fix. Install package using requirements_versions.txt 2023-04-01 22:18:35 -05:00
papuSpartan
8c88bf4006 use pypi package for tomesd intead of manually cloning repo 2023-04-01 14:12:12 -05:00
papuSpartan
26ab018253 delay import 2023-04-01 03:31:22 -05:00
papuSpartan
ef8c044051 forgot to add reinstall arg back earlier since args moved out of shared 2023-04-01 03:21:23 -05:00
papuSpartan
56680cd84a first 2023-04-01 02:07:08 -05:00
Z_nonymous
18e4ca4694 Fix #9185 2023-03-31 10:54:42 +02:00
siutin
70ab21e67d keep randomId simpler 2023-03-30 17:20:09 +08:00
siutin
90366b8d85 tool button 2023-03-30 17:20:09 +08:00
siutin
e0b58527ff use condition to wait for result 2023-03-30 17:20:09 +08:00
siutin
4242e194e4 add a button to restore the current progress 2023-03-30 17:20:09 +08:00
siutin
9407f1731a store the last generated result 2023-03-30 17:20:09 +08:00
siutin
dbca512154 add an internal API for obtaining current task id 2023-03-30 17:20:09 +08:00
devdn
44e8e9c368 fix live preview & alternate uncond guidance for better quality 2023-03-30 00:54:28 -04:00
space-nuko
3ccf6f5ae8 Add webui link 2023-03-29 19:26:52 -05:00
space-nuko
1c0544abdb Add links for commits in table, if remote is from GitHub 2023-03-29 19:21:57 -05:00
space-nuko
64bbd3bf03 Make into divs 2023-03-29 19:00:51 -05:00
space-nuko
9b1fa82981 Add filename to UI and config name to filename 2023-03-29 18:55:57 -05:00
space-nuko
f3320b802c Various UI fixes in config state tab 2023-03-29 18:35:25 -05:00
space-nuko
f22d0dde4e Better checking of extension state from Git info 2023-03-29 18:32:29 -05:00
space-nuko
ad5afcaae0 Save/restore working webui/extension configs 2023-03-29 16:55:33 -05:00
space-nuko
67955ca9e5 Make selected tab configurable with UI config 2023-03-29 13:07:12 -05:00
AUTOMATIC
22bcc7be42 attempted fix for infinite loading for settings that some people experience 2023-03-29 08:58:29 +03:00
Vespinian
70a0a11783 Changed behavior that puts the args from alwayson_script request in the script_args, so don't accidently resize the arg list if we get less arg then or default list has 2023-03-28 23:52:51 -04:00
devdn
bc90592031 increase range of negative guidance minimum sigma option 2023-03-28 20:59:31 -04:00
devdn
42082e8a32 performance increase 2023-03-28 20:56:01 -04:00
AUTOMATIC
d667fc435f add "resize by" and "resize to" tabs to img2img 2023-03-28 22:23:40 +03:00
AUTOMATIC
3856ada5cc do not add mask blur to infotext if there is no mask 2023-03-28 22:20:31 +03:00
AUTOMATIC
433b3ab701 Revert "Merge pull request #7931 from space-nuko/img2img-enhance" 
This reverts commit 4268759370, reversing
changes made to 1b63afbedc.
 2023-03-28 20:36:57 +03:00
AUTOMATIC1111
4268759370
Merge pull request #7931 from space-nuko/img2img-enhance 
Add `Upscale by` and `Upscaler` options to img2img
 2023-03-28 20:21:25 +03:00
AUTOMATIC
1b63afbedc sort hypernetworks and checkpoints by name 2023-03-28 20:03:57 +03:00
AUTOMATIC1111
daa5a83bb7
Merge pull request #9052 from space-nuko/temp-disable-extensions 
Temporary disable extensions option
 2023-03-28 19:42:09 +03:00
AUTOMATIC1111
f1db987e6a
Merge pull request #8958 from MrCheeze/variations-model 
Add support for the unclip (Variations) models, unclip-h and unclip-l
 2023-03-28 19:39:20 +03:00
space-nuko
4414d36bf6
Merge branch 'master' into img2img-enhance 2023-03-28 10:59:12 -04:00
space-nuko
082613036a
Merge branch 'master' into remove-watermark-option 2023-03-27 16:26:23 -05:00
space-nuko
fc8e1008ea Make disable configurable between builtin/extra extensions 2023-03-27 12:44:49 -04:00
space-nuko
2a4d3d2124 Add temporary "disable all extensions" option for debugging use 2023-03-27 12:04:45 -04:00
AUTOMATIC
77f9db3b08 serve css as independent files 2023-03-27 12:59:12 +03:00
AUTOMATIC
9e82896d5f remove an extra unneeded row in outputs 2023-03-27 10:20:01 +03:00
AUTOMATIC
5fcd4bfa3d do not read extensions' git stuff at startup 2023-03-27 10:02:30 +03:00
AUTOMATIC1111
c7daba71de
Merge pull request #8669 from Vespinian/fix-api-running-unwanted_scripts 
Fix for API running unwanted alwayson scripts
 2023-03-27 08:11:34 +03:00
AUTOMATIC1111
769def1e41
Merge pull request #8944 from SirFrags/extra_save_geninfo 
Transfer generation parameters to previews
 2023-03-27 08:06:54 +03:00
AUTOMATIC
a70ae917ea update button pressed down style for #8569 2023-03-27 08:05:55 +03:00
AUTOMATIC1111
a7d6fc3b42
Merge pull request #8569 from missionfloyd/extra-networks-toggle 
Make extra networks button togglable
 2023-03-27 07:35:39 +03:00
AUTOMATIC1111
c5e1efb4ca
Merge pull request #8525 from bluelovers/pr/sort-001 
feat: try sort as ignore-case
 2023-03-27 07:34:18 +03:00
AUTOMATIC
3d09b4e99f remove -y, bring back -f 2023-03-27 07:12:40 +03:00
AUTOMATIC
ff0d97c1e3 bring back -y 2023-03-27 07:11:39 +03:00
missionfloyd
8410b1351e
Merge branch 'AUTOMATIC1111:master' into extra-network-preview-lazyload 2023-03-26 21:50:22 -06:00
missionfloyd
efac2cf1ab Merge branch 'extra-network-preview-lazyload' of https://github.com/missionfloyd/stable-diffusion-webui into extra-network-preview-lazyload 2023-03-26 21:47:05 -06:00
AUTOMATIC1111
3b5a3fab91
Merge pull request #8943 from space-nuko/fix-accordion-padding 
Fix padding on accordion/dropdown list elements
 2023-03-27 06:45:39 +03:00
MrCheeze
1f08600345 overwrite xformers in the unclip model config if not available 2023-03-26 16:55:29 -04:00
AUTOMATIC
4c1ad743e3 for img2img, use None as upscaler instead of erroring out if the desired upscaler is not found 2023-03-26 11:01:32 +03:00
MrCheeze
8a34671fe9 Add support for the Variations models (unclip-h and unclip-l) 2023-03-25 21:03:07 -04:00
bluelovers
d64ff4248b remove changes in textual_inversion.py 2023-03-26 06:15:09 +08:00
missionfloyd
6f18c9b13f
Merge branch 'master' into extra-networks-toggle 2023-03-25 14:51:25 -06:00
space-nuko
c9647c8d23 Support Gradio's theme API 2023-03-25 16:11:41 -04:00
SirFrags
abc4d3a693
preview replace save params 2023-03-25 15:59:50 -04:00
space-nuko
d3b188c82d Fix padding on accordion/dropdown list elements 2023-03-25 15:52:06 -04:00
space-nuko
c5f9f7c237 Use .success() callback on img2img preview inputs change 2023-03-25 14:26:36 -04:00
Vespinian
23f6dfce4c Reworked this PR, now we have 2 default arg list (one for each tab) that will be initialized on the first api request and then reused afterwards. The init_script_args copies the corresponding default list and applies the modifications asked by the api request. 2023-03-25 14:16:35 -04:00
Vespinian
f371579571 Revert "Made copies of global scriptrunners, now we clear the copied scriptrunner of alwayson_scripts and only add back the ones that that were requested" 
This reverts commit dfa258de5f.
 2023-03-25 14:11:46 -04:00
Vespinian
db602b100e Revert "Comment fix" 
This reverts commit f04bd037a5.
 2023-03-25 14:11:38 -04:00
space-nuko
7ea5d395c4 Add upscaler to img2img 2023-03-25 12:52:43 -04:00
space-nuko
68999d0b15 Add upscale slider to img2img 2023-03-25 12:52:35 -04:00
pieresimakp
fb72066ef6 fixed button position 2023-03-25 23:03:22 +08:00
pieresimakp
e3b9d0e3e8 Merge branch 'master' into img2img-detect-image-size 2023-03-25 23:00:45 +08:00
kurilee
993c11549c
Merge branch 'AUTOMATIC1111:master' into master 2023-03-25 22:47:05 +08:00
kurilee
b2fc7dba2e Add option "keep original size" to textual inversion images preprocess 2023-03-25 22:45:41 +08:00
AUTOMATIC
69eb2a9ee8 add missing extensions_dir, extensions_builtin_dir to extensions.py 2023-03-25 17:39:53 +03:00
AUTOMATIC1111
9b2dcb04bc
Merge branch 'master' into master 2023-03-25 16:15:29 +03:00
AUTOMATIC
8c801362b4 split commandline args into its own file 
make launch.py use the same command line argument parser as the main program
 2023-03-25 16:05:25 +03:00
Andrey
3ec7e19f2b Split history: mv temp modules/shared.py 2023-03-25 14:30:50 +03:00
Andrey
a5cef4932f Split history: mv modules/shared.py modules/cmd_args.py 2023-03-25 14:30:49 +03:00
AUTOMATIC1111
6b00d876f7
Merge pull request #7936 from EllangoK/master 
Custom height and width settings for Extra Networks cards
 2023-03-25 13:01:49 +03:00
AUTOMATIC1111
a03536f213
Merge pull request #8662 from vladmandic/api-handler 
api error handler
 2023-03-25 12:47:32 +03:00
AUTOMATIC
616cc13b6b update overflow-wrap: break-word; for gradio 3.23 2023-03-25 12:43:14 +03:00
Karun
63a2f8d822
Merge branch 'master' into master 2023-03-25 05:12:55 -04:00
AUTOMATIC1111
8dbe793af5
Merge branch 'master' into extra-network-info 2023-03-25 12:08:24 +03:00
AUTOMATIC1111
956ed9a737
Merge pull request #8780 from Brawlence/master 
Unload and re-load checkpoint to VRAM on request (API & Manual)
 2023-03-25 12:03:26 +03:00
AUTOMATIC1111
8d2c582e3e
Merge pull request #8797 from ArrowM/master 
Move `load_file_from_url` import
 2023-03-25 11:34:07 +03:00
AUTOMATIC1111
c0a7ff8055
Merge pull request #8803 from mlhub-action/fix_scripts_load_order 
Fix scripts load order
 2023-03-25 11:23:41 +03:00
AUTOMATIC1111
90410e212f
Merge pull request #8814 from catboxanon/inpaint-mask 
Add ability to display and/or save inpainting mask and masked composite
 2023-03-25 11:21:45 +03:00
AUTOMATIC1111
e8bbc344c3
Merge pull request #8824 from zimkjh/fix-variable-typo 
fix variable typo
 2023-03-25 11:04:46 +03:00
AUTOMATIC1111
9d2551d593
Merge pull request #8647 from Tps-F/add_submodule 
Support git submodule for extension and Fix Windows PermissionError
 2023-03-25 11:02:41 +03:00
AUTOMATIC
9ed04e759d use HTTP request to fetch metadata for Lora cards instead of including it into the main page 2023-03-25 10:11:04 +03:00
AUTOMATIC1111
724a63714d
Merge pull request #8878 from butaixianran/master 
Fix None type error for TI module
 2023-03-25 09:20:43 +03:00
AUTOMATIC1111
89ea746f7c
Merge pull request #8866 from brkirch/mps-torch-2-0-nn-linear-workarounds 
Add PyTorch 2.0 support for macOS, fix image generation on macOS 13.2.X
 2023-03-25 09:17:09 +03:00
AUTOMATIC1111
03c8eefbcc
Merge pull request #8782 from FNSpd/master 
--upcast-sampling support for CUDA
 2023-03-25 09:10:01 +03:00
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