From 11875f586323cea7c5b8398976449788a83dee76 Mon Sep 17 00:00:00 2001
From: d8ahazard <d8ahazard@gmail.com>
Date: Tue, 27 Sep 2022 11:01:13 -0500
Subject: 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.
---
 modules/sd_models.py | 48 +++++++++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 19 deletions(-)

(limited to 'modules/sd_models.py')

diff --git a/modules/sd_models.py b/modules/sd_models.py
index dc81b0dc..89b7d276 100644
--- a/modules/sd_models.py
+++ b/modules/sd_models.py
@@ -8,7 +8,13 @@ from omegaconf import OmegaConf
 
 from ldm.util import instantiate_from_config
 
-from modules import shared
+from modules import shared, modelloader
+from modules.paths import models_path
+
+model_dir = "Stable-diffusion"
+model_path = os.path.join(models_path, model_dir)
+model_name = "sd-v1-4.ckpt"
+model_url = "https://drive.yerf.org/wl/?id=EBfTrmcCCUAGaQBXVIj5lJmEhjoP1tgl&mode=grid&download=1"
 
 CheckpointInfo = namedtuple("CheckpointInfo", ['filename', 'title', 'hash'])
 checkpoints_list = {}
@@ -23,23 +29,28 @@ except Exception:
     pass
 
 
-def list_models():
-    checkpoints_list.clear()
+def modeltitle(path, h):
+    abspath = os.path.abspath(path)
 
-    model_dir = os.path.abspath(shared.cmd_opts.ckpt_dir)
+    if abspath.startswith(model_dir):
+        name = abspath.replace(model_dir, '')
+    else:
+        name = os.path.basename(path)
 
-    def modeltitle(path, h):
-        abspath = os.path.abspath(path)
+    if name.startswith("\\") or name.startswith("/"):
+        name = name[1:]
 
-        if abspath.startswith(model_dir):
-            name = abspath.replace(model_dir, '')
-        else:
-            name = os.path.basename(path)
+    return f'{name} [{h}]'
 
-        if name.startswith("\\") or name.startswith("/"):
-            name = name[1:]
 
-        return f'{name} [{h}]'
+def setup_model(dirname):
+    global model_path
+    global model_name
+    global model_url
+    if not os.path.exists(model_path):
+        os.makedirs(model_path)
+    checkpoints_list.clear()
+    model_list = modelloader.load_models(model_path, model_url, dirname, model_name, ext_filter=".ckpt")
 
     cmd_ckpt = shared.cmd_opts.ckpt
     if os.path.exists(cmd_ckpt):
@@ -47,13 +58,12 @@ def list_models():
         title = modeltitle(cmd_ckpt, h)
         checkpoints_list[title] = CheckpointInfo(cmd_ckpt, title, h)
     elif cmd_ckpt is not None and cmd_ckpt != shared.default_sd_model_file:
-        print(f"Checkpoint in --ckpt argument not found: {cmd_ckpt}", file=sys.stderr)
+        print(f"Checkpoint in --ckpt argument not found (Possible it was moved to {model_path}: {cmd_ckpt}", file=sys.stderr)
 
-    if os.path.exists(model_dir):
-        for filename in glob.glob(model_dir + '/**/*.ckpt', recursive=True):
-            h = model_hash(filename)
-            title = modeltitle(filename, h)
-            checkpoints_list[title] = CheckpointInfo(filename, title, h)
+    for filename in model_list:
+        h = model_hash(filename)
+        title = modeltitle(filename, h)
+        checkpoints_list[title] = CheckpointInfo(filename, title, h)
 
 
 def model_hash(filename):
-- 
cgit v1.2.3


From 0dce0df1ee63b2f158805c1a1f1a3743cc4a104b Mon Sep 17 00:00:00 2001
From: d8ahazard <d8ahazard@gmail.com>
Date: Thu, 29 Sep 2022 17:46:23 -0500
Subject: 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.
---
 modules/sd_models.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules/sd_models.py')

diff --git a/modules/sd_models.py b/modules/sd_models.py
index 89b7d276..23826727 100644
--- a/modules/sd_models.py
+++ b/modules/sd_models.py
@@ -50,7 +50,7 @@ def setup_model(dirname):
     if not os.path.exists(model_path):
         os.makedirs(model_path)
     checkpoints_list.clear()
-    model_list = modelloader.load_models(model_path, model_url, dirname, model_name, ext_filter=".ckpt")
+    model_list = modelloader.load_models(model_path=model_path, model_url=model_url, command_path=dirname, download_name=model_name, ext_filter=".ckpt")
 
     cmd_ckpt = shared.cmd_opts.ckpt
     if os.path.exists(cmd_ckpt):
@@ -68,6 +68,7 @@ def setup_model(dirname):
 
 def model_hash(filename):
     try:
+        print(f"Opening: {filename}")
         with open(filename, "rb") as file:
             import hashlib
             m = hashlib.sha256()
-- 
cgit v1.2.3