mirror of
https://gitee.com/wanwujie/deer-flow
synced 2026-04-02 22:02:13 +08:00
* 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>
439 lines
15 KiB
Python
439 lines
15 KiB
Python
import json
|
|
import logging
|
|
import shutil
|
|
import stat
|
|
import tempfile
|
|
import zipfile
|
|
from pathlib import Path
|
|
|
|
from fastapi import APIRouter, HTTPException
|
|
from pydantic import BaseModel, Field
|
|
|
|
from app.gateway.path_utils import resolve_thread_virtual_path
|
|
from deerflow.config.extensions_config import ExtensionsConfig, SkillStateConfig, get_extensions_config, reload_extensions_config
|
|
from deerflow.skills import Skill, load_skills
|
|
from deerflow.skills.loader import get_skills_root_path
|
|
from deerflow.skills.validation import _validate_skill_frontmatter
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
def _is_unsafe_zip_member(info: zipfile.ZipInfo) -> bool:
|
|
"""Return True if the zip member path is absolute or attempts directory traversal."""
|
|
name = info.filename
|
|
if not name:
|
|
return False
|
|
path = Path(name)
|
|
if path.is_absolute():
|
|
return True
|
|
if ".." in path.parts:
|
|
return True
|
|
return False
|
|
|
|
|
|
def _is_symlink_member(info: zipfile.ZipInfo) -> bool:
|
|
"""Detect symlinks based on the external attributes stored in the ZipInfo."""
|
|
# Upper 16 bits of external_attr contain the Unix file mode when created on Unix.
|
|
mode = info.external_attr >> 16
|
|
return stat.S_ISLNK(mode)
|
|
|
|
|
|
def _safe_extract_skill_archive(
|
|
zip_ref: zipfile.ZipFile,
|
|
dest_path: Path,
|
|
max_total_size: int = 512 * 1024 * 1024,
|
|
) -> None:
|
|
"""Safely extract a skill archive into dest_path with basic protections.
|
|
|
|
Protections:
|
|
- Reject absolute paths and directory traversal (..).
|
|
- Skip symlink entries instead of materialising them.
|
|
- Enforce a hard limit on total uncompressed size to mitigate zip bombs.
|
|
"""
|
|
dest_root = Path(dest_path).resolve()
|
|
total_size = 0
|
|
|
|
for info in zip_ref.infolist():
|
|
# Reject absolute paths or any path that attempts directory traversal.
|
|
if _is_unsafe_zip_member(info):
|
|
raise HTTPException(
|
|
status_code=400,
|
|
detail=f"Archive contains unsafe member path: {info.filename!r}",
|
|
)
|
|
|
|
# Skip any symlink entries instead of materialising them on disk.
|
|
if _is_symlink_member(info):
|
|
logger.warning("Skipping symlink entry in skill archive: %s", info.filename)
|
|
continue
|
|
|
|
# Basic unzip-bomb defence: bound the total uncompressed size we will write.
|
|
total_size += max(info.file_size, 0)
|
|
if total_size > max_total_size:
|
|
raise HTTPException(
|
|
status_code=400,
|
|
detail="Skill archive is too large or appears highly compressed.",
|
|
)
|
|
|
|
member_path = dest_root / info.filename
|
|
member_path_parent = member_path.parent
|
|
member_path_parent.mkdir(parents=True, exist_ok=True)
|
|
|
|
if info.is_dir():
|
|
member_path.mkdir(parents=True, exist_ok=True)
|
|
continue
|
|
|
|
with zip_ref.open(info) as src, open(member_path, "wb") as dst:
|
|
shutil.copyfileobj(src, dst)
|
|
|
|
|
|
router = APIRouter(prefix="/api", tags=["skills"])
|
|
|
|
|
|
class SkillResponse(BaseModel):
|
|
"""Response model for skill information."""
|
|
|
|
name: str = Field(..., description="Name of the skill")
|
|
description: str = Field(..., description="Description of what the skill does")
|
|
license: str | None = Field(None, description="License information")
|
|
category: str = Field(..., description="Category of the skill (public or custom)")
|
|
enabled: bool = Field(default=True, description="Whether this skill is enabled")
|
|
|
|
|
|
class SkillsListResponse(BaseModel):
|
|
"""Response model for listing all skills."""
|
|
|
|
skills: list[SkillResponse]
|
|
|
|
|
|
class SkillUpdateRequest(BaseModel):
|
|
"""Request model for updating a skill."""
|
|
|
|
enabled: bool = Field(..., description="Whether to enable or disable the skill")
|
|
|
|
|
|
class SkillInstallRequest(BaseModel):
|
|
"""Request model for installing a skill from a .skill file."""
|
|
|
|
thread_id: str = Field(..., description="The thread ID where the .skill file is located")
|
|
path: str = Field(..., description="Virtual path to the .skill file (e.g., mnt/user-data/outputs/my-skill.skill)")
|
|
|
|
|
|
class SkillInstallResponse(BaseModel):
|
|
"""Response model for skill installation."""
|
|
|
|
success: bool = Field(..., description="Whether the installation was successful")
|
|
skill_name: str = Field(..., description="Name of the installed skill")
|
|
message: str = Field(..., description="Installation result message")
|
|
|
|
|
|
def _should_ignore_archive_entry(path: Path) -> bool:
|
|
return path.name.startswith(".") or path.name == "__MACOSX"
|
|
|
|
|
|
def _resolve_skill_dir_from_archive_root(temp_path: Path) -> Path:
|
|
extracted_items = [item for item in temp_path.iterdir() if not _should_ignore_archive_entry(item)]
|
|
if len(extracted_items) == 0:
|
|
raise HTTPException(status_code=400, detail="Skill archive is empty")
|
|
if len(extracted_items) == 1 and extracted_items[0].is_dir():
|
|
return extracted_items[0]
|
|
return temp_path
|
|
|
|
|
|
def _skill_to_response(skill: Skill) -> SkillResponse:
|
|
"""Convert a Skill object to a SkillResponse."""
|
|
return SkillResponse(
|
|
name=skill.name,
|
|
description=skill.description,
|
|
license=skill.license,
|
|
category=skill.category,
|
|
enabled=skill.enabled,
|
|
)
|
|
|
|
|
|
@router.get(
|
|
"/skills",
|
|
response_model=SkillsListResponse,
|
|
summary="List All Skills",
|
|
description="Retrieve a list of all available skills from both public and custom directories.",
|
|
)
|
|
async def list_skills() -> SkillsListResponse:
|
|
"""List all available skills.
|
|
|
|
Returns all skills regardless of their enabled status.
|
|
|
|
Returns:
|
|
A list of all skills with their metadata.
|
|
|
|
Example Response:
|
|
```json
|
|
{
|
|
"skills": [
|
|
{
|
|
"name": "PDF Processing",
|
|
"description": "Extract and analyze PDF content",
|
|
"license": "MIT",
|
|
"category": "public",
|
|
"enabled": true
|
|
},
|
|
{
|
|
"name": "Frontend Design",
|
|
"description": "Generate frontend designs and components",
|
|
"license": null,
|
|
"category": "custom",
|
|
"enabled": false
|
|
}
|
|
]
|
|
}
|
|
```
|
|
"""
|
|
try:
|
|
# Load all skills (including disabled ones)
|
|
skills = load_skills(enabled_only=False)
|
|
return SkillsListResponse(skills=[_skill_to_response(skill) for skill in skills])
|
|
except Exception as e:
|
|
logger.error(f"Failed to load skills: {e}", exc_info=True)
|
|
raise HTTPException(status_code=500, detail=f"Failed to load skills: {str(e)}")
|
|
|
|
|
|
@router.get(
|
|
"/skills/{skill_name}",
|
|
response_model=SkillResponse,
|
|
summary="Get Skill Details",
|
|
description="Retrieve detailed information about a specific skill by its name.",
|
|
)
|
|
async def get_skill(skill_name: str) -> SkillResponse:
|
|
"""Get a specific skill by name.
|
|
|
|
Args:
|
|
skill_name: The name of the skill to retrieve.
|
|
|
|
Returns:
|
|
Skill information if found.
|
|
|
|
Raises:
|
|
HTTPException: 404 if skill not found.
|
|
|
|
Example Response:
|
|
```json
|
|
{
|
|
"name": "PDF Processing",
|
|
"description": "Extract and analyze PDF content",
|
|
"license": "MIT",
|
|
"category": "public",
|
|
"enabled": true
|
|
}
|
|
```
|
|
"""
|
|
try:
|
|
skills = load_skills(enabled_only=False)
|
|
skill = next((s for s in skills if s.name == skill_name), None)
|
|
|
|
if skill is None:
|
|
raise HTTPException(status_code=404, detail=f"Skill '{skill_name}' not found")
|
|
|
|
return _skill_to_response(skill)
|
|
except HTTPException:
|
|
raise
|
|
except Exception as e:
|
|
logger.error(f"Failed to get skill {skill_name}: {e}", exc_info=True)
|
|
raise HTTPException(status_code=500, detail=f"Failed to get skill: {str(e)}")
|
|
|
|
|
|
@router.put(
|
|
"/skills/{skill_name}",
|
|
response_model=SkillResponse,
|
|
summary="Update Skill",
|
|
description="Update a skill's enabled status by modifying the extensions_config.json file.",
|
|
)
|
|
async def update_skill(skill_name: str, request: SkillUpdateRequest) -> SkillResponse:
|
|
"""Update a skill's enabled status.
|
|
|
|
This will modify the extensions_config.json file to update the enabled state.
|
|
The SKILL.md file itself is not modified.
|
|
|
|
Args:
|
|
skill_name: The name of the skill to update.
|
|
request: The update request containing the new enabled status.
|
|
|
|
Returns:
|
|
The updated skill information.
|
|
|
|
Raises:
|
|
HTTPException: 404 if skill not found, 500 if update fails.
|
|
|
|
Example Request:
|
|
```json
|
|
{
|
|
"enabled": false
|
|
}
|
|
```
|
|
|
|
Example Response:
|
|
```json
|
|
{
|
|
"name": "PDF Processing",
|
|
"description": "Extract and analyze PDF content",
|
|
"license": "MIT",
|
|
"category": "public",
|
|
"enabled": false
|
|
}
|
|
```
|
|
"""
|
|
try:
|
|
# Find the skill to verify it exists
|
|
skills = load_skills(enabled_only=False)
|
|
skill = next((s for s in skills if s.name == skill_name), None)
|
|
|
|
if skill is None:
|
|
raise HTTPException(status_code=404, detail=f"Skill '{skill_name}' not found")
|
|
|
|
# Get or create config path
|
|
config_path = ExtensionsConfig.resolve_config_path()
|
|
if config_path is None:
|
|
# Create new config file in parent directory (project root)
|
|
config_path = Path.cwd().parent / "extensions_config.json"
|
|
logger.info(f"No existing extensions config found. Creating new config at: {config_path}")
|
|
|
|
# Load current configuration
|
|
extensions_config = get_extensions_config()
|
|
|
|
# Update the skill's enabled status
|
|
extensions_config.skills[skill_name] = SkillStateConfig(enabled=request.enabled)
|
|
|
|
# Convert to JSON format (preserve MCP servers config)
|
|
config_data = {
|
|
"mcpServers": {name: server.model_dump() for name, server in extensions_config.mcp_servers.items()},
|
|
"skills": {name: {"enabled": skill_config.enabled} for name, skill_config in extensions_config.skills.items()},
|
|
}
|
|
|
|
# Write the configuration to file
|
|
with open(config_path, "w") as f:
|
|
json.dump(config_data, f, indent=2)
|
|
|
|
logger.info(f"Skills configuration updated and saved to: {config_path}")
|
|
|
|
# Reload the extensions config to update the global cache
|
|
reload_extensions_config()
|
|
|
|
# Reload the skills to get the updated status (for API response)
|
|
skills = load_skills(enabled_only=False)
|
|
updated_skill = next((s for s in skills if s.name == skill_name), None)
|
|
|
|
if updated_skill is None:
|
|
raise HTTPException(status_code=500, detail=f"Failed to reload skill '{skill_name}' after update")
|
|
|
|
logger.info(f"Skill '{skill_name}' enabled status updated to {request.enabled}")
|
|
return _skill_to_response(updated_skill)
|
|
|
|
except HTTPException:
|
|
raise
|
|
except Exception as e:
|
|
logger.error(f"Failed to update skill {skill_name}: {e}", exc_info=True)
|
|
raise HTTPException(status_code=500, detail=f"Failed to update skill: {str(e)}")
|
|
|
|
|
|
@router.post(
|
|
"/skills/install",
|
|
response_model=SkillInstallResponse,
|
|
summary="Install Skill",
|
|
description="Install a skill from a .skill file (ZIP archive) located in the thread's user-data directory.",
|
|
)
|
|
async def install_skill(request: SkillInstallRequest) -> SkillInstallResponse:
|
|
"""Install a skill from a .skill file.
|
|
|
|
The .skill file is a ZIP archive containing a skill directory with SKILL.md
|
|
and optional resources (scripts, references, assets).
|
|
|
|
Args:
|
|
request: The install request containing thread_id and virtual path to .skill file.
|
|
|
|
Returns:
|
|
Installation result with skill name and status message.
|
|
|
|
Raises:
|
|
HTTPException:
|
|
- 400 if path is invalid or file is not a valid .skill file
|
|
- 403 if access denied (path traversal detected)
|
|
- 404 if file not found
|
|
- 409 if skill already exists
|
|
- 500 if installation fails
|
|
|
|
Example Request:
|
|
```json
|
|
{
|
|
"thread_id": "abc123-def456",
|
|
"path": "/mnt/user-data/outputs/my-skill.skill"
|
|
}
|
|
```
|
|
|
|
Example Response:
|
|
```json
|
|
{
|
|
"success": true,
|
|
"skill_name": "my-skill",
|
|
"message": "Skill 'my-skill' installed successfully"
|
|
}
|
|
```
|
|
"""
|
|
try:
|
|
# Resolve the virtual path to actual file path
|
|
skill_file_path = resolve_thread_virtual_path(request.thread_id, request.path)
|
|
|
|
# Check if file exists
|
|
if not skill_file_path.exists():
|
|
raise HTTPException(status_code=404, detail=f"Skill file not found: {request.path}")
|
|
|
|
# Check if it's a file
|
|
if not skill_file_path.is_file():
|
|
raise HTTPException(status_code=400, detail=f"Path is not a file: {request.path}")
|
|
|
|
# Check file extension
|
|
if not skill_file_path.suffix == ".skill":
|
|
raise HTTPException(status_code=400, detail="File must have .skill extension")
|
|
|
|
# Verify it's a valid ZIP file
|
|
if not zipfile.is_zipfile(skill_file_path):
|
|
raise HTTPException(status_code=400, detail="File is not a valid ZIP archive")
|
|
|
|
# Get the custom skills directory
|
|
skills_root = get_skills_root_path()
|
|
custom_skills_dir = skills_root / "custom"
|
|
|
|
# Create custom directory if it doesn't exist
|
|
custom_skills_dir.mkdir(parents=True, exist_ok=True)
|
|
|
|
# Extract to a temporary directory first for validation
|
|
with tempfile.TemporaryDirectory() as temp_dir:
|
|
temp_path = Path(temp_dir)
|
|
|
|
# Extract the .skill file with validation and protections.
|
|
with zipfile.ZipFile(skill_file_path, "r") as zip_ref:
|
|
_safe_extract_skill_archive(zip_ref, temp_path)
|
|
|
|
skill_dir = _resolve_skill_dir_from_archive_root(temp_path)
|
|
|
|
# Validate the skill
|
|
is_valid, message, skill_name = _validate_skill_frontmatter(skill_dir)
|
|
if not is_valid:
|
|
raise HTTPException(status_code=400, detail=f"Invalid skill: {message}")
|
|
|
|
if not skill_name:
|
|
raise HTTPException(status_code=400, detail="Could not determine skill name")
|
|
|
|
# Check if skill already exists
|
|
target_dir = custom_skills_dir / skill_name
|
|
if target_dir.exists():
|
|
raise HTTPException(status_code=409, detail=f"Skill '{skill_name}' already exists. Please remove it first or use a different name.")
|
|
|
|
# Move the skill directory to the custom skills directory
|
|
shutil.copytree(skill_dir, target_dir)
|
|
|
|
logger.info(f"Skill '{skill_name}' installed successfully to {target_dir}")
|
|
return SkillInstallResponse(success=True, skill_name=skill_name, message=f"Skill '{skill_name}' installed successfully")
|
|
|
|
except HTTPException:
|
|
raise
|
|
except Exception as e:
|
|
logger.error(f"Failed to install skill: {e}", exc_info=True)
|
|
raise HTTPException(status_code=500, detail=f"Failed to install skill: {str(e)}")
|