mirror of
https://gitee.com/wanwujie/deer-flow
synced 2026-04-07 07:50:22 +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>
84 lines
2.8 KiB
Python
84 lines
2.8 KiB
Python
import logging
|
|
import re
|
|
import subprocess
|
|
from urllib.parse import urljoin
|
|
|
|
from markdownify import markdownify as md
|
|
from readabilipy import simple_json_from_html_string
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class Article:
|
|
url: str
|
|
|
|
def __init__(self, title: str, html_content: str):
|
|
self.title = title
|
|
self.html_content = html_content
|
|
|
|
def to_markdown(self, including_title: bool = True) -> str:
|
|
markdown = ""
|
|
if including_title:
|
|
markdown += f"# {self.title}\n\n"
|
|
|
|
if self.html_content is None or not str(self.html_content).strip():
|
|
markdown += "*No content available*\n"
|
|
else:
|
|
markdown += md(self.html_content)
|
|
|
|
return markdown
|
|
|
|
def to_message(self) -> list[dict]:
|
|
image_pattern = r"!\[.*?\]\((.*?)\)"
|
|
|
|
content: list[dict[str, str]] = []
|
|
markdown = self.to_markdown()
|
|
|
|
if not markdown or not markdown.strip():
|
|
return [{"type": "text", "text": "No content available"}]
|
|
|
|
parts = re.split(image_pattern, markdown)
|
|
|
|
for i, part in enumerate(parts):
|
|
if i % 2 == 1:
|
|
image_url = urljoin(self.url, part.strip())
|
|
content.append({"type": "image_url", "image_url": {"url": image_url}})
|
|
else:
|
|
text_part = part.strip()
|
|
if text_part:
|
|
content.append({"type": "text", "text": text_part})
|
|
|
|
# If after processing all parts, content is still empty, provide a fallback message.
|
|
if not content:
|
|
content = [{"type": "text", "text": "No content available"}]
|
|
|
|
return content
|
|
|
|
|
|
class ReadabilityExtractor:
|
|
def extract_article(self, html: str) -> Article:
|
|
try:
|
|
article = simple_json_from_html_string(html, use_readability=True)
|
|
except (subprocess.CalledProcessError, FileNotFoundError) as exc:
|
|
stderr = getattr(exc, "stderr", None)
|
|
if isinstance(stderr, bytes):
|
|
stderr = stderr.decode(errors="replace")
|
|
stderr_info = f"; stderr={stderr.strip()}" if isinstance(stderr, str) and stderr.strip() else ""
|
|
logger.warning(
|
|
"Readability.js extraction failed with %s%s; falling back to pure-Python extraction",
|
|
type(exc).__name__,
|
|
stderr_info,
|
|
exc_info=True,
|
|
)
|
|
article = simple_json_from_html_string(html, use_readability=False)
|
|
|
|
html_content = article.get("content")
|
|
if not html_content or not str(html_content).strip():
|
|
html_content = "No content could be extracted from this page"
|
|
|
|
title = article.get("title")
|
|
if not title or not str(title).strip():
|
|
title = "Untitled"
|
|
|
|
return Article(title=title, html_content=html_content)
|