更新版本V0.0.69

更新版本V0.0.69

Author: weilin9999

.gitignore

@@ -5,6 +5,4 @@ __pycache__
 /loras_userdatas/info
 init.json
 /panel
-user_cloud_package.json
-tag_labels.json
-.claude/
+user_cloud_package.json

README.md

@@ -8,6 +8,8 @@
 ##### 一定要进群！一定要进群！一定要进群！
 官方 QQ 群：`1018231382`
 
+如果你有什么意见或者想法亦或者是BUG提交请你进入群聊AT群主！或者写群文档中
+
 插件使用教程：[点击访问](https://www.bilibili.com/list/288025756/?sid=4690314&spm_id_from=333.1387.0.0&oid=114342431298474&bvid=BV1txdfYxE7X)
 或者在B站搜索：WeiLin-Comfyui-Tools
 
@@ -28,9 +30,20 @@
 
 # 版本更新介绍
 
-> 最新更新：2025-11-08
+> 最新更新：2025-12-06
+
+> 0.0.69 公测版本介绍 如果你要使用本插件请务必进我们的官方 QQ 群（1018231382）！
+>
+> 1. 合并PR [#50](https://github.com/weilin9999/WeiLin-Comfyui-Tools/pull/50) 感谢各位小伙伴的帮助
+>
+> 2. 合并PR [#52](https://github.com/weilin9999/WeiLin-Comfyui-Tools/pull/52) 感谢各位小伙伴的帮助
+>
+
+<details>
+<summary>点击查看往期更多更新内容</summary>
+
 
-> 0.0.68 公测版本介绍 如果你要使用本插件请务必进我们的官方 QQ 群（1018231382）！
+> 0.0.68 公测版本介绍 2025-11-08
 >
 > 1. 修复悬浮球功能菜单样式丢失问题
 >
@@ -39,9 +52,6 @@
 > 3. 新增功能：一键清空功能，能清空所有的内容
 >
 
-<details>
-<summary>点击查看往期更多更新内容</summary>
-
 > 0.0.67 公测版本介绍 2025-10-26
 >
 > 1. 修复一键翻译不全的问题

README_EN.md

@@ -24,9 +24,19 @@ Due to limited personal time, the frequency of updating plug-ins will not be ver
 
 # Version update introduction
 
-> Last updated: 2025-11-08
+> Last updated: 2025-12-06
 
-> 0.0.68 Public Beta Version Introduction: If you want to use this plugin, please be sure to join our official QQ group (1018231382)! 
+> 0.0.69 Public Beta Version Introduction: If you want to use this plugin, please be sure to join our official QQ group (1018231382)! 
+>
+> 1. Merger PR [#50](https://github.com/weilin9999/WeiLin-Comfyui-Tools/pull/50) thank you for your friend's help
+>
+> 2. Merger PR [#52](https://github.com/weilin9999/WeiLin-Comfyui-Tools/pull/52) thank you for your friend's help
+>
+
+<details>
+<summary>Click here for more updates from the past</summary>
+
+> 0.0.68 Public Beta Version 2025-11-08
 >
 > 1. Fixed the missing style of the hover ball menu
 >
@@ -35,9 +45,6 @@ Due to limited personal time, the frequency of updating plug-ins will not be ver
 > 3. New feature: One click clear function, can clear all the content
 >
 
-<details>
-<summary>Click here for more updates from the past</summary>
-
 > 0.0.67 Public Beta Version 2025-10-26
 >
 > 1. Fixed the issue of incomplete one-click translation

app/server/prompt_api/random_tag_template.py

@@ -1,17 +1,20 @@
 import json
 import os
 import datetime
-import random
+# import random
 from typing import List
 from ..dao.dao import tags_db_path
 import sqlite3
+import secrets
 
 current_dir = os.path.dirname(os.path.abspath(__file__))
 init_file_path = os.path.join(current_dir, '../../../random_tag')
+
+
 def save_template(data):
     """
     保存模板到random_tag文件夹
-    
+
     参数:
         name: 文件名前缀(可选)
         data: 要保存的字典数据
@@ -20,23 +23,23 @@ def save_template(data):
         # 检查random_tag文件夹是否存在，不存在则创建
         if not os.path.exists(init_file_path):
             os.makedirs(init_file_path)
-            
+
         # 生成时间戳文件名
         timestamp = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
         file_name = timestamp
         file_path = os.path.join(init_file_path, f"{file_name}.json")
-        
+
         # 检查文件是否已存在
         if os.path.exists(file_path):
             print("文件已存在")
             raise Exception("文件已存在")
-            
+
         # 写入JSON文件
         with open(file_path, 'w', encoding='utf-8') as f:
             json.dump(data, f, ensure_ascii=False, indent=4)
-        
+
         return {"code": 200, "path_name": str(file_name)}
-        
+
     except Exception as e:
         print(str(e))
         raise Exception(str(e))
@@ -45,50 +48,49 @@ def save_template(data):
 def update_template(name: str, data):
     """
     更新random_tag文件夹中的模板文件
-    
+
     参数:
         name: 文件名(不带.json后缀)
         data: 要更新的字典数据
     """
     try:
         # 构建完整文件路径
         file_path = os.path.join(init_file_path, f"{name}.json")
-        
+
         # 检查文件是否存在
         if not os.path.exists(file_path):
             raise Exception("文件不存在")
-            
+
         # 写入JSON文件(覆盖更新)
         with open(file_path, 'w', encoding='utf-8') as f:
             json.dump(data, f, ensure_ascii=False, indent=4)
-        
+
         return {"code": 200, "path_name": str(name)}
-        
+
     except Exception as e:
         raise Exception(str(e))
 
 
-
 def delete_template(name: str):
     """
     删除random_tag文件夹中的模板文件
-    
+
     参数:
         name: 文件名(不带.json后缀)
     """
     try:
         # 构建完整文件路径
         file_path = os.path.join(init_file_path, f"{name}.json")
-        
+
         # 检查文件是否存在
         if not os.path.exists(file_path):
             raise Exception("文件不存在")
-            
+
         # 删除文件
         os.remove(file_path)
-        
+
         return {"code": 200, "message": "文件删除成功", "path_name": str(name)}
-        
+
     except Exception as e:
         raise Exception(str(e))
 
@@ -102,7 +104,7 @@ def get_template_list():
         # 检查random_tag文件夹是否存在
         if not os.path.exists(init_file_path):
             return {"code": 200, "data": []}
-            
+
         # 获取所有JSON文件
         file_list = []
         for filename in os.listdir(init_file_path):
@@ -115,21 +117,22 @@ def get_template_list():
                         file_name = data.get('file_name', '')
                 except:
                     file_name = ''
-                
+
                 file_list.append({
                     "file_name": file_name,
                     "path_name": filename.replace('.json', '')
                 })
-        
+
         return {"code": 200, "data": file_list}
-        
+
     except Exception as e:
         raise Exception(str(e))
 
+
 def get_template_data(name: str):
     """
     获取指定模板文件的JSON数据
-    
+
     参数:
         name: 文件名(不带.json后缀)
     返回:
@@ -138,17 +141,17 @@ def get_template_data(name: str):
     try:
         # 构建完整文件路径
         file_path = os.path.join(init_file_path, f"{name}.json")
-        
+
         # 检查文件是否存在
         if not os.path.exists(file_path):
             raise Exception("文件不存在")
-            
+
         # 读取JSON文件
         with open(file_path, 'r', encoding='utf-8') as f:
             data = json.load(f)
-        
+
         return {"code": 200, "data": data, "path_name": str(name)}
-        
+
     except Exception as e:
         raise Exception(str(e))
 
@@ -165,65 +168,74 @@ def get_random_tags_by_group(p_uuid: str) -> List[str]:
     results = cursor.fetchall()
     return [row[0] for row in results]
 
+
 def get_random_tags_by_subgroup(g_uuid: str) -> List[str]:
     """根据subgroup的g_uuid获取随机标签"""
     conn = sqlite3.connect(tags_db_path)
-    cursor =  conn.cursor()
+    cursor = conn.cursor()
     cursor.execute('''
         SELECT text FROM tag_tags WHERE g_uuid = ?
     ''', (g_uuid,))
     results = cursor.fetchall()
     return [row[0] for row in results]
 
+
 def shuffle_and_select(tags: List[str], count: int) -> List[str]:
     """随机打乱并选择指定数量的标签"""
-    random.shuffle(tags)
-    return tags[:count]
+    # random.shuffle(tags)
+    # return tags[:count]
+    rng = secrets.SystemRandom()  # 加密级真随机数生成器
+    shuffled = tags.copy()
+    rng.shuffle(shuffled)
+    return shuffled[:count]
+
 
 def generate_random_tags(data: dict) -> str:
     """生成随机标签字符串"""
     result = []
-    
+
     for rule in data['rules']:
         min_count = rule['range']['min']
         max_count = rule['range']['max']
         count = max_count - min_count + 1
-        
+
         if rule['type'] == 'category':
             tags = []
             for group in rule['tagGroupList']:
                 if group['sub']:
-                    tags.extend(get_random_tags_by_subgroup(group['sub']['g_uuid']))
+                    tags.extend(get_random_tags_by_subgroup(
+                        group['sub']['g_uuid']))
                 else:
-                    tags.extend(get_random_tags_by_group(group['group']['p_uuid']))
+                    tags.extend(get_random_tags_by_group(
+                        group['group']['p_uuid']))
             selected_tags = shuffle_and_select(tags, count)
             result.extend(selected_tags)
-            
+
         elif rule['type'] == 'specific':
             tags = rule['specificTags']
             selected_tags = shuffle_and_select(tags, min(count, len(tags)))
             result.extend(selected_tags)
-    
+
     return ','.join(result) + ','
 
 
 def go_radom_template(name: str):
     try:
         # 构建完整文件路径
         file_path = os.path.join(init_file_path, f"{name}.json")
-        
+
         # 检查文件是否存在
         if not os.path.exists(file_path):
             raise Exception("文件不存在")
-            
+
         # 读取JSON文件
         with open(file_path, 'r', encoding='utf-8') as f:
             data = json.load(f)
-        
+
         # 生成随机标签
         random_tags = generate_random_tags(data)
-        
+
         return {"code": 200, "random_tags": random_tags, "path_name": str(name)}
-        
+
     except Exception as e:
-        raise Exception(str(e))
+        raise Exception(str(e))