Merge branch 'main' into feature-sort-by-frequent-use

javascript/_utils.js

@@ -1,13 +1,14 @@
 // Utility functions for tag autocomplete
 
 // Parse the CSV file into a 2D array. Doesn't use regex, so it is very lightweight.
+// We are ignoring newlines in quote fields since we expect one-line entries and parsing would break for unclosed quotes otherwise
 function parseCSV(str) {
-    var arr = [];
-    var quote = false;  // 'true' means we're inside a quoted field
+    const arr = [];
+    let quote = false;  // 'true' means we're inside a quoted field
 
     // Iterate over each character, keep track of current row and column (of the returned array)
-    for (var row = 0, col = 0, c = 0; c < str.length; c++) {
-        var cc = str[c], nc = str[c + 1];        // Current character, next character
+    for (let row = 0, col = 0, c = 0; c < str.length; c++) {
+        let cc = str[c], nc = str[c+1];        // Current character, next character
         arr[row] = arr[row] || [];             // Create a new row if necessary
         arr[row][col] = arr[row][col] || '';   // Create a new column (start with empty string) if necessary
 
@@ -22,14 +23,12 @@ function parseCSV(str) {
         // If it's a comma and we're not in a quoted field, move on to the next column
         if (cc == ',' && !quote) { ++col; continue; }
 
-        // If it's a newline (CRLF) and we're not in a quoted field, skip the next character
-        // and move on to the next row and move to column 0 of that new row
-        if (cc == '\r' && nc == '\n' && !quote) { ++row; col = 0; ++c; continue; }
+        // If it's a newline (CRLF), skip the next character and move on to the next row and move to column 0 of that new row
+        if (cc == '\r' && nc == '\n') { ++row; col = 0; ++c; quote = false; continue; }
 
-        // If it's a newline (LF or CR) and we're not in a quoted field,
-        // move on to the next row and move to column 0 of that new row
-        if (cc == '\n' && !quote) { ++row; col = 0; continue; }
-        if (cc == '\r' && !quote) { ++row; col = 0; continue; }
+        // If it's a newline (LF or CR) move on to the next row and move to column 0 of that new row
+        if (cc == '\n') { ++row; col = 0; quote = false; continue; }
+        if (cc == '\r') { ++row; col = 0; quote = false; continue; }
 
         // Otherwise, append the current character to the current column
         arr[row][col] += cc;

javascript/ext_embeddings.js

@@ -11,12 +11,15 @@ class EmbeddingParser extends BaseTagParser {
             if (searchTerm.startsWith("v1") || searchTerm.startsWith("v2")) {
                 versionString = searchTerm.slice(0, 2);
                 searchTerm = searchTerm.slice(2);
+            } else if (searchTerm.startsWith("vxl")) {
+                versionString = searchTerm.slice(0, 3);
+                searchTerm = searchTerm.slice(3);
             }
 
             let filterCondition = x => x[0].toLowerCase().includes(searchTerm) || x[0].toLowerCase().replaceAll(" ", "_").includes(searchTerm);
 
             if (versionString)
-                tempResults = embeddings.filter(x => filterCondition(x) && x[2] && x[2] === versionString); // Filter by tagword
+                tempResults = embeddings.filter(x => filterCondition(x) && x[2] && x[2].toLowerCase() === versionString.toLowerCase()); // Filter by tagword
             else
                 tempResults = embeddings.filter(x => filterCondition(x)); // Filter by tagword
         } else {

javascript/ext_modelKeyword.js

@@ -20,7 +20,7 @@ async function load() {
             // Add to the dict
             csv_lines.forEach(parts => {
                 const hash = parts[0];
-                const keywords = parts[1].replaceAll("| ", ", ").replaceAll("|", ", ").trim();
+                const keywords = parts[1]?.replaceAll("| ", ", ")?.replaceAll("|", ", ")?.trim();
                 const lastSepIndex = parts[2]?.lastIndexOf("/") + 1 || parts[2]?.lastIndexOf("\\") + 1 || 0;
                 const name = parts[2]?.substring(lastSepIndex).trim() || "none"
 

javascript/ext_umi.js

@@ -129,7 +129,7 @@ class UmiParser extends BaseTagParser {
                 return;
             }
 
-            let umiTagword = diff[0] || '';
+            let umiTagword = tagCountChange < 0 ? '' : diff[0] || '';
             let tempResults = [];
             if (umiTagword && umiTagword.length > 0) {
                 umiTagword = umiTagword.toLowerCase().replace(/[\n\r]/g, "");
@@ -188,7 +188,7 @@ class UmiParser extends BaseTagParser {
     }
 }
 
-function updateUmiTags( tagType, sanitizedText, newPrompt, textArea) {
+function updateUmiTags(tagType, sanitizedText, newPrompt, textArea) {
     // If it was a umi wildcard, also update the umiPreviousTags
     if (tagType === ResultType.umiWildcard && originalTagword.length > 0) {
         let umiSubPrompts = [...newPrompt.matchAll(UMI_PROMPT_REGEX)];

javascript/tagAutocomplete.js

@@ -546,6 +546,14 @@ async function insertTextAtCursor(textArea, result, tagword, tabCompletedWithout
             let nameDict = modelKeywordDict.get(result.hash);
             let names = [result.text + ".safetensors", result.text + ".pt", result.text + ".ckpt"];
 
+            // No match, try to find a sha256 match from the cache file
+            if (!nameDict) {
+                const sha256 = await fetchAPI(`/tacapi/v1/lora-cached-hash/${result.text}`)
+                if (sha256) {
+                    nameDict = modelKeywordDict.get(sha256);
+                }
+            }
+
             if (nameDict) {
                 let found = false;
                 names.forEach(name => {
@@ -715,6 +723,8 @@ function addResultsToList(textArea, results, tagword, resetList) {
                 linkPart = linkPart.split("[")[0]
             }
 
+            linkPart = encodeURIComponent(linkPart);
+
             // Set link based on selected file
             let tagFileNameLower = tagFileName.toLowerCase();
             if (tagFileNameLower.startsWith("danbooru")) {