From 477199357f4f5f02d62857a0cf432a3ed19e6418 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Sat, 13 May 2023 20:15:37 +0300
Subject: add an option to always refer to lora by filenames never refer to
 lora by an alias if multiple loras have same alias or the alias is called
 none

---
 extensions-builtin/Lora/lora.py | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'extensions-builtin/Lora/lora.py')

diff --git a/extensions-builtin/Lora/lora.py b/extensions-builtin/Lora/lora.py
index ba1293df..6fa80006 100644
--- a/extensions-builtin/Lora/lora.py
+++ b/extensions-builtin/Lora/lora.py
@@ -393,6 +393,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)
 
@@ -406,6 +408,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
 
@@ -445,6 +450,7 @@ def infotext_pasted(infotext, params):
 
 available_loras = {}
 available_lora_aliases = {}
+forbidden_lora_aliases = {}
 loaded_loras = []
 
 list_available_loras()
-- 
cgit v1.2.3


From b9abdb50a3684e2f7392bf68736ad1ec025045af Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Sun, 14 May 2023 13:31:03 +0300
Subject: add a possible fix for 'LatentDiffusion' object has no attribute
 'lora_layer_mapping'

---
 CHANGELOG.md                    | 1 +
 extensions-builtin/Lora/lora.py | 4 ++++
 2 files changed, 5 insertions(+)

(limited to 'extensions-builtin/Lora/lora.py')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7bf4c2f..881870bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
  * allow bf16 in safe unpickler (resolves problems with loading some loras)
  * allow web UI to be ran fully offline
  * fix localizations not working
+ * fix error for loras: 'LatentDiffusion' object has no attribute 'lora_layer_mapping'
 
 ## 1.2.0
 
diff --git a/extensions-builtin/Lora/lora.py b/extensions-builtin/Lora/lora.py
index 6fa80006..b5d0c98f 100644
--- a/extensions-builtin/Lora/lora.py
+++ b/extensions-builtin/Lora/lora.py
@@ -133,6 +133,10 @@ def load_lora(name, filename):
 
     sd = sd_models.read_state_dict(filename)
 
+    # this should not be needed but is here as an emergency fix for an unknown error people are experiencing in 1.2.0
+    if not hasattr(shared.sd_model, 'lora_layer_mapping'):
+        assign_lora_names_to_compvis_modules(shared.sd_model)
+
     keys_failed_to_match = {}
     is_sd2 = 'model_transformer_resblocks' in shared.sd_model.lora_layer_mapping
 
-- 
cgit v1.2.3