aboutsummaryrefslogtreecommitdiffstats
path: root/modules/sd_models.py
diff options
context:
space:
mode:
authorInvincibleDude <81354513+InvincibleDude@users.noreply.github.com>2023-03-03 16:49:24 +0000
committerGitHub <noreply@github.com>2023-03-03 16:49:24 +0000
commite97b83bdbb852fd2c06ed2ec6c0f92d458e82245 (patch)
tree0f0b3779120d602d1d833a50e33c9f73b218f684 /modules/sd_models.py
parent51f81efb02876d24c9e6d844e8c0cbd2384f6514 (diff)
parent0cc0ee1bcb4c24a8c9715f66cede06601bfc00c8 (diff)
downloadstable-diffusion-webui-gfx803-e97b83bdbb852fd2c06ed2ec6c0f92d458e82245.tar.gz
stable-diffusion-webui-gfx803-e97b83bdbb852fd2c06ed2ec6c0f92d458e82245.tar.bz2
stable-diffusion-webui-gfx803-e97b83bdbb852fd2c06ed2ec6c0f92d458e82245.zip
Merge branch 'master' into improved-hr-conflict-test
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()