aboutsummaryrefslogtreecommitdiffstats
path: root/modules/sd_models.py
diff options
context:
space:
mode:
authorVladimir Mandic <mandic00@live.com>2023-02-19 14:19:25 +0000
committerGitHub <noreply@github.com>2023-02-19 14:19:25 +0000
commit8affa42588e85d10da86c401e3558143b05121af (patch)
treee6b9640f52787f41ba675ec0fb98e580dbad1d85 /modules/sd_models.py
parenta320d157ec0221fa4e9c756327e31d881b9921ae (diff)
parent076d624a297532d6e4abebe5807fd7c7504d7a73 (diff)
downloadstable-diffusion-webui-gfx803-8affa42588e85d10da86c401e3558143b05121af.tar.gz
stable-diffusion-webui-gfx803-8affa42588e85d10da86c401e3558143b05121af.tar.bz2
stable-diffusion-webui-gfx803-8affa42588e85d10da86c401e3558143b05121af.zip
Merge branch 'AUTOMATIC1111:master' into hide_ui_tabs
Diffstat (limited to 'modules/sd_models.py')
-rw-r--r--modules/sd_models.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/modules/sd_models.py b/modules/sd_models.py
index d847d358..93959f55 100644
--- a/modules/sd_models.py
+++ b/modules/sd_models.py
@@ -105,9 +105,15 @@ def checkpoint_tiles():
def list_models():
checkpoints_list.clear()
checkpoint_alisases.clear()
- model_list = modelloader.load_models(model_path=model_path, command_path=shared.cmd_opts.ckpt_dir, ext_filter=[".ckpt", ".safetensors"], ext_blacklist=[".vae.safetensors"])
cmd_ckpt = shared.cmd_opts.ckpt
+ if shared.cmd_opts.no_download_sd_model or cmd_ckpt != shared.sd_model_file or os.path.exists(cmd_ckpt):
+ model_url = None
+ else:
+ model_url = "https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.safetensors"
+
+ model_list = modelloader.load_models(model_path=model_path, model_url=model_url, command_path=shared.cmd_opts.ckpt_dir, ext_filter=[".ckpt", ".safetensors"], download_name="v1-5-pruned-emaonly.safetensors", ext_blacklist=[".vae.ckpt", ".vae.safetensors"])
+
if os.path.exists(cmd_ckpt):
checkpoint_info = CheckpointInfo(cmd_ckpt)
checkpoint_info.register()