Commit graph

1329 commits

Author SHA1 Message Date
Trung Ngo
e72adc999b Restore last generation params 2022-10-13 12:21:20 +03:00
Greg Fuller
04c0e643f2 Merge branch 'master' of https://github.com/HunterVacui/stable-diffusion-webui 2022-10-13 08:21:01 +03:00
AUTOMATIC1111
4f73e057a9
Merge pull request #2324 from HunterVacui/interrogate_include_ranks_in_output
Interrogate: add option to include ranks in output
2022-10-13 08:05:41 +03:00
AUTOMATIC
78592d404a remove interrogate option I accidentally deleted 2022-10-13 07:40:03 +03:00
不会画画的中医不是好程序员
0186db178e
Merge branch 'AUTOMATIC1111:master' into master 2022-10-13 12:35:39 +08:00
yfszzx
716a9e034f images history delete a number of images consecutively next 2022-10-13 12:19:50 +08:00
d8ahazard
54e0051bdd Add drag/drop param loading.
Drop an image or generational text onto the prompt bar, it loads the info for parsing.
2022-10-12 18:17:26 -05:00
Melan
1cfc2a1898 Save a csv containing the loss while training 2022-10-12 23:36:29 +02:00
Greg Fuller
514456101b [3/?] [wip] fix incorrect variable reference
still needs testing
2022-10-12 13:14:13 -07:00
Greg Fuller
f776254b12 [2/?] [wip] ignore OPT_INCLUDE_RANKS for training filenames 2022-10-12 13:12:18 -07:00
Greg Fuller
efefa4862c [1/?] [wip] Reintroduce opts.interrogate_return_ranks
looks functionally correct, needs testing

Needs particular testing care around whether the colon usage (:) will break anything in whatever new use cases were introduced by https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/2143
2022-10-12 13:03:00 -07:00
Greg Fuller
fb3cefb348 Merge remote-tracking branch 'upstream/master' into interrogate_include_ranks_in_output 2022-10-12 12:44:41 -07:00
AUTOMATIC
698d303b04 deepbooru: added option to use spaces or underscores
deepbooru: added option to quote (\) in tags
deepbooru/BLIP: write caption to file instead of image filename
deepbooru/BLIP: now possible to use both for captions
deepbooru: process is stopped even if an exception occurs
2022-10-12 21:55:43 +03:00
AUTOMATIC
c3c8eef9fd train: change filename processing to be more simple and configurable
train: make it possible to make text files with prompts
train: rework scheduler so that there's less repeating code in textual inversion and hypernets
train: move epochs setting to options
2022-10-12 20:49:47 +03:00
yfszzx
df97947b21 Merge branch 'master' of https://github.com/yfszzx/stable-diffusion-webui-plus 2022-10-13 00:28:37 +08:00
不会画画的中医不是好程序员
324e6ed5d1
Merge branch 'AUTOMATIC1111:master' into master 2022-10-13 00:21:57 +08:00
yfszzx
a2aa2a68bc images history improvement 2022-10-13 00:21:16 +08:00
yfszzx
a1a94b8b5f images history improvement 2022-10-13 00:19:34 +08:00
yfszzx
c87c3b9c11 test 2022-10-12 21:24:40 +08:00
AUTOMATIC1111
cc5803603b
Merge pull request #2037 from AUTOMATIC1111/embed-embeddings-in-images
Add option to store TI embeddings in png chunks, and load from same.
2022-10-12 15:59:24 +03:00
yfszzx
511ca57e37 Merge branch 'master' of https://github.com/yfszzx/stable-diffusion-webui-plus 2022-10-12 20:48:03 +08:00
yfszzx
e05573e1ad images history improvement 2022-10-12 20:47:55 +08:00
DepFA
10a2de644f
formatting 2022-10-12 13:15:35 +01:00
DepFA
50be33e953
formatting 2022-10-12 13:13:25 +01:00
AUTOMATIC
429442f4a6 fix iterator bug for #2295 2022-10-12 13:38:03 +03:00
hentailord85ez
80f3cf2bb2 Account when lines are mismatched 2022-10-12 11:38:41 +03:00
AUTOMATIC
ee015a1af6 change textual inversion tab to train
remake train interface to use tabs
2022-10-12 11:05:57 +03:00
Milly
2d006ce16c xy_grid: Find hypernetwork by closest name 2022-10-12 10:40:10 +03:00
AUTOMATIC1111
dc1432e0dd
Merge branch 'master' into feature/scale_to 2022-10-12 10:35:42 +03:00
brkirch
57e03cdd24 Ensure the directory exists before saving to it
The directory for the images saved with the Save button may still not exist, so it needs to be created prior to opening the log.csv file.
2022-10-12 09:55:56 +03:00
AUTOMATIC
336bd8703c just add the deepdanbooru settings unconditionally 2022-10-12 09:00:07 +03:00
AUTOMATIC
ee10c41e2a Merge remote-tracking branch 'origin/steve3d' 2022-10-12 08:35:52 +03:00
AUTOMATIC1111
2e2d45b281
Merge pull request #2143 from JC-Array/deepdanbooru_pre_process
deepbooru tags for textual inversion preproccessing
2022-10-12 08:35:27 +03:00
Greg Fuller
fec2221eea Truncate error text to fix service lockup / stall
What:
* Update wrap_gradio_call to add a limit to the maximum amount of text output

Why:
* wrap_gradio_call currently prints out a list of the arguments provided to the failing function.
   * if that function is save_image, this causes the entire image to be printed to stderr
    * If the image is large, this can cause the service to lock up while attempting to print all the text
 * It is easy to generate large images using the x/y plot script
 * it is easy to encounter image save exceptions, including if the output directory does not exist / cannot be written to, or if the file is too big
  * The huge amount of log spam is confusing and not particularly helpful
2022-10-12 08:30:06 +03:00
AUTOMATIC
6ac2ec2b78 create dir for hypernetworks 2022-10-12 07:01:20 +03:00
Greg Fuller
d717eb079c Interrogate: add option to include ranks in output
Since the UI also allows users to specify ranks, it can be useful to show people what ranks are being returned by interrogate

This can also give much better results when feeding the interrogate results back into either img2img or txt2img, especially when trying to generate a specific character or scene for which you have a similar concept image

Testing Steps:

