mirror of
https://gitee.com/wanwujie/deer-flow
synced 2026-04-03 06:12:14 +08:00
76803b826f
* refactor: extract shared utils to break harness→app cross-layer imports Move _validate_skill_frontmatter to src/skills/validation.py and CONVERTIBLE_EXTENSIONS + convert_file_to_markdown to src/utils/file_conversion.py. This eliminates the two reverse dependencies from client.py (harness layer) into gateway/routers/ (app layer), preparing for the harness/app package split. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * refactor: split backend/src into harness (deerflow.*) and app (app.*) Physically split the monolithic backend/src/ package into two layers: - **Harness** (`packages/harness/deerflow/`): publishable agent framework package with import prefix `deerflow.*`. Contains agents, sandbox, tools, models, MCP, skills, config, and all core infrastructure. - **App** (`app/`): unpublished application code with import prefix `app.*`. Contains gateway (FastAPI REST API) and channels (IM integrations). Key changes: - Move 13 harness modules to packages/harness/deerflow/ via git mv - Move gateway + channels to app/ via git mv - Rename all imports: src.* → deerflow.* (harness) / app.* (app layer) - Set up uv workspace with deerflow-harness as workspace member - Update langgraph.json, config.example.yaml, all scripts, Docker files - Add build-system (hatchling) to harness pyproject.toml - Add PYTHONPATH=. to gateway startup commands for app.* resolution - Update ruff.toml with known-first-party for import sorting - Update all documentation to reflect new directory structure Boundary rule enforced: harness code never imports from app. All 429 tests pass. Lint clean. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * chore: add harness→app boundary check test and update docs Add test_harness_boundary.py that scans all Python files in packages/harness/deerflow/ and fails if any `from app.*` or `import app.*` statement is found. This enforces the architectural rule that the harness layer never depends on the app layer. Update CLAUDE.md to document the harness/app split architecture, import conventions, and the boundary enforcement test. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * feat: add config versioning with auto-upgrade on startup When config.example.yaml schema changes, developers' local config.yaml files can silently become outdated. This adds a config_version field and auto-upgrade mechanism so breaking changes (like src.* → deerflow.* renames) are applied automatically before services start. - Add config_version: 1 to config.example.yaml - Add startup version check warning in AppConfig.from_file() - Add scripts/config-upgrade.sh with migration registry for value replacements - Add `make config-upgrade` target - Auto-run config-upgrade in serve.sh and start-daemon.sh before starting services - Add config error hints in service failure messages Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix comments * fix: update src.* import in test_sandbox_tools_security to deerflow.* Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: handle empty config and search parent dirs for config.example.yaml Address Copilot review comments on PR #1131: - Guard against yaml.safe_load() returning None for empty config files - Search parent directories for config.example.yaml instead of only looking next to config.yaml, fixing detection in common setups Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: correct skills root path depth and config_version type coercion - loader.py: fix get_skills_root_path() to use 5 parent levels (was 3) after harness split, file lives at packages/harness/deerflow/skills/ so parent×3 resolved to backend/packages/harness/ instead of backend/ - app_config.py: coerce config_version to int() before comparison in _check_config_version() to prevent TypeError when YAML stores value as string (e.g. config_version: "1") - tests: add regression tests for both fixes Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: update test imports from src.* to deerflow.*/app.* after harness refactor Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
67 lines
2.7 KiB
Python
67 lines
2.7 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, use_config=False, 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, use_config=False, enabled_only=False)
|
|
names = {skill.name for skill in skills}
|
|
|
|
assert "ok-skill" in names
|
|
assert "secret-skill" not in names
|