mirror of
https://gitee.com/wanwujie/deer-flow
synced 2026-04-13 18:24:45 +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>
69 lines
2.3 KiB
Python
69 lines
2.3 KiB
Python
"""MCP client using langchain-mcp-adapters."""
|
|
|
|
import logging
|
|
from typing import Any
|
|
|
|
from deerflow.config.extensions_config import ExtensionsConfig, McpServerConfig
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
def build_server_params(server_name: str, config: McpServerConfig) -> dict[str, Any]:
|
|
"""Build server parameters for MultiServerMCPClient.
|
|
|
|
Args:
|
|
server_name: Name of the MCP server.
|
|
config: Configuration for the MCP server.
|
|
|
|
Returns:
|
|
Dictionary of server parameters for langchain-mcp-adapters.
|
|
"""
|
|
transport_type = config.type or "stdio"
|
|
params: dict[str, Any] = {"transport": transport_type}
|
|
|
|
if transport_type == "stdio":
|
|
if not config.command:
|
|
raise ValueError(f"MCP server '{server_name}' with stdio transport requires 'command' field")
|
|
params["command"] = config.command
|
|
params["args"] = config.args
|
|
# Add environment variables if present
|
|
if config.env:
|
|
params["env"] = config.env
|
|
elif transport_type in ("sse", "http"):
|
|
if not config.url:
|
|
raise ValueError(f"MCP server '{server_name}' with {transport_type} transport requires 'url' field")
|
|
params["url"] = config.url
|
|
# Add headers if present
|
|
if config.headers:
|
|
params["headers"] = config.headers
|
|
else:
|
|
raise ValueError(f"MCP server '{server_name}' has unsupported transport type: {transport_type}")
|
|
|
|
return params
|
|
|
|
|
|
def build_servers_config(extensions_config: ExtensionsConfig) -> dict[str, dict[str, Any]]:
|
|
"""Build servers configuration for MultiServerMCPClient.
|
|
|
|
Args:
|
|
extensions_config: Extensions configuration containing all MCP servers.
|
|
|
|
Returns:
|
|
Dictionary mapping server names to their parameters.
|
|
"""
|
|
enabled_servers = extensions_config.get_enabled_mcp_servers()
|
|
|
|
if not enabled_servers:
|
|
logger.info("No enabled MCP servers found")
|
|
return {}
|
|
|
|
servers_config = {}
|
|
for server_name, server_config in enabled_servers.items():
|
|
try:
|
|
servers_config[server_name] = build_server_params(server_name, server_config)
|
|
logger.info(f"Configured MCP server: {server_name}")
|
|
except Exception as e:
|
|
logger.error(f"Failed to configure MCP server '{server_name}': {e}")
|
|
|
|
return servers_config
|