Launch Webui with command line arg: --deepdanbooru
Navigate to img2img tab, use interrogate DeepBooru, verify tags appears as before. Use "Interrogate CLIP", verify prompt appears as before
Navigate to Settings tab, enable new option, click "apply settings"
Navigate to img2img, Interrogate DeepBooru again, verify that weights appear and are properly formatted. Note that "Interrogate CLIP" prompt is still unchanged
In my testing, this change has no effect to "Interrogate CLIP", as it seems to generate a sentence-structured caption, and not a set of tags.

(reproduce changes from 6ed4faac46)
2022-10-11 18:02:41 -07:00
supersteve3d
65b973ac4e
Update shared.py
Correct typo to "Unload VAE and CLIP from VRAM when training" in settings tab.
2022-10-12 08:21:52 +08:00
JC_Array
f53f703aeb resolved conflicts, moved settings under interrogate section, settings only show if deepbooru flag is enabled 2022-10-11 18:12:12 -05:00
JC-Array
963d986396
Merge branch 'AUTOMATIC1111:master' into deepdanbooru_pre_process 2022-10-11 17:33:15 -05:00
AUTOMATIC
6be32b31d1 reports that training with medvram is possible. 2022-10-11 23:07:09 +03:00
DepFA
66ec505975
add file based test 2022-10-11 20:21:30 +01:00
DepFA
7e6a6e00ad
Add files via upload 2022-10-11 20:20:46 +01:00
DepFA
5f3317376b
spacing 2022-10-11 20:09:49 +01:00
DepFA
91d7ee0d09
update imports 2022-10-11 20:09:10 +01:00
DepFA
aa75d5cfe8
correct conflict resolution typo 2022-10-11 20:06:13 +01:00
AUTOMATIC
d6fcc6b87b apply lr schedule to hypernets 2022-10-11 22:03:05 +03:00
DepFA
db71290d26
remove old caption method 2022-10-11 19:55:54 +01:00
DepFA
61788c0538
shift embedding logic out of textual_inversion 2022-10-11 19:50:50 +01:00
AUTOMATIC1111
419e539fe3
Merge branch 'learning_rate-scheduling' into learnschedule 2022-10-11 21:50:19 +03:00
DepFA
e5fbf5c755
remove embedding related image functions from images 2022-10-11 19:46:33 +01:00
DepFA
c080f52cea
move embedding logic to separate file 2022-10-11 19:37:58 +01:00
AUTOMATIC
6a9ea5b41c prevent extra modules from being saved/loaded with hypernet 2022-10-11 19:22:30 +03:00
AUTOMATIC
d4ea5f4d86 add an option to unload models during hypernetwork training to save VRAM 2022-10-11 19:03:08 +03:00
AUTOMATIC
6d09b8d1df produce error when training with medvram/lowvram enabled 2022-10-11 18:33:57 +03:00
JC_Array
ff4ef13dd5 removed unneeded print 2022-10-11 10:24:27 -05:00
AUTOMATIC
d682444ecc add option to select hypernetwork modules when creating 2022-10-11 18:04:47 +03:00
AUTOMATIC1111
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
brkirch
861db783c7 Use apply_hypernetwork function 2022-10-11 17:24:00 +03:00
brkirch
574c8e554a Add InvokeAI and lstein to credits, add back CUDA support 2022-10-11 17:24:00 +03:00
brkirch
98fd5cde72 Add check for psutil 2022-10-11 17:24:00 +03:00
brkirch
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
AUTOMATIC1111
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
DepFA
1eaad95533
Merge branch 'master' into embed-embeddings-in-images 2022-10-11 15:15:09 +01:00
AUTOMATIC
66b7d7584f become even stricter with pickles
no pickle shall pass
thank you again, RyotaK
2022-10-11 17:03:16 +03:00
papuSpartan
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
AUTOMATIC
b0583be088 more renames 2022-10-11 15:54:34 +03:00
AUTOMATIC
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
JamnedZ
a004d1a855 Added new line at the end of ngrok.py 2022-10-11 15:38:53 +03:00
JamnedZ
5992564448 Cleaned ngrok integration 2022-10-11 15:38:53 +03:00
Ben
861297cefe add a space holder 2022-10-11 15:37:04 +03:00
Ben
87b77cad5f Layout fix 2022-10-11 15:37:04 +03:00
yfszzx
87d63bbab5 images history improvement 2022-10-11 20:37:03 +08:00
Martin Cairns
eacc03b167 Fix typo in comments 2022-10-11 15:36:29 +03:00
Martin Cairns
1eae307607 Remove debug code for checking that first sigma value is same after code cleanup 2022-10-11 15:36:29 +03:00
Martin Cairns
92d7a13885 Handle different parameters for DPM fast & adaptive 2022-10-11 15:36:29 +03:00
yfszzx
594ab4ba53 images history improvement 2022-10-11 20:23:41 +08:00
yfszzx
7b1db45e1f images history improvement 2022-10-11 20:17:27 +08:00
AUTOMATIC
530103b586 fixes related to merge 2022-10-11 14:53:02 +03:00
alg-wiki
8bacbca0a1
Removed my local edits to checkpoint image generation 2022-10-11 17:35:09 +09:00
alg-wiki
b2368a3bce
Switched to exception handling 2022-10-11 17:32:46 +09:00
AUTOMATIC
5de806184f Merge branch 'master' into hypernetwork-training 2022-10-11 11:14:36 +03:00
AUTOMATIC
948533950c replace duplicate code with a function 2022-10-11 11:10:17 +03:00
hentailord85ez
5e2627a1a6
Comma backtrack padding (#2192)
Comma backtrack padding
2022-10-11 09:55:28 +03:00
Kenneth
8617396c6d Added slider for deepbooru score threshold in settings 2022-10-11 09:43:16 +03:00
Jairo Correa
8b7d3f1bef Make the ctrl+enter shortcut use the generate button on the current tab 2022-10-11 09:32:03 +03:00
DepFA
7aa8fcac1e
use simple lcg in xor 2022-10-11 04:17:36 +01:00
papuSpartan
1add3cff84 Refresh list of models/ckpts upon hitting restart gradio in the settings pane 2022-10-10 19:57:43 -05:00
JC_Array
bb932dbf9f added alpha sort and threshold variables to create process method in preprocessing 2022-10-10 18:37:52 -05:00
JC-Array
47f5e216da
Merge branch 'deepdanbooru_pre_process' into master 2022-10-10 18:10:49 -05:00
JC_Array
76ef3d75f6 added deepbooru settings (threshold and sort by alpha or likelyhood) 2022-10-10 18:01:49 -05:00
DepFA
e0fbe6d27e
colour depth conversion fix 2022-10-10 23:26:24 +01:00
DepFA
767202a4c3
add dependency 2022-10-10 23:20:52 +01:00
DepFA
315d5a8ed9
update data dis[play style 2022-10-10 23:14:44 +01:00
JC_Array
b980e7188c corrected tag return in get_deepbooru_tags 2022-10-10 16:52:54 -05:00
JC_Array
a1a05ad2d1 import time missing, added to deepbooru fixxing error on get_deepbooru_tags 2022-10-10 16:47:58 -05:00
alg-wiki
907a88b2d0 Added .webp .bmp 2022-10-11 06:35:07 +09:00
Fampai
2536ecbb17 Refactored learning rate code 2022-10-10 17:10:29 -04:00
AUTOMATIC
f98338faa8 add an option to not add watermark to created images 2022-10-10 23:15:48 +03:00
alg-wiki
f0ab972f85
Merge branch 'master' into textual__inversion 2022-10-11 03:35:28 +08:00
alg-wiki
bc3e183b73
Textual Inversion: Preprocess and Training will only pick-up image files 2022-10-11 04:30:13 +09:00
Justin Maier
1d64976dbc Simplify crop logic 2022-10-10 12:04:21 -06:00
AUTOMATIC
727e4d1086 no to different messages plus fix using != to compare to None 2022-10-10 20:46:55 +03:00
AUTOMATIC1111
b3d3b335cf
Merge pull request #2131 from ssysm/upstream-master
Add VAE Path Arguments
2022-10-10 20:45:14 +03:00
AUTOMATIC
39919c40dd add eta noise seed delta option 2022-10-10 20:32:44 +03:00
ssysm
af62ad4d25 change vae loading method 2022-10-10 13:25:28 -04:00
C43H66N12O12S2
ed769977f0 add swinir v2 support 2022-10-10 19:54:57 +03:00
C43H66N12O12S2
ece27fe989 Add files via upload 2022-10-10 19:54:57 +03:00
C43H66N12O12S2
3e7a981194 remove functorch 2022-10-10 19:54:07 +03:00
C43H66N12O12S2
623251ce2b allow pascal onwards 2022-10-10 19:54:07 +03:00
Vladimir Repin
9d33baba58 Always show previous mask and fix extras_send dest 2022-10-10 19:39:24 +03:00
hentailord85ez
d5c14365fd Add back in output hidden states parameter 2022-10-10 18:54:48 +03:00
hentailord85ez
460bbae587 Pad beginning of textual inversion embedding 2022-10-10 18:54:48 +03:00
hentailord85ez
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
RW21
f347ddfd80 Remove max_batch_count from ui.py 2022-10-10 18:53:40 +03:00
DepFA
df6d0d9286
convert back to rgb as some hosts add alpha 2022-10-10 15:43:09 +01:00
DepFA
707a431100
add pixel data footer 2022-10-10 15:34:49 +01:00
DepFA
ce2d7f7eac
Merge branch 'master' into embed-embeddings-in-images 2022-10-10 15:13:48 +01:00
alg-wiki
7a20f914ed Custom Width and Height 2022-10-10 17:05:12 +03:00
alg-wiki
6ad3a53e36 Fixed progress bar output for epoch 2022-10-10 17:05:12 +03:00
alg-wiki
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
AUTOMATIC
8f1efdc130 --no-half-vae pt2 2022-10-10 17:03:45 +03:00
alg-wiki
04c745ea4f
Custom Width and Height 2022-10-10 22:35:35 +09:00
AUTOMATIC
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
yfszzx
23f2989799 images history over 2022-10-10 18:33:49 +08:00
JC_Array
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
alg-wiki
4ee7519fc2
Fixed progress bar output for epoch 2022-10-10 17:31:33 +09:00
JC_Array
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
alg-wiki
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
yfszzx
8a7c07a214 show image history 2022-10-10 15:39:39 +08:00
brkirch
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
JC_Array
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
ssysm
6fdad291bd Merge branch 'master' of https://github.com/AUTOMATIC1111/stable-diffusion-webui into upstream-master 2022-10-09 23:20:39 -04:00
ssysm
cc92dc1f8d add vae path args 2022-10-09 23:17:29 -04:00
Justin Maier
6435691bb1 Add "Scale to" option to Extras 2022-10-09 19:26:52 -06:00
DepFA
4117afff11
Merge branch 'master' into embed-embeddings-in-images 2022-10-10 00:38:54 +01:00
DepFA
e2c2925eb4
remove braces from steps 2022-10-10 00:12:53 +01:00
DepFA
d6a599ef9b
change caption method 2022-10-10 00:07:52 +01:00
DepFA
0ac3a07eec
add caption image with overlay 2022-10-10 00:05:36 +01:00
DepFA
01fd9cf0d2
change source of step count 2022-10-09 22:17:02 +01:00
DepFA
96f1e6be59
source checkpoint hash from current checkpoint 2022-10-09 22:14:50 +01:00
DepFA
6684610510
correct case on embeddingFromB64 2022-10-09 22:06:42 +01:00
DepFA
d0184b8f76
change json tensor key name 2022-10-09 22:06:12 +01:00
DepFA
5d12ec82d3
add encoder and decoder classes 2022-10-09 22:05:09 +01:00
DepFA
969bd8256e
add alternate checkpoint hash source 2022-10-09 22:02:28 +01:00
DepFA
03694e1f99
add embedding load and save from b64 json 2022-10-09 21:58:14 +01:00
AUTOMATIC
a65476718f add DoubleStorage to list of allowed classes for pickle 2022-10-09 23:38:49 +03:00
DepFA
fa0c5eb81b
Add pretty image captioning functions 2022-10-09 20:41:22 +01:00
AUTOMATIC
8d340cfb88 do not add clip skip to parameters if it's 1 or 0 2022-10-09 22:31:35 +03:00
Fampai
1824e9ee3a Removed unnecessary tmp variable 2022-10-09 22:31:23 +03:00
Fampai
ad3ae44108 Updated code for legibility 2022-10-09 22:31:23 +03:00
Fampai
ec2bd9be75 Fix issues with CLIP ignore option name change 2022-10-09 22:31:23 +03:00
Fampai
a14f7bf113 Corrected CLIP Layer Ignore description and updated its range to the max possible 2022-10-09 22:31:23 +03:00
Fampai
e59c66c008 Optimized code for Ignoring last CLIP layers 2022-10-09 22:31:23 +03:00
AUTOMATIC
6c383d2e82 show model selection setting on top of page 2022-10-09 22:24:07 +03:00
Artem Zagidulin
9ecea0a8d6 fix missing png info when Extras Batch Process 2022-10-09 18:35:25 +03:00
AUTOMATIC
875ddfeecf added guard for torch.load to prevent loading pickles with unknown content 2022-10-09 17:58:43 +03:00
victorca25
53154ba10a
Merge branch 'master' into esrgan_mod 2022-10-09 14:11:22 +02:00
AUTOMATIC
9d1138e294 fix typo in filename for ESRGAN arch 2022-10-09 15:08:27 +03:00
AUTOMATIC
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
William Moorehouse
594cbfd8fb Sanitize infotext output (for now) 2022-10-09 14:49:15 +03:00
William Moorehouse
006791c13d Fix grabbing the model name for infotext 2022-10-09 14:49:15 +03:00
William Moorehouse
d6d10a37bf Added extended model details to infotext 2022-10-09 14:49:15 +03:00
AUTOMATIC
542a3d3a4a fix btoken hypernetworks in XY plot 2022-10-09 14:33:22 +03:00
victorca25
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
AUTOMATIC
77a719648d fix logic error in #1832 2022-10-09 13:48:04 +03:00
AUTOMATIC
f4578b343d fix model switching not working properly if there is a different yaml config 2022-10-09 13:23:30 +03:00
AUTOMATIC
bd833409ac additional changes for saving pnginfo for #1803 2022-10-09 13:10:15 +03:00
Milly
0609ce06c0 Removed duplicate definition model_path 2022-10-09 12:46:07 +03:00
AUTOMATIC
6f6798ddab prevent a possible code execution error (thanks, RyotaK) 2022-10-09 12:33:37 +03:00
AUTOMATIC
0241d811d2 Revert "Fix for Prompts_from_file showing extra textbox."
This reverts commit e2930f9821.
2022-10-09 12:04:44 +03:00
AUTOMATIC
ab4fe4f44c hide filenames for save button by default 2022-10-09 11:59:41 +03:00
Tony Beeman
cbf6dad02d Handle case where on_show returns the wrong number of arguments 2022-10-09 11:16:38 +03:00
Tony Beeman
86cb16886f Pull Request Code Review Fixes 2022-10-09 11:16:38 +03:00
Tony Beeman
e2930f9821 Fix for Prompts_from_file showing extra textbox. 2022-10-09 11:16:38 +03:00
Nicolas Noullet
1ffeb42d38 Fix typo 2022-10-09 11:10:13 +03:00
frostydad
ef93acdc73 remove line break 2022-10-09 11:09:17 +03:00
frostydad
03e570886f Fix incorrect sampler name in output 2022-10-09 11:09:17 +03:00
Fampai
122d42687b Fix VRAM Issue by only loading in hypernetwork when selected in settings 2022-10-09 11:08:11 +03:00
AUTOMATIC1111
e00b4df7c6
Merge pull request #1752 from Greendayle/dev/deepdanbooru
Added DeepDanbooru interrogator
2022-10-09 10:52:21 +03:00
aoirusann
14192c5b20 Support Download for txt files. 2022-10-09 10:49:11 +03:00
aoirusann
5ab7e88d9b Add Download & Download as zip 2022-10-09 10:49:11 +03:00
AUTOMATIC
4e569fd888 fixed incorrect message about loading config; thanks anon! 2022-10-09 10:31:47 +03:00
AUTOMATIC
c77c89cc83 make main model loading and model merger use the same code 2022-10-09 10:23:31 +03:00
DepFA
cd8673bd9b
add embed embedding to ui 2022-10-09 05:40:57 +01:00
DepFA
5841990b0d
Update textual_inversion.py 2022-10-09 05:38:38 +01:00
AUTOMATIC
050a6a798c support loading .yaml config with same name as model
support EMA weights in processing (????)
2022-10-08 23:26:48 +03:00
Aidan Holland
432782163a chore: Fix typos 2022-10-08 22:42:30 +03:00
Edouard Leurent
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
AUTOMATIC
3b2141c5fb add 'Ignore last layers of CLIP model' option as a parameter to the infotext 2022-10-08 22:21:15 +03:00
AUTOMATIC
e6e42f98df make --force-enable-xformers work without needing --xformers 2022-10-08 22:12:23 +03:00
Fampai
1371d7608b Added ability to ignore last n layers in FrozenCLIPEmbedder 2022-10-08 22:10:37 +03:00
DepFA
b458fa48fe Update ui.py 2022-10-08 20:38:35 +03:00
DepFA
15c4278f1a TI preprocess wording
I had to check the code to work out what splitting was 🤷🏿
2022-10-08 20:38:35 +03:00
Greendayle
0ec80f0125
Merge branch 'master' into dev/deepdanbooru 2022-10-08 18:28:22 +02:00
AUTOMATIC
3061cdb7b6 add --force-enable-xformers option and also add messages to console regarding cross attention optimizations 2022-10-08 19:22:15 +03:00
AUTOMATIC
f9c5da1592 add fallback for xformers_attnblock_forward 2022-10-08 19:05:19 +03:00
Greendayle
01f8cb4447 made deepdanbooru optional, added to readme, automatic download of deepbooru model 2022-10-08 18:02:56 +02:00
Artem Zagidulin
a5550f0213 alternate prompt 2022-10-08 18:12:19 +03:00
C43H66N12O12S2
cc0258aea7 check for ampere without destroying the optimizations. again. 2022-10-08 17:54:16 +03:00
C43H66N12O12S2
017b6b8744 check for ampere 2022-10-08 17:54:16 +03:00
Greendayle
5329d0aba0 Merge branch 'master' into dev/deepdanbooru 2022-10-08 16:30:28 +02:00
AUTOMATIC
cfc33f99d4 why did you do this 2022-10-08 17:29:06 +03:00
Greendayle
2e8ba0fa47 fix conflicts 2022-10-08 16:27:48 +02:00
Milly
4f33289d0f Fixed typo 2022-10-08 17:15:30 +03:00
AUTOMATIC
27032c47df restore old opt_split_attention/disable_opt_split_attention logic 2022-10-08 17:10:05 +03:00
AUTOMATIC
dc1117233e simplify xfrmers options: --xformers to enable and that's it 2022-10-08 17:02:18 +03:00
AUTOMATIC
7ff1170a2e emergency fix for xformers (continue + shared) 2022-10-08 16:33:39 +03:00
AUTOMATIC1111
48feae37ff
Merge pull request #1851 from C43H66N12O12S2/flash
xformers attention
2022-10-08 16:29:59 +03:00
C43H66N12O12S2
970de9ee68
Update sd_hijack.py 2022-10-08 16:29:43 +03:00
C43H66N12O12S2
69d0053583
update sd_hijack_opt to respect new env variables 2022-10-08 16:21:40 +03:00
C43H66N12O12S2
ddfa9a9786
add xformers_available shared variable 2022-10-08 16:20:41 +03:00
C43H66N12O12S2
26b459a379
default to split attention if cuda is available and xformers is not 2022-10-08 16:20:04 +03:00
MrCheeze
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
ddPn08
772db721a5 fix glob path in hypernetwork.py 2022-10-08 15:46:54 +03:00
AUTOMATIC
7001bffe02 fix AND broken for long prompts 2022-10-08 15:43:25 +03:00
AUTOMATIC
77f4237d1c fix bugs related to variable prompt lengths 2022-10-08 15:25:59 +03:00
AUTOMATIC
4999eb2ef9 do not let user choose his own prompt token count limit 2022-10-08 14:25:47 +03:00
Trung Ngo
00117a07ef check specifically for skipped 2022-10-08 13:40:39 +03:00
Trung Ngo
786d9f63aa Add button to skip the current iteration 2022-10-08 13:40:39 +03:00
AUTOMATIC
45cc0ce3c4 Merge remote-tracking branch 'origin/master' 2022-10-08 13:39:08 +03:00
AUTOMATIC
706d5944a0 let user choose his own prompt token count limit 2022-10-08 13:38:57 +03:00
leko
616b7218f7 fix: handles when state_dict does not exist 2022-10-08 12:38:50 +03:00
C43H66N12O12S2
91d66f5520
use new attnblock for xformers path 2022-10-08 11:56:01 +03:00
C43H66N12O12S2
76a616fa6b
Update sd_hijack_optimizations.py 2022-10-08 11:55:38 +03:00
C43H66N12O12S2
5d54f35c58
add xformers attnblock and hypernetwork support 2022-10-08 11:55:02 +03:00
brkirch
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
C43H66N12O12S2
b70eaeb200
delete broken and unnecessary aliases 2022-10-08 04:10:35 +03:00
C43H66N12O12S2
c9cc65b201
switch to the proper way of calling xformers 2022-10-08 04:09:18 +03:00
AUTOMATIC
12c4d5c6b5 hypernetwork training mk1 2022-10-07 23:22:22 +03:00
Greendayle
5f12e7efd9 linux test 2022-10-07 20:58:30 +02:00
Greendayle
fa2ea648db even more powerfull fix 2022-10-07 20:46:38 +02:00
Greendayle
54fa613c83 loading tf only in interrogation process 2022-10-07 20:37:43 +02:00
Greendayle
537da7a304 Merge branch 'master' into dev/deepdanbooru 2022-10-07 18:31:49 +02:00
AUTOMATIC
f7c787eb7c make it possible to use hypernetworks without opt split attention 2022-10-07 16:39:51 +03:00
AUTOMATIC
97bc0b9504 do not stop working on failed hypernetwork load 2022-10-07 13:22:50 +03:00
AUTOMATIC
d15b3ec001 support loading VAE 2022-10-07 10:40:22 +03:00
AUTOMATIC
bad7cb29ce added support for hypernetworks (???) 2022-10-07 10:17:52 +03:00
C43H66N12O12S2
5e3ff846c5
Update sd_hijack.py 2022-10-07 06:38:01 +03:00
C43H66N12O12S2
5303df2428
Update sd_hijack.py 2022-10-07 06:01:14 +03:00
C43H66N12O12S2
35d6b23162
Update sd_hijack.py 2022-10-07 05:31:53 +03:00
C43H66N12O12S2
da4ab2707b
Update shared.py 2022-10-07 05:23:06 +03:00
C43H66N12O12S2
2eb911b056
Update sd_hijack.py 2022-10-07 05:22:28 +03:00
C43H66N12O12S2
f174fb2922
add xformers attention 2022-10-07 05:21:49 +03:00
AUTOMATIC
b34b25b4c9 karras samplers for img2img? 2022-10-06 23:27:01 +03:00
Milly
405c8171d1 Prefer using Processed.sd_model_hash attribute when filename pattern 2022-10-06 20:41:23 +03:00
Milly
1cc36d170a Added job_timestamp to Processed
So `[job_timestamp]` pattern can use in saving image UI.
2022-10-06 20:41:23 +03:00
Milly
070b7d60cf Added styles to Processed
So `[styles]` pattern can use in saving image UI.
2022-10-06 20:41:23 +03:00
Milly
cf7c784fcc Removed duplicate defined models_path
Use `modules.paths.models_path` instead `modules.shared.model_path`.
2022-10-06 20:29:12 +03:00
AUTOMATIC
dbc8a4d351 add generation parameters to images shown in web ui 2022-10-06 20:27:50 +03:00
Milly
0bb458f0ca Removed duplicate image saving codes
Use `modules.images.save_image()` instead.
2022-10-06 20:15:39 +03:00
Jairo Correa
b66aa334a9 Merge branch 'master' into fix-vram 2022-10-06 13:41:37 -03:00
DepFA
fec71e4de2 Default window title progress updates on 2022-10-06 17:58:52 +03:00
DepFA
be71115b1a Update shared.py 2022-10-06 17:58:52 +03:00
AUTOMATIC
5993df24a1 integrate the new samplers PR 2022-10-06 14:12:52 +03:00
C43H66N12O12S2
3ddf80a9db add variant setting 2022-10-06 13:42:21 +03:00
C43H66N12O12S2
71901b3d3b add karras scheduling variants 2022-10-06 13:42:21 +03:00
AUTOMATIC
2d3ea42a2d workaround for a mysterious bug where prompt weights can't be matched 2022-10-06 13:21:12 +03:00
AUTOMATIC
5f24b7bcf4 option to let users select which samplers they want to hide 2022-10-06 12:08:59 +03:00
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
Hanusz Leszek
e9919f2ab7 Sort scripts loading order 2022-09-29 12:48:42 +03:00
safentisAuth
66fed8ffb8 Add custom name and try-except 2022-09-29 12:41:47 +03:00
Michoko
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
Michoko
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
Michoko
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
AUTOMATIC
4127f4aff8 fix program breaking on empty prompt 2022-09-29 11:39:55 +03:00
AUTOMATIC
c1c27dad3b new implementation for attention/emphasis 2022-09-29 11:31:48 +03:00
AUTOMATIC
29ce8a687d remove unneded debug print 2022-09-29 08:03:23 +03:00
Jairo Correa
c2d5b29040 Move silu to sd_hijack 2022-09-29 01:16:25 -03:00
Jairo Correa
c938679de7 Fix memory leak and reduce memory usage 2022-09-28 22:14:13 -03:00
William Moorehouse
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
AUTOMATIC
7acfaca05a update lists of models after merging them in checkpoints tab
support saving as half
2022-09-29 00:59:44 +03:00
AUTOMATIC
791808c890 correctly list and display model names for #1261 2022-09-29 00:21:54 +03:00
AUTOMATIC
d62954c2bc fix broken DDIM with img2img 2022-09-28 22:30:52 +03:00
AUTOMATIC
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
AUTOMATIC1111
278e7c7114
Merge pull request #1194 from liamkerr/token_count
Token count
2022-09-28 19:22:55 +03:00
AUTOMATIC
1deac2b645 do nor add log messages to saved iamge parameters 2022-09-28 18:20:30 +03:00
AUTOMATIC
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
AUTOMATIC
9be0d1b89e Merge remote-tracking branch 'origin/master' 2022-09-28 17:05:32 +03:00
AUTOMATIC
aea5b2510e save parameters for images when using the Save button. 2022-09-28 17:05:23 +03:00
Liam
7ca9858c4c removed unused import; now using javascript to watch prompt textarea 2022-09-28 09:43:54 -04:00
Bernard Maltais
228a2f30e7 Remove unintended code commit for this PR 2022-09-28 08:56:07 -04:00
Bernard Maltais
fe2f0e1729 Adding support for inverse sigmoid interpolation 2022-09-28 08:52:46 -04:00
Bernard Maltais
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
WDevelopsWebApps
03ee67bfd3 add advanced saving for save button 2022-09-28 10:53:40 +02:00
AUTOMATIC
2ab64ec81a emergency fix for #1199 2022-09-28 10:49:07 +03:00
AUTOMATIC1111
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
Bernard Maltais
4c9c2a6702 -Fix interp_amount rounding in filename
-Sort list of checkpoints in list
2022-09-27 22:16:25 -04:00
C43H66N12O12S2
047ca73388
Update shared.py 2022-09-28 05:11:40 +03:00
C43H66N12O12S2
5391c0bf3e
Update processing.py 2022-09-28 05:11:03 +03:00
C43H66N12O12S2
8644e494be
add eta to k ancestral 2022-09-28 05:09:22 +03:00
Bernard Maltais
8c48ede135 Fix variable conversion code issue 2022-09-27 21:34:24 -04:00
Bernard Maltais
d641af6a7d - Add gradio dropdown list to select checkpoints
- Update checkpoint model fields labels
2022-09-27 21:09:28 -04:00
Bernard Maltais
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
Liam
e5707b66d6 switched the token counter to use hidden buttons instead of api call 2022-09-27 19:29:53 -04:00
Liam
981fe9c4a3 Merge remote-tracking branch 'upstream/master' into token_count 2022-09-27 16:37:24 -04:00
Liam
5034f7d759 added token counter next to txt2img and img2img prompts 2022-09-27 15:56:18 -04:00
Bernard Maltais
e258f89080 Fix file name 2022-09-27 15:31:00 -04:00
Bernard Maltais
20b41b7be7 (feat): Rework Checkpoint Merger UI for better clarity
- Rename variables to better align with field input
- Improve merged checkpoint output file name
2022-09-27 15:21:25 -04:00
AUTOMATIC1111
f2a4a2c3a6
Merge pull request #1165 from baumandm/patch-1
Fix downssample typo in options
2022-09-27 20:57:28 +03:00
d8ahazard
31ad536c33 Remove debugging message 2022-09-27 11:05:25 -05:00
d8ahazard
5756d517a6 Merge remote-tracking branch 'upstream/master' into ModelLoader 2022-09-27 11:02:41 -05:00
d8ahazard
11875f5863 Use model loader with stable-diffusion too.
Hook the model loader into the SD_models file.
Add default url/download if checkpoint is not found.
Add matching stablediffusion-models-path argument.
Add message that --ckpt-dir will be removed in the future, but have it pipe to stablediffusion-models-path for now.
Update help strings for models-path args so they're more or less uniform.
Move sd_model "setup" call to webUI with the others.
Ensure "cleanup_models" method moves existing models to the new locations, including SD, and that we aren't deleting folders that still have stuff in them.
2022-09-27 11:01:13 -05:00
Bernard Maltais
0bd8aa937f Add interpolation method and weight to output filename 2022-09-27 10:29:52 -04:00
Dave Bauman
c055132606
Fix downssample typo in options
Updated `downssample` to `down-sample`, matching spelling in other places.
2022-09-27 09:50:06 -04:00
AUTOMATIC
ada901ed66 added console outputs, more clear indication of progress, and ability to specify full filename to checkpoint merger
restore "Loading..." text
2022-09-27 10:44:00 +03:00
AUTOMATIC1111
a9dc307a21
Merge pull request #1066 from moorehousew/master
Add support for checkpoint merging
2022-09-27 09:59:37 +03:00
AUTOMATIC1111
dbe072dcff
Merge pull request #1126 from AUTOMATIC1111/notification-sound
adds support for a notification.mp3 in the root directory that will play upon completion (fixes #1013)
2022-09-27 09:57:16 +03:00
DepFA
adbd26a68f add missing s_tmax 2022-09-27 09:30:45 +03:00
DepFA
48d5796f0d pass eta to tex2img sampler 2022-09-27 09:30:45 +03:00
DepFA
61585e5778 rename DDIM eta label 2022-09-27 09:30:45 +03:00
DepFA
a860839f1f take extra sampler properties from StableDiffusionProcessing 2022-09-27 09:30:45 +03:00
DepFA
4ea36a37d6 add sampler properties to StableDiffusionProcessing and Processed 2022-09-27 09:30:45 +03:00
DepFA
2ab3d593f9 pass extra KDiffusionSampler function parameters 2022-09-27 09:30:45 +03:00
DepFA
6b78833e33 Add extra kdiffusion parameters 2022-09-27 09:30:45 +03:00
DepFA
ed5736139c pass ddim_eta and ddim_discretize 2022-09-27 09:30:45 +03:00
DepFA
619668ccfe Add options for exposed ddim sampler params
ddim_eta & ddim_discretize
2022-09-27 09:30:45 +03:00
48DESIGN
e4145c8453
Merge branch 'master' into notification-sound 2022-09-27 08:05:19 +02:00
Daniel
8dcac9ac81 Grids saving to subdirectory when setting unchecked
Fixed grids saving to subdirectory when the setting is unchecked but "save images to subdirectory" was checked.
2022-09-27 08:58:47 +03:00
DepFA
16e7ac09df job_timestamp initialization change 2022-09-27 08:51:59 +03:00
Connum
2846ca5702 adds support for a notification.mp3 in the root directory that will play upon completion (fixes #1013) 2022-09-26 22:57:31 +02:00
d8ahazard
7d5c29b674 Cleanup existing directories, fixes 2022-09-26 10:27:18 -05:00
William Moorehouse
dc11748dea Added smoothstep interpolation to checkpoint merging 2022-09-26 10:50:21 -04:00
d8ahazard
740070ea9c Re-implement universal model loading 2022-09-26 09:29:50 -05:00
d8ahazard
bfb7f15d46 Rename swinir -> swinir_model 2022-09-26 09:29:22 -05:00
d8ahazard
bff8d0ce42 Fix swinir arch name 2022-09-26 09:27:50 -05:00
tateisu
78d6aef302 use strftime. update hints.js 2022-09-26 16:24:21 +03:00
tateisu
b39f06cea7 add [datetime] to image file name pattern 2022-09-26 16:24:21 +03:00
Liam
db4ab47f09 copy over fields when sending to img2img: https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/1029 2022-09-26 08:33:02 +03:00
William Moorehouse
91643f651d Add support for checkpoint merging 2022-09-25 19:22:12 -04:00
AUTOMATIC
ca3e5519e8 Merge remote-tracking branch 'origin/master' 2022-09-25 19:45:22 +03:00
AUTOMATIC
ff107845b4 added hiding items to ui-config.json 2022-09-25 19:43:42 +03:00
Eyrie
1877a3767e Changed job_id to timestamp 2022-09-25 17:11:07 +03:00
Eyrie
4c3d4aad60 fix formatting 2022-09-25 17:11:07 +03:00
Eyrie
e13912dfde fix formatting 2022-09-25 17:11:07 +03:00
Eyrie
40166dbf08 Added job_id pattern for directories 2022-09-25 17:11:07 +03:00
AUTOMATIC
073f6eac22 potential fix for embeddings no loading on AMD cards 2022-09-25 15:04:39 +03:00
DepFA
50ae19acf6 add custom script source to config path keys 2022-09-25 09:59:31 +03:00
DepFA
31a0fbf1ad add attribute to custom script controls 2022-09-25 09:59:31 +03:00
guaneec
615b2fc9ce Fix token max length 2022-09-25 09:30:02 +03:00
AUTOMATIC
b8eae5de93 Merge remote-tracking branch 'origin/master' 2022-09-25 09:25:47 +03:00
AUTOMATIC
600cc0342d added support for setting hires fix from pasted prompts
added more robust detection of last line with parameters for pasted prompts
2022-09-25 09:25:28 +03:00
DepFA
72e2a96284 Correct indent 2022-09-25 08:46:09 +03:00
DepFA
ab5a472556 Persist default Number values 2022-09-25 08:46:09 +03:00
DepFA
ca13264609 Add attr to skip 2022-09-25 08:46:09 +03:00
DepFA
b1320d79b5 Apply to all checkboxes and textboxes 2022-09-25 08:46:09 +03:00
DepFA
714dcda068 Add attributes to checkboxes for persisting 2022-09-25 08:46:09 +03:00
AUTOMATIC
53be15c204 by popular request, moves width/height sliders higher 2022-09-25 08:40:29 +03:00
EyeDeck
b5d705e263 Disable 'batch img2img' when launched with --hide-ui-dir-config
Prevent writing to arbitrary directories, as usual
2022-09-24 19:06:36 +03:00
RnDMonkey
a2bea2f97a added [styles] filename pattern 2022-09-24 11:12:58 +03:00
AUTOMATIC
410bef0853 do not hide preview image too early 2022-09-24 09:16:54 +03:00
AUTOMATIC
31ac0baba0 Reformat some changes from the previous commit. 2022-09-24 08:23:01 +03:00
RnDMonkey
ed8b8b3b8c
Fix to XY_Grid script console progress bar and other progress bar improvements (#890)
Fix to XY_Grid script console progress bar and other progress bar improvements #890
2022-09-24 08:09:59 +03:00
innovaciones
3e4b7fb869 Remove double loading message 2022-09-24 07:58:07 +03:00
Jacob Tyndall
0f77e1852f Clear no longer needed VRAM during a 'highres fix' generation created during the first sampling before doing the second (img2img) sampling. Makes it possible to use the feature on an 8GB card. 2022-09-24 07:41:59 +03:00
AUTOMATIC
71cfb9ebac fix for settings sometimes not applying on javascript side 2022-09-24 00:13:32 +03:00
AUTOMATIC
c8c662901b fix for inpaint at full resolution breaking if you have an NN upscaler. 2022-09-23 23:29:53 +03:00
AUTOMATIC
39ce23f42d add the bitton to paste parameters into UI for txt2img, img2img, and pnginfo tabs
fixed some [send to..] buttons to work properly with all tabs
2022-09-23 22:49:21 +03:00
AUTOMATIC
8ffc07b7b1 one change didn't make it into the previous commit 2022-09-23 20:54:17 +03:00
AUTOMATIC
0065327726 upgrade to gradio==3.4b3 t fixthe inpain bugs
rework progressbar/preview to work with new gradio
remove unnecessary create style button
added link to alternative colab
2022-09-23 20:46:02 +03:00
AUTOMATIC
1a0353675d Option to use advanced upscalers with normal img2img 2022-09-23 17:37:47 +03:00
AUTOMATIC
6fa20d51dc prevent saving settings with bogus values 2022-09-23 17:27:30 +03:00
AUTOMATIC1111
79e7c39298
Merge pull request #847 from rewbs/rewbs-optionally-save-before-color-correction
Add option to save before color correction. This helps with some posterisation issues in img2img loopback.
2022-09-23 14:41:06 +03:00
Seki
03faf20251 add extrastab send to inpaint 2022-09-23 14:19:33 +03:00
Seki
8708386609 add extrastab send to img2img 2022-09-23 14:19:33 +03:00
AUTOMATIC
d4205e66fa gfpgan: just download the damn model 2022-09-23 10:26:00 +03:00
AUTOMATIC
7ef361dfc3 add warning for when user's settings are broken 2022-09-23 09:15:00 +03:00
innovaciones
0ce9e05a42 Fix typo 2022-09-23 08:33:08 +03:00
innovaciones
ebf19c1145 Show interrupt button without progress bar 2022-09-23 08:33:08 +03:00
DepFA
42b7902922 sort JavaScript includes to assure script sequence
Who knows what filesystem they're on
2022-09-23 08:30:32 +03:00
Robin Fernandes
d26d89377b Remove unnecessary duplication 2022-09-23 00:57:42 +00:00
Robin Fernandes
03738668c0 Merge from master 2022-09-23 00:54:32 +00:00
AUTOMATIC
77cf346d93 settings categories split to columns, remade categories 2022-09-22 21:32:44 +03:00
AUTOMATIC
75b90a5e40 emergency fix for the settings screen breaking the program 2022-09-22 20:41:22 +03:00
DepFA
6d1c01c955 Add section splitting to settings ui 2022-09-22 20:26:21 +03:00
DepFA
dec7584903 Add Section keys and headers to settings 2022-09-22 20:26:21 +03:00
Prof-Cheese
ae32b8a53f Fixed directory name generation process.
'Max prompt words' has been added to config and modified to be used in the directory name generation process.
2022-09-22 20:15:37 +03:00
Johan Aires Rastén
a213d3a21c Add option to always log generation info 2022-09-22 16:34:54 +03:00
Robin Fernandes
25eb1e3d90 Add option to save before color correction. Add suffix param when saving files, used for special saves without color correction and face restoration. 2022-09-22 20:54:50 +10:00
AUTOMATIC
3582befdcd move Notification.requestPermission() entirely to javascript to possibly fix problem with secure context people are having on non-localhost 2022-09-22 13:15:33 +03:00
AUTOMATIC
b0765a6788 remove labels from output gallery 2022-09-22 12:30:11 +03:00
AUTOMATIC
91bfc71261 A big rework, just what you were secretly hoping for!
SD upscale moved to scripts
Batch processing script removed
Batch processing added to main img2img and now works with scripts
img2img page UI reworked to use tabs
2022-09-22 12:11:48 +03:00
innovaciones
aa1d1bf44e New position and interrupt integration 2022-09-22 08:12:10 +03:00
innovaciones
70e39f6cfe Use generate button as progress bar 2022-09-22 08:12:10 +03:00
AUTOMATIC
3eaae8ae65 reworking #775 2022-09-22 07:59:27 +03:00
d8ahazard
c214c428bc Basic settings for realesrgan model selection.
I don't like that you have to restart the app, but it works.
2022-09-22 07:21:54 +03:00
d8ahazard
4f434c8aea Fix/Revert opts name from GAN to ESRGAN 2022-09-22 07:21:54 +03:00
d8ahazard
9a93a82b82 Cleanup Imports 2022-09-22 07:21:54 +03:00
d8ahazard
3cc68300cb Typo Fix 2022-09-22 07:21:54 +03:00
d8ahazard
dd5566814a Add new models, fix shared opts issues
Add General x4x3, GeneralWDN x4x3, and AnimeVideo models from newer ESRGAN releases.

Fix issues caused by renaming ESRGAN_tille values to GAN_tile without using an IDE...
2022-09-22 07:21:54 +03:00
d8ahazard
1a1f7e85c7
Add LDSR and "GoLatent?" Upscaling (#763)
* Add LDSR Upscaling
2022-09-21 16:06:37 +03:00
AUTOMATIC
75dd274dd6 prevent seed extras from having effect when extras checkbox is not checked 2022-09-21 13:34:10 +03:00
AUTOMATIC
4b26b50df0 Merge remote-tracking branch 'origin/master' 2022-09-21 09:49:07 +03:00
AUTOMATIC
254da5d127 --opt-split-attention now on by default for torch.cuda, off for others (cpu and MPS; because the option does not work there according to reports) 2022-09-21 09:49:02 +03:00
Connum
e9ba2d42d6 fix image replacement via clipboard paste or drag and drop on PNG Info tab 2022-09-21 09:13:13 +03:00
C43H66N12O12S2
29d6084f47 disallow no tiling as we don't support it 2022-09-21 09:09:39 +03:00
C43H66N12O12S2
a5313351b3 Update swinir.py 2022-09-21 09:09:39 +03:00
C43H66N12O12S2
403bb02948 breakout tile options 2022-09-21 09:09:39 +03:00
AUTOMATIC
6785fabefb Revert "fix for swininr PR breaking ESRGAN for new users"
This reverts commit 8d1d64f9a2.
2022-09-21 09:09:20 +03:00
AUTOMATIC
8d1d64f9a2 fix for swininr PR breaking ESRGAN for new users 2022-09-21 08:39:47 +03:00