正则相关
This commit is contained in:
@@ -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():
|
||||
"""导出所有全局规则"""
|
||||
|
||||
Reference in New Issue
Block a user