From c659ed21550e3ae3c3bd2d8f0f4e566aeae7ecfd Mon Sep 17 00:00:00 2001
From: DominikDoom <rehdominik@gmail.com>
Date: Sun, 24 Dec 2023 14:11:19 +0100
Subject: [PATCH] Use <lora: for models in lycoris folder by default Added a
 backcompat option to keep using <lyco: if needed. Closes #263

---
 javascript/ext_lycos.js            | 7 ++++---
 javascript/tagAutocomplete.js      | 1 +
 scripts/tag_autocomplete_helper.py | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/javascript/ext_lycos.js b/javascript/ext_lycos.js
index ad6271e..94d5fe2 100644
--- a/javascript/ext_lycos.js
+++ b/javascript/ext_lycos.js
@@ -5,8 +5,8 @@ class LycoParser extends BaseTagParser {
     parse() {
         // Show lyco
         let tempResults = [];
-        if (tagword !== "<" && tagword !== "<l:" && tagword !== "<lyco:") {
-            let searchTerm = tagword.replace("<lyco:", "").replace("<l:", "").replace("<", "");
+        if (tagword !== "<" && tagword !== "<l:" && tagword !== "<lyco:" && tagword !== "<lora:") {
+            let searchTerm = tagword.replace("<lyco:", "").replace("<lora:", "").replace("<l:", "").replace("<", "");
             let filterCondition = x => x.toLowerCase().includes(searchTerm) || x.toLowerCase().replaceAll(" ", "_").includes(searchTerm);
             tempResults = lycos.filter(x => filterCondition(x[0])); // Filter by tagword
         } else {
@@ -52,7 +52,8 @@ async function sanitize(tagType, text) {
             multiplier = info["preferred weight"];
         }
 
-        return `<lyco:${text}:${multiplier}>`;
+        let prefix = TAC_CFG.useLoraPrefixForLycos ? "lora" : "lyco";
+        return `<${prefix}:${text}:${multiplier}>`;
     }
     return null;
 }
diff --git a/javascript/tagAutocomplete.js b/javascript/tagAutocomplete.js
index 2d0b3fc..b25050e 100644
--- a/javascript/tagAutocomplete.js
+++ b/javascript/tagAutocomplete.js
@@ -217,6 +217,7 @@ async function syncOptions() {
         useHypernetworks: opts["tac_useHypernetworks"],
         useLoras: opts["tac_useLoras"],
 	    useLycos: opts["tac_useLycos"],
+        useLoraPrefixForLycos: opts["tac_useLoraPrefixForLycos"],
         showWikiLinks: opts["tac_showWikiLinks"],
         showExtraNetworkPreviews: opts["tac_showExtraNetworkPreviews"],
         modelSortOrder: opts["tac_modelSortOrder"],
diff --git a/scripts/tag_autocomplete_helper.py b/scripts/tag_autocomplete_helper.py
index 486056f..deccc0e 100644
--- a/scripts/tag_autocomplete_helper.py
+++ b/scripts/tag_autocomplete_helper.py
@@ -476,6 +476,7 @@ def on_ui_settings():
         "tac_useHypernetworks": shared.OptionInfo(True, "Search for hypernetworks"),
         "tac_useLoras": shared.OptionInfo(True, "Search for Loras"),
         "tac_useLycos": shared.OptionInfo(True, "Search for LyCORIS/LoHa"),
+        "tac_useLoraPrefixForLycos": shared.OptionInfo(True, "Use the '<lora:' prefix instead of '<lyco:' for models in the LyCORIS folder").info("The lyco prefix is included for backwards compatibility and not used anymore by default. Disable this if you are on an old webui version without built-in lyco support."),
         "tac_showWikiLinks": shared.OptionInfo(False, "Show '?' next to tags, linking to its Danbooru or e621 wiki page").info("Warning: This is an external site and very likely contains NSFW examples!"),
         "tac_showExtraNetworkPreviews": shared.OptionInfo(True, "Show preview thumbnails for extra networks if available"),
         "tac_modelSortOrder": shared.OptionInfo("Name", "Model sort order", gr.Dropdown, lambda: {"choices": list(sort_criteria.keys())}).info("Order for extra network models and wildcards in dropdown"),