Merge pull request #308 from yangming915/main

let it work better with extranetwork-lora

src/src/mixins/phystonPrompt/groupTagsMixin.js

@@ -340,6 +340,7 @@ export default {
                     find = tag.originalValue === name || (output_name && tag.originalValue === output_name)
                 }
                 if (find) {
+                    console.log("1")
                     indexes.push(index)
                 }
             }

src/src/mixins/phystonPrompt/tagMixin.js

@@ -371,7 +371,7 @@ export default {
         onTagWeightNumChange(id, e) {
             let tag = this.tags.find(tag => tag.id === id)
             if (!tag) return false
-            e = typeof e === "number" || typeof a === "string" ? e : e.target.value
+            e = typeof e === "number" || typeof e === "string" ? e : e.target.value
             if (tag.weightNum == e) return
             let weightNum = e
             let value = tag.value
@@ -403,8 +403,10 @@ export default {
                             if (localValue !== '') localValue = localValue + ':' + weightNum
                         }
                     }
-                    // 如果原来没有括号() [] {} <>，那么就加上括号
-                    if (!common.hasBrackets(value)) {
+                    // 排除Lora、embedding、lyco
+                    // 如果原来没有括号() [] {}，那么就加上括号
+                    if (tag.isLora||tag.isLyco||tag.isEmbedding){}
+                    else if (!common.hasBrackets(value)) {
                         if (this.useNovelAiWeightSymbol) {
                             value = common.setLayers(value, 1, '{', '}')
                             if (localValue !== '') localValue = common.setLayers(localValue, 1, '{', '}')

src/src/utils/common.js

@@ -4,7 +4,8 @@ import tinycolor from "tinycolor2";
 
 export default {
     // loraRegex: /^\<lora:\s*([^\:]+)\s*(:)?\s*(\-?[0-9\.]+)?\>$/,
-    loraRegex: /^\<lora:\s*([^\:]+)\s*(:)?\s*(\-?[0-9\.]+)?([^\>]+)?\>$/,
+    // lora加上metadata 描述词
+    loraRegex: /^\<lora:\s*([^\:]+)\s*(:)?\s*(\-?[0-9\.]+)?([^\>]+)?\>/,
     // lycoRegex: /^\<lyco:\s*([^\:]+)\s*(:)?\s*(\-?[0-9\.]+)?\>$/,
     lycoRegex: /^\<lyco:\s*([^\:]+)\s*(:)?\s*(\-?[0-9\.]+)?([^\>]+)?\>$/,
     weightNumRegex: /(.*):(\-?[0-9\.]+)/,

src/src/utils/splitTags.js

@@ -150,8 +150,8 @@ export default (tags, autoBreakBeforeWrap = false, autoBreakAfterWrap = false) =
         while (match = regex.exec(value)) {
             let startIndex = match.index
             let endIndex = startIndex + match[0].length
-            let before = value.substring(0, startIndex)
-            let after = value.substring(endIndex)
+            let before = value.substring(0, startIndex).trim()
+            let after = value.substring(endIndex).trim()
             let middle = match[0]
             values.push(before)
             values.push(middle)