mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-05-20 07:33:42 +00:00
84dccef230
Finish Phase 2 of the config refactor: production code no longer calls AppConfig.current() anywhere. AppConfig now flows as an explicit parameter down every consumer lane. Call-site migrations -------------------- - Memory subsystem (queue/updater/storage): MemoryConfig captured at enqueue time so the Timer closure survives the ContextVar boundary. - Sandbox layer: tools.py, security.py, sandbox_provider.py, local_sandbox_provider, aio_sandbox_provider all take app_config explicitly. Module-level caching in tools.py's path helpers is removed — pure parameter flow. - Skills layer: manager.py + loader.py + lead_agent.prompt cache refresh all thread app_config; cache worker closes over it. - Community tools (tavily, jina, firecrawl, exa, ddg, image_search, infoquest, aio_sandbox): read runtime.context.app_config. - Subagents registry: get_subagent_config / list_subagents / get_available_subagent_names require app_config. - Runtime worker: requires RunContext.app_config; no fallback. - Gateway routers (uploads, skills): add Depends(get_config). - Channels feishu: uses AppConfig.from_file() (pure) at its sync boundary. - LangGraph Server bootstrap (make_lead_agent): falls back to AppConfig.from_file() — pure load, not ambient lookup. Context resolution ------------------ - resolve_context(runtime) now raises on non-DeerFlowContext runtime.context. Every entry point attaches typed context; dict/None shapes are rejected loudly instead of being papered over with an ambient AppConfig lookup. AppConfig lifecycle ------------------- - AppConfig.current() kept as a deprecated slot that raises RuntimeError, purely so legacy tests that still run `patch.object(AppConfig, "current")` don't trip AttributeError at teardown. Production never calls it. - conftest autouse fixture no longer monkey-patches `current` — it only stubs `from_file()` so tests don't need a real config.yaml. Design refs ----------- - docs/plans/2026-04-12-config-refactor-plan.md (Phase 2: P2-6..P2-10) - docs/plans/2026-04-12-config-refactor-design.md §8 All 2338 non-e2e tests pass. Zero AppConfig.current() call sites remain in backend/packages or backend/app (docstrings in deps.py excepted).
77 lines
3.2 KiB
Python
77 lines
3.2 KiB
Python
"""Tests for recursive skills loading."""
|
|
|
|
from pathlib import Path
|
|
|
|
from deerflow.skills.loader import get_skills_root_path, load_skills
|
|
|
|
|
|
def _write_skill(skill_dir: Path, name: str, description: str) -> None:
|
|
"""Write a minimal SKILL.md for tests."""
|
|
skill_dir.mkdir(parents=True, exist_ok=True)
|
|
content = f"---\nname: {name}\ndescription: {description}\n---\n\n# {name}\n"
|
|
(skill_dir / "SKILL.md").write_text(content, encoding="utf-8")
|
|
|
|
|
|
def test_get_skills_root_path_points_to_project_root_skills():
|
|
"""get_skills_root_path() should point to deer-flow/skills (sibling of backend/), not backend/packages/skills."""
|
|
path = get_skills_root_path()
|
|
assert path.name == "skills", f"Expected 'skills', got '{path.name}'"
|
|
assert (path.parent / "backend").is_dir(), f"Expected skills path's parent to be project root containing 'backend/', but got {path}"
|
|
|
|
|
|
def test_load_skills_discovers_nested_skills_and_sets_container_paths(tmp_path: Path):
|
|
"""Nested skills should be discovered recursively with correct container paths."""
|
|
skills_root = tmp_path / "skills"
|
|
|
|
_write_skill(skills_root / "public" / "root-skill", "root-skill", "Root skill")
|
|
_write_skill(skills_root / "public" / "parent" / "child-skill", "child-skill", "Child skill")
|
|
_write_skill(skills_root / "custom" / "team" / "helper", "team-helper", "Team helper")
|
|
|
|
skills = load_skills(skills_path=skills_root, enabled_only=False)
|
|
by_name = {skill.name: skill for skill in skills}
|
|
|
|
assert {"root-skill", "child-skill", "team-helper"} <= set(by_name)
|
|
|
|
root_skill = by_name["root-skill"]
|
|
child_skill = by_name["child-skill"]
|
|
team_skill = by_name["team-helper"]
|
|
|
|
assert root_skill.skill_path == "root-skill"
|
|
assert root_skill.get_container_file_path() == "/mnt/skills/public/root-skill/SKILL.md"
|
|
|
|
assert child_skill.skill_path == "parent/child-skill"
|
|
assert child_skill.get_container_file_path() == "/mnt/skills/public/parent/child-skill/SKILL.md"
|
|
|
|
assert team_skill.skill_path == "team/helper"
|
|
assert team_skill.get_container_file_path() == "/mnt/skills/custom/team/helper/SKILL.md"
|
|
|
|
|
|
def test_load_skills_skips_hidden_directories(tmp_path: Path):
|
|
"""Hidden directories should be excluded from recursive discovery."""
|
|
skills_root = tmp_path / "skills"
|
|
|
|
_write_skill(skills_root / "public" / "visible" / "ok-skill", "ok-skill", "Visible skill")
|
|
_write_skill(
|
|
skills_root / "public" / "visible" / ".hidden" / "secret-skill",
|
|
"secret-skill",
|
|
"Hidden skill",
|
|
)
|
|
|
|
skills = load_skills(skills_path=skills_root, enabled_only=False)
|
|
names = {skill.name for skill in skills}
|
|
|
|
assert "ok-skill" in names
|
|
assert "secret-skill" not in names
|
|
|
|
|
|
def test_load_skills_prefers_custom_over_public_with_same_name(tmp_path: Path):
|
|
skills_root = tmp_path / "skills"
|
|
_write_skill(skills_root / "public" / "shared-skill", "shared-skill", "Public version")
|
|
_write_skill(skills_root / "custom" / "shared-skill", "shared-skill", "Custom version")
|
|
|
|
skills = load_skills(skills_path=skills_root, enabled_only=False)
|
|
shared = next(skill for skill in skills if skill.name == "shared-skill")
|
|
|
|
assert shared.category == "custom"
|
|
assert shared.description == "Custom version"
|