更新版本V0.0.59

更新版本V0.0.59

Author: weilin9999

README.md

@@ -28,9 +28,24 @@
 
 # 版本更新介绍
 
-> 最新更新：2025-05-07
+> 最新更新：2025-05-08
 
-> 0.0.58 公测版本介绍 如果你要使用本插件请务必进我们的官方 QQ 群（1018231382）！
+> 0.0.59 公测版本介绍 如果你要使用本插件请务必进我们的官方 QQ 群（1018231382）！
+>
+> 1. 修复了已知BUG
+>
+> 2. 新增功能（测试）：Lora可以以Tag形式加载（仅全能提示词编辑器生效）在编辑器下方的Lora管理器点击添加Tag即可我们插件识别的方式为```<wlr:Lora名称:模型权重:文本权重>``` 
+>
+> 3. 修复了Lora管理器二级目录加载的问题
+>
+> 4. 修复了Tag管理器Tag点击排序的bug问题
+>
+
+<details>
+<summary>点击查看往期更多更新内容</summary>
+
+
+> 0.0.58 公测版本介绍 2025-05-07
 >
 > 1. 修复了已知BUG
 >
@@ -57,9 +72,6 @@
 > 12. 修改了Lora管理器，新增了二级目录显示全部的功能，修改了目录栏的高度问题
 >
 
-<details>
-<summary>点击查看往期更多更新内容</summary>
-
 > 0.0.53 公测版本介绍 2025-04-30
 >
 > 1. 功能优化：修复了在日间模式下的Lora详细内容的按钮样式看不到问题

README_EN.md

@@ -24,9 +24,23 @@ Due to limited personal time, the frequency of updating plug-ins will not be ver
 
 # Version update introduction
 
-> Last updated: 2025-05-07
+> Last updated: 2025-05-08
 
-> 0.0.58 Public Beta Version Introduction: If you want to use this plugin, please be sure to join our official QQ group (1018231382)! 
+> 0.0.59 Public Beta Version Introduction: If you want to use this plugin, please be sure to join our official QQ group (1018231382)! 
+>
+> 1. Fixed known bugs
+>
+> 2. New function (test) :Lora can be loaded in the form of Tag (only the omnipotent prompt word editor is effective) Click on the Lora manager below the editor to add the Tag. The way that our plugin can identify is' ' '<wlr:Lora name: model weight: text weight >' ' '
+>
+> 3. Fixed issues with Lora manager subdirectory loading
+>
+> 4. Fixed a bug with Tag click sorting in Tag manager
+>
+
+<details>
+<summary>Click here for more updates from the past</summary>
+
+> 0.0.58 Public Beta Version 2025-05-07
 >
 > 1. Fixed known bugs
 >
@@ -53,9 +67,6 @@ Due to limited personal time, the frequency of updating plug-ins will not be ver
 > 12. Modified the Lora manager, added the function of displaying all secondary directories, and changed the height problem of the directory bar
 >
 
-<details>
-<summary>Click here for more updates from the past</summary>
-
 > 0.0.53 Public Beta Version 2025-04-30
 >
 > 1. Feature optimization: Fixed the issue that Lora details button style could not be seen in daytime mode

__init__.py

@@ -5,6 +5,7 @@
 import locale
 import json
 import shutil
+import re
 
 # Server Init
 from .install_request import *
@@ -121,7 +122,10 @@ def INPUT_TYPES(self):
     CATEGORY = node_name_text
 
     # 加载Lora
-    def load_lora_ing(self, positive="", auto_random=False, lora_str="", temp_str="", temp_lora_str="",random_template="", opt_text="", opt_clip=None, opt_model=None):
+    def load_lora_ing(self, positive="", auto_random=False, lora_str="",
+     temp_str="", temp_lora_str="", random_template="", opt_text="",
+      opt_clip=None, opt_model=None):
+
         model_lora_secondA = opt_model
         clip_lora_secondA = opt_clip
 
