Add trigger word completion using the model-keyword extension

Works for both the built-in and user defined list
Restructure some of the python helper for path reusability

javascript/__globals.js

@@ -1,6 +1,7 @@
 // Core components
 var TAC_CFG = null;
 var tagBasePath = "";
+var modelKeywordPath = "";
 
 // Tag completion data loaded from files
 var allTags = [];
@@ -14,6 +15,7 @@ var embeddings = [];
 var hypernetworks = [];
 var loras = [];
 var lycos = [];
+var modelKeywordDict = new Map();
 var chants = [];
 
 // Selected model info for black/whitelisting

javascript/_result.js

@@ -25,6 +25,7 @@ class AutocompleteResult {
     count = null;
     aliases = null;
     meta = null;
+    hash = null;
 
     // Constructor
     constructor(text, type) {

javascript/ext_loras.js

@@ -8,7 +8,7 @@ class LoraParser extends BaseTagParser {
         if (tagword !== "<" && tagword !== "<l:" && tagword !== "<lora:") {
             let searchTerm = tagword.replace("<lora:", "").replace("<l:", "").replace("<", "");
             let filterCondition = x => x.toLowerCase().includes(searchTerm) || x.toLowerCase().replaceAll(" ", "_").includes(searchTerm);
-            tempResults = loras.filter(x => filterCondition(x)); // Filter by tagword
+            tempResults = loras.filter(x => filterCondition(x[0])); // Filter by tagword
         } else {
             tempResults = loras;
         }
@@ -16,8 +16,9 @@ class LoraParser extends BaseTagParser {
         // Add final results
         let finalResults = [];
         tempResults.forEach(t => {
-            let result = new AutocompleteResult(t.trim(), ResultType.lora)
+            let result = new AutocompleteResult(t[0].trim(), ResultType.lora)
             result.meta = "Lora";
+            result.hash = t[1];
             finalResults.push(result);
         });
 
@@ -30,7 +31,7 @@ async function load() {
         try {
             loras = (await readFile(`${tagBasePath}/temp/lora.txt`)).split("\n")
                 .filter(x => x.trim().length > 0) // Remove empty lines
-                .map(x => x.trim()); // Remove carriage returns and padding if it exists
+                .map(x => x.trim().split(",")); // Remove carriage returns and padding if it exists, split into name, hash pairs
         } catch (e) {
             console.error("Error loading lora.txt: " + e);
         }

javascript/ext_lycos.js

@@ -8,7 +8,7 @@ class LycoParser extends BaseTagParser {
         if (tagword !== "<" && tagword !== "<l:" && tagword !== "<lyco:") {
             let searchTerm = tagword.replace("<lyco:", "").replace("<l:", "").replace("<", "");
             let filterCondition = x => x.toLowerCase().includes(searchTerm) || x.toLowerCase().replaceAll(" ", "_").includes(searchTerm);
-            tempResults = lycos.filter(x => filterCondition(x)); // Filter by tagword
+            tempResults = lycos.filter(x => filterCondition(x[0])); // Filter by tagword
         } else {
             tempResults = lycos;
         }
@@ -16,8 +16,9 @@ class LycoParser extends BaseTagParser {
         // Add final results
         let finalResults = [];
         tempResults.forEach(t => {
-            let result = new AutocompleteResult(t.trim(), ResultType.lyco)
+            let result = new AutocompleteResult(t[0].trim(), ResultType.lyco)
             result.meta = "Lyco";
+            result.hash = t[1];
             finalResults.push(result);
         });
 
@@ -30,7 +31,7 @@ async function load() {
         try {
             lycos = (await readFile(`${tagBasePath}/temp/lyco.txt`)).split("\n")
                 .filter(x => x.trim().length > 0) // Remove empty lines
-                .map(x => x.trim()); // Remove carriage returns and padding if it exists
+                .map(x => x.trim().split(",")); // Remove carriage returns and padding if it exists, split into name, hash pairs
         } catch (e) {
             console.error("Error loading lyco.txt: " + e);
         }

javascript/ext_modelKeyword.js

@@ -0,0 +1,29 @@
+async function load() {
+    let modelKeywordParts = (await readFile(`tmp/modelKeywordPath.txt`)).split(",")
+    modelKeywordPath = modelKeywordParts[0];
+    let customFileExists = modelKeywordParts[1] === "True";
+
+    if (modelKeywordPath.length > 0 && modelKeywordDict.size === 0) {
+        try {
+            let lines = (await readFile(`${modelKeywordPath}/lora-keyword.txt`)).split("\n");
+            // Add custom user keywords if the file exists
+            if (customFileExists)
+                lines = lines.concat((await readFile(`${modelKeywordPath}/lora-keyword-user.txt`)).split("\n"));
+
+            lines = lines.filter(x => x.trim().length > 0 && x.trim()[0] !== "#") // Remove empty lines and comments
+            
+            // Add to the dict
+            lines.forEach(line => {
+                const parts = line.split(",");
+                const hash = parts[0];
+                const keywords = parts[1].replaceAll("| ", ", ").replaceAll("|", ", ").trim();
+
+                modelKeywordDict.set(hash, keywords);
+            });
+        } catch (e) {
+            console.error("Error loading model-keywords list: " + e);
+        }
+    }
+}
+
+QUEUE_FILE_LOAD.push(load);

javascript/tagAutocomplete.js

@@ -202,6 +202,7 @@ async function syncOptions() {
         appendSpace: opts["tac_appendSpace"],
         alwaysSpaceAtEnd: opts["tac_alwaysSpaceAtEnd"],
         wildcardCompletionMode: opts["tac_wildcardCompletionMode"],
+        modelKeywordCompletion: opts["tac_modelKeywordCompletion"],
         // Alias settings
         alias: {
             searchByAlias: opts["tac_alias.searchByAlias"],
@@ -441,8 +442,22 @@ async function insertTextAtCursor(textArea, result, tagword, tabCompletedWithout
 
     // Add back start
     var newPrompt = prompt.substring(0, editStart) + insert + prompt.substring(editEnd);
+
+    // Add lora/lyco keywords if enabled and found
+    let keywordsLength = 0;
+    if (TAC_CFG.modelKeywordCompletion && modelKeywordPath.length > 0 && (tagType === ResultType.lora || tagType === ResultType.lyco)) {
+        if (result.hash && result.hash !== "NOFILE" && result.hash.length > 0) {
+            let keywords = modelKeywordDict.get(result.hash);
+            if (keywords && keywords.length > 0) {
+                newPrompt = `${keywords}, ${newPrompt}`;
+                keywordsLength = keywords.length + 2; // +2 for the comma and space
+            }
+        }
+    }
+    
+    // Insert into prompt textbox and reposition cursor
     textArea.value = newPrompt;
-    textArea.selectionStart = afterInsertCursorPos + optionalSeparator.length;
+    textArea.selectionStart = afterInsertCursorPos + optionalSeparator.length + keywordsLength;
     textArea.selectionEnd = textArea.selectionStart
 
     // Since we've modified a Gradio Textbox component manually, we need to simulate an `input` DOM event to ensure it's propagated back to python.