sync update from LAN repo (source ji @ 85078a31)

This commit is contained in:
gozeros committed 2026-10-21 15:09:16 +08:00
1 parent 5d6627af50
commit e602d88695
864 files changed
+99150 -6346

No files matched your search

@@ -1,13 +1,16 @@
import json
import logging
from pathlib import Path
from typing import Literal
from fastapi import APIRouter, HTTPException, Request
from pydantic import BaseModel, Field
from pydantic import BaseModel, ConfigDict, Field
from app.gateway.deps import get_optional_user_from_request
from deerflow.config.extensions_config import ExtensionsConfig, get_extensions_config, reload_extensions_config
from deerflow.config.extensions_config import (
ExtensionsConfig,
patch_extensions_config,
read_extensions_config_document,
)
logger = logging.getLogger(__name__)
router = APIRouter(prefix="/api", tags=["mcp"])
@@ -45,6 +48,7 @@ class McpOAuthConfigResponse(BaseModel):
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")
model_config = ConfigDict(extra="allow", populate_by_name=True)
class McpServerConfigResponse(BaseModel):
@@ -63,6 +67,7 @@ class McpServerConfigResponse(BaseModel):
default_factory=list,
description="Tool names (without server-name prefix) to hide from the agent",
)
model_config = ConfigDict(extra="allow", populate_by_name=True)
class McpConfigResponse(BaseModel):
@@ -89,7 +94,7 @@ class McpConfigUpdateRequest(BaseModel):
summary="Get MCP Configuration",
description="Retrieve the current Model Context Protocol (MCP) server configurations.",
)
async def get_mcp_configuration() -> McpConfigResponse:
async def get_mcp_configuration(http_request: Request) -> McpConfigResponse:
"""Get the current MCP configuration.
Returns:
@@ -110,9 +115,17 @@ async def get_mcp_configuration() -> McpConfigResponse:
}
```
"""
config = get_extensions_config()
return McpConfigResponse(mcp_servers={name: McpServerConfigResponse(**server.model_dump()) for name, server in config.mcp_servers.items()})
await _require_admin(http_request)
config_path = ExtensionsConfig.resolve_config_path()
if config_path is None:
return McpConfigResponse()
document = read_extensions_config_document(config_path)
raw_servers = document.get("mcpServers", {})
if not isinstance(raw_servers, dict):
raise HTTPException(status_code=500, detail="Extensions config 'mcpServers' must be a JSON object")
return McpConfigResponse(
mcp_servers={name: McpServerConfigResponse.model_validate(server) for name, server in raw_servers.items()}
)
@router.put(
@@ -178,30 +191,22 @@ async def update_mcp_configuration(request: McpConfigUpdateRequest, http_request
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()
mcp_servers = {name: server.model_dump(by_alias=True) for name, server in request.mcp_servers.items()}
# Convert request to dict format for JSON serialization
config_data = {
"mcpServers": {name: server.model_dump(by_alias=True) for name, server in request.mcp_servers.items()},
"skills": {
name: skill.model_dump(by_alias=True, exclude_none=True)
for name, skill in current_config.skills.items()
},
}
def _patch_mcp_servers(config_data: dict) -> None:
config_data["mcpServers"] = mcp_servers
# Write the configuration to file
with open(config_path, "w", encoding="utf-8") as f:
json.dump(config_data, f, indent=2)
patch_extensions_config(config_path, _patch_mcp_servers)
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
# The shared writer reloads this process's cache. LangGraph Server runs
# separately and detects the file change via mtime.
# 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()})
# Echo the validated raw request rather than the reloaded model, whose
# env placeholders are expanded in memory and must never be persisted
# by a later GET -> PUT round trip.
return McpConfigResponse(mcp_servers=request.mcp_servers)
except Exception as e:
logger.error(f"Failed to update MCP configuration: {e}", exc_info=True)