Merge branch 'master' into esrgan_mod

modules/hypernetwork.py

@@ -49,15 +49,18 @@ def list_hypernetworks(path):
 
 
 def load_hypernetwork(filename):
-    print(f"Loading hypernetwork {filename}")
     path = shared.hypernetworks.get(filename, None)
-    if (path is not None):
+    if path is not None:
+        print(f"Loading hypernetwork {filename}")
         try:
             shared.loaded_hypernetwork = Hypernetwork(path)
         except Exception:
             print(f"Error loading hypernetwork {path}", file=sys.stderr)
             print(traceback.format_exc(), file=sys.stderr)
     else:
+        if shared.loaded_hypernetwork is not None:
+            print(f"Unloading hypernetwork")
+
         shared.loaded_hypernetwork = None
 
 

modules/processing.py

@@ -284,6 +284,8 @@ def create_infotext(p, all_prompts, all_seeds, all_subseeds, comments, iteration
         "Face restoration": (opts.face_restoration_model if p.restore_faces else None),
         "Size": f"{p.width}x{p.height}",
         "Model hash": getattr(p, 'sd_model_hash', None if not opts.add_model_hash_to_info or not shared.sd_model.sd_model_hash else shared.sd_model.sd_model_hash),
+        "Model": (None if not opts.add_model_name_to_info or not shared.sd_model.sd_checkpoint_info.model_name else shared.sd_model.sd_checkpoint_info.model_name.replace(',', '').replace(':', '')),
+        "Hypernet": (None if shared.loaded_hypernetwork is None else shared.loaded_hypernetwork.name.replace(',', '').replace(':', '')),
         "Batch size": (None if p.batch_size < 2 else p.batch_size),
         "Batch pos": (None if p.batch_size < 2 else position_in_batch),
         "Variation seed": (None if p.subseed_strength == 0 else all_subseeds[index]),

modules/sd_models.py

@@ -5,7 +5,6 @@ from collections import namedtuple
 import torch
 from omegaconf import OmegaConf
 
-
 from ldm.util import instantiate_from_config
 
 from modules import shared, modelloader, devices

modules/shared.py

@@ -242,6 +242,7 @@ options_templates.update(options_section(('ui', "User interface"), {
     "return_grid": OptionInfo(True, "Show grid in results for web"),
     "do_not_show_images": OptionInfo(False, "Do not show any images in results for web"),
     "add_model_hash_to_info": OptionInfo(True, "Add model hash to generation information"),
+    "add_model_name_to_info": OptionInfo(False, "Add model name to generation information"),
     "font": OptionInfo("", "Font for image grids that have text"),
     "js_modal_lightbox": OptionInfo(True, "Enable full page image viewer"),
     "js_modal_lightbox_initially_zoomed": OptionInfo(True, "Show images zoomed in by default in full page image viewer"),

modules/upscaler.py

@@ -37,7 +37,7 @@ class Upscaler:
         self.pre_pad = 0
         self.mod_scale = None
 
-        if self.model_path is not None and self.name:
+        if self.model_path is None and self.name:
             self.model_path = os.path.join(models_path, self.name)
         if self.model_path and create_dirs:
             os.makedirs(self.model_path, exist_ok=True)