Merge branch 'dev' of https://github.com/AUTOMATIC1111/stable-diffusion-webui into tomesd

1 files changed, 9 insertions, 12 deletions

diff --git a/modules/sd_models.py b/modules/sd_models.py
index abe57294..4787193c 100644
--- a/modules/sd_models.py
+++ b/modules/sd_models.py
@@ -15,7 +15,6 @@ import ldm.modules.midas as midas
 from ldm.util import instantiate_from_config

 

 from modules import paths, shared, modelloader, devices, script_callbacks, sd_vae, sd_disable_initialization, errors, hashes, sd_models_config

-from modules.paths import models_path

 from modules.sd_hijack_inpainting import do_inpainting_hijack

 from modules.timer import Timer

 import tomesd

@@ -48,7 +47,7 @@ class CheckpointInfo:
         self.model_name = os.path.splitext(name.replace("/", "_").replace("\\", "_"))[0]

         self.hash = model_hash(filename)

 

-        self.sha256 = hashes.sha256_from_cache(self.filename, "checkpoint/" + name)

+        self.sha256 = hashes.sha256_from_cache(self.filename, f"checkpoint/{name}")

         self.shorthash = self.sha256[0:10] if self.sha256 else None

 

         self.title = name if self.shorthash is None else f'{name} [{self.shorthash}]'

@@ -70,7 +69,7 @@ class CheckpointInfo:
             checkpoint_alisases[id] = self

 

     def calculate_shorthash(self):

-        self.sha256 = hashes.sha256(self.filename, "checkpoint/" + self.name)

+        self.sha256 = hashes.sha256(self.filename, f"checkpoint/{self.name}")

         if self.sha256 is None:

             return

 

@@ -88,8 +87,7 @@ class CheckpointInfo:
 

 try:

     # this silences the annoying "Some weights of the model checkpoint were not used when initializing..." message at start.

-

-    from transformers import logging, CLIPModel

+    from transformers import logging, CLIPModel  # noqa: F401

 

     logging.set_verbosity_error()

 except Exception:

@@ -168,7 +166,7 @@ def model_hash(filename):
 

 def select_checkpoint():

     model_checkpoint = shared.opts.sd_model_checkpoint

-        

+

     checkpoint_info = checkpoint_alisases.get(model_checkpoint, None)

     if checkpoint_info is not None:

         return checkpoint_info

@@ -240,7 +238,7 @@ def read_metadata_from_safetensors(filename):
             if isinstance(v, str) and v[0:1] == '{':

                 try:

                     res[k] = json.loads(v)

-                except Exception as e:

+                except Exception:

                     pass

 

         return res

@@ -375,7 +373,7 @@ def enable_midas_autodownload():
         if not os.path.exists(path):

             if not os.path.exists(midas_path):

                 mkdir(midas_path)

-    

+

             print(f"Downloading midas model weights for {model_type} to {path}")

             request.urlretrieve(midas_urls[model_type], path)

             print(f"{model_type} downloaded")

@@ -468,8 +466,7 @@ def load_model(checkpoint_info=None, already_loaded_state_dict=None):
     try:

         with sd_disable_initialization.DisableInitialization(disable_clip=clip_is_included_into_sd):

             sd_model = instantiate_from_config(sd_config.model)

-

-    except Exception as e:

+    except Exception:

         pass

 

     if sd_model is None:

@@ -546,7 +543,7 @@ def reload_model_weights(sd_model=None, info=None):
 

     try:

         load_model_weights(sd_model, checkpoint_info, state_dict, timer)

-    except Exception as e:

+    except Exception:

         print("Failed to load checkpoint, restoring previous")

         load_model_weights(sd_model, current_checkpoint_info, None, timer)

         raise

@@ -567,7 +564,7 @@ def reload_model_weights(sd_model=None, info=None):
 

 

 def unload_model_weights(sd_model=None, info=None):

-    from modules import lowvram, devices, sd_hijack

+    from modules import devices, sd_hijack

     timer = Timer()

 

     if model_data.sd_model: