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

@@ -16,11 +16,9 @@ Usage:
"""
import asyncio
import json
import logging
import mimetypes
import shutil
import tempfile
import uuid
from collections.abc import Generator, Sequence
from dataclasses import dataclass, field
@@ -37,7 +35,12 @@ from deerflow.agents.lead_agent.prompt import apply_prompt_template
from deerflow.agents.thread_state import ThreadState
from deerflow.config.agents_config import AGENT_NAME_PATTERN
from deerflow.config.app_config import get_app_config, reload_app_config
from deerflow.config.extensions_config import ExtensionsConfig, SkillStateConfig, get_extensions_config, reload_extensions_config
from deerflow.config.extensions_config import (
ExtensionsConfig,
McpServerConfig,
patch_extensions_config,
read_extensions_config_document,
)
from deerflow.config.paths import get_paths
from deerflow.models import create_chat_model
from deerflow.runtime.user_context import get_effective_user_id
@@ -175,24 +178,6 @@ class DeerFlowClient:
# Internal helpers
# ------------------------------------------------------------------
@staticmethod
def _atomic_write_json(path: Path, data: dict) -> None:
"""Write JSON to *path* atomically (temp file + replace)."""
fd = tempfile.NamedTemporaryFile(
mode="w",
dir=path.parent,
suffix=".tmp",
delete=False,
)
try:
json.dump(data, fd, indent=2)
fd.close()
Path(fd.name).replace(path)
except BaseException:
fd.close()
Path(fd.name).unlink(missing_ok=True)
raise
def _get_runnable_config(self, thread_id: str, **overrides) -> RunnableConfig:
"""Build a RunnableConfig for agent invocation."""
configurable = {
@@ -840,8 +825,19 @@ class DeerFlowClient:
Dict with "mcp_servers" key mapping server name to config,
matching the Gateway API ``McpConfigResponse`` schema.
"""
config = get_extensions_config()
return {"mcp_servers": {name: server.model_dump() for name, server in config.mcp_servers.items()}}
config_path = ExtensionsConfig.resolve_config_path()
if config_path is None:
return {"mcp_servers": {}}
document = read_extensions_config_document(config_path)
raw_servers = document.get("mcpServers", {})
if not isinstance(raw_servers, dict):
raise ValueError("Extensions config 'mcpServers' must be a JSON object")
return {
"mcp_servers": {
name: McpServerConfig.model_validate(server).model_dump()
for name, server in raw_servers.items()
}
}
def update_mcp_config(self, mcp_servers: dict[str, dict]) -> dict:
"""Update MCP server configurations.
@@ -863,22 +859,19 @@ class DeerFlowClient:
if config_path is None:
raise FileNotFoundError("Cannot locate extensions_config.json. Set DEER_FLOW_EXTENSIONS_CONFIG_PATH or ensure it exists in the project root.")
current_config = get_extensions_config()
def _patch_mcp_servers(config_data: dict[str, Any]) -> None:
config_data["mcpServers"] = mcp_servers
config_data = {
"mcpServers": mcp_servers,
"skills": {
name: skill.model_dump(by_alias=True, exclude_none=True)
for name, skill in current_config.skills.items()
},
}
self._atomic_write_json(config_path, config_data)
patch_extensions_config(config_path, _patch_mcp_servers)
self._agent = None
self._agent_config_key = None
reloaded = reload_extensions_config()
return {"mcp_servers": {name: server.model_dump() for name, server in reloaded.mcp_servers.items()}}
return {
"mcp_servers": {
name: McpServerConfig.model_validate(server).model_dump()
for name, server in mcp_servers.items()
}
}
# ------------------------------------------------------------------
# Public API — skills management
@@ -931,26 +924,24 @@ class DeerFlowClient:
if config_path is None:
raise FileNotFoundError("Cannot locate extensions_config.json. Set DEER_FLOW_EXTENSIONS_CONFIG_PATH or ensure it exists in the project root.")
extensions_config = get_extensions_config()
current_skill_config = extensions_config.skills.get(name)
extensions_config.skills[name] = SkillStateConfig(
enabled=enabled,
display=current_skill_config.display if current_skill_config else None,
)
config_data = {
"mcpServers": {n: s.model_dump(by_alias=True) for n, s in extensions_config.mcp_servers.items()},
"skills": {
n: sc.model_dump(by_alias=True, exclude_none=True)
for n, sc in extensions_config.skills.items()
},
}
self._atomic_write_json(config_path, config_data)
def _patch_skill_state(config_data: dict[str, Any]) -> None:
skill_states = config_data.setdefault("skills", {})
if not isinstance(skill_states, dict):
raise ValueError("Extensions config 'skills' must be a JSON object")
raw_skill_state = skill_states.get(name)
if raw_skill_state is None:
raw_skill_state = {}
elif not isinstance(raw_skill_state, dict):
raise ValueError(f"Extensions config state for skill '{name}' must be a JSON object")
else:
raw_skill_state = dict(raw_skill_state)
raw_skill_state["enabled"] = enabled
skill_states[name] = raw_skill_state
patch_extensions_config(config_path, _patch_skill_state)
self._agent = None
self._agent_config_key = None
reload_extensions_config()
updated = next((s for s in get_or_new_skill_storage().load_skills(enabled_only=False) if s.name == name), None)
if updated is None: