mirror of
https://gitee.com/wanwujie/deer-flow
synced 2026-04-02 22:02:13 +08:00
* 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>
66 lines
2.2 KiB
Python
66 lines
2.2 KiB
Python
"""Configuration for the subagent system loaded from config.yaml."""
|
|
|
|
import logging
|
|
|
|
from pydantic import BaseModel, Field
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class SubagentOverrideConfig(BaseModel):
|
|
"""Per-agent configuration overrides."""
|
|
|
|
timeout_seconds: int | None = Field(
|
|
default=None,
|
|
ge=1,
|
|
description="Timeout in seconds for this subagent (None = use global default)",
|
|
)
|
|
|
|
|
|
class SubagentsAppConfig(BaseModel):
|
|
"""Configuration for the subagent system."""
|
|
|
|
timeout_seconds: int = Field(
|
|
default=900,
|
|
ge=1,
|
|
description="Default timeout in seconds for all subagents (default: 900 = 15 minutes)",
|
|
)
|
|
agents: dict[str, SubagentOverrideConfig] = Field(
|
|
default_factory=dict,
|
|
description="Per-agent configuration overrides keyed by agent name",
|
|
)
|
|
|
|
def get_timeout_for(self, agent_name: str) -> int:
|
|
"""Get the effective timeout for a specific agent.
|
|
|
|
Args:
|
|
agent_name: The name of the subagent.
|
|
|
|
Returns:
|
|
The timeout in seconds, using per-agent override if set, otherwise global default.
|
|
"""
|
|
override = self.agents.get(agent_name)
|
|
if override is not None and override.timeout_seconds is not None:
|
|
return override.timeout_seconds
|
|
return self.timeout_seconds
|
|
|
|
|
|
_subagents_config: SubagentsAppConfig = SubagentsAppConfig()
|
|
|
|
|
|
def get_subagents_app_config() -> SubagentsAppConfig:
|
|
"""Get the current subagents configuration."""
|
|
return _subagents_config
|
|
|
|
|
|
def load_subagents_config_from_dict(config_dict: dict) -> None:
|
|
"""Load subagents configuration from a dictionary."""
|
|
global _subagents_config
|
|
_subagents_config = SubagentsAppConfig(**config_dict)
|
|
|
|
overrides_summary = {name: f"{override.timeout_seconds}s" for name, override in _subagents_config.agents.items() if override.timeout_seconds is not None}
|
|
if overrides_summary:
|
|
logger.info(f"Subagents config loaded: default timeout={_subagents_config.timeout_seconds}s, per-agent overrides={overrides_summary}")
|
|
else:
|
|
logger.info(f"Subagents config loaded: default timeout={_subagents_config.timeout_seconds}s, no per-agent overrides")
|