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>
170 lines
7.2 KiB
Python
170 lines
7.2 KiB
Python
import json
|
|
import logging
|
|
from pathlib import Path
|
|
from typing import Literal
|
|
|
|
from fastapi import APIRouter, HTTPException
|
|
from pydantic import BaseModel, Field
|
|
|
|
from deerflow.config.extensions_config import ExtensionsConfig, get_extensions_config, reload_extensions_config
|
|
|
|
logger = logging.getLogger(__name__)
|
|
router = APIRouter(prefix="/api", tags=["mcp"])
|
|
|
|
|
|
class McpOAuthConfigResponse(BaseModel):
|
|
"""OAuth configuration for an MCP server."""
|
|
|
|
enabled: bool = Field(default=True, description="Whether OAuth token injection is enabled")
|
|
token_url: str = Field(default="", description="OAuth token endpoint URL")
|
|
grant_type: Literal["client_credentials", "refresh_token"] = Field(default="client_credentials", description="OAuth grant type")
|
|
client_id: str | None = Field(default=None, description="OAuth client ID")
|
|
client_secret: str | None = Field(default=None, description="OAuth client secret")
|
|
refresh_token: str | None = Field(default=None, description="OAuth refresh token")
|
|
scope: str | None = Field(default=None, description="OAuth scope")
|
|
audience: str | None = Field(default=None, description="OAuth audience")
|
|
token_field: str = Field(default="access_token", description="Token response field containing access token")
|
|
token_type_field: str = Field(default="token_type", description="Token response field containing token type")
|
|
expires_in_field: str = Field(default="expires_in", description="Token response field containing expires-in seconds")
|
|
default_token_type: str = Field(default="Bearer", description="Default token type when response omits token_type")
|
|
refresh_skew_seconds: int = Field(default=60, description="Refresh this many seconds before expiry")
|
|
extra_token_params: dict[str, str] = Field(default_factory=dict, description="Additional form params sent to token endpoint")
|
|
|
|
|
|
class McpServerConfigResponse(BaseModel):
|
|
"""Response model for MCP server configuration."""
|
|
|
|
enabled: bool = Field(default=True, description="Whether this MCP server is enabled")
|
|
type: str = Field(default="stdio", description="Transport type: 'stdio', 'sse', or 'http'")
|
|
command: str | None = Field(default=None, description="Command to execute to start the MCP server (for stdio type)")
|
|
args: list[str] = Field(default_factory=list, description="Arguments to pass to the command (for stdio type)")
|
|
env: dict[str, str] = Field(default_factory=dict, description="Environment variables for the MCP server")
|
|
url: str | None = Field(default=None, description="URL of the MCP server (for sse or http type)")
|
|
headers: dict[str, str] = Field(default_factory=dict, description="HTTP headers to send (for sse or http type)")
|
|
oauth: McpOAuthConfigResponse | None = Field(default=None, description="OAuth configuration for MCP HTTP/SSE servers")
|
|
description: str = Field(default="", description="Human-readable description of what this MCP server provides")
|
|
|
|
|
|
class McpConfigResponse(BaseModel):
|
|
"""Response model for MCP configuration."""
|
|
|
|
mcp_servers: dict[str, McpServerConfigResponse] = Field(
|
|
default_factory=dict,
|
|
description="Map of MCP server name to configuration",
|
|
)
|
|
|
|
|
|
class McpConfigUpdateRequest(BaseModel):
|
|
"""Request model for updating MCP configuration."""
|
|
|
|
mcp_servers: dict[str, McpServerConfigResponse] = Field(
|
|
...,
|
|
description="Map of MCP server name to configuration",
|
|
)
|
|
|
|
|
|
@router.get(
|
|
"/mcp/config",
|
|
response_model=McpConfigResponse,
|
|
summary="Get MCP Configuration",
|
|
description="Retrieve the current Model Context Protocol (MCP) server configurations.",
|
|
)
|
|
async def get_mcp_configuration() -> McpConfigResponse:
|
|
"""Get the current MCP configuration.
|
|
|
|
Returns:
|
|
The current MCP configuration with all servers.
|
|
|
|
Example:
|
|
```json
|
|
{
|
|
"mcp_servers": {
|
|
"github": {
|
|
"enabled": true,
|
|
"command": "npx",
|
|
"args": ["-y", "@modelcontextprotocol/server-github"],
|
|
"env": {"GITHUB_TOKEN": "ghp_xxx"},
|
|
"description": "GitHub MCP server for repository operations"
|
|
}
|
|
}
|
|
}
|
|
```
|
|
"""
|
|
config = get_extensions_config()
|
|
|
|
return McpConfigResponse(mcp_servers={name: McpServerConfigResponse(**server.model_dump()) for name, server in config.mcp_servers.items()})
|
|
|
|
|
|
@router.put(
|
|
"/mcp/config",
|
|
response_model=McpConfigResponse,
|
|
summary="Update MCP Configuration",
|
|
description="Update Model Context Protocol (MCP) server configurations and save to file.",
|
|
)
|
|
async def update_mcp_configuration(request: McpConfigUpdateRequest) -> McpConfigResponse:
|
|
"""Update the MCP configuration.
|
|
|
|
This will:
|
|
1. Save the new configuration to the mcp_config.json file
|
|
2. Reload the configuration cache
|
|
3. Reset MCP tools cache to trigger reinitialization
|
|
|
|
Args:
|
|
request: The new MCP configuration to save.
|
|
|
|
Returns:
|
|
The updated MCP configuration.
|
|
|
|
Raises:
|
|
HTTPException: 500 if the configuration file cannot be written.
|
|
|
|
Example Request:
|
|
```json
|
|
{
|
|
"mcp_servers": {
|
|
"github": {
|
|
"enabled": true,
|
|
"command": "npx",
|
|
"args": ["-y", "@modelcontextprotocol/server-github"],
|
|
"env": {"GITHUB_TOKEN": "$GITHUB_TOKEN"},
|
|
"description": "GitHub MCP server for repository operations"
|
|
}
|
|
}
|
|
}
|
|
```
|
|
"""
|
|
try:
|
|
# Get the current config path (or determine where to save it)
|
|
config_path = ExtensionsConfig.resolve_config_path()
|
|
|
|
# If no config file exists, create one in the parent directory (project root)
|
|
if config_path is None:
|
|
config_path = Path.cwd().parent / "extensions_config.json"
|
|
logger.info(f"No existing extensions config found. Creating new config at: {config_path}")
|
|
|
|
# Load current config to preserve skills configuration
|
|
current_config = get_extensions_config()
|
|
|
|
# Convert request to dict format for JSON serialization
|
|
config_data = {
|
|
"mcpServers": {name: server.model_dump() for name, server in request.mcp_servers.items()},
|
|
"skills": {name: {"enabled": skill.enabled} for name, skill in current_config.skills.items()},
|
|
}
|
|
|
|
# Write the configuration to file
|
|
with open(config_path, "w") as f:
|
|
json.dump(config_data, f, indent=2)
|
|
|
|
logger.info(f"MCP configuration updated and saved to: {config_path}")
|
|
|
|
# NOTE: No need to reload/reset cache here - LangGraph Server (separate process)
|
|
# will detect config file changes via mtime and reinitialize MCP tools automatically
|
|
|
|
# Reload the configuration and update the global cache
|
|
reloaded_config = reload_extensions_config()
|
|
return McpConfigResponse(mcp_servers={name: McpServerConfigResponse(**server.model_dump()) for name, server in reloaded_config.mcp_servers.items()})
|
|
|
|
except Exception as e:
|
|
logger.error(f"Failed to update MCP configuration: {e}", exc_info=True)
|
|
raise HTTPException(status_code=500, detail=f"Failed to update MCP configuration: {str(e)}")
|