正则相关

2026-05-06 00:40:18 +08:00
parent f843a74715
commit 9faccc2c03
32 changed files with 4814 additions and 346 deletions
--- a/backend/api/routes/chatWsRoute.py
+++ b/backend/api/routes/chatWsRoute.py
@@ -389,36 +389,95 @@ async def _save_messages(
    try:
        from datetime import datetime
        
-        # 1. 保存用户消息
-        user_message = {
-            "id": f"msg_{datetime.now().timestamp()}_user",
-            "name": request_data.get("userName", "User"),
-            "is_user": True,
-            "is_system": False,
-            "sendDate": datetime.now().isoformat(),
-            "mes": request_data.get("mes", ""),
-            "chatId": f"{role_name}/{chat_name}",
-            "floor": request_data.get("floor", 0)
-        }
+        # ✅ 检查是否是重roll模式（targetFloor 存在且不为 null）
+        target_floor = request_data.get("floor")
+        is_reroll = target_floor is not None
        
-        chat_service.add_message(role_name, chat_name, user_message)
-        
-        # 2. 保存AI回复
-        ai_message = {
-            "id": f"msg_{datetime.now().timestamp()}_ai",
-            "name": request_data.get("characterName", role_name),
-            "is_user": False,
-            "is_system": False,
-            "sendDate": datetime.now().isoformat(),
-            "mes": ai_response,
-            "chatId": f"{role_name}/{chat_name}",
-            "floor": request_data.get("floor", 0) + 1
-        }
-        
-        chat_service.add_message(role_name, chat_name, ai_message)
-        
-        print(f"[WebSocket] 消息已保存: {role_name}/{chat_name}")
+        if is_reroll:
+            # ✅ 重roll模式：更新现有消息的 swipes 数组
+            print(f"[WebSocket] 🔄 重roll模式，更新楼层 {target_floor} 的 swipes")
+            
+            # 获取现有的消息
+            existing_message = chat_service.get_message(role_name, chat_name, target_floor)
+            
+            if not existing_message:
+                print(f"[WebSocket] ⚠️ 找不到楼层 {target_floor} 的消息，创建新消息")
+                # 如果找不到，创建新消息（兼容处理）
+                ai_message = {
+                    "id": f"msg_{datetime.now().timestamp()}_ai",
+                    "name": request_data.get("characterName", role_name),
+                    "is_user": False,
+                    "is_system": False,
+                    "sendDate": datetime.now().isoformat(),
+                    "mes": ai_response,
+                    "chatId": f"{role_name}/{chat_name}",
+                    "floor": target_floor,
+                    "swipes": [ai_response],
+                    "swipe_id": 0
+                }
+                chat_service.add_message(role_name, chat_name, ai_message)
+            else:
+                # ✅ 更新 swipes 数组
+                existing_swipes = existing_message.get("swipes", [])
+                current_mes = existing_message.get("mes", "")
+                
+                # 构建新的 swipes 数组
+                updated_swipes = list(existing_swipes)  # 复制现有swipes
+                
+                # 如果当前 mes 不在 swipes 中，先添加它
+                if current_mes and current_mes not in updated_swipes:
+                    updated_swipes.append(current_mes)
+                    print(f"[WebSocket] 📝 将当前内容添加到 swipes")
+                
+                # 添加新生成的内容
+                updated_swipes.append(ai_response)
+                print(f"[WebSocket] 📊 Swipes 更新: {len(existing_swipes)} -> {len(updated_swipes)}")
+                
+                # 更新消息
+                update_data = {
+                    "mes": ai_response,  # 显示最新内容
+                    "swipes": updated_swipes,  # 更新 swipes 数组
+                    "swipe_id": len(updated_swipes) - 1  # 自动切换到新版本
+                }
+                
+                chat_service.update_message(role_name, chat_name, target_floor, update_data)
+                print(f"[WebSocket] ✅ 楼层 {target_floor} 已更新，swipes 数量: {len(updated_swipes)}")
+        else:
+            # ✅ 正常模式：创建新的用户消息和AI消息
+            print(f"[WebSocket] ➕ 正常模式，创建新消息")
+            
+            # 1. 保存用户消息
+            user_message = {
+                "id": f"msg_{datetime.now().timestamp()}_user",
+                "name": request_data.get("userName", "User"),
+                "is_user": True,
+                "is_system": False,
+                "sendDate": datetime.now().isoformat(),
+                "mes": request_data.get("mes", ""),
+                "chatId": f"{role_name}/{chat_name}",
+                "floor": request_data.get("floor", 0)
+            }
+            
+            chat_service.add_message(role_name, chat_name, user_message)
+            
+            # 2. 保存AI回复
+            ai_message = {
+                "id": f"msg_{datetime.now().timestamp()}_ai",
+                "name": request_data.get("characterName", role_name),
+                "is_user": False,
+                "is_system": False,
+                "sendDate": datetime.now().isoformat(),
+                "mes": ai_response,
+                "chatId": f"{role_name}/{chat_name}",
+                "floor": request_data.get("floor", 0) + 1
+            }
+            
+            chat_service.add_message(role_name, chat_name, ai_message)
+            
+            print(f"[WebSocket] ✅ 新消息已保存: {role_name}/{chat_name}")
        
    except Exception as e:
        print(f"[WebSocket] 保存消息失败: {e}")
+        import traceback
+        traceback.print_exc()
        # 不抛出异常，避免影响主流程
--- a/backend/api/routes/regexRoute.py
+++ b/backend/api/routes/regexRoute.py
@@ -15,7 +15,7 @@ from services.system_settings_service import system_settings_service

 logger = logging.getLogger(__name__)

-router = APIRouter(prefix="/api/regex", tags=["regex"])
+router = APIRouter(prefix="/regex", tags=["regex"])


 # ==================== 数据模型 ====================
@@ -146,13 +146,68 @@ async def add_rule(request: RuleUpdateRequest):


@router.delete("/rules/{rule_id}")
-async def delete_rule(rule_id: str):
-    """删除规则（需要指定作用域和名称）"""
-    # TODO: 实现具体的删除逻辑
-    return {
-        "success": False,
-        "message": "暂未实现，请使用规则集级别的删除"
-    }
+async def delete_rule(rule_id: str, scope: str = "global", name: Optional[str] = None):
+    """
+    删除规则
+    
+    Args:
+        rule_id: 规则ID
+        scope: 作用域 (global/character/preset)
+        name: 角色名或预设名（scope 为 character/preset 时需要）
+    """
+    try:
+        from models.regex_rules import RegexScope
+        
+        scope_map = {
+            "global": RegexScope.GLOBAL,
+            "character": RegexScope.CHARACTER,
+            "preset": RegexScope.PRESET
+        }
+        scope_enum = scope_map.get(scope, RegexScope.GLOBAL)
+        
+        # 找到包含该规则的规则集
+        if scope_enum == RegexScope.GLOBAL:
+            rulesets = regex_service.global_rulesets
+        elif scope_enum == RegexScope.CHARACTER:
+            if not name:
+                raise ValueError("删除角色规则需要提供角色名称")
+            rulesets = {name: regex_service.character_rulesets.get(name)} if name in regex_service.character_rulesets else {}
+        elif scope_enum == RegexScope.PRESET:
+            if not name:
+                raise ValueError("删除预设规则需要提供预设名称")
+            rulesets = {name: regex_service.preset_rulesets.get(name)} if name in regex_service.preset_rulesets else {}
+        
+        # 查找并删除规则
+        deleted = False
+        for ruleset_name, ruleset in rulesets.items():
+            if not ruleset:
+                continue
+            
+            original_count = len(ruleset.rules)
+            ruleset.rules = [r for r in ruleset.rules if r.id != rule_id]
+            
+            if len(ruleset.rules) < original_count:
+                # 保存更新后的规则集
+                regex_service.save_ruleset(ruleset, scope_enum, ruleset_name if scope_enum != RegexScope.GLOBAL else None)
+                deleted = True
+                break
+        
+        if not deleted:
+            return {
+                "success": False,
+                "message": "未找到指定的规则"
+            }
+        
+        # 重新加载规则
+        regex_service._load_all_rules()
+        
+        return {
+            "success": True,
+            "message": "规则已删除"
+        }
+    except Exception as e:
+        logger.error(f"删除规则失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))


 # ==================== 规则导入导出 ====================
@@ -160,7 +215,7 @@ async def delete_rule(rule_id: str):
@router.post("/import")
 async def import_rules(file: UploadFile = File(...)):
    """
-    导入正则规则（支持 SillyTavern 格式）
+    导入正则规则（支持 SillyTavern 格式）- 文件上传方式
    
    可以导入：
    1. 单个规则文件（JSON 数组）
@@ -197,6 +252,56 @@ async def import_rules(file: UploadFile = File(...)):
        raise HTTPException(status_code=500, detail=str(e))


+@router.post("/import-from-preset")
+async def import_rules_from_preset(request: dict):
+    """
+    从预设导入正则规则 - JSON 数据方式
+    
+    Request Body:
+    {
+        "rules": [...],  // SillyTavern 格式的 regex_scripts 数组
+        "scope": "preset",  // 作用域：global/character/preset
+        "presetName": "预设名称"  // 当 scope 为 preset 时需要
+    }
+    """
+    try:
+        rules_data = request.get("rules", [])
+        scope_str = request.get("scope", "global")
+        preset_name = request.get("presetName")
+        
+        if not rules_data or not isinstance(rules_data, list):
+            raise ValueError("无效的规则数据")
+        
+        # 转换作用域字符串为枚举
+        scope_map = {
+            "global": RegexScope.GLOBAL,
+            "character": RegexScope.CHARACTER,
+            "preset": RegexScope.PRESET
+        }
+        scope = scope_map.get(scope_str, RegexScope.GLOBAL)
+        
+        # 转换 SillyTavern 格式
+        name = preset_name or "imported_rules"
+        ruleset = regex_service._convert_sillytavern_format(rules_data, name, scope)
+        
+        # 保存规则集
+        regex_service.save_ruleset(ruleset, scope, name)
+        
+        # 重新加载规则
+        regex_service._load_all_rules()
+        
+        logger.info(f"✅ 从预设导入 {len(rules_data)} 条正则规则到 {scope.value}: {name}")
+        
+        return {
+            "success": True,
+            "message": f"成功导入 {len(rules_data)} 条正则规则",
+            "rulesetId": ruleset.id
+        }
+    except Exception as e:
+        logger.error(f"从预设导入规则失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
@router.get("/export/global")
 async def export_global_rules():
    """导出所有全局规则"""