diff options
author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-02-19 12:04:03 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-19 12:04:03 +0000 |
commit | 076d624a297532d6e4abebe5807fd7c7504d7a73 (patch) | |
tree | ce218bfe34702314ac19669c37bb4f7af3455ae1 /modules/sd_models.py | |
parent | 72022133581e47a5b65075777522b392fb77b285 (diff) | |
parent | 014e7323f6f54a38183f8de52dc83f2248eee251 (diff) | |
download | stable-diffusion-webui-gfx803-076d624a297532d6e4abebe5807fd7c7504d7a73.tar.gz stable-diffusion-webui-gfx803-076d624a297532d6e4abebe5807fd7c7504d7a73.tar.bz2 stable-diffusion-webui-gfx803-076d624a297532d6e4abebe5807fd7c7504d7a73.zip |
Merge pull request #7933 from w-e-w/fix-auto-sd-download
Fix issue with auto sd1.5 download
Diffstat (limited to 'modules/sd_models.py')
-rw-r--r-- | modules/sd_models.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/modules/sd_models.py b/modules/sd_models.py index 127e9663..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, model_url="https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.safetensors", command_path=shared.cmd_opts.ckpt_dir, ext_filter=[".ckpt", ".safetensors"], download_name="v1-5-pruned-emaonly.safetensors", ext_blacklist=[".vae.ckpt", ".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()
|