2026-03-13 09:41:59 +08:00
|
|
|
from types import SimpleNamespace
|
|
|
|
|
|
|
|
|
|
import pytest
|
|
|
|
|
from langchain_core.messages import ToolMessage
|
|
|
|
|
from langgraph.errors import GraphInterrupt
|
|
|
|
|
|
refactor: split backend into harness (deerflow.*) and app (app.*) (#1131)
* 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>
2026-03-14 22:55:52 +08:00
|
|
|
from deerflow.agents.middlewares.tool_error_handling_middleware import ToolErrorHandlingMiddleware
|
2026-03-13 09:41:59 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
def _request(name: str = "web_search", tool_call_id: str | None = "tc-1"):
|
|
|
|
|
tool_call = {"name": name}
|
|
|
|
|
if tool_call_id is not None:
|
|
|
|
|
tool_call["id"] = tool_call_id
|
|
|
|
|
return SimpleNamespace(tool_call=tool_call)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_wrap_tool_call_passthrough_on_success():
|
|
|
|
|
middleware = ToolErrorHandlingMiddleware()
|
|
|
|
|
req = _request()
|
|
|
|
|
expected = ToolMessage(content="ok", tool_call_id="tc-1", name="web_search")
|
|
|
|
|
|
|
|
|
|
result = middleware.wrap_tool_call(req, lambda _req: expected)
|
|
|
|
|
|
|
|
|
|
assert result is expected
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_wrap_tool_call_returns_error_tool_message_on_exception():
|
|
|
|
|
middleware = ToolErrorHandlingMiddleware()
|
|
|
|
|
req = _request(name="web_search", tool_call_id="tc-42")
|
|
|
|
|
|
|
|
|
|
def _boom(_req):
|
|
|
|
|
raise RuntimeError("network down")
|
|
|
|
|
|
|
|
|
|
result = middleware.wrap_tool_call(req, _boom)
|
|
|
|
|
|
|
|
|
|
assert isinstance(result, ToolMessage)
|
|
|
|
|
assert result.tool_call_id == "tc-42"
|
|
|
|
|
assert result.name == "web_search"
|
|
|
|
|
assert result.status == "error"
|
|
|
|
|
assert "Tool 'web_search' failed" in result.text
|
|
|
|
|
assert "network down" in result.text
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_wrap_tool_call_uses_fallback_tool_call_id_when_missing():
|
|
|
|
|
middleware = ToolErrorHandlingMiddleware()
|
|
|
|
|
req = _request(name="mcp_tool", tool_call_id=None)
|
|
|
|
|
|
|
|
|
|
def _boom(_req):
|
|
|
|
|
raise ValueError("bad request")
|
|
|
|
|
|
|
|
|
|
result = middleware.wrap_tool_call(req, _boom)
|
|
|
|
|
|
|
|
|
|
assert isinstance(result, ToolMessage)
|
|
|
|
|
assert result.tool_call_id == "missing_tool_call_id"
|
|
|
|
|
assert result.name == "mcp_tool"
|
|
|
|
|
assert result.status == "error"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_wrap_tool_call_reraises_graph_interrupt():
|
|
|
|
|
middleware = ToolErrorHandlingMiddleware()
|
|
|
|
|
req = _request(name="ask_clarification", tool_call_id="tc-int")
|
|
|
|
|
|
|
|
|
|
def _interrupt(_req):
|
|
|
|
|
raise GraphInterrupt(())
|
|
|
|
|
|
|
|
|
|
with pytest.raises(GraphInterrupt):
|
|
|
|
|
middleware.wrap_tool_call(req, _interrupt)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.anyio
|
|
|
|
|
async def test_awrap_tool_call_returns_error_tool_message_on_exception():
|
|
|
|
|
middleware = ToolErrorHandlingMiddleware()
|
|
|
|
|
req = _request(name="mcp_tool", tool_call_id="tc-async")
|
|
|
|
|
|
|
|
|
|
async def _boom(_req):
|
|
|
|
|
raise TimeoutError("request timed out")
|
|
|
|
|
|
|
|
|
|
result = await middleware.awrap_tool_call(req, _boom)
|
|
|
|
|
|
|
|
|
|
assert isinstance(result, ToolMessage)
|
|
|
|
|
assert result.tool_call_id == "tc-async"
|
|
|
|
|
assert result.name == "mcp_tool"
|
|
|
|
|
assert result.status == "error"
|
|
|
|
|
assert "request timed out" in result.text
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.anyio
|
|
|
|
|
async def test_awrap_tool_call_reraises_graph_interrupt():
|
|
|
|
|
middleware = ToolErrorHandlingMiddleware()
|
|
|
|
|
req = _request(name="ask_clarification", tool_call_id="tc-int-async")
|
|
|
|
|
|
|
|
|
|
async def _interrupt(_req):
|
|
|
|
|
raise GraphInterrupt(())
|
|
|
|
|
|
|
|
|
|
with pytest.raises(GraphInterrupt):
|
|
|
|
|
await middleware.awrap_tool_call(req, _interrupt)
|