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
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
William Moorehouse