61788c0538
shift embedding logic out of textual_inversion
2022-10-11 19:50:50 +01:00
419e539fe3
Merge branch 'learning_rate-scheduling' into learnschedule
2022-10-11 21:50:19 +03:00
e5fbf5c755
remove embedding related image functions from images
2022-10-11 19:46:33 +01:00
c080f52cea
move embedding logic to separate file
2022-10-11 19:37:58 +01:00
6a9ea5b41c
prevent extra modules from being saved/loaded with hypernet
2022-10-11 19:22:30 +03:00
d4ea5f4d86
add an option to unload models during hypernetwork training to save VRAM
2022-10-11 19:03:08 +03:00
6d09b8d1df
produce error when training with medvram/lowvram enabled
2022-10-11 18:33:57 +03:00
ff4ef13dd5
removed unneeded print
2022-10-11 10:24:27 -05:00
d682444ecc
add option to select hypernetwork modules when creating
2022-10-11 18:04:47 +03:00
4f96ffd0b5
Merge pull request #2201 from alg-wiki/textual__inversion
...
Textual Inversion: Preprocess and Training will only pick-up image files instead
2022-10-11 17:25:36 +03:00
861db783c7
Use apply_hypernetwork function
2022-10-11 17:24:00 +03:00
574c8e554a
Add InvokeAI and lstein to credits, add back CUDA support
2022-10-11 17:24:00 +03:00
98fd5cde72
Add check for psutil
2022-10-11 17:24:00 +03:00
c0484f1b98
Add cross-attention optimization from InvokeAI
...
* Add cross-attention optimization from InvokeAI (~30% speed improvement on MPS)
* Add command line option for it
* Make it default when CUDA is unavailable
2022-10-11 17:24:00 +03:00
f7e86aa420
Merge pull request #2227 from papuSpartan/master
...
Refresh list of models/ckpts upon hitting restart gradio in the setti…
2022-10-11 17:15:19 +03:00
1eaad95533
Merge branch 'master' into embed-embeddings-in-images
2022-10-11 15:15:09 +01:00
66b7d7584f
become even stricter with pickles
...
no pickle shall pass
thank you again, RyotaK
2022-10-11 17:03:16 +03:00
d01a2d0156
move list refresh to webui.py and add stdout indicating it's doing so
2022-10-11 08:31:28 -05:00
a36dea9596
Merge branch 'master' into master
2022-10-11 21:03:41 +08:00
b0583be088
more renames
2022-10-11 15:54:34 +03:00
873efeed49
rename hypernetwork dir to hypernetworks to prevent clash with an old filename that people who use zip instead of git clone will have
2022-10-11 15:51:30 +03:00
a004d1a855
Added new line at the end of ngrok.py
2022-10-11 15:38:53 +03:00
5992564448
Cleaned ngrok integration
2022-10-11 15:38:53 +03:00
861297cefe
add a space holder
2022-10-11 15:37:04 +03:00
87b77cad5f
Layout fix
2022-10-11 15:37:04 +03:00
87d63bbab5
images history improvement
2022-10-11 20:37:03 +08:00
eacc03b167
Fix typo in comments
2022-10-11 15:36:29 +03:00
1eae307607
Remove debug code for checking that first sigma value is same after code cleanup
2022-10-11 15:36:29 +03:00
92d7a13885
Handle different parameters for DPM fast & adaptive
2022-10-11 15:36:29 +03:00
594ab4ba53
images history improvement
2022-10-11 20:23:41 +08:00
7b1db45e1f
images history improvement
2022-10-11 20:17:27 +08:00
530103b586
fixes related to merge
2022-10-11 14:53:02 +03:00
8bacbca0a1
Removed my local edits to checkpoint image generation
2022-10-11 17:35:09 +09:00
b2368a3bce
Switched to exception handling
2022-10-11 17:32:46 +09:00
5de806184f
Merge branch 'master' into hypernetwork-training
2022-10-11 11:14:36 +03:00
948533950c
replace duplicate code with a function
2022-10-11 11:10:17 +03:00
5e2627a1a6
Comma backtrack padding ( #2192 )
...
Comma backtrack padding
2022-10-11 09:55:28 +03:00
8617396c6d
Added slider for deepbooru score threshold in settings
2022-10-11 09:43:16 +03:00
8b7d3f1bef
Make the ctrl+enter shortcut use the generate button on the current tab
2022-10-11 09:32:03 +03:00
7aa8fcac1e
use simple lcg in xor
2022-10-11 04:17:36 +01:00
1add3cff84
Refresh list of models/ckpts upon hitting restart gradio in the settings pane
2022-10-10 19:57:43 -05:00
bb932dbf9f
added alpha sort and threshold variables to create process method in preprocessing
2022-10-10 18:37:52 -05:00
47f5e216da
Merge branch 'deepdanbooru_pre_process' into master
2022-10-10 18:10:49 -05:00
76ef3d75f6
added deepbooru settings (threshold and sort by alpha or likelyhood)
2022-10-10 18:01:49 -05:00
e0fbe6d27e
colour depth conversion fix
2022-10-10 23:26:24 +01:00
767202a4c3
add dependency
2022-10-10 23:20:52 +01:00
315d5a8ed9
update data dis[play style
2022-10-10 23:14:44 +01:00
b980e7188c
corrected tag return in get_deepbooru_tags
2022-10-10 16:52:54 -05:00
a1a05ad2d1
import time missing, added to deepbooru fixxing error on get_deepbooru_tags
2022-10-10 16:47:58 -05:00
907a88b2d0
Added .webp .bmp
2022-10-11 06:35:07 +09:00
2536ecbb17
Refactored learning rate code
2022-10-10 17:10:29 -04:00
f98338faa8
add an option to not add watermark to created images
2022-10-10 23:15:48 +03:00
f0ab972f85
Merge branch 'master' into textual__inversion
2022-10-11 03:35:28 +08:00
bc3e183b73
Textual Inversion: Preprocess and Training will only pick-up image files
2022-10-11 04:30:13 +09:00
1d64976dbc
Simplify crop logic
2022-10-10 12:04:21 -06:00
727e4d1086
no to different messages plus fix using != to compare to None
2022-10-10 20:46:55 +03:00
b3d3b335cf
Merge pull request #2131 from ssysm/upstream-master
...
Add VAE Path Arguments
2022-10-10 20:45:14 +03:00
39919c40dd
add eta noise seed delta option
2022-10-10 20:32:44 +03:00
af62ad4d25
change vae loading method
2022-10-10 13:25:28 -04:00
ed769977f0
add swinir v2 support
2022-10-10 19:54:57 +03:00
ece27fe989
Add files via upload
2022-10-10 19:54:57 +03:00
3e7a981194
remove functorch
2022-10-10 19:54:07 +03:00
623251ce2b
allow pascal onwards
2022-10-10 19:54:07 +03:00
9d33baba58
Always show previous mask and fix extras_send dest
2022-10-10 19:39:24 +03:00
d5c14365fd
Add back in output hidden states parameter
2022-10-10 18:54:48 +03:00
460bbae587
Pad beginning of textual inversion embedding
2022-10-10 18:54:48 +03:00
b340439586
Unlimited Token Works
...
Unlimited tokens actually work now. Works with textual inversion too. Replaces the previous not-so-much-working implementation.
2022-10-10 18:54:48 +03:00
f347ddfd80
Remove max_batch_count from ui.py
2022-10-10 18:53:40 +03:00
df6d0d9286
convert back to rgb as some hosts add alpha
2022-10-10 15:43:09 +01:00
707a431100
add pixel data footer
2022-10-10 15:34:49 +01:00
ce2d7f7eac
Merge branch 'master' into embed-embeddings-in-images
2022-10-10 15:13:48 +01:00
7a20f914ed
Custom Width and Height
2022-10-10 17:05:12 +03:00
6ad3a53e36
Fixed progress bar output for epoch
2022-10-10 17:05:12 +03:00
ea00c1624b
Textual Inversion: Added custom training image size and number of repeats per input image in a single epoch
2022-10-10 17:05:12 +03:00
8f1efdc130
--no-half-vae pt2
2022-10-10 17:03:45 +03:00
04c745ea4f
Custom Width and Height
2022-10-10 22:35:35 +09:00
7349088d32
--no-half-vae
2022-10-10 16:16:29 +03:00
1e18a5ffcc
Merge branch 'AUTOMATIC1111:master' into master
2022-10-10 20:21:25 +08:00
23f2989799
images history over
2022-10-10 18:33:49 +08:00
2f94331df2
removed change in last commit, simplified to adding the visible argument to process_caption_deepbooru and it set to False if deepdanbooru argument is not set
2022-10-10 03:34:00 -05:00
4ee7519fc2
Fixed progress bar output for epoch
2022-10-10 17:31:33 +09:00
8ec069e64d
removed duplicate run_preprocess.click by creating run_preprocess_inputs list and appending deepbooru variable to input list if in scope
2022-10-10 03:23:24 -05:00
3110f895b2
Textual Inversion: Added custom training image size and number of repeats per input image in a single epoch
2022-10-10 17:07:46 +09:00
8a7c07a214
show image history
2022-10-10 15:39:39 +08:00
8acc901ba3
Newer versions of PyTorch use TypedStorage instead
...
Pytorch 1.13 and later will rename _TypedStorage to TypedStorage, so check for TypedStorage and use _TypedStorage if it is not available. Currently this is needed so that nightly builds of PyTorch work correctly.
2022-10-10 08:04:52 +03:00
1f92336be7
refactored the deepbooru module to improve speed on running multiple interogations in a row. Added the option to generate deepbooru tags for textual inversion preproccessing.
2022-10-09 23:58:18 -05:00
6fdad291bd
Merge branch 'master' of https://github.com/AUTOMATIC1111/stable-diffusion-webui into upstream-master
2022-10-09 23:20:39 -04:00
cc92dc1f8d
add vae path args
2022-10-09 23:17:29 -04:00
6435691bb1
Add "Scale to" option to Extras
2022-10-09 19:26:52 -06:00
4117afff11
Merge branch 'master' into embed-embeddings-in-images
2022-10-10 00:38:54 +01:00
e2c2925eb4
remove braces from steps
2022-10-10 00:12:53 +01:00
d6a599ef9b
change caption method
2022-10-10 00:07:52 +01:00
0ac3a07eec
add caption image with overlay
2022-10-10 00:05:36 +01:00
01fd9cf0d2
change source of step count
2022-10-09 22:17:02 +01:00
96f1e6be59
source checkpoint hash from current checkpoint
2022-10-09 22:14:50 +01:00
6684610510
correct case on embeddingFromB64
2022-10-09 22:06:42 +01:00
d0184b8f76
change json tensor key name
2022-10-09 22:06:12 +01:00
5d12ec82d3
add encoder and decoder classes
2022-10-09 22:05:09 +01:00
969bd8256e
add alternate checkpoint hash source
2022-10-09 22:02:28 +01:00
03694e1f99
add embedding load and save from b64 json
2022-10-09 21:58:14 +01:00
a65476718f
add DoubleStorage to list of allowed classes for pickle
2022-10-09 23:38:49 +03:00
fa0c5eb81b
Add pretty image captioning functions
2022-10-09 20:41:22 +01:00
8d340cfb88
do not add clip skip to parameters if it's 1 or 0
2022-10-09 22:31:35 +03:00
1824e9ee3a
Removed unnecessary tmp variable
2022-10-09 22:31:23 +03:00
ad3ae44108
Updated code for legibility
2022-10-09 22:31:23 +03:00
ec2bd9be75
Fix issues with CLIP ignore option name change
2022-10-09 22:31:23 +03:00
a14f7bf113
Corrected CLIP Layer Ignore description and updated its range to the max possible
2022-10-09 22:31:23 +03:00
e59c66c008
Optimized code for Ignoring last CLIP layers
2022-10-09 22:31:23 +03:00
6c383d2e82
show model selection setting on top of page
2022-10-09 22:24:07 +03:00
9ecea0a8d6
fix missing png info when Extras Batch Process
2022-10-09 18:35:25 +03:00
875ddfeecf
added guard for torch.load to prevent loading pickles with unknown content
2022-10-09 17:58:43 +03:00
53154ba10a
Merge branch 'master' into esrgan_mod
2022-10-09 14:11:22 +02:00
9d1138e294
fix typo in filename for ESRGAN arch
2022-10-09 15:08:27 +03:00
e6e8cabe0c
change up #2056 to make it work how i want it to plus make xy plot write correct values to images
2022-10-09 14:57:48 +03:00
594cbfd8fb
Sanitize infotext output (for now)
2022-10-09 14:49:15 +03:00
006791c13d
Fix grabbing the model name for infotext
2022-10-09 14:49:15 +03:00
d6d10a37bf
Added extended model details to infotext
2022-10-09 14:49:15 +03:00
542a3d3a4a
fix btoken hypernetworks in XY plot
2022-10-09 14:33:22 +03:00
ad4de819c4
update ESRGAN architecture and model to support all ESRGAN models in the DB, BSRGAN and real-ESRGAN models
2022-10-09 13:07:50 +02:00
77a719648d
fix logic error in #1832
2022-10-09 13:48:04 +03:00
f4578b343d
fix model switching not working properly if there is a different yaml config
2022-10-09 13:23:30 +03:00
bd833409ac
additional changes for saving pnginfo for #1803
2022-10-09 13:10:15 +03:00
0609ce06c0
Removed duplicate definition model_path
2022-10-09 12:46:07 +03:00
6f6798ddab
prevent a possible code execution error (thanks, RyotaK)
2022-10-09 12:33:37 +03:00
0241d811d2
Revert "Fix for Prompts_from_file showing extra textbox."
...
This reverts commit e2930f9821
2022-10-09 12:04:44 +03:00
ab4fe4f44c
hide filenames for save button by default
2022-10-09 11:59:41 +03:00
cbf6dad02d
Handle case where on_show returns the wrong number of arguments
2022-10-09 11:16:38 +03:00
86cb16886f
Pull Request Code Review Fixes
2022-10-09 11:16:38 +03:00
e2930f9821
Fix for Prompts_from_file showing extra textbox.
2022-10-09 11:16:38 +03:00
1ffeb42d38
Fix typo
2022-10-09 11:10:13 +03:00
ef93acdc73
remove line break
2022-10-09 11:09:17 +03:00
03e570886f
Fix incorrect sampler name in output
2022-10-09 11:09:17 +03:00
122d42687b
Fix VRAM Issue by only loading in hypernetwork when selected in settings
2022-10-09 11:08:11 +03:00
e00b4df7c6
Merge pull request #1752 from Greendayle/dev/deepdanbooru
...
Added DeepDanbooru interrogator
2022-10-09 10:52:21 +03:00
14192c5b20
Support `Download` for txt files.
2022-10-09 10:49:11 +03:00
5ab7e88d9b
Add `Download` & `Download as zip`
2022-10-09 10:49:11 +03:00
4e569fd888
fixed incorrect message about loading config; thanks anon!
2022-10-09 10:31:47 +03:00
c77c89cc83
make main model loading and model merger use the same code
2022-10-09 10:23:31 +03:00
cd8673bd9b
add embed embedding to ui
2022-10-09 05:40:57 +01:00
5841990b0d
Update textual_inversion.py
2022-10-09 05:38:38 +01:00
050a6a798c
support loading .yaml config with same name as model
...
support EMA weights in processing (????)
2022-10-08 23:26:48 +03:00
432782163a
chore: Fix typos
2022-10-08 22:42:30 +03:00
610a7f4e14
Break after finding the local directory of stable diffusion
...
Otherwise, we may override it with one of the next two path (. or ..) if it is present there, and then the local paths of other modules (taming transformers, codeformers, etc.) wont be found in sd_path/../.
Fix https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/1085
2022-10-08 22:35:04 +03:00
3b2141c5fb
add 'Ignore last layers of CLIP model' option as a parameter to the infotext
2022-10-08 22:21:15 +03:00
e6e42f98df
make --force-enable-xformers work without needing --xformers
2022-10-08 22:12:23 +03:00
1371d7608b
Added ability to ignore last n layers in FrozenCLIPEmbedder
2022-10-08 22:10:37 +03:00
b458fa48fe
Update ui.py
2022-10-08 20:38:35 +03:00
15c4278f1a
TI preprocess wording
...
I had to check the code to work out what splitting was 🤷🏿
2022-10-08 20:38:35 +03:00
0ec80f0125
Merge branch 'master' into dev/deepdanbooru
2022-10-08 18:28:22 +02:00
3061cdb7b6
add --force-enable-xformers option and also add messages to console regarding cross attention optimizations
2022-10-08 19:22:15 +03:00
f9c5da1592
add fallback for xformers_attnblock_forward
2022-10-08 19:05:19 +03:00
01f8cb4447
made deepdanbooru optional, added to readme, automatic download of deepbooru model
2022-10-08 18:02:56 +02:00
a5550f0213
alternate prompt
2022-10-08 18:12:19 +03:00
cc0258aea7
check for ampere without destroying the optimizations. again.
2022-10-08 17:54:16 +03:00
017b6b8744
check for ampere
2022-10-08 17:54:16 +03:00
5329d0aba0
Merge branch 'master' into dev/deepdanbooru
2022-10-08 16:30:28 +02:00
cfc33f99d4
why did you do this
2022-10-08 17:29:06 +03:00
2e8ba0fa47
fix conflicts
2022-10-08 16:27:48 +02:00
4f33289d0f
Fixed typo
2022-10-08 17:15:30 +03:00
27032c47df
restore old opt_split_attention/disable_opt_split_attention logic
2022-10-08 17:10:05 +03:00
dc1117233e
simplify xfrmers options: --xformers to enable and that's it
2022-10-08 17:02:18 +03:00
7ff1170a2e
emergency fix for xformers (continue + shared)
2022-10-08 16:33:39 +03:00
48feae37ff
Merge pull request #1851 from C43H66N12O12S2/flash
...
xformers attention
2022-10-08 16:29:59 +03:00
970de9ee68
Update sd_hijack.py
2022-10-08 16:29:43 +03:00
69d0053583
update sd_hijack_opt to respect new env variables
2022-10-08 16:21:40 +03:00
ddfa9a9786
add xformers_available shared variable
2022-10-08 16:20:41 +03:00
26b459a379
default to split attention if cuda is available and xformers is not
2022-10-08 16:20:04 +03:00
5f85a74b00
fix bug where when using prompt composition, hijack_comments generated before the final AND will be dropped
2022-10-08 15:48:04 +03:00
772db721a5
fix glob path in hypernetwork.py
2022-10-08 15:46:54 +03:00
7001bffe02
fix AND broken for long prompts
2022-10-08 15:43:25 +03:00
77f4237d1c
fix bugs related to variable prompt lengths
2022-10-08 15:25:59 +03:00
4999eb2ef9
do not let user choose his own prompt token count limit
2022-10-08 14:25:47 +03:00
00117a07ef
check specifically for skipped
2022-10-08 13:40:39 +03:00
786d9f63aa
Add button to skip the current iteration
2022-10-08 13:40:39 +03:00
45cc0ce3c4
Merge remote-tracking branch 'origin/master'
2022-10-08 13:39:08 +03:00
706d5944a0
let user choose his own prompt token count limit
2022-10-08 13:38:57 +03:00
616b7218f7
fix: handles when state_dict does not exist
2022-10-08 12:38:50 +03:00
91d66f5520
use new attnblock for xformers path
2022-10-08 11:56:01 +03:00
76a616fa6b
Update sd_hijack_optimizations.py
2022-10-08 11:55:38 +03:00
5d54f35c58
add xformers attnblock and hypernetwork support
2022-10-08 11:55:02 +03:00
f2055cb1d4
Add hypernetwork support to split cross attention v1
...
* Add hypernetwork support to split_cross_attention_forward_v1
* Fix device check in esrgan_model.py to use devices.device_esrgan instead of shared.device
2022-10-08 09:39:17 +03:00
b70eaeb200
delete broken and unnecessary aliases
2022-10-08 04:10:35 +03:00
c9cc65b201
switch to the proper way of calling xformers
2022-10-08 04:09:18 +03:00
12c4d5c6b5
hypernetwork training mk1
2022-10-07 23:22:22 +03:00
5f12e7efd9
linux test
2022-10-07 20:58:30 +02:00
fa2ea648db
even more powerfull fix
2022-10-07 20:46:38 +02:00
54fa613c83
loading tf only in interrogation process
2022-10-07 20:37:43 +02:00
537da7a304
Merge branch 'master' into dev/deepdanbooru
2022-10-07 18:31:49 +02:00
f7c787eb7c
make it possible to use hypernetworks without opt split attention
2022-10-07 16:39:51 +03:00
97bc0b9504
do not stop working on failed hypernetwork load
2022-10-07 13:22:50 +03:00
d15b3ec001
support loading VAE
2022-10-07 10:40:22 +03:00
bad7cb29ce
added support for hypernetworks (???)
2022-10-07 10:17:52 +03:00
5e3ff846c5
Update sd_hijack.py
2022-10-07 06:38:01 +03:00
5303df2428
Update sd_hijack.py
2022-10-07 06:01:14 +03:00
35d6b23162
Update sd_hijack.py
2022-10-07 05:31:53 +03:00
da4ab2707b
Update shared.py
2022-10-07 05:23:06 +03:00
2eb911b056
Update sd_hijack.py
2022-10-07 05:22:28 +03:00
f174fb2922
add xformers attention
2022-10-07 05:21:49 +03:00
b34b25b4c9
karras samplers for img2img?
2022-10-06 23:27:01 +03:00
405c8171d1
Prefer using `Processed.sd_model_hash` attribute when filename pattern
2022-10-06 20:41:23 +03:00
1cc36d170a
Added job_timestamp to Processed
...
So `[job_timestamp]` pattern can use in saving image UI.
2022-10-06 20:41:23 +03:00
070b7d60cf
Added styles to Processed
...
So `[styles]` pattern can use in saving image UI.
2022-10-06 20:41:23 +03:00
cf7c784fcc
Removed duplicate defined models_path
...
Use `modules.paths.models_path` instead `modules.shared.model_path`.
2022-10-06 20:29:12 +03:00
dbc8a4d351
add generation parameters to images shown in web ui
2022-10-06 20:27:50 +03:00
0bb458f0ca
Removed duplicate image saving codes
...
Use `modules.images.save_image()` instead.
2022-10-06 20:15:39 +03:00
b66aa334a9
Merge branch 'master' into fix-vram
2022-10-06 13:41:37 -03:00
fec71e4de2
Default window title progress updates on
2022-10-06 17:58:52 +03:00
be71115b1a
Update shared.py
2022-10-06 17:58:52 +03:00
5993df24a1
integrate the new samplers PR
2022-10-06 14:12:52 +03:00
3ddf80a9db
add variant setting
2022-10-06 13:42:21 +03:00
71901b3d3b
add karras scheduling variants
2022-10-06 13:42:21 +03:00
2d3ea42a2d
workaround for a mysterious bug where prompt weights can't be matched
2022-10-06 13:21:12 +03:00
5f24b7bcf4
option to let users select which samplers they want to hide
2022-10-06 12:08:59 +03:00
4288e53fc2
removed unused import, fixed typo
2022-10-06 08:52:29 +03:00
2499fb4e19
Add sanitizer for captions in Textual inversion
2022-10-06 08:52:29 +03:00
0e92c36707
Merge pull request #1755 from AUTOMATIC1111/use-typing-list
...
use typing.list in prompt_parser.py for wider python version support
2022-10-06 08:50:06 +03:00
55400c981b
Set gradio-img2img-tool default to 'editor'
2022-10-06 08:46:32 +03:00
af02ee1297
Merge branch 'master' into use-typing-list
2022-10-05 23:02:45 +01:00
34c358d10d
use typing.list in prompt_parser.py for wider python version support
2022-10-05 22:11:30 +01:00
20f8ec877a
remove type annotations in new code because presumably they don't work in 3.7
2022-10-06 00:09:32 +03:00
f8e41a96bb
fix various float parsing errors
2022-10-05 23:52:05 +03:00
4320f386d9
removing underscores and colons
2022-10-05 22:39:32 +02:00
c26732fbee
added support for AND from https://energy-based-model.github.io/Compositional-Visual-Generation-with-Composable-Diffusion-Models/
2022-10-05 23:16:27 +03:00
17a99baf0c
better model search
2022-10-05 22:07:28 +02:00
1506fab29a
removing problematic tag
2022-10-05 21:15:08 +02:00
59a2b9e5af
deepdanbooru interrogator
2022-10-05 20:55:26 +02:00
bbdbbd36ed
shared.state.interrupt when restart is requested
2022-10-05 11:37:18 +03:00
82380d9ac1
Removing parts no longer needed to fix vram
2022-10-04 22:31:40 -03:00
1f50971fb8
Merge branch 'master' into fix-vram
2022-10-04 19:53:52 -03:00
ef40e4cd4d
Display time taken in mins, secs when relevant
...
Fixes #1656
2022-10-04 23:41:42 +03:00
b32852ef03
add editor to img2img
2022-10-04 20:49:54 +03:00
90e911fd54
prompt_parser: allow spaces in schedules, add test, log/ignore errors
...
Only build the parser once (at import time) instead of for each step.
doctest is run by simply executing modules/prompt_parser.py
2022-10-04 20:26:15 +03:00
1eb588cbf1
remove functools.cache as some people are having issues with it
2022-10-04 18:02:01 +03:00
e1b128d8e4
do not touch p.seed/p.subseed during processing #1181
2022-10-04 17:36:39 +03:00
957e29a8e9
option to not show images in web ui
2022-10-04 17:23:48 +03:00
52cef36f6b
emergency fix for img2img
2022-10-04 16:54:31 +03:00
e6cbef785a
Merge pull request #1550 from RnDMonkey/#1484_fix_empty_styles_pattern
...
#1484 fix empty styles pattern
2022-10-04 15:26:48 +03:00
eec1b39bd5
Apply prompt pattern last
2022-10-04 15:22:49 +03:00
ea6b0d98a6
Remove pycharm note, fix typo
2022-10-04 15:21:34 +03:00
accd00d6b8
Explain how to use second progress bar in pycharm
2022-10-04 15:21:34 +03:00
e9e2a7ec9a
Merge branch 'master' into cpu-cmdline-opt
2022-10-04 07:42:53 -04:00
d5bba20a58
ignore errors in parse for purposes of token counting for #1564
2022-10-04 14:35:12 +03:00
b7f3996982
Merge remote-tracking branch 'origin/master'
2022-10-04 14:23:29 +03:00
6165246124
support interrupting after the previous change
2022-10-04 14:23:22 +03:00
2f1b61d979
Allow nested structures inside schedules
2022-10-04 14:22:41 +03:00
6c6ae28bf5
send all three of GFPGAN's and codeformer's models to CPU memory instead of just one for #1283
2022-10-04 12:32:22 +03:00
dc9c5a9774
Modify --add-cpu description
2022-10-04 05:22:50 -04:00
27ddc24fde
Add BSRGAN to --add-cpu
2022-10-04 05:18:17 -04:00
2adb249740
Merge branch 'cpu-cmdline-opt' of https://github.com/brkirch/stable-diffusion-webui into cpu-cmdline-opt
2022-10-04 04:26:54 -04:00
35a00b0130
Merge branch 'AUTOMATIC1111:master' into cpu-cmdline-opt
2022-10-04 04:25:27 -04:00
eeab7aedf5
Add --use-cpu command line option
...
Remove MPS detection to use CPU for GFPGAN / CodeFormer and add a --use-cpu command line option.
2022-10-04 04:24:35 -04:00
5ef0baf5ea
add support for gelbooru tags in filenames for textual inversion
2022-10-04 08:52:27 +03:00
b88e4ea7d6
Merge branch 'master' into master
2022-10-04 01:04:19 -04:00
2865ef4b9a
fix broken date in TI
2022-10-03 13:10:03 +03:00
43a74fa595
batch processing for img2img with an empty output directory, by request
2022-10-03 11:48:19 +03:00
d15c125db7
Merge remote-tracking branch 'origin/master'
2022-10-03 08:54:06 +03:00
6491b09c24
use existing function for gfpgan
2022-10-03 08:53:52 +03:00
80c418c0d3
Merge branch 'AUTOMATIC1111:master' into #1484_fix_empty_styles_pattern
2022-10-02 22:22:14 -07:00
36ea4ac0f5
moved no-style return outside join function
2022-10-02 22:21:16 -07:00
34c638142e
Fixed when eta = 0
...
Unexpected behavior when using eta = 0 in something like XY, but your default eta was set to something not 0.
2022-10-03 08:20:19 +03:00
e615d4f9d1
Convert folder icon surrogate pair to valid utf8
2022-10-03 07:59:13 +03:00
2cd6a00f37
Merge remote-tracking branch 'origin/master'
2022-10-03 07:58:06 +03:00
138662734c
use dropdown instead of radio for img2img upscaler selection
2022-10-03 07:57:59 +03:00
3fac3764b3
Merge branch 'master' into #1484_fix_empty_styles_pattern
2022-10-03 07:54:57 +03:00
ad0cc85d1f
Merge branch 'master' into stable
2022-10-02 18:31:19 -03:00
166283653c
remove LDSR warning
2022-10-02 23:18:13 +03:00
6785331e22
keep textual inversion dataset latents in CPU memory to save a bit of VRAM
2022-10-02 22:59:01 +03:00
c7543d4940
preprocessing for textual inversion added
2022-10-02 22:41:21 +03:00
c4445225f7
change wording for options
2022-10-02 21:50:14 +03:00
91f327f22b
make save to dirs optional for imgs saved from ui
2022-10-02 21:47:52 +03:00
688c4a914a
Merge branch 'master' into 1404-script-reload-without-restart
2022-10-02 21:33:22 +03:00
e808096cf6
correct indent
2022-10-02 19:26:06 +01:00
852fd90c0d
emergency fix for disabling SD model download after multiple complaints
2022-10-02 21:22:20 +03:00
0a435f0988
Merge remote-tracking branch 'origin/master'
2022-10-02 21:21:10 +03:00
0b94fc5033
Merge pull request #1324 from liamkerr/token_updates
...
Fixing Bugs with Token Counter
2022-10-02 21:20:05 +03:00
a1cde7e646
disabled SD model download after multiple complaints
2022-10-02 21:09:10 +03:00
6365a41f59
Update esrgan_model.py
...
Use alternate ESRGAN Model download path.
2022-10-02 21:02:03 +03:00
3ff0de2c59
added --disable-console-progressbars to disable progressbars in console
...
disabled printing prompts to console by default, enabled by --enable-console-prompts
2022-10-02 20:23:40 +03:00
4ec4af6e0b
add checkpoint info to saved embeddings
2022-10-02 20:15:25 +03:00
71fe7fa49f
fix using aaaa-100 embedding when the prompt has aaaa-10000 and you have both aaaa-100 and aaaa-10000 in the directory with embeddings.
2022-10-02 19:56:37 +03:00
88ec0cf557
fix for incorrect embedding token length calculation (will break seeds that use embeddings, you're welcome!)
...
add option to input initialization text for embeddings
2022-10-02 19:40:51 +03:00
6e063124ac
Merge pull request #1403 from d8ahazard/ScuNET
...
Add ScuNET Denoiser/Upscaler, Fix some Model Loader issues
2022-10-02 17:39:34 +03:00
a32a068ed1
Merge branch 'master' into token_updates
2022-10-02 10:26:20 -04:00
f34e2293d0
Merge remote-tracking branch 'origin/master'
2022-10-02 17:25:28 +03:00
0758f6e641
fix --ckpt option breaking model selection
2022-10-02 17:24:50 +03:00
a9d7eb722f
Merge branch 'master' into saving
2022-10-02 17:03:01 +03:00
7308aeefd9
Merge branch 'master' into token_updates
2022-10-02 10:02:38 -04:00
5d26ba2b4b
Merge branch 'master' into ScuNET
2022-10-02 07:56:22 -05:00
5f561ee95d
Merge remote-tracking branch 'origin/master'
2022-10-02 15:49:59 +03:00
0114057ad6
fix incorrect use of glob in modelloader for #1410
2022-10-02 15:49:42 +03:00
820f1dc96b
initial support for training textual inversion
2022-10-02 15:03:39 +03:00
32edf1732f
os.path.normpath wasn't working, reverting to manual strip
2022-10-01 21:37:14 -07:00
70f5267047
use os.path.normpath for better safety checking
2022-10-01 21:18:15 -07:00
3cf1a96006
added safety for blank directory naming patterns
2022-10-01 21:11:03 -07:00
2deea86781
Put reload buttons in row and add secondary style
2022-10-02 01:36:30 +01:00
07e40ad7f2
add custom script body only refresh option
2022-10-02 01:19:55 +01:00
cf33268d68
add script body only refresh
2022-10-02 01:18:42 +01:00
0aa354bd5e
remove styling from python side
2022-10-02 00:13:47 +01:00
027c5aae55
update reloading message style
2022-10-01 23:29:26 +01:00
6048002dad
Add scope warning to refresh button
2022-10-01 23:10:07 +01:00
afaa03c5fd
add redefinition guard to gradio_routes_templates_response
2022-10-01 22:43:45 +01:00
121ed7d36f
Add progress bar for SwinIR in cmd
...
I do not know how to add them to the UI...
2022-10-01 14:04:20 -04:00
4f8490cd56
add restart button
2022-10-01 18:33:31 +01:00
4c2478a68a
add script reload method
2022-10-01 18:30:53 +01:00
bc38c80cfc
add sampler_noise_scheduler_override switch
2022-10-01 08:08:50 +03:00
9de1e56e2d
add sampler_noise_scheduler_override property
2022-10-01 08:08:50 +03:00
bdaa36c844
When device is MPS, use CPU for GFPGAN instead
...
GFPGAN will not work if the device is MPS, so default to CPU instead.
2022-09-30 23:53:25 -04:00
3c6a049fc3
consolidated token counter functions
2022-09-30 18:22:50 -04:00
ff8dc1908a
fixed token counter for prompt editing
2022-09-30 18:22:50 -04:00
abdbf1de64
token counters now update when roll artist and style buttons are pressed https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/1194#issuecomment-1261203893
2022-09-30 18:22:40 -04:00
ad1fbbae93
Merge branch 'master' into fix-vram
2022-09-30 18:58:51 -03:00
d1db330010
ALT + return will submit prompt when it's in focus
2022-09-30 15:39:57 -05:00
8deae07700
Add ScuNET DeNoiser/Upscaler
...
Q&D Implementation of ScuNET, thanks to our handy model loader. :P
https://github.com/cszn/SCUNet
2022-09-30 15:28:37 -05:00
e82ea20299
Optimize model loader
...
Child classes only get populated to __subclassess__ when they are imported. We don't actually need to import any of them to webui any more, so clean up webUI imports and make sure loader imports children.
Also, fix command line paths not actually being passed to the scalers.
2022-09-30 15:26:18 -05:00
89f0acc6bf
remove extra print from BSRGAN
2022-09-30 23:18:47 +03:00
f253790b40
Merge pull request #1371 from d8ahazard/master
...
Fix LDSR, BSRGAN, recursive SD checkpoint Loading
2022-09-30 23:09:18 +03:00
3f64e23f81
fix model checkpoint merger tab failing to save model
2022-09-30 22:57:25 +03:00
a9a0320d26
Merge branch 'master' into master
2022-09-30 14:27:27 -05:00
2b03f0bbda
if --ckpt option is specified, load that model
2022-09-30 22:16:03 +03:00
7ab91d9e1b
Update bsrgan_model.py
2022-09-30 13:29:33 -05:00
3665551b12
Merge branch 'master' of https://github.com/d8ahazard/stable-diffusion-webui
2022-09-30 12:51:57 -05:00
8f1d412e7b
Fix BSRGAN Model loading.
2022-09-30 12:51:54 -05:00
2162be514a
Merge branch 'master' into master
2022-09-30 11:33:41 -05:00
3a876b16a9
Merge remote-tracking branch 'origin/master'
2022-09-30 18:56:23 +03:00
4794202ebc
hello #1109
2022-09-30 18:56:10 +03:00
ac21d308cd
fix for one error with BSRGAN, though it fails to work anyway #1109
2022-09-30 18:55:46 +03:00
43c87ef0fc
change default inpaint mode to original
2022-09-30 18:07:49 +03:00
9fc1e49bd2
Set default value for ckpt-dir
2022-09-30 09:38:57 -05:00
f71d02b85f
Remove unused LDSR opt
2022-09-30 09:29:31 -05:00
5d52231bcb
Logging....
...
Cleanup. Sorry.
2022-09-30 09:28:48 -05:00
ca87c09c0e
Fix recursive model loading
...
Ensure we find checkpoints within subdirectories.
2022-09-30 09:28:28 -05:00
19eb1467f1
Fix BSRGAN variable not found.
2022-09-30 09:05:00 -05:00
99aa132df7
Remove useless print message
2022-09-30 08:56:39 -05:00
8d60645106
Fix model paths, ensure we have the right files.
...
Also, clean up logging in the ldsr arch file.
2022-09-30 08:55:04 -05:00
64c6b13312
Remove LDSR project.yaml if too large.
...
If we accidentally downloaded the wrong file and saved it as project.yaml, this will delete it so it can be re-downloaded.
2022-09-30 08:41:25 -05:00
41f9449d96
Fix LDSR YAML path
2022-09-30 08:33:06 -05:00
980cd1697a
prevent neural network resizing when it is not necessary #1109
2022-09-30 14:23:41 +03:00
98cc6c6e74
add embeddings dir
2022-09-30 14:16:26 +03:00
5c0c778a65
fixed so that {prompt} can be anywhere in style
2022-09-30 13:00:43 +03:00
ff4df06c57
refined [styles] pattern and added [prompt_no_styles]
2022-09-30 13:00:43 +03:00
b60cd0809f
return the dropdown that mysteriously disappeared
2022-09-30 12:56:36 +03:00
9a54077d4d
repair broken highres fix #1109
2022-09-30 12:26:41 +03:00
cef838a6ab
revert the annotation not supported by old pythons
2022-09-30 12:15:29 +03:00
d1f098540a
remove unwanted formatting/functionality from the PR
2022-09-30 11:42:40 +03:00
2552204fcb
fix for broken codeformer in PR
2022-09-30 11:03:00 +03:00
aec811c5e6
undo upscaler model filename tampering
2022-09-30 10:52:45 +03:00
a5e7b371d6
fix the bug with broken rescaling in PR
2022-09-30 10:38:48 +03:00
8f1b315318
fix bugs in the PR
2022-09-30 09:46:52 +03:00
25414bcd05
Merge pull request #1109 from d8ahazard/ModelLoader
...
Model Loader, Fixes
2022-09-30 09:35:58 +03:00
f80c3696f6
fix the sys not found error when importing sd_samplers that appeared after PR
2022-09-30 08:21:05 +03:00
28307a9f10
force usage of cloned k-diffusion
2022-09-30 07:57:39 +03:00
ebd2c48115
return shortest checkpoint title match
2022-09-30 07:37:05 +03:00
642b7e333e
add get_closet_checkpoint_match
2022-09-30 07:37:05 +03:00
435fd2112a
Fixes, cleanup.
2022-09-29 19:59:53 -05:00
d73741794d
Merge remote-tracking branch 'upstream/master' into ModelLoader
2022-09-29 19:59:36 -05:00
0dce0df1ee
Holy $hit.
...
Yep.
Fix gfpgan_model_arch requirement(s).
Add Upscaler base class, move from images.
Add a lot of methods to Upscaler.
Re-work all the child upscalers to be proper classes.
Add BSRGAN scaler.
Add ldsr_model_arch class, removing the dependency for another repo that just uses regular latent-diffusion stuff.
Add one universal method that will always find and load new upscaler models without having to add new "setup_model" calls. Still need to add command line params, but that could probably be automated.
Add a "self.scale" property to all Upscalers so the scalers themselves can do "things" in response to the requested upscaling size.
Ensure LDSR doesn't get stuck in a longer loop of "upscale/downscale/upscale" as we try to reach the target upscale size.
Add typehints for IDE sanity.
PEP-8 improvements.
Moar.
2022-09-29 17:46:23 -05:00
a112168d28
Save parameters as comments when saving as jpg
2022-09-29 19:07:29 +03:00
ca5901b5c8
Save should use desired sample format fixes #1028
2022-09-29 19:07:29 +03:00
c715ef04d1
fix for incorrect model weight loading for #814
2022-09-29 15:40:28 +03:00
965dcf4469
improve code quality
2022-09-29 13:52:51 +03:00
b05355770c
add new samplers
2022-09-29 13:52:51 +03:00
f28ce3e3a1
Merge branch 'master' into saving
2022-09-29 12:19:13 +02:00
be5555fce4
drop the print
2022-09-29 12:48:42 +03:00
e9919f2ab7
Sort scripts loading order
2022-09-29 12:48:42 +03:00
66fed8ffb8
Add custom name and try-except
2022-09-29 12:41:47 +03:00
819fd3af40
Add output folder icons
...
Changed the hidden element class name to a more generic one, so people can reuse it if they want to hide further elements in the future
2022-09-29 12:10:00 +03:00
02c4b757b6
Add output folder icons
...
Handling of the --hide-ui-dir-config flag and added multi-platform code for opening a folder
2022-09-29 12:10:00 +03:00
f8acbb8f88
Add output folder icons
...
Adds icons on the first 3 tabs to directly open the corresponding images output directory
2022-09-29 12:10:00 +03:00
4127f4aff8
fix program breaking on empty prompt
2022-09-29 11:39:55 +03:00
c1c27dad3b
new implementation for attention/emphasis
2022-09-29 11:31:48 +03:00
29ce8a687d
remove unneded debug print
2022-09-29 08:03:23 +03:00
c2d5b29040
Move silu to sd_hijack
2022-09-29 01:16:25 -03:00
c938679de7
Fix memory leak and reduce memory usage
2022-09-28 22:14:13 -03:00
041d2aefc0
Respect --ckpt-dir command-line argument when merging models ( #1261 )
...
* Update .gitignore to ignore *all* checkpoint files in /models
* Fixed typo in UI
2022-09-29 01:00:48 +03:00
7acfaca05a
update lists of models after merging them in checkpoints tab
...
support saving as half
2022-09-29 00:59:44 +03:00
791808c890
correctly list and display model names for #1261
2022-09-29 00:21:54 +03:00
d62954c2bc
fix broken DDIM with img2img
2022-09-28 22:30:52 +03:00
a703f56d73
clone k-diffusion instead of installing it via pip, and do not install its requirements.txt
2022-09-28 21:38:26 +03:00
278e7c7114
Merge pull request #1194 from liamkerr/token_count
...
Token count
2022-09-28 19:22:55 +03:00
1deac2b645
do nor add log messages to saved iamge parameters
2022-09-28 18:20:30 +03:00
d64b451681
added support for automatically installing latest k-diffusion
...
added eta parameter to parameters output for generated images
split eta settings into ancestral and ddim (because they have different default values)
2022-09-28 18:09:06 +03:00
9be0d1b89e
Merge remote-tracking branch 'origin/master'
2022-09-28 17:05:32 +03:00
aea5b2510e
save parameters for images when using the Save button.
2022-09-28 17:05:23 +03:00
7ca9858c4c
removed unused import; now using javascript to watch prompt textarea
2022-09-28 09:43:54 -04:00
228a2f30e7
Remove unintended code commit for this PR
2022-09-28 08:56:07 -04:00
fe2f0e1729
Adding support for inverse sigmoid interpolation
2022-09-28 08:52:46 -04:00
c3bcc7e9fc
Switch active checkpoint selection to dropdown
...
- Provides a better user experience
- Better suited to variable list of options
- Keep the UI "stable" as list contract or expand
2022-09-28 07:07:19 -04:00
03ee67bfd3
add advanced saving for save button
2022-09-28 10:53:40 +02:00
2ab64ec81a
emergency fix for #1199
2022-09-28 10:49:07 +03:00
15f333a266
Merge pull request #1185 from bmaltais/checkpoint-merger-ui-improvement
...
(feat): Rework Checkpoint Merger UI for better clarity and usability
2022-09-28 08:42:26 +03:00
4c9c2a6702
-Fix interp_amount rounding in filename
...
-Sort list of checkpoints in list
2022-09-27 22:16:25 -04:00
047ca73388
Update shared.py
2022-09-28 05:11:40 +03:00
5391c0bf3e
Update processing.py
2022-09-28 05:11:03 +03:00
8644e494be
add eta to k ancestral
2022-09-28 05:09:22 +03:00
8c48ede135
Fix variable conversion code issue
2022-09-27 21:34:24 -04:00
d641af6a7d
- Add gradio dropdown list to select checkpoints
...
- Update checkpoint model fields labels
2022-09-27 21:09:28 -04:00
591c138e32
-Add gradio dropdown list to select checkpoints to merge
...
-Update the name of the model feilds
-Update the associated variable names
2022-09-27 21:08:07 -04:00
e5707b66d6
switched the token counter to use hidden buttons instead of api call
2022-09-27 19:29:53 -04:00
981fe9c4a3
Merge remote-tracking branch 'upstream/master' into token_count
2022-09-27 16:37:24 -04:00
5034f7d759
added token counter next to txt2img and img2img prompts
2022-09-27 15:56:18 -04:00
DepFA