2026-01-14 07:19:34 +08:00
|
|
|
from abc import ABC, abstractmethod
|
|
|
|
|
|
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.config import get_app_config
|
|
|
|
|
from deerflow.reflection import resolve_class
|
|
|
|
|
from deerflow.sandbox.sandbox import Sandbox
|
2026-01-14 07:19:34 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
class SandboxProvider(ABC):
|
|
|
|
|
"""Abstract base class for sandbox providers"""
|
|
|
|
|
|
|
|
|
|
@abstractmethod
|
2026-01-15 13:22:30 +08:00
|
|
|
def acquire(self, thread_id: str | None = None) -> str:
|
2026-01-14 12:32:34 +08:00
|
|
|
"""Acquire a sandbox environment and return its ID.
|
2026-01-14 07:19:34 +08:00
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
|
The ID of the acquired sandbox environment.
|
|
|
|
|
"""
|
|
|
|
|
pass
|
|
|
|
|
|
|
|
|
|
@abstractmethod
|
2026-01-14 12:32:34 +08:00
|
|
|
def get(self, sandbox_id: str) -> Sandbox | None:
|
2026-01-14 07:19:34 +08:00
|
|
|
"""Get a sandbox environment by ID.
|
|
|
|
|
|
|
|
|
|
Args:
|
|
|
|
|
sandbox_id: The ID of the sandbox environment to retain.
|
|
|
|
|
"""
|
|
|
|
|
pass
|
|
|
|
|
|
|
|
|
|
@abstractmethod
|
|
|
|
|
def release(self, sandbox_id: str) -> None:
|
|
|
|
|
"""Release a sandbox environment.
|
|
|
|
|
|
|
|
|
|
Args:
|
|
|
|
|
sandbox_id: The ID of the sandbox environment to destroy.
|
|
|
|
|
"""
|
|
|
|
|
pass
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
_default_sandbox_provider: SandboxProvider | None = None
|
|
|
|
|
|
|
|
|
|
|
2026-01-15 13:22:30 +08:00
|
|
|
def get_sandbox_provider(**kwargs) -> SandboxProvider:
|
2026-01-17 23:23:12 +08:00
|
|
|
"""Get the sandbox provider singleton.
|
|
|
|
|
|
|
|
|
|
Returns a cached singleton instance. Use `reset_sandbox_provider()` to clear
|
|
|
|
|
the cache, or `shutdown_sandbox_provider()` to properly shutdown and clear.
|
2026-01-14 07:19:34 +08:00
|
|
|
|
|
|
|
|
Returns:
|
2026-01-17 23:23:12 +08:00
|
|
|
A sandbox provider instance.
|
2026-01-14 07:19:34 +08:00
|
|
|
"""
|
|
|
|
|
global _default_sandbox_provider
|
|
|
|
|
if _default_sandbox_provider is None:
|
|
|
|
|
config = get_app_config()
|
|
|
|
|
cls = resolve_class(config.sandbox.use, SandboxProvider)
|
2026-01-15 13:22:30 +08:00
|
|
|
_default_sandbox_provider = cls(**kwargs)
|
2026-01-14 07:19:34 +08:00
|
|
|
return _default_sandbox_provider
|
2026-01-17 23:23:12 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
def reset_sandbox_provider() -> None:
|
|
|
|
|
"""Reset the sandbox provider singleton.
|
|
|
|
|
|
|
|
|
|
This clears the cached instance without calling shutdown.
|
|
|
|
|
The next call to `get_sandbox_provider()` will create a new instance.
|
|
|
|
|
Useful for testing or when switching configurations.
|
|
|
|
|
|
|
|
|
|
Note: If the provider has active sandboxes, they will be orphaned.
|
|
|
|
|
Use `shutdown_sandbox_provider()` for proper cleanup.
|
|
|
|
|
"""
|
|
|
|
|
global _default_sandbox_provider
|
|
|
|
|
_default_sandbox_provider = None
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def shutdown_sandbox_provider() -> None:
|
|
|
|
|
"""Shutdown and reset the sandbox provider.
|
|
|
|
|
|
|
|
|
|
This properly shuts down the provider (releasing all sandboxes)
|
|
|
|
|
before clearing the singleton. Call this when the application
|
|
|
|
|
is shutting down or when you need to completely reset the sandbox system.
|
|
|
|
|
"""
|
|
|
|
|
global _default_sandbox_provider
|
|
|
|
|
if _default_sandbox_provider is not None:
|
|
|
|
|
if hasattr(_default_sandbox_provider, "shutdown"):
|
|
|
|
|
_default_sandbox_provider.shutdown()
|
|
|
|
|
_default_sandbox_provider = None
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def set_sandbox_provider(provider: SandboxProvider) -> None:
|
|
|
|
|
"""Set a custom sandbox provider instance.
|
|
|
|
|
|
|
|
|
|
This allows injecting a custom or mock provider for testing purposes.
|
|
|
|
|
|
|
|
|
|
Args:
|
|
|
|
|
provider: The SandboxProvider instance to use.
|
|
|
|
|
"""
|
|
|
|
|
global _default_sandbox_provider
|
|
|
|
|
_default_sandbox_provider = provider
|