Kris
1f78c44b03
这是一个批量整理提交，包含以下主要改动： 1. 删除多处冗余的空行和未使用的导入 2. 修复文件末尾缺少换行符的问题 3. 调整部分模块的导入顺序与代码排版 4. 修复部分配置默认值与策略逻辑 5. 新增多个功能模块与辅助工具 6. 完善异常处理与日志记录 7. 修复速率限制、消息缓存、权限校验等逻辑bug 8. 废弃部分旧有API与配置项并添加警告提示
84 lines
2.5 KiB
Python
84 lines
2.5 KiB
Python
from __future__ import annotations
|
|
|
|
from typing import Any
|
|
|
|
from yuxi.utils.logging_config import logger
|
|
|
|
|
|
def normalize_approver_id(raw: str) -> str:
|
|
if not raw:
|
|
return ""
|
|
if raw.startswith("users/") or raw.startswith("user:"):
|
|
return raw
|
|
if "@" in raw:
|
|
return f"users/{raw}"
|
|
return f"users/{raw}"
|
|
|
|
|
|
def resolve_approver_ids(
|
|
dm_allow_from: list[str],
|
|
default_to: str = "",
|
|
) -> list[str]:
|
|
approvers: list[str] = []
|
|
for entry in dm_allow_from:
|
|
if entry == "*":
|
|
continue
|
|
normalized = normalize_approver_id(entry)
|
|
if normalized:
|
|
approvers.append(normalized)
|
|
if not approvers and default_to:
|
|
approvers.append(normalize_approver_id(default_to))
|
|
return approvers
|
|
|
|
|
|
def build_exec_approval_context(
|
|
action_id: str,
|
|
approvers: list[str],
|
|
metadata: dict[str, Any] | None = None,
|
|
) -> dict[str, Any]:
|
|
return {
|
|
"action_id": action_id,
|
|
"approvers": approvers,
|
|
"approved_by": [],
|
|
"rejected_by": [],
|
|
"metadata": metadata or {},
|
|
}
|
|
|
|
|
|
def record_approval_decision(
|
|
context: dict[str, Any],
|
|
user_id: str,
|
|
approved: bool,
|
|
) -> bool:
|
|
action_id = context.get("action_id", "unknown")
|
|
normalized = normalize_approver_id(user_id)
|
|
|
|
if normalized not in context.get("approvers", []):
|
|
logger.warning(f"Unauthorized approval attempt: action={action_id}, user={normalized}")
|
|
return False
|
|
|
|
if approved:
|
|
if normalized in context.get("approved_by", []):
|
|
logger.warning(f"Duplicate approval ignored: action={action_id}, user={normalized}")
|
|
return True
|
|
context.setdefault("approved_by", []).append(normalized)
|
|
approved_count = len(context["approved_by"])
|
|
approvers_count = len(context["approvers"])
|
|
logger.info(
|
|
f"Approval GRANTED: action={action_id}, user={normalized}, progress={approved_count}/{approvers_count}"
|
|
)
|
|
else:
|
|
if normalized in context.get("rejected_by", []):
|
|
logger.warning(f"Duplicate rejection ignored: action={action_id}, user={normalized}")
|
|
return True
|
|
context.setdefault("rejected_by", []).append(normalized)
|
|
logger.info(f"Approval DENIED: action={action_id}, user={normalized}")
|
|
|
|
return True
|
|
|
|
|
|
def is_fully_approved(context: dict[str, Any]) -> bool:
|
|
approvers = context.get("approvers", [])
|
|
approved = context.get("approved_by", [])
|
|
return bool(approvers) and set(approvers) == set(approved)
|