Merge branch 'v1.2.0-hotfix' into release_candidate

1 files changed, 7 insertions, 1 deletions

diff --git a/extensions-builtin/Lora/ui_extra_networks_lora.py b/extensions-builtin/Lora/ui_extra_networks_lora.py
index a0edbc1e..2050e3fa 100644
--- a/extensions-builtin/Lora/ui_extra_networks_lora.py
+++ b/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,

             }