Raphael Stoeckli
4288e53fc2
removed unused import, fixed typo
2022-10-06 08:52:29 +03:00
Raphael Stoeckli
2499fb4e19
Add sanitizer for captions in Textual inversion
2022-10-06 08:52:29 +03:00
AUTOMATIC1111
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
DepFA
55400c981b
Set gradio-img2img-tool default to 'editor'
2022-10-06 08:46:32 +03:00
DepFA
af02ee1297
Merge branch 'master' into use-typing-list
2022-10-05 23:02:45 +01:00
DepFA
34c358d10d
use typing.list in prompt_parser.py for wider python version support
2022-10-05 22:11:30 +01:00
AUTOMATIC
20f8ec877a
remove type annotations in new code because presumably they don't work in 3.7
2022-10-06 00:09:32 +03:00
AUTOMATIC
f8e41a96bb
fix various float parsing errors
2022-10-05 23:52:05 +03:00
Greendayle
4320f386d9
removing underscores and colons
2022-10-05 22:39:32 +02:00
AUTOMATIC
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
Greendayle
17a99baf0c
better model search
2022-10-05 22:07:28 +02:00
Greendayle
1506fab29a
removing problematic tag
2022-10-05 21:15:08 +02:00
Greendayle
59a2b9e5af
deepdanbooru interrogator
2022-10-05 20:55:26 +02:00
DepFA
bbdbbd36ed
shared.state.interrupt when restart is requested
2022-10-05 11:37:18 +03:00
Jairo Correa
82380d9ac1
Removing parts no longer needed to fix vram
2022-10-04 22:31:40 -03:00
Jairo Correa
1f50971fb8
Merge branch 'master' into fix-vram
2022-10-04 19:53:52 -03:00
xpscyho
ef40e4cd4d
Display time taken in mins, secs when relevant
...
Fixes #1656
2022-10-04 23:41:42 +03:00
AUTOMATIC
b32852ef03
add editor to img2img
2022-10-04 20:49:54 +03:00
Rae Fu
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
AUTOMATIC
1eb588cbf1
remove functools.cache as some people are having issues with it
2022-10-04 18:02:01 +03:00
AUTOMATIC
e1b128d8e4
do not touch p.seed/p.subseed during processing #1181
2022-10-04 17:36:39 +03:00
AUTOMATIC
957e29a8e9
option to not show images in web ui
2022-10-04 17:23:48 +03:00
AUTOMATIC
52cef36f6b
emergency fix for img2img
2022-10-04 16:54:31 +03:00
AUTOMATIC1111
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
Milly
eec1b39bd5
Apply prompt pattern last
2022-10-04 15:22:49 +03:00
Justin Riddiough
ea6b0d98a6
Remove pycharm note, fix typo
2022-10-04 15:21:34 +03:00
Justin Riddiough
accd00d6b8
Explain how to use second progress bar in pycharm
2022-10-04 15:21:34 +03:00
brkirch
e9e2a7ec9a
Merge branch 'master' into cpu-cmdline-opt
2022-10-04 07:42:53 -04:00
AUTOMATIC
d5bba20a58
ignore errors in parse for purposes of token counting for #1564
2022-10-04 14:35:12 +03:00
AUTOMATIC
b7f3996982
Merge remote-tracking branch 'origin/master'
2022-10-04 14:23:29 +03:00
AUTOMATIC
6165246124
support interrupting after the previous change
2022-10-04 14:23:22 +03:00
dan
2f1b61d979
Allow nested structures inside schedules
2022-10-04 14:22:41 +03:00
AUTOMATIC
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
brkirch
dc9c5a9774
Modify --add-cpu description
2022-10-04 05:22:50 -04:00
brkirch
27ddc24fde
Add BSRGAN to --add-cpu
2022-10-04 05:18:17 -04:00
brkirch
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
brkirch
35a00b0130
Merge branch 'AUTOMATIC1111:master' into cpu-cmdline-opt
2022-10-04 04:25:27 -04:00
brkirch
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
AUTOMATIC
5ef0baf5ea
add support for gelbooru tags in filenames for textual inversion
2022-10-04 08:52:27 +03:00
brkirch
b88e4ea7d6
Merge branch 'master' into master
2022-10-04 01:04:19 -04:00
AUTOMATIC
2865ef4b9a
fix broken date in TI
2022-10-03 13:10:03 +03:00
AUTOMATIC
43a74fa595
batch processing for img2img with an empty output directory, by request
2022-10-03 11:48:19 +03:00
AUTOMATIC
d15c125db7
Merge remote-tracking branch 'origin/master'
2022-10-03 08:54:06 +03:00
AUTOMATIC
6491b09c24
use existing function for gfpgan
2022-10-03 08:53:52 +03:00
RnDMonkey
80c418c0d3
Merge branch 'AUTOMATIC1111:master' into #1484_fix_empty_styles_pattern
2022-10-02 22:22:14 -07:00
RnDMonkey
36ea4ac0f5
moved no-style return outside join function
2022-10-02 22:21:16 -07:00
hentailord85ez
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
Hanusz Leszek
e615d4f9d1
Convert folder icon surrogate pair to valid utf8
2022-10-03 07:59:13 +03:00
AUTOMATIC
2cd6a00f37
Merge remote-tracking branch 'origin/master'
2022-10-03 07:58:06 +03:00
AUTOMATIC
138662734c
use dropdown instead of radio for img2img upscaler selection
2022-10-03 07:57:59 +03:00
AUTOMATIC1111
3fac3764b3
Merge branch 'master' into #1484_fix_empty_styles_pattern
2022-10-03 07:54:57 +03:00
Jairo Correa
ad0cc85d1f
Merge branch 'master' into stable
2022-10-02 18:31:19 -03:00
AUTOMATIC
166283653c
remove LDSR warning
2022-10-02 23:18:13 +03:00
AUTOMATIC
6785331e22
keep textual inversion dataset latents in CPU memory to save a bit of VRAM
2022-10-02 22:59:01 +03:00
AUTOMATIC
c7543d4940
preprocessing for textual inversion added
2022-10-02 22:41:21 +03:00
AUTOMATIC
c4445225f7
change wording for options
2022-10-02 21:50:14 +03:00
Lopyter
91f327f22b
make save to dirs optional for imgs saved from ui
2022-10-02 21:47:52 +03:00
AUTOMATIC1111
688c4a914a
Merge branch 'master' into 1404-script-reload-without-restart
2022-10-02 21:33:22 +03:00
DepFA
e808096cf6
correct indent
2022-10-02 19:26:06 +01:00
AUTOMATIC
852fd90c0d
emergency fix for disabling SD model download after multiple complaints
2022-10-02 21:22:20 +03:00
AUTOMATIC
0a435f0988
Merge remote-tracking branch 'origin/master'
2022-10-02 21:21:10 +03:00
AUTOMATIC1111
0b94fc5033
Merge pull request #1324 from liamkerr/token_updates
...
Fixing Bugs with Token Counter
2022-10-02 21:20:05 +03:00
AUTOMATIC
a1cde7e646
disabled SD model download after multiple complaints
2022-10-02 21:09:10 +03:00
d8ahazard
6365a41f59
Update esrgan_model.py
...
Use alternate ESRGAN Model download path.
2022-10-02 21:02:03 +03:00
AUTOMATIC
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
AUTOMATIC
4ec4af6e0b
add checkpoint info to saved embeddings
2022-10-02 20:15:25 +03:00
AUTOMATIC
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
AUTOMATIC
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
AUTOMATIC1111
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
liamkerr
a32a068ed1
Merge branch 'master' into token_updates
2022-10-02 10:26:20 -04:00
AUTOMATIC
f34e2293d0
Merge remote-tracking branch 'origin/master'
2022-10-02 17:25:28 +03:00
AUTOMATIC
0758f6e641
fix --ckpt option breaking model selection
2022-10-02 17:24:50 +03:00
AUTOMATIC1111
a9d7eb722f
Merge branch 'master' into saving
2022-10-02 17:03:01 +03:00
liamkerr
7308aeefd9
Merge branch 'master' into token_updates
2022-10-02 10:02:38 -04:00
d8ahazard
5d26ba2b4b
Merge branch 'master' into ScuNET
2022-10-02 07:56:22 -05:00
AUTOMATIC
5f561ee95d
Merge remote-tracking branch 'origin/master'
2022-10-02 15:49:59 +03:00
AUTOMATIC
0114057ad6
fix incorrect use of glob in modelloader for #1410
2022-10-02 15:49:42 +03:00
AUTOMATIC
820f1dc96b
initial support for training textual inversion
2022-10-02 15:03:39 +03:00
RnDMonkey
32edf1732f
os.path.normpath wasn't working, reverting to manual strip
2022-10-01 21:37:14 -07:00
RnDMonkey
70f5267047
use os.path.normpath for better safety checking
2022-10-01 21:18:15 -07:00
RnDMonkey
3cf1a96006
added safety for blank directory naming patterns
2022-10-01 21:11:03 -07:00
DepFA
2deea86781
Put reload buttons in row and add secondary style
2022-10-02 01:36:30 +01:00
DepFA
07e40ad7f2
add custom script body only refresh option
2022-10-02 01:19:55 +01:00
DepFA
cf33268d68
add script body only refresh
2022-10-02 01:18:42 +01:00
DepFA
0aa354bd5e
remove styling from python side
2022-10-02 00:13:47 +01:00
DepFA
027c5aae55
update reloading message style
2022-10-01 23:29:26 +01:00
DepFA
6048002dad
Add scope warning to refresh button
2022-10-01 23:10:07 +01:00
DepFA
afaa03c5fd
add redefinition guard to gradio_routes_templates_response
2022-10-01 22:43:45 +01:00
Alexandre Simard
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
DepFA
4f8490cd56
add restart button
2022-10-01 18:33:31 +01:00
DepFA
4c2478a68a
add script reload method
2022-10-01 18:30:53 +01:00
DepFA
bc38c80cfc
add sampler_noise_scheduler_override switch
2022-10-01 08:08:50 +03:00
DepFA
9de1e56e2d
add sampler_noise_scheduler_override property
2022-10-01 08:08:50 +03:00
brkirch
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
Liam
3c6a049fc3
consolidated token counter functions
2022-09-30 18:22:50 -04:00
Liam
ff8dc1908a
fixed token counter for prompt editing
2022-09-30 18:22:50 -04:00
Liam
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
Jairo Correa
ad1fbbae93
Merge branch 'master' into fix-vram
2022-09-30 18:58:51 -03:00
Trung Ngo
d1db330010
ALT + return will submit prompt when it's in focus
2022-09-30 15:39:57 -05:00
d8ahazard
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
d8ahazard
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
AUTOMATIC
89f0acc6bf
remove extra print from BSRGAN
2022-09-30 23:18:47 +03:00
AUTOMATIC1111
f253790b40
Merge pull request #1371 from d8ahazard/master
...
Fix LDSR, BSRGAN, recursive SD checkpoint Loading
2022-09-30 23:09:18 +03:00
AUTOMATIC
3f64e23f81
fix model checkpoint merger tab failing to save model
2022-09-30 22:57:25 +03:00
d8ahazard
a9a0320d26
Merge branch 'master' into master
2022-09-30 14:27:27 -05:00
AUTOMATIC
2b03f0bbda
if --ckpt option is specified, load that model
2022-09-30 22:16:03 +03:00
d8ahazard
7ab91d9e1b
Update bsrgan_model.py
2022-09-30 13:29:33 -05:00
d8ahazard
3665551b12
Merge branch 'master' of https://github.com/d8ahazard/stable-diffusion-webui
2022-09-30 12:51:57 -05:00
d8ahazard
8f1d412e7b
Fix BSRGAN Model loading.
2022-09-30 12:51:54 -05:00
d8ahazard
2162be514a
Merge branch 'master' into master
2022-09-30 11:33:41 -05:00
AUTOMATIC
3a876b16a9
Merge remote-tracking branch 'origin/master'
2022-09-30 18:56:23 +03:00
AUTOMATIC
4794202ebc
hello #1109
2022-09-30 18:56:10 +03:00
AUTOMATIC
ac21d308cd
fix for one error with BSRGAN, though it fails to work anyway #1109
2022-09-30 18:55:46 +03:00
AUTOMATIC
43c87ef0fc
change default inpaint mode to original
2022-09-30 18:07:49 +03:00
d8ahazard
9fc1e49bd2
Set default value for ckpt-dir
2022-09-30 09:38:57 -05:00
d8ahazard
f71d02b85f
Remove unused LDSR opt
2022-09-30 09:29:31 -05:00
d8ahazard
5d52231bcb
Logging....
...
Cleanup. Sorry.
2022-09-30 09:28:48 -05:00
d8ahazard
ca87c09c0e
Fix recursive model loading
...
Ensure we find checkpoints within subdirectories.
2022-09-30 09:28:28 -05:00
d8ahazard
19eb1467f1
Fix BSRGAN variable not found.
2022-09-30 09:05:00 -05:00
d8ahazard
99aa132df7
Remove useless print message
2022-09-30 08:56:39 -05:00
d8ahazard
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
d8ahazard
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
d8ahazard
41f9449d96
Fix LDSR YAML path
2022-09-30 08:33:06 -05:00
AUTOMATIC
980cd1697a
prevent neural network resizing when it is not necessary #1109
2022-09-30 14:23:41 +03:00
AUTOMATIC
98cc6c6e74
add embeddings dir
2022-09-30 14:16:26 +03:00
RnDMonkey
5c0c778a65
fixed so that {prompt} can be anywhere in style
2022-09-30 13:00:43 +03:00
RnDMonkey
ff4df06c57
refined [styles] pattern and added [prompt_no_styles]
2022-09-30 13:00:43 +03:00
AUTOMATIC
b60cd0809f
return the dropdown that mysteriously disappeared
2022-09-30 12:56:36 +03:00
AUTOMATIC
9a54077d4d
repair broken highres fix #1109
2022-09-30 12:26:41 +03:00
AUTOMATIC
cef838a6ab
revert the annotation not supported by old pythons
2022-09-30 12:15:29 +03:00
AUTOMATIC
d1f098540a
remove unwanted formatting/functionality from the PR
2022-09-30 11:42:40 +03:00
AUTOMATIC
2552204fcb
fix for broken codeformer in PR
2022-09-30 11:03:00 +03:00
AUTOMATIC
aec811c5e6
undo upscaler model filename tampering
2022-09-30 10:52:45 +03:00
AUTOMATIC
a5e7b371d6
fix the bug with broken rescaling in PR
2022-09-30 10:38:48 +03:00
AUTOMATIC
8f1b315318
fix bugs in the PR
2022-09-30 09:46:52 +03:00
AUTOMATIC1111
25414bcd05
Merge pull request #1109 from d8ahazard/ModelLoader
...
Model Loader, Fixes
2022-09-30 09:35:58 +03:00
AUTOMATIC
f80c3696f6
fix the sys not found error when importing sd_samplers that appeared after PR
2022-09-30 08:21:05 +03:00
C43H66N12O12S2
28307a9f10
force usage of cloned k-diffusion
2022-09-30 07:57:39 +03:00
DepFA
ebd2c48115
return shortest checkpoint title match
2022-09-30 07:37:05 +03:00
DepFA
642b7e333e
add get_closet_checkpoint_match
2022-09-30 07:37:05 +03:00
d8ahazard
435fd2112a
Fixes, cleanup.
2022-09-29 19:59:53 -05:00
d8ahazard
d73741794d
Merge remote-tracking branch 'upstream/master' into ModelLoader
2022-09-29 19:59:36 -05:00
d8ahazard
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
Justin Maier
a112168d28
Save parameters as comments when saving as jpg
2022-09-29 19:07:29 +03:00
Justin Maier
ca5901b5c8
Save should use desired sample format fixes #1028
2022-09-29 19:07:29 +03:00
AUTOMATIC
c715ef04d1
fix for incorrect model weight loading for #814
2022-09-29 15:40:28 +03:00
C43H66N12O12S2
965dcf4469
improve code quality
2022-09-29 13:52:51 +03:00
C43H66N12O12S2
b05355770c
add new samplers
2022-09-29 13:52:51 +03:00
WDevelopsWebApps
f28ce3e3a1
Merge branch 'master' into saving
2022-09-29 12:19:13 +02:00
Hanusz Leszek
be5555fce4
drop the print
2022-09-29 12:48:42 +03:00
