From bc5ae74c7d8949bab37e260b16e76889b9968099 Mon Sep 17 00:00:00 2001
From: Learwin <6223515+Learwin@users.noreply.github.com>
Date: Sat, 30 Dec 2023 21:52:27 +0100
Subject: Added negative prompts to extra networks lora

---
 modules/ui_extra_networks.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py
index fe5d3ba3..b8c02241 100644
--- a/modules/ui_extra_networks.py
+++ b/modules/ui_extra_networks.py
@@ -223,7 +223,10 @@ class ExtraNetworksPage:
 
         onclick = item.get("onclick", None)
         if onclick is None:
-            onclick = '"' + html.escape(f"""return cardClicked({quote_js(tabname)}, {item["prompt"]}, {"true" if self.allow_negative_prompt else "false"})""") + '"'
+            if "negative_prompt" in item:
+                onclick = '"' + html.escape(f"""return cardClicked({quote_js(tabname)}, {item["prompt"]}, {item["negative_prompt"]}, {"true" if self.allow_negative_prompt else "false"})""") + '"'
+            else:
+                onclick = '"' + html.escape(f"""return cardClicked({quote_js(tabname)}, {item["prompt"]}, {'""'}, {"true" if self.allow_negative_prompt else "false"})""") + '"'
 
         height = f"height: {shared.opts.extra_networks_card_height}px;" if shared.opts.extra_networks_card_height else ''
         width = f"width: {shared.opts.extra_networks_card_width}px;" if shared.opts.extra_networks_card_width else ''
-- 
cgit v1.2.3


From a2f23f9d22dde87bf2529dcb2854a6a5d3d44278 Mon Sep 17 00:00:00 2001
From: Learwin <6223515+Learwin@users.noreply.github.com>
Date: Sat, 30 Dec 2023 22:16:51 +0100
Subject: Code Style fixes

---
 extensions-builtin/Lora/ui_extra_networks_lora.py | 4 ++--
 javascript/extraNetworks.js                       | 6 +++---
 modules/upscaler_utils.py                         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/extensions-builtin/Lora/ui_extra_networks_lora.py b/extensions-builtin/Lora/ui_extra_networks_lora.py
index 09ce2a05..9a6624e3 100644
--- a/extensions-builtin/Lora/ui_extra_networks_lora.py
+++ b/extensions-builtin/Lora/ui_extra_networks_lora.py
@@ -52,8 +52,8 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage):
             neg_prompt = negative_prompt
             if (preferred_negative_weight > 0):
                 neg_prompt = '(' + negative_prompt + ':' + str(preferred_negative_weight) + ')'
-            item["negative_prompt"] = quote_js(neg_prompt)  
-            
+            item["negative_prompt"] = quote_js(neg_prompt)
+
         sd_version = item["user_metadata"].get("sd version")
         if sd_version in network.SdVersion.__members__:
             item["sd_version"] = sd_version
diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js
index 2bb9795d..f1ad19a6 100644
--- a/javascript/extraNetworks.js
+++ b/javascript/extraNetworks.js
@@ -243,11 +243,11 @@ function updatePromptArea(text, textArea, isNeg) {
 
 function cardClicked(tabname, textToAdd, textToAddNegative, allowNegativePrompt) {
     if (textToAddNegative.length > 0) {
-        updatePromptArea(textToAdd, gradioApp().querySelector("#" + tabname + "_prompt > label > textarea"))
-        updatePromptArea(textToAddNegative, gradioApp().querySelector("#" + tabname + "_neg_prompt > label > textarea"), true)
+        updatePromptArea(textToAdd, gradioApp().querySelector("#" + tabname + "_prompt > label > textarea"));
+        updatePromptArea(textToAddNegative, gradioApp().querySelector("#" + tabname + "_neg_prompt > label > textarea"), true);
     } else {
         var textarea = allowNegativePrompt ? activePromptTextarea[tabname] : gradioApp().querySelector("#" + tabname + "_prompt > label > textarea");
-        updatePromptArea(textToAdd, textarea)
+        updatePromptArea(textToAdd, textarea);
     }
 }
 
diff --git a/modules/upscaler_utils.py b/modules/upscaler_utils.py
index 39f78a0b..1d610dbf 100644
--- a/modules/upscaler_utils.py
+++ b/modules/upscaler_utils.py
@@ -6,7 +6,7 @@ import torch
 import tqdm
 from PIL import Image
 
-from modules import devices, images
+from modules import images
 
 logger = logging.getLogger(__name__)
 
-- 
cgit v1.2.3


From b6f74e936e4de3b8d190bffaf3bed67d6d4bd211 Mon Sep 17 00:00:00 2001
From: Learwin <6223515+Learwin@users.noreply.github.com>
Date: Sun, 31 Dec 2023 13:36:36 +0100
Subject: Revert change from linting for unrelated file

---
 modules/upscaler_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/upscaler_utils.py b/modules/upscaler_utils.py
index 1d610dbf..39f78a0b 100644
--- a/modules/upscaler_utils.py
+++ b/modules/upscaler_utils.py
@@ -6,7 +6,7 @@ import torch
 import tqdm
 from PIL import Image
 
-from modules import images
+from modules import devices, images
 
 logger = logging.getLogger(__name__)
 
-- 
cgit v1.2.3