feat(skills/notifications): 多租户阶段 2 — 路由 + 级联 + 启动迁移
后端工作:
deps.py
- 挂载 skill_store / notification_store 到 app.state
- 启动时 set_notification_store(...) 注入到 harness sender;
关闭时清空,保证测试和 embedded 模式不留状态
- 加 get_skill_store / get_notification_store FastAPI 依赖
routers/skills.py
- 加 _current_user_id / _is_admin_user / _get_owned_skill_or_raise /
_get_editable_skill_or_raise(对齐 routers/agents.py)
- SkillResponse 加 owner_user_id / published / builtin 字段,
_skill_to_response 接受 SkillStore 记录映射
- GET /api/skills 与 GET /api/skills/custom 改 per-user 可见性过滤
- POST /api/skills/install + /install-upload 预解析 archive 名校验
全局 name 不被他人持有;安装后 ensure_legacy 注册 owner=current
- DELETE /api/skills/custom/{name} 走 _get_editable_skill_or_raise,
调 cascade(owner 自删 = delete,admin 跨用户 = admin_takedown),
SkillStore.delete / delete_admin 同步清除 DB 记录
- 新增 PUT /api/skills/custom/{name}/published 切换发布状态;
从 published → unpublished 时触发 cascade(unpublish / admin_takedown)
skills/cascade.py(新)
- 扫所有 .deer-flow/agents/{id}/config.yaml,把指定 skill 从其 skills
数组移除,并通过 deerflow.persistence.notifications.notify 给受
影响 agent 的 owner 发站内信;admin 强制下架时另给 skill owner 发
一条
- 操作类型:unpublish / delete / admin_takedown,对应不同文案
routers/notifications.py(新)+ app.include_router
- GET /api/notifications(unread_only / limit)
- GET /api/notifications/unread_count(红点用)
- POST /api/notifications/{id}/read
- POST /api/notifications/read_all
- DELETE /api/notifications/{id}
app.py lifespan
- _sync_legacy_skills(app):每次启动扫 skills/custom/ 把没在 DB
的 skill 落库为 admin owner + published=True,幂等、非阻塞失败
- 调用顺序:_ensure_admin_user → _sync_legacy_skills → 启动 curator
测试:19 个旧用例继续通过;阶段 4 会写 test_skills_multitenancy.py
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
8162719e36
commit
cf191ef874
7 files changed
+675
-14
No files matched your search
+7
@@ -16,4 +16,11 @@ __all__ = [
|
||||
"notify",
|
||||
"set_notification_store",
|
||||
"get_notification_store",
|
||||
"make_notification_store",
|
||||
]
|
||||
|
||||
|
||||
def make_notification_store(session_factory):
|
||||
if session_factory is None:
|
||||
return MemoryNotificationStore()
|
||||
return NotificationRepository(session_factory)
|
||||
+7
-1
@@ -4,4 +4,10 @@ from deerflow.persistence.skills.base import SkillStore
|
||||
from deerflow.persistence.skills.memory import MemorySkillStore
|
||||
from deerflow.persistence.skills.sql import SkillRepository
|
||||
|
||||
__all__ = ["SkillStore", "MemorySkillStore", "SkillRepository"]
|
||||
__all__ = ["SkillStore", "MemorySkillStore", "SkillRepository", "make_skill_store"]
|
||||
|
||||
|
||||
def make_skill_store(session_factory):
|
||||
if session_factory is None:
|
||||
return MemorySkillStore()
|
||||
return SkillRepository(session_factory)
|
||||
@@ -0,0 +1,151 @@
|
||||
"""Cascade handling when a published skill is removed from circulation.
|
||||
|
||||
Called from the Gateway skills router whenever a published skill is
|
||||
unpublished, deleted, or admin-taken-down. Walks every agent on disk that
|
||||
referenced the skill, strips the skill from its ``config.yaml`` ``skills``
|
||||
list, and emits an in-app notification to that agent's owner.
|
||||
|
||||
The harness/app firewall means we cannot import the FastAPI app side; the
|
||||
``AgentStore`` instance must be passed in by the caller (the router gets
|
||||
it from ``app.gateway.deps.get_agent_store``).
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
from pathlib import Path
|
||||
from typing import Any, Literal
|
||||
|
||||
import yaml
|
||||
|
||||
from deerflow.config.agents_config import load_agent_config
|
||||
from deerflow.config.paths import get_paths
|
||||
from deerflow.persistence.notifications import notify
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
CascadeOperation = Literal["unpublish", "delete", "admin_takedown"]
|
||||
|
||||
|
||||
def _list_agent_dirs() -> list[Path]:
|
||||
agents_dir = get_paths().agents_dir
|
||||
if not agents_dir.exists():
|
||||
return []
|
||||
return [entry for entry in sorted(agents_dir.iterdir()) if entry.is_dir()]
|
||||
|
||||
|
||||
def _remove_skill_from_yaml(config_file: Path, skill_name: str) -> bool:
|
||||
"""Rewrite ``config.yaml`` removing ``skill_name`` from its ``skills`` list.
|
||||
|
||||
Returns True if the file was modified, False otherwise.
|
||||
"""
|
||||
if not config_file.exists():
|
||||
return False
|
||||
try:
|
||||
with config_file.open("r", encoding="utf-8") as f:
|
||||
data: dict[str, Any] = yaml.safe_load(f) or {}
|
||||
except yaml.YAMLError:
|
||||
logger.warning("Cascade: failed to parse %s, skipping", config_file)
|
||||
return False
|
||||
|
||||
skills = data.get("skills")
|
||||
if not isinstance(skills, list) or skill_name not in skills:
|
||||
return False
|
||||
|
||||
data["skills"] = [s for s in skills if s != skill_name]
|
||||
with config_file.open("w", encoding="utf-8") as f:
|
||||
yaml.safe_dump(data, f, default_flow_style=False, allow_unicode=True)
|
||||
return True
|
||||
|
||||
|
||||
_OP_LABELS: dict[CascadeOperation, str] = {
|
||||
"unpublish": "取消发布",
|
||||
"delete": "删除",
|
||||
"admin_takedown": "管理员强制下架",
|
||||
}
|
||||
|
||||
|
||||
async def cascade_skill_unpublished_or_deleted(
|
||||
skill_name: str,
|
||||
*,
|
||||
actor_user_id: str,
|
||||
operation: CascadeOperation,
|
||||
skill_owner_user_id: str | None,
|
||||
agent_store: Any,
|
||||
) -> dict[str, Any]:
|
||||
"""Detach ``skill_name`` from every referencing agent and notify owners.
|
||||
|
||||
Self-references (agent.user_id == actor_user_id) are still detached but
|
||||
the owner gets no in-app notification — the user just did the action,
|
||||
they know.
|
||||
|
||||
On ``admin_takedown`` we additionally notify ``skill_owner_user_id``.
|
||||
|
||||
Returns counters for testability: ``{checked, modified, notified}``.
|
||||
"""
|
||||
counters = {"checked": 0, "modified": 0, "notified": 0}
|
||||
label = _OP_LABELS.get(operation, operation)
|
||||
|
||||
for agent_dir in _list_agent_dirs():
|
||||
config_file = agent_dir / "config.yaml"
|
||||
if not config_file.exists():
|
||||
continue
|
||||
counters["checked"] += 1
|
||||
|
||||
# Quick read to decide whether we need to mutate at all.
|
||||
try:
|
||||
agent_cfg = load_agent_config(agent_dir.name)
|
||||
except Exception:
|
||||
logger.debug("Cascade: failed to load %s, skipping", agent_dir.name, exc_info=True)
|
||||
continue
|
||||
if agent_cfg is None or not agent_cfg.skills or skill_name not in agent_cfg.skills:
|
||||
continue
|
||||
|
||||
modified = _remove_skill_from_yaml(config_file, skill_name)
|
||||
if not modified:
|
||||
continue
|
||||
counters["modified"] += 1
|
||||
logger.info(
|
||||
"Cascade: removed skill '%s' from agent '%s/config.yaml' (op=%s)",
|
||||
skill_name,
|
||||
agent_dir.name,
|
||||
operation,
|
||||
)
|
||||
|
||||
# Look up agent owner from DB to decide where to send the notification.
|
||||
record = await agent_store.get_any(agent_dir.name)
|
||||
agent_owner = record.get("user_id") if record else None
|
||||
if agent_owner and agent_owner != actor_user_id:
|
||||
agent_display = (record.get("name") if record else None) or agent_dir.name
|
||||
await notify(
|
||||
agent_owner,
|
||||
type="agent_skill_removed",
|
||||
title=f"专家 “{agent_display}” 的一个技能已失效",
|
||||
body=(
|
||||
f"技能 “{skill_name}” 被 {label},已从该专家的技能列表中自动移除。"
|
||||
),
|
||||
payload={
|
||||
"skill_name": skill_name,
|
||||
"agent_id": agent_dir.name,
|
||||
"agent_name": agent_display,
|
||||
"operation": operation,
|
||||
"actor_user_id": actor_user_id,
|
||||
},
|
||||
)
|
||||
counters["notified"] += 1
|
||||
|
||||
if operation == "admin_takedown" and skill_owner_user_id and skill_owner_user_id != actor_user_id:
|
||||
await notify(
|
||||
skill_owner_user_id,
|
||||
type="skill_taken_down",
|
||||
title=f"你的技能 “{skill_name}” 已被管理员下架",
|
||||
body="管理员对该技能执行了强制下架。如有疑问请联系管理员。",
|
||||
payload={
|
||||
"skill_name": skill_name,
|
||||
"operation": operation,
|
||||
"actor_user_id": actor_user_id,
|
||||
},
|
||||
)
|
||||
counters["notified"] += 1
|
||||
|
||||
return counters
|
||||
Reference in new issue
Block a user