sync: 鍚屾灞€鍩熺綉鏈€鏂颁唬鐮?(source master @ b69568e4)
This commit is contained in:
1 parent
4f7f07504a
commit
8bc8b0e082
1651 files changed
+278599
-11416
No files matched your search
@@ -10,18 +10,27 @@ Covers:
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import subprocess
|
||||
import sys
|
||||
import time
|
||||
from pathlib import Path
|
||||
from types import SimpleNamespace
|
||||
|
||||
import pytest
|
||||
|
||||
from app.gateway.routers import mcp as mcp_router
|
||||
from app.gateway.routers.skills import (
|
||||
SkillDetailRequest,
|
||||
SkillResponse,
|
||||
_can_view_skill_source,
|
||||
_skill_to_response,
|
||||
)
|
||||
from deerflow.client import DeerFlowClient
|
||||
from deerflow.config import paths as paths_module
|
||||
from deerflow.config.extensions_config import reset_extensions_config
|
||||
from deerflow.persistence.skills import MemorySkillStore
|
||||
from deerflow.skills.storage.local_skill_storage import LocalSkillStorage
|
||||
from deerflow.skills.types import SkillCategory
|
||||
|
||||
|
||||
@@ -187,3 +196,199 @@ def test_non_owner_cannot_view_custom_skill_source() -> None:
|
||||
def test_non_admin_cannot_view_builtin_skill_source() -> None:
|
||||
# Built-in / public skills have no publisher, so non-admins never see source.
|
||||
assert _can_view_skill_source(SkillCategory.PUBLIC, None, "user-a", is_admin=False) is False
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Unified extensions-config writer regressions
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def raw_extensions_config(tmp_path: Path, monkeypatch: pytest.MonkeyPatch):
|
||||
config_path = tmp_path / "extensions_config.json"
|
||||
monkeypatch.setenv("DEER_FLOW_EXTENSIONS_CONFIG_PATH", str(config_path))
|
||||
reset_extensions_config()
|
||||
try:
|
||||
yield config_path
|
||||
finally:
|
||||
reset_extensions_config()
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_mcp_router_patches_raw_document_without_overwriting_skills(
|
||||
raw_extensions_config: Path,
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
) -> None:
|
||||
original = {
|
||||
"mcpServers": {"old": {"command": "$OLD_COMMAND", "futureMcp": "old"}},
|
||||
"skills": {
|
||||
"offline-skill": {
|
||||
"enabled": False,
|
||||
"display": {"enabled": True, "mode": "list"},
|
||||
"futureSkill": {"keep": True},
|
||||
}
|
||||
},
|
||||
"futureTopLevel": {"placeholder": "$DO_NOT_RESOLVE"},
|
||||
}
|
||||
raw_extensions_config.write_text(json.dumps(original), encoding="utf-8")
|
||||
|
||||
async def _allow_admin(_request) -> None:
|
||||
return None
|
||||
|
||||
monkeypatch.setattr(mcp_router, "_require_admin", _allow_admin)
|
||||
before_update = await mcp_router.get_mcp_configuration(SimpleNamespace())
|
||||
assert before_update.mcp_servers["old"].command == "$OLD_COMMAND"
|
||||
assert before_update.mcp_servers["old"].model_extra == {"futureMcp": "old"}
|
||||
|
||||
response = await mcp_router.update_mcp_configuration(
|
||||
mcp_router.McpConfigUpdateRequest(
|
||||
mcp_servers={
|
||||
"replacement": mcp_router.McpServerConfigResponse(
|
||||
type="stdio",
|
||||
command="python",
|
||||
env={"TOKEN": "$MCP_TOKEN"},
|
||||
)
|
||||
}
|
||||
),
|
||||
SimpleNamespace(),
|
||||
)
|
||||
|
||||
persisted = json.loads(raw_extensions_config.read_text(encoding="utf-8"))
|
||||
assert set(response.mcp_servers) == {"replacement"}
|
||||
assert persisted["mcpServers"]["replacement"]["env"]["TOKEN"] == "$MCP_TOKEN"
|
||||
assert persisted["skills"] == original["skills"]
|
||||
assert persisted["futureTopLevel"] == original["futureTopLevel"]
|
||||
|
||||
|
||||
def test_embedded_client_mcp_and_skill_updates_patch_only_owned_fields(
|
||||
raw_extensions_config: Path,
|
||||
tmp_path: Path,
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
) -> None:
|
||||
skills_root = tmp_path / "skills"
|
||||
skill_file = skills_root / "public" / "demo-dir" / "SKILL.md"
|
||||
skill_file.parent.mkdir(parents=True)
|
||||
skill_file.write_text(
|
||||
"---\nname: demo-skill\ndescription: Demo\n---\n",
|
||||
encoding="utf-8",
|
||||
)
|
||||
storage = LocalSkillStorage(host_path=str(skills_root))
|
||||
import deerflow.skills.storage as storage_module
|
||||
|
||||
monkeypatch.setattr(storage_module, "get_or_new_skill_storage", lambda **_kwargs: storage)
|
||||
original = {
|
||||
"mcpServers": {"old": {"command": "$OLD_COMMAND"}},
|
||||
"skills": {
|
||||
"demo-skill": {
|
||||
"enabled": True,
|
||||
"display": {"enabled": True, "mode": "list"},
|
||||
"futureSkill": "keep",
|
||||
}
|
||||
},
|
||||
"futureTopLevel": ["keep"],
|
||||
}
|
||||
raw_extensions_config.write_text(json.dumps(original), encoding="utf-8")
|
||||
|
||||
client = object.__new__(DeerFlowClient)
|
||||
client._agent = object()
|
||||
client._agent_config_key = ("cached",)
|
||||
assert client.get_mcp_config()["mcp_servers"]["old"]["command"] == "$OLD_COMMAND"
|
||||
|
||||
before_invalid_update = raw_extensions_config.read_bytes()
|
||||
with pytest.raises(ValueError):
|
||||
client.update_mcp_config({"invalid": {"command": "python", "env": ["not-a-mapping"]}})
|
||||
assert raw_extensions_config.read_bytes() == before_invalid_update
|
||||
|
||||
client.update_mcp_config(
|
||||
{
|
||||
"client-server": {
|
||||
"type": "stdio",
|
||||
"command": "python",
|
||||
"env": {"TOKEN": "$CLIENT_SECRET"},
|
||||
"futureMcp": {"keep": True},
|
||||
}
|
||||
}
|
||||
)
|
||||
persisted = json.loads(raw_extensions_config.read_text(encoding="utf-8"))
|
||||
assert persisted["mcpServers"]["client-server"]["env"]["TOKEN"] == "$CLIENT_SECRET"
|
||||
assert persisted["mcpServers"]["client-server"]["futureMcp"] == {"keep": True}
|
||||
assert persisted["skills"] == original["skills"]
|
||||
assert persisted["futureTopLevel"] == ["keep"]
|
||||
|
||||
updated = client.update_skill("demo-skill", enabled=False)
|
||||
persisted = json.loads(raw_extensions_config.read_text(encoding="utf-8"))
|
||||
assert updated["enabled"] is False
|
||||
assert persisted["skills"]["demo-skill"]["enabled"] is False
|
||||
assert persisted["skills"]["demo-skill"]["display"] == original["skills"]["demo-skill"]["display"]
|
||||
assert persisted["skills"]["demo-skill"]["futureSkill"] == "keep"
|
||||
assert persisted["mcpServers"]["client-server"]["futureMcp"] == {"keep": True}
|
||||
assert persisted["futureTopLevel"] == ["keep"]
|
||||
assert client._agent is None
|
||||
assert client._agent_config_key is None
|
||||
|
||||
|
||||
def test_extensions_config_writer_serializes_cross_process_patches(
|
||||
raw_extensions_config: Path,
|
||||
) -> None:
|
||||
raw_extensions_config.write_text(
|
||||
json.dumps({"mcpServers": {}, "skills": {}, "concurrent": {}}),
|
||||
encoding="utf-8",
|
||||
)
|
||||
script = """
|
||||
import sys
|
||||
import time
|
||||
from pathlib import Path
|
||||
from deerflow.config.extensions_config import patch_extensions_config
|
||||
|
||||
Path(sys.argv[3]).write_text("ready", encoding="utf-8")
|
||||
while not Path(sys.argv[4]).exists():
|
||||
time.sleep(0.01)
|
||||
|
||||
def update(document):
|
||||
current = document.setdefault("concurrent", {})
|
||||
time.sleep(0.25)
|
||||
current[sys.argv[2]] = True
|
||||
|
||||
patch_extensions_config(sys.argv[1], update)
|
||||
"""
|
||||
backend_root = Path(__file__).resolve().parents[1]
|
||||
start_path = raw_extensions_config.with_suffix(".start")
|
||||
ready_paths = {
|
||||
key: raw_extensions_config.with_suffix(f".{key}.ready")
|
||||
for key in ("mcp", "skill")
|
||||
}
|
||||
processes = [
|
||||
subprocess.Popen(
|
||||
[
|
||||
sys.executable,
|
||||
"-c",
|
||||
script,
|
||||
str(raw_extensions_config),
|
||||
key,
|
||||
str(ready_paths[key]),
|
||||
str(start_path),
|
||||
],
|
||||
cwd=backend_root,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
text=True,
|
||||
)
|
||||
for key in ("mcp", "skill")
|
||||
]
|
||||
deadline = time.monotonic() + 30
|
||||
while not all(path.exists() for path in ready_paths.values()):
|
||||
if time.monotonic() >= deadline:
|
||||
for process in processes:
|
||||
process.terminate()
|
||||
pytest.fail("Timed out waiting for config-writer subprocesses")
|
||||
time.sleep(0.01)
|
||||
start_path.touch()
|
||||
failures: list[str] = []
|
||||
for process in processes:
|
||||
_stdout, stderr = process.communicate(timeout=30)
|
||||
if process.returncode != 0:
|
||||
failures.append(stderr)
|
||||
assert failures == []
|
||||
|
||||
persisted = json.loads(raw_extensions_config.read_text(encoding="utf-8"))
|
||||
assert persisted["concurrent"] == {"mcp": True, "skill": True}
|
||||
Reference in new issue
Block a user