2026-03-06 22:39:58 +08:00
|
|
|
import asyncio
|
|
|
|
|
from unittest.mock import MagicMock
|
|
|
|
|
|
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 app.gateway.routers import suggestions
|
2026-03-06 22:39:58 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_strip_markdown_code_fence_removes_wrapping():
|
feat: add IM channels for Feishu, Slack, and Telegram (#1010)
* feat: add IM channels system for Feishu, Slack, and Telegram integration
Bridge external messaging platforms to DeerFlow via LangGraph Server with
async message bus, thread management, and per-channel configuration.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* fix: address review comments on IM channels system
Fix topic_id handling in store remove/list_entries and manager commands,
correct Telegram reply threading, remove unused imports/variables, update
docstrings and docs to match implementation, and prevent config mutation.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* update skill creator
* fix im reply text
* fix comments
---------
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-08 15:21:18 +08:00
|
|
|
text = '```json\n["a"]\n```'
|
|
|
|
|
assert suggestions._strip_markdown_code_fence(text) == '["a"]'
|
2026-03-06 22:39:58 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_strip_markdown_code_fence_no_fence_keeps_content():
|
feat: add IM channels for Feishu, Slack, and Telegram (#1010)
* feat: add IM channels system for Feishu, Slack, and Telegram integration
Bridge external messaging platforms to DeerFlow via LangGraph Server with
async message bus, thread management, and per-channel configuration.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* fix: address review comments on IM channels system
Fix topic_id handling in store remove/list_entries and manager commands,
correct Telegram reply threading, remove unused imports/variables, update
docstrings and docs to match implementation, and prevent config mutation.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* update skill creator
* fix im reply text
* fix comments
---------
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-08 15:21:18 +08:00
|
|
|
text = ' ["a"] '
|
|
|
|
|
assert suggestions._strip_markdown_code_fence(text) == '["a"]'
|
2026-03-06 22:39:58 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_parse_json_string_list_filters_invalid_items():
|
feat: add IM channels for Feishu, Slack, and Telegram (#1010)
* feat: add IM channels system for Feishu, Slack, and Telegram integration
Bridge external messaging platforms to DeerFlow via LangGraph Server with
async message bus, thread management, and per-channel configuration.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* fix: address review comments on IM channels system
Fix topic_id handling in store remove/list_entries and manager commands,
correct Telegram reply threading, remove unused imports/variables, update
docstrings and docs to match implementation, and prevent config mutation.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* update skill creator
* fix im reply text
* fix comments
---------
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-08 15:21:18 +08:00
|
|
|
text = '```json\n["a", " ", 1, "b"]\n```'
|
2026-03-06 22:39:58 +08:00
|
|
|
assert suggestions._parse_json_string_list(text) == ["a", "b"]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_parse_json_string_list_rejects_non_list():
|
feat: add IM channels for Feishu, Slack, and Telegram (#1010)
* feat: add IM channels system for Feishu, Slack, and Telegram integration
Bridge external messaging platforms to DeerFlow via LangGraph Server with
async message bus, thread management, and per-channel configuration.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* fix: address review comments on IM channels system
Fix topic_id handling in store remove/list_entries and manager commands,
correct Telegram reply threading, remove unused imports/variables, update
docstrings and docs to match implementation, and prevent config mutation.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* update skill creator
* fix im reply text
* fix comments
---------
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-08 15:21:18 +08:00
|
|
|
text = '{"a": 1}'
|
2026-03-06 22:39:58 +08:00
|
|
|
assert suggestions._parse_json_string_list(text) is None
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_format_conversation_formats_roles():
|
|
|
|
|
messages = [
|
|
|
|
|
suggestions.SuggestionMessage(role="User", content="Hi"),
|
|
|
|
|
suggestions.SuggestionMessage(role="assistant", content="Hello"),
|
|
|
|
|
suggestions.SuggestionMessage(role="system", content="note"),
|
|
|
|
|
]
|
|
|
|
|
assert suggestions._format_conversation(messages) == "User: Hi\nAssistant: Hello\nsystem: note"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_generate_suggestions_parses_and_limits(monkeypatch):
|
|
|
|
|
req = suggestions.SuggestionsRequest(
|
|
|
|
|
messages=[
|
|
|
|
|
suggestions.SuggestionMessage(role="user", content="Hi"),
|
|
|
|
|
suggestions.SuggestionMessage(role="assistant", content="Hello"),
|
|
|
|
|
],
|
|
|
|
|
n=3,
|
|
|
|
|
model_name=None,
|
|
|
|
|
)
|
|
|
|
|
fake_model = MagicMock()
|
feat: add IM channels for Feishu, Slack, and Telegram (#1010)
* feat: add IM channels system for Feishu, Slack, and Telegram integration
Bridge external messaging platforms to DeerFlow via LangGraph Server with
async message bus, thread management, and per-channel configuration.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* fix: address review comments on IM channels system
Fix topic_id handling in store remove/list_entries and manager commands,
correct Telegram reply threading, remove unused imports/variables, update
docstrings and docs to match implementation, and prevent config mutation.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* update skill creator
* fix im reply text
* fix comments
---------
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-08 15:21:18 +08:00
|
|
|
fake_model.invoke.return_value = MagicMock(content='```json\n["Q1", "Q2", "Q3", "Q4"]\n```')
|
2026-03-06 22:39:58 +08:00
|
|
|
monkeypatch.setattr(suggestions, "create_chat_model", lambda **kwargs: fake_model)
|
|
|
|
|
|
|
|
|
|
result = asyncio.run(suggestions.generate_suggestions("t1", req))
|
|
|
|
|
|
|
|
|
|
assert result.suggestions == ["Q1", "Q2", "Q3"]
|
|
|
|
|
|
|
|
|
|
|
2026-03-13 21:20:15 +08:00
|
|
|
def test_generate_suggestions_parses_list_block_content(monkeypatch):
|
|
|
|
|
req = suggestions.SuggestionsRequest(
|
|
|
|
|
messages=[
|
|
|
|
|
suggestions.SuggestionMessage(role="user", content="Hi"),
|
|
|
|
|
suggestions.SuggestionMessage(role="assistant", content="Hello"),
|
|
|
|
|
],
|
|
|
|
|
n=2,
|
|
|
|
|
model_name=None,
|
|
|
|
|
)
|
|
|
|
|
fake_model = MagicMock()
|
|
|
|
|
fake_model.invoke.return_value = MagicMock(content=[{"type": "text", "text": '```json\n["Q1", "Q2"]\n```'}])
|
|
|
|
|
monkeypatch.setattr(suggestions, "create_chat_model", lambda **kwargs: fake_model)
|
|
|
|
|
|
|
|
|
|
result = asyncio.run(suggestions.generate_suggestions("t1", req))
|
|
|
|
|
|
|
|
|
|
assert result.suggestions == ["Q1", "Q2"]
|
|
|
|
|
|
|
|
|
|
|
2026-03-22 19:59:54 +08:00
|
|
|
def test_generate_suggestions_parses_output_text_block_content(monkeypatch):
|
|
|
|
|
req = suggestions.SuggestionsRequest(
|
|
|
|
|
messages=[
|
|
|
|
|
suggestions.SuggestionMessage(role="user", content="Hi"),
|
|
|
|
|
suggestions.SuggestionMessage(role="assistant", content="Hello"),
|
|
|
|
|
],
|
|
|
|
|
n=2,
|
|
|
|
|
model_name=None,
|
|
|
|
|
)
|
|
|
|
|
fake_model = MagicMock()
|
|
|
|
|
fake_model.invoke.return_value = MagicMock(content=[{"type": "output_text", "text": '```json\n["Q1", "Q2"]\n```'}])
|
|
|
|
|
monkeypatch.setattr(suggestions, "create_chat_model", lambda **kwargs: fake_model)
|
|
|
|
|
|
|
|
|
|
result = asyncio.run(suggestions.generate_suggestions("t1", req))
|
|
|
|
|
|
|
|
|
|
assert result.suggestions == ["Q1", "Q2"]
|
|
|
|
|
|
|
|
|
|
|
2026-03-06 22:39:58 +08:00
|
|
|
def test_generate_suggestions_returns_empty_on_model_error(monkeypatch):
|
|
|
|
|
req = suggestions.SuggestionsRequest(
|
|
|
|
|
messages=[suggestions.SuggestionMessage(role="user", content="Hi")],
|
|
|
|
|
n=2,
|
|
|
|
|
model_name=None,
|
|
|
|
|
)
|
|
|
|
|
fake_model = MagicMock()
|
|
|
|
|
fake_model.invoke.side_effect = RuntimeError("boom")
|
|
|
|
|
monkeypatch.setattr(suggestions, "create_chat_model", lambda **kwargs: fake_model)
|
|
|
|
|
|
|
|
|
|
result = asyncio.run(suggestions.generate_suggestions("t1", req))
|
|
|
|
|
|
feat: add IM channels for Feishu, Slack, and Telegram (#1010)
* feat: add IM channels system for Feishu, Slack, and Telegram integration
Bridge external messaging platforms to DeerFlow via LangGraph Server with
async message bus, thread management, and per-channel configuration.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* fix: address review comments on IM channels system
Fix topic_id handling in store remove/list_entries and manager commands,
correct Telegram reply threading, remove unused imports/variables, update
docstrings and docs to match implementation, and prevent config mutation.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* update skill creator
* fix im reply text
* fix comments
---------
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-08 15:21:18 +08:00
|
|
|
assert result.suggestions == []
|