From b57a816038cbe1e41dbdd505dcac81393edfc1ea Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Tue, 25 Jul 2023 16:17:41 +0300
Subject: Merge pull request #11963 from catboxanon/fix/lora-te

Fix parsing text encoder blocks in some LoRAs
---
 extensions-builtin/Lora/networks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'extensions-builtin')

diff --git a/extensions-builtin/Lora/networks.py b/extensions-builtin/Lora/networks.py
index af8188e3..3a8cfa3b 100644
--- a/extensions-builtin/Lora/networks.py
+++ b/extensions-builtin/Lora/networks.py
@@ -161,7 +161,7 @@ def load_network(name, network_on_disk):
             sd_module = shared.sd_model.network_layer_mapping.get(key, None)
         elif sd_module is None and "lora_te1_text_model" in key_network_without_network_parts:
             key = key_network_without_network_parts.replace("lora_te1_text_model", "0_transformer_text_model")
-            sd_module = shared.sd_model.network_layer_mapping.get(key, None)
+            sd_module = shared.sd_model.network_layer_mapping.get(key, None) or shared.sd_model.network_layer_mapping.get(key[2:], None)
 
         if sd_module is None:
             keys_failed_to_match[key_network] = key
-- 
cgit v1.2.3


From 65b6f8d3d58ff4122162b68b6f126d63c98723ea Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Tue, 25 Jul 2023 16:18:10 +0300
Subject: fix for #11963

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

(limited to 'extensions-builtin')

diff --git a/extensions-builtin/Lora/networks.py b/extensions-builtin/Lora/networks.py
index 3a8cfa3b..17cbe1bb 100644
--- a/extensions-builtin/Lora/networks.py
+++ b/extensions-builtin/Lora/networks.py
@@ -161,7 +161,12 @@ def load_network(name, network_on_disk):
             sd_module = shared.sd_model.network_layer_mapping.get(key, None)
         elif sd_module is None and "lora_te1_text_model" in key_network_without_network_parts:
             key = key_network_without_network_parts.replace("lora_te1_text_model", "0_transformer_text_model")
-            sd_module = shared.sd_model.network_layer_mapping.get(key, None) or shared.sd_model.network_layer_mapping.get(key[2:], None)
+            sd_module = shared.sd_model.network_layer_mapping.get(key, None)
+
+            # some SD1 Loras also have correct compvis keys
+            if sd_module is None:
+                key = key_network_without_network_parts.replace("lora_te1_text_model", "transformer_text_model")
+                sd_module = shared.sd_model.network_layer_mapping.get(key, None)
 
         if sd_module is None:
             keys_failed_to_match[key_network] = key
-- 
cgit v1.2.3


From f82e08cf45e9eb0ea4fa15825f27313b8e78a73c Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Thu, 27 Jul 2023 09:00:47 +0300
Subject: update lora extension to work with python 3.8

---
 extensions-builtin/Lora/network.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'extensions-builtin')

diff --git a/extensions-builtin/Lora/network.py b/extensions-builtin/Lora/network.py
index 8ecfa29a..0a18d69e 100644
--- a/extensions-builtin/Lora/network.py
+++ b/extensions-builtin/Lora/network.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
 import os
 from collections import namedtuple
 import enum
-- 
cgit v1.2.3