Merge branch 'release_candidate' into dev

CHANGELOG.md

+## Upcoming 1.2.1
+
+### Features:
+ * add an option to always refer to lora by filenames
+
+### Bug Fixes:
+ * never refer to lora by an alias if multiple loras have same alias or the alias is called none
+ * fix upscalers disappearing after the user reloads UI
+ * allow bf16 in safe unpickler (resolves problems with loading some loras)
+ * allow web UI to be ran fully offline
+
 ## 1.2.0
 
 ### Features:

extensions-builtin/Lora/lora.py

@@ -392,6 +392,8 @@ def lora_MultiheadAttention_load_state_dict(self, *args, **kwargs):
 def list_available_loras():
     available_loras.clear()
     available_lora_aliases.clear()
+    forbidden_lora_aliases.clear()
+    forbidden_lora_aliases.update({"none": 1})
 
     os.makedirs(shared.cmd_opts.lora_dir, exist_ok=True)
 
@@ -405,6 +407,9 @@ def list_available_loras():
 
         available_loras[name] = entry
 
+        if entry.alias in available_lora_aliases:
+            forbidden_lora_aliases[entry.alias.lower()] = 1
+
         available_lora_aliases[name] = entry
         available_lora_aliases[entry.alias] = entry
 
@@ -444,6 +449,7 @@ def infotext_pasted(infotext, params):
 
 available_loras = {}
 available_lora_aliases = {}
+forbidden_lora_aliases = {}
 loaded_loras = []
 
 list_available_loras()

extensions-builtin/Lora/scripts/lora_script.py

@@ -54,6 +54,7 @@ script_callbacks.on_infotext_pasted(lora.infotext_pasted)
 
 shared.options_templates.update(shared.options_section(('extra_networks', "Extra Networks"), {
     "sd_lora": shared.OptionInfo("None", "Add Lora to prompt", gr.Dropdown, lambda: {"choices": ["None", *lora.available_loras]}, refresh=lora.list_available_loras),
+    "lora_preferred_name": shared.OptionInfo("Alias from file", "When adding to prompt, refer to lora by", gr.Radio, {"choices": ["Alias from file", "Filename"]}),
 }))
 
 

extensions-builtin/Lora/ui_extra_networks_lora.py

@@ -15,13 +15,19 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage):
     def list_items(self):
         for name, lora_on_disk in lora.available_loras.items():
             path, ext = os.path.splitext(lora_on_disk.filename)
+
+            if shared.opts.lora_preferred_name == "Filename" or lora_on_disk.alias.lower() in lora.forbidden_lora_aliases:
+                alias = name
+            else:
+                alias = lora_on_disk.alias
+
             yield {
                 "name": name,
                 "filename": path,
                 "preview": self.find_preview(path),
                 "description": self.find_description(path),
                 "search_term": self.search_terms_from_path(lora_on_disk.filename),
-                "prompt": json.dumps(f"<lora:{lora_on_disk.alias}:") + " + opts.extra_networks_default_multiplier + " + json.dumps(">"),
+                "prompt": json.dumps(f"<lora:{alias}:") + " + opts.extra_networks_default_multiplier + " + json.dumps(">"),
                 "local_preview": f"{path}.{shared.opts.samples_format}",
                 "metadata": json.dumps(lora_on_disk.metadata, indent=4) if lora_on_disk.metadata else None,
             }