@@ -155,6 +159,36 @@ def load_lora_ing(self, positive="", auto_random=False, lora_str="", temp_str=""
                         text_dec = opt_text +", "+positive
                     else:
                         text_dec = positive
+        
+        
+        wlr_pattern = r'<wlr:([^:]+):([^:]+):([^>]+)>'
+        wlr_matches = re.findall(wlr_pattern, text_dec)
+
+        # print(wlr_matches)
+        # 如果找到了wlr标签，创建lora列表
+        if wlr_matches:
+            extracted_loras = []
+            for lora_path, model_weight, text_weight in wlr_matches:
+                extracted_loras.append({
+                    "lora": lora_path.strip()+".safetensors",
+                    "weight": float(model_weight.strip()),
+                    "text_encoder_weight": float(text_weight.strip())
+                })
+            
+            # print(extracted_loras)
+            # 如果已经有lora_list，合并它们
+            if lora_list is not None:
+                lora_list.extend(extracted_loras)
+            else:
+                lora_list = extracted_loras
+            
+            # 从text_dec中移除这些标签
+            clean_text_dec = re.sub(wlr_pattern, '', text_dec)
+            # 清理连续的逗号
+            clean_text_dec = re.sub(r',\s*,', ',', clean_text_dec)
+            # 清理开头和结尾的逗号
+            clean_text_dec = clean_text_dec.strip().strip(',').strip()
+            text_dec = clean_text_dec
 
 
         # 当模型不为空时
@@ -183,6 +217,7 @@ def load_lora_ing(self, positive="", auto_random=False, lora_str="", temp_str=""
                     self.loaded_loraA = (lora_path, lora)
 
                 model_lora_secondA, clip_lora_secondA = load_lora_for_models(model_lora_secondA, clip_lora_secondA, lora, strength_model, strength_clip)
+        
         if opt_clip != None:
             tokensA = clip_lora_secondA.tokenize(text_dec)
             outputA = clip_lora_secondA.encode_from_tokens(tokensA, return_pooled=True, return_dict=True)

app/server/prompt_api/lora_networks.py

@@ -7,6 +7,8 @@
 import asyncio
 import concurrent.futures
 from tqdm import tqdm
+import zlib
+import base64
 
 from .lora_info import get_model_info
 
@@ -25,6 +27,51 @@
     'metadata',
 ]
 
+def path_to_shortcode(path):
+    """
+    将路径转换为短码，可直接反向解析
+    
+    参数:
+        path: 文件路径
+    
+    返回:
+        生成的短码
+    """
+    # 压缩路径字符串
+    compressed = zlib.compress(path.encode('utf-8'))
+    
+    # 使用Base64编码，并替换一些特殊字符以便于URL使用
+    # 替换 + 为 - 和 / 为 _
+    shortcode = base64.b64encode(compressed).decode('utf-8').replace('+', '-').replace('/', '_').replace('=', '')
+    
+    return shortcode
+
+def shortcode_to_path(shortcode):
+    """
+    从短码反向解析出原始路径
+    
+    参数:
+        shortcode: 短码
+    
+    返回:
+        原始文件路径
+    """
+    # 还原Base64编码中被替换的字符
+    base64_str = shortcode.replace('-', '+').replace('_', '/')
+    
+    # 添加回可能被移除的填充字符
+    padding = 4 - (len(base64_str) % 4)
+    if padding < 4:
+        base64_str += '=' * padding
+    
+    # 解码Base64
+    compressed = base64.b64decode(base64_str)
+    
+    # 解压缩
+    path = zlib.decompress(compressed).decode('utf-8')
+    
+    return path
+
 
 def prepare_lora_item_data(item_path, auto_fetch=False):
     lora_path = folder_paths.get_full_path("loras", item_path)
@@ -47,6 +94,8 @@ def prepare_lora_item_data(item_path, auto_fetch=False):
         #     url = next(filter(lambda x: x['type'] == 'image', info_data['images']), {}).get('url')
         #     download_image(url=url, filename=file_name, directory=os.path.dirname(lora_path))
 
+    # 为item_path生成短码
+    # shortcode = path_to_shortcode(item_path)
     item = {
             "basename": item_path,
             "name": item_path,
@@ -55,6 +104,7 @@ def prepare_lora_item_data(item_path, auto_fetch=False):
             "preview":preview_file(lora_path),
             "model_name": model_name,
             "model_filename": file_name,
+            # "shortcode": shortcode,  # 添加短码到返回数据中
         }
     item["local_info"] = info_data
     # item["search_terms"] = ["Lora\\"+item_path]
@@ -113,14 +163,10 @@ def get_lora_folder():
 
                 # 确保子目录在一级目录下
                 if subdir not in result[level1_dir]:
-                    result[level1_dir][subdir] = {
-                        "all": [],  # 子目录下所有文件
-                        "/": {}  # 子目录下的文件
-                    }
+                    result[level1_dir][subdir] = {}
 
                 # 添加文件到子目录，使用完整路径
                 result[level1_dir][subdir][parts[-1]] = file_path
-                result[level1_dir][subdir]["all"].append(file_path)
                 result[level1_dir]["all"].append(file_path)
 
     return result

dist/javascript/main.entry.js

@@ -181,6 +181,9 @@ function initLoraStack() {
 // Render all Lora items
 function renderAllLoras(seed) {
     const loraListContainer = document.getElementById('loraListContainer_' + seed);
+    if (!loraListContainer) {
+        return;
+    }
     loraListContainer.innerHTML = '';
     window.weilinGlobalSelectedLoras[seed].forEach((lora, index) => {
         renderLoraItem(seed, index, lora);
@@ -189,6 +192,7 @@ function renderAllLoras(seed) {
 
 // Update Lora stack info to windows
 function updateLoraStackInfoToWindows(seed) {
+    
     let putJson = {
         lora: "",
         temp_lora: window.weilinGlobalSelectedLoras[seed]

dist/javascript/main.entry.js.map

@@ -1,7 +1,7 @@
 [project]
 name = "weilin-comfyui-tools"
 description = "让你在 ComfyUI 中快捷的使用提示词工具 Quickly use the prompt word tool in ComfyUI"
-version = "0.0.58"
+version = "0.0.59"
 license = {file = "LICENSE"}
 dependencies = []
 

dist/lora_stack.js

@@ -19,6 +19,8 @@ export default {
         oneClickRandomTag: 'one Click Random Tag',
         randomTagSettings: 'setting Random Tag',
         oneClickTranslate: "one Click Translate Tag",
+        modelWeight: "Model Weight",
+        textWeight: "Text Weight",
         settings: {
             title: 'Settings',
             cancel: 'Cancel',