feat(skills): curator 三条件过滤 — agent 创建 + 未发布 + 无引用
Curator 之前只过滤 source=='agent',导致两类 skill 仍会被自动归档: 1. owner 已 published 的 skill(user B 在用,结果被 curator 收走) 2. 加进 agent.skills 但 .usage.json 活动不够频繁的 skill 新规则:curator transitions 和 LLM 合并候选**只**作用于同时满足 三条件的 skill —— source=='agent' + published==False + 不被任何 agent.config.yaml 的 skills 字段引用。 curator.py - 新 helper _collect_referenced_skill_names():扫所有 .deer-flow/agents/*/config.yaml 把 skills 字段聚合成 set,一次 curator run 内只调一次 - 新 helper _is_skill_published(name):通过 SkillStore 查 published 状态,失败时返回 False(保守降级到旧行为) - 新 helper _eligible_for_curation(name, entry, owned_set, referenced_set) 三条件合一判定 - apply_automatic_transitions 应用三条件过滤;返回的 counters 加 skipped_referenced / skipped_published 计数 - _render_candidate_list 应用同一过滤,LLM 看不到 protected skill - _make_skill_archive_tool safety net:即使 LLM 编造名字调 archive, 工具内部再做一次"被引用 + published"检查,违规拒绝并记 warning 测试 tests/test_skills_multitenancy.py 新增 5 用例: - test_curator_skips_skill_referenced_by_any_agent - test_curator_skips_published_skill - test_curator_archives_orphan_unpublished_skill - test_skill_archive_tool_refuses_referenced_or_published - test_collect_referenced_skill_names_aggregates_from_disk 跑测试:tests/test_skills_multitenancy.py 17/17,全套 36/36 全过。 Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
6155a2ec2b
commit
3e6e3c08d5
2 files changed
+336
-14
No files matched your search
@@ -430,3 +430,171 @@ def test_curator_log_buckets_records_per_user() -> None:
|
||||
assert curator_log.get_recent(user_id="user-c") == []
|
||||
|
||||
curator_log.clear_all()
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Increment #1: Curator three-condition eligibility filter
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
def _seed_old_agent_skill(name: str) -> None:
|
||||
"""Helper: stamp an agent-created skill as 90 days idle (archive-eligible)."""
|
||||
from datetime import UTC, datetime, timedelta
|
||||
|
||||
from deerflow.skills import usage
|
||||
|
||||
old_iso = (datetime.now(UTC) - timedelta(days=90)).isoformat()
|
||||
usage._update_entry(
|
||||
name,
|
||||
{
|
||||
"source": usage.SOURCE_AGENT,
|
||||
"created_at": old_iso,
|
||||
"last_used_at": old_iso,
|
||||
"state": usage.STATE_ACTIVE,
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
def _isolated_skills_root(isolated_paths, monkeypatch) -> None:
|
||||
"""Helper: point the on-disk skills root at the temp directory."""
|
||||
from deerflow.skills.storage import get_or_new_skill_storage, reset_skill_storage
|
||||
|
||||
reset_skill_storage()
|
||||
monkeypatch.setattr(
|
||||
"deerflow.skills.storage._default_skill_storage",
|
||||
get_or_new_skill_storage(skills_path=str(isolated_paths / "skills")),
|
||||
raising=False,
|
||||
)
|
||||
|
||||
|
||||
def test_curator_skips_skill_referenced_by_any_agent(
|
||||
isolated_paths, monkeypatch
|
||||
) -> None:
|
||||
"""A skill listed in any agent's config.yaml ``skills`` field must be
|
||||
exempt from automatic archive, even if it has been idle for ages."""
|
||||
from datetime import UTC, datetime
|
||||
|
||||
from deerflow.skills import curator, usage
|
||||
|
||||
monkeypatch.setattr(curator, "_list_user_owned_skill_names", lambda uid: {"linked-skill"})
|
||||
monkeypatch.setattr(curator, "_is_skill_published", lambda name: False)
|
||||
# Pretend one agent's config references linked-skill.
|
||||
monkeypatch.setattr(curator, "_collect_referenced_skill_names", lambda: {"linked-skill"})
|
||||
_isolated_skills_root(isolated_paths, monkeypatch)
|
||||
_seed_old_agent_skill("linked-skill")
|
||||
|
||||
counters = curator.apply_automatic_transitions("user-a", datetime.now(UTC))
|
||||
|
||||
# Should be excluded from the eligible set entirely.
|
||||
assert counters["checked"] == 0
|
||||
assert counters["archived"] == 0
|
||||
assert counters["skipped_referenced"] == 1
|
||||
assert usage.get_entry("linked-skill")["state"] == usage.STATE_ACTIVE
|
||||
|
||||
|
||||
def test_curator_skips_published_skill(isolated_paths, monkeypatch) -> None:
|
||||
"""A skill marked ``published`` in SkillStore must never be auto-archived
|
||||
even when nothing references it."""
|
||||
from datetime import UTC, datetime
|
||||
|
||||
from deerflow.skills import curator, usage
|
||||
|
||||
monkeypatch.setattr(curator, "_list_user_owned_skill_names", lambda uid: {"public-tool"})
|
||||
monkeypatch.setattr(curator, "_collect_referenced_skill_names", lambda: set())
|
||||
monkeypatch.setattr(curator, "_is_skill_published", lambda name: name == "public-tool")
|
||||
_isolated_skills_root(isolated_paths, monkeypatch)
|
||||
_seed_old_agent_skill("public-tool")
|
||||
|
||||
counters = curator.apply_automatic_transitions("user-a", datetime.now(UTC))
|
||||
|
||||
assert counters["checked"] == 0
|
||||
assert counters["archived"] == 0
|
||||
assert counters["skipped_published"] == 1
|
||||
assert usage.get_entry("public-tool")["state"] == usage.STATE_ACTIVE
|
||||
|
||||
|
||||
def test_curator_archives_orphan_unpublished_skill(isolated_paths, monkeypatch) -> None:
|
||||
"""The "default happy path": owner's own agent-created skill, unpublished,
|
||||
not referenced anywhere — IS archived when idle past the threshold."""
|
||||
from datetime import UTC, datetime
|
||||
|
||||
from deerflow.skills import curator, usage
|
||||
|
||||
monkeypatch.setattr(curator, "_list_user_owned_skill_names", lambda uid: {"orphan-skill"})
|
||||
monkeypatch.setattr(curator, "_collect_referenced_skill_names", lambda: set())
|
||||
monkeypatch.setattr(curator, "_is_skill_published", lambda name: False)
|
||||
_isolated_skills_root(isolated_paths, monkeypatch)
|
||||
_seed_old_agent_skill("orphan-skill")
|
||||
|
||||
counters = curator.apply_automatic_transitions("user-a", datetime.now(UTC))
|
||||
|
||||
assert counters["checked"] == 1
|
||||
assert counters["archived"] == 1
|
||||
assert counters["skipped_referenced"] == 0
|
||||
assert counters["skipped_published"] == 0
|
||||
assert usage.get_entry("orphan-skill")["state"] == usage.STATE_ARCHIVED
|
||||
|
||||
|
||||
def test_skill_archive_tool_refuses_referenced_or_published(
|
||||
isolated_paths, monkeypatch
|
||||
) -> None:
|
||||
"""Safety net: even if the LLM bypasses the candidate filter and invokes
|
||||
skill_archive with a protected name, the tool itself refuses."""
|
||||
from deerflow.skills import curator
|
||||
|
||||
# Make the on-disk lookup believe the skill exists and is not pinned.
|
||||
class _FakeStorage:
|
||||
def custom_skill_exists(self, _name: str) -> bool:
|
||||
return True
|
||||
|
||||
class _FakeEntry:
|
||||
def get(self, key, default=None):
|
||||
return False # pinned=False
|
||||
|
||||
monkeypatch.setattr("deerflow.skills.storage.get_or_new_skill_storage", lambda *_a, **_kw: _FakeStorage())
|
||||
monkeypatch.setattr("deerflow.skills.usage.get_entry", lambda _n: _FakeEntry())
|
||||
|
||||
tool = curator._make_skill_archive_tool("user-a")
|
||||
|
||||
# Case A: target is referenced — must refuse.
|
||||
monkeypatch.setattr(curator, "_collect_referenced_skill_names", lambda: {"linked"})
|
||||
monkeypatch.setattr(curator, "_is_skill_published", lambda name: False)
|
||||
out_a = tool.invoke({"name": "linked"})
|
||||
assert "Refused" in out_a
|
||||
assert "referenced" in out_a
|
||||
|
||||
# Case B: target is published — must refuse.
|
||||
monkeypatch.setattr(curator, "_collect_referenced_skill_names", lambda: set())
|
||||
monkeypatch.setattr(curator, "_is_skill_published", lambda name: name == "pub")
|
||||
out_b = tool.invoke({"name": "pub"})
|
||||
assert "Refused" in out_b
|
||||
assert "published" in out_b
|
||||
|
||||
|
||||
def test_collect_referenced_skill_names_aggregates_from_disk(
|
||||
isolated_paths, monkeypatch
|
||||
) -> None:
|
||||
"""End-to-end of the scanner helper: it walks ``.deer-flow/agents/*/config.yaml``
|
||||
and returns the union of every ``skills`` list."""
|
||||
from deerflow.skills import curator
|
||||
|
||||
# Build two agents on disk, each referencing one skill.
|
||||
agents_root = isolated_paths / "agents"
|
||||
(agents_root / "agent-1").mkdir(parents=True, exist_ok=True)
|
||||
(agents_root / "agent-2").mkdir(parents=True, exist_ok=True)
|
||||
(agents_root / "agent-1" / "config.yaml").write_text(
|
||||
yaml.safe_dump({"id": "agent-1", "name": "A", "skills": ["alpha", "beta"]}),
|
||||
encoding="utf-8",
|
||||
)
|
||||
(agents_root / "agent-2" / "config.yaml").write_text(
|
||||
yaml.safe_dump({"id": "agent-2", "name": "B", "skills": ["beta", "gamma"]}),
|
||||
encoding="utf-8",
|
||||
)
|
||||
|
||||
# Point get_paths().agents_dir at the temp tree.
|
||||
class _FakePaths:
|
||||
agents_dir = agents_root
|
||||
|
||||
monkeypatch.setattr("deerflow.config.paths.get_paths", lambda: _FakePaths())
|
||||
|
||||
assert curator._collect_referenced_skill_names() == {"alpha", "beta", "gamma"}
|
||||
Reference in new issue
Block a user