mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-09-19 02:56:17 +00:00
* feat(projects): Projects MVP Phase 2 — instructions, document shelf, promotion, trash Implements docs/superpowers/specs/2026-09-12-projects-mvp-phase2-design.md (issue #5160, tracker #5129) in the slice order of the spec's §16. Slices: - A: ProjectsConfig + write-time 422 UTF-8 byte cap; PROJECT_CONTEXT_KEY admission pinning (both server-owned sets + worker hoist); latest-only request-scoped <project> block via DynamicContextMiddleware wrap_model_call/awrap_model_call (idempotent reassembly, reserved ID prefix + marker + provenance, never persisted); journal audit fingerprints; Instructions tab. - B: ProjectDocumentRow + migration 0023; ProjectDocumentRepository with locked check-and-set; hash-qualified immutable shelf storage with Paths helpers; upload/list/content/delete-to-trash routes; project delete trashes the shelf in-transaction; request-scoped bounded <documents> index with honest count/shown + actionable overflow note; list_project_documents/read_project_document tools registered only on pinned runs; PAT allowlist + drift guards; blocking-IO anchors. - C: shared thread-upload ingestion service (uploads router refactored to parity); POST from-thread with provenance; attach-to-thread with lock-staged copy (archived source allowed); read-only thread-files view with per-group truncation reporting. - D: restore (restored/merged/not_found/no_target/content_missing; no file moves), purge (continuous row lock across unlink/delete/commit, retryable on FS errors), retention sweep (lazy + startup, 24h orphan guard, row-side reconciliation never deletes). - E: Documents tab (shelf + conversation-files browser, provenance, archived banner, content-missing rows), /workspace/trash route, sidebar entry, composer attach handoff, i18n (en-US/zh-CN), e2e mocks + specs. Review hardening folded in (10 rounds, all with tests): - force active shelf content (HTML/XML family) to download; nosniff on artifact + content responses; unified unsandboxed-iframe PDF preview (fixes the pre-existing Chromium sandbox blank in the artifact viewer) - scope document trash to the URL project under the document lock - atomic no-overwrite filename reservation for ALL ingestion (seeded claims + os.link commit with suffix retry; same-name re-upload now unique-names instead of replacing); hidden staging only, no visible placeholders; lease cleanup on setup failure - serialize conversion under the document lock with post-lock active revalidation; drain locked filesystem work on cancellation; preserve bytes when an insert's commit state is uncertain (including trashed rows) - original-integrity checks before serving text or cached conversions; content_missing surfaced in list responses (UI reads the flag, no 409-probe); downloads always serve original bytes - bounded streaming document reads with cached char counts; shelf limits declared in middleware release identity - thread-root confinement for from-thread sources; config fallback rejects fractional/infinite values; composer counts staged attachments; pending attachments persist until submission or removal; in-flight instruction/rename edits survive save refetches; shelf and trash pagination; conversation-file and thread-files pages stay subscribed to refetches Docs: README/README_zh, backend API.md/ARCHITECTURE.md, AGENTS.md contracts, config.example.yaml projects block. Review follow-ups (head b4807477 → this revision): - The trash retention sweep is split so repeated lazy triggers stay bounded: the indexed expiry purge still runs on every trigger (GET /api/trash/documents, POST /api/trash/purge) while the O(all rows + all files) reconciliation is throttled to one run per user per 15 minutes (process-local, per-user window). The startup sweep now runs as a background task instead of blocking gateway readiness, and shutdown awaits it (bounded). - The export scrub (stripInternalMarkers) is fence- and indentation-aware like the render path, so a pasted, fenced <project>/<documents> snippet survives markdown export while real injected blocks (never fenced) are still removed. Fence regexes moved to a dependency-free leaf module to avoid the messages↔streamdown import cycle. - The artifact viewer's PDF iframe no longer carries an added title attribute (the upstream e2e contract locates it via :not([title])), and the upstream artifact-preview spec now pins the new contract: PDFs render unsandboxed, images keep sandbox="". * fix(projects): round-2 review — cancel an overrun trash sweep, restore the PDF frame title - Shutdown cancelled only the shield around the background startup sweep, so an all-users reconciliation that outlived the 5s budget kept walking rows and files while the document repo and DB engine were disposed underneath it. The wait now lives in `_shutdown_startup_trash_sweep`, which cancels the task and drains it before worker exit: the shield keeps the wait bounded, the cancel makes it final (CancelledError lands at the sweep's next await, and `_run_startup_trash_sweep` only catches `Exception`, so nothing swallows it). - The browser-preview iframe lost `title={getFileName(filepath)}` in the previous fix round, leaving the PDF frame without an accessible name while its siblings keep theirs. Restore it (WCAG frame titles), assert it in the DOM test, and anchor the e2e on `iframe[title="report.pdf"]` instead of `iframe:not([title])`. * fix(projects): round-3 review — report the sweep's late finish, not a phantom cancel `Task.cancel()` returns False when the sweep already finished inside the window between the deadline firing and the cancel, so the shutdown log claimed a cancellation that never happened. Branch on that outcome: the warning stays for a real cancel, a late finish is logged at info, and both paths still reap the task before worker exit. * fix(projects): round-4 review — make Empty trash delete what it confirms `POST /api/trash/purge` only ran the retention sweep, and the sweep's candidate selection is age-gated, so a freshly trashed document survived "Empty trash" even though the confirmation promises that every listed document is permanently deleted. With one trashed row the route answered `{"purged": 0}` and left it in place; `GET /api/trash/documents` sweeps expired rows before listing, so the visible rows were normally ineligible for the action by construction. Empty trash now drives `purge_all_trashed`: the caller's trashed rows (`list_all_trashed`, no age filter) each go through the same guarded, row-locked `purge` as the single-document delete — bytes first, then the row, in one transaction — so a row restored mid-flight is skipped instead of force-deleted, and an unlink failure rolls that row back and answers 500 with a retryable message. Retention expiry stays where it was: the sweep's `purge_candidates` is now the only age-gated selection, and the lazy retention sweep still runs on the listing and at startup. Tests: the router suite replaces the retention-gated expectation with the reviewer's repro (fresh row purged, bytes unlinked, shelf and other users' trash untouched, a failing unlink stays retryable and 500); a blocking-I/O anchor drives the new entry point through the offload; the mocked e2e covers the action end to end; a new real-backend spec performs it against the real gateway and re-reads `GET /api/trash/documents`. README, API, ARCHITECTURE and the phase-2 design docs (en+zh) state the age-independent contract.
196 lines
9.6 KiB
Python
196 lines
9.6 KiB
Python
"""Regression anchors: project shelf async paths must keep FS work off the loop.
|
|
|
|
Guards the Phase-2 Slice-B filesystem surfaces (spec §13): upload staging
|
|
and the atomic rename into the document namespace, dedup-hit staging
|
|
cleanup, the conversion publish path (temp file + atomic rename of
|
|
``derived/converted.md``), and the ``read_project_document`` tool's sampled
|
|
text detection and content reads.
|
|
|
|
A real ``init_engine`` cannot run under the strict Blockbuster gate
|
|
(SQLAlchemy's sync ``create_engine`` stats paths; the same constraint
|
|
``test_persistence_bootstrap.py`` documents), so these anchors are marked
|
|
``allow_blocking_io`` and instead spy on the production offload,
|
|
``run_file_io``: every anchor asserts the specific worker functions for its
|
|
branch were dispatched through it. Removing an offload (the mutation) drops
|
|
that dispatch and turns the anchor red; the full-suite GREEN run proves the
|
|
real path still works end to end against a real engine and real files.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import functools
|
|
import json
|
|
from types import SimpleNamespace
|
|
|
|
import pytest
|
|
|
|
from deerflow.persistence.engine import close_engine, get_session_factory, init_engine
|
|
from deerflow.persistence.projects import ProjectDocumentRepository, ProjectRepository
|
|
from deerflow.projects import documents as documents_mod
|
|
from deerflow.projects.documents import add_staged_document, original_file_path, stage_document_bytes
|
|
from deerflow.projects.tools import _read_project_document_impl
|
|
from deerflow.runtime.context_keys import PROJECT_CONTEXT_KEY
|
|
from deerflow.utils.file_io import run_file_io as _real_run_file_io
|
|
|
|
pytestmark = [pytest.mark.asyncio, pytest.mark.allow_blocking_io]
|
|
|
|
_USER = "u1"
|
|
|
|
|
|
def _spy_offload(monkeypatch) -> list[str]:
|
|
"""Record every ``run_file_io`` dispatch in the shelf modules (call-through)."""
|
|
calls: list[str] = []
|
|
|
|
async def spy(func, /, *args, **kwargs):
|
|
target = func.func if isinstance(func, functools.partial) else func
|
|
calls.append(getattr(target, "__name__", repr(target)))
|
|
return await _real_run_file_io(func, *args, **kwargs)
|
|
|
|
monkeypatch.setattr("deerflow.projects.documents.run_file_io", spy)
|
|
monkeypatch.setattr("deerflow.projects.tools.run_file_io", spy)
|
|
monkeypatch.setattr("app.gateway.routers.project_documents.run_file_io", spy)
|
|
return calls
|
|
|
|
|
|
async def _make_env(tmp_path, monkeypatch) -> SimpleNamespace:
|
|
import deerflow.config.paths as paths_mod
|
|
|
|
monkeypatch.setenv("DEER_FLOW_HOME", str(tmp_path))
|
|
monkeypatch.setattr(paths_mod, "_paths", None)
|
|
await init_engine("sqlite", url=f"sqlite+aiosqlite:///{tmp_path / 'test.db'}", sqlite_dir=str(tmp_path))
|
|
sf = get_session_factory()
|
|
project = await ProjectRepository(sf).create(name="P", user_id=_USER)
|
|
return SimpleNamespace(paths=paths_mod.get_paths(), docs=ProjectDocumentRepository(sf), project_id=project["id"])
|
|
|
|
|
|
def _runtime(project_id: str) -> SimpleNamespace:
|
|
return SimpleNamespace(context={"user_id": _USER, PROJECT_CONTEXT_KEY: {"project_id": project_id, "name": "P", "instructions": ""}})
|
|
|
|
|
|
async def test_upload_staging_and_rename_dispatch_off_the_loop(tmp_path, monkeypatch) -> None:
|
|
"""Staging spool (``_open_staging``/chunk writes) and the file-before-row
|
|
atomic rename (``_place_staging``) must go through ``run_file_io``."""
|
|
calls = _spy_offload(monkeypatch)
|
|
env = await _make_env(tmp_path, monkeypatch)
|
|
try:
|
|
|
|
async def _chunks():
|
|
for i in range(4):
|
|
yield f"chunk-{i}\n".encode()
|
|
|
|
staged = await stage_document_bytes(env.paths, user_id=_USER, project_id=env.project_id, chunks=_chunks(), max_bytes=1 << 20)
|
|
result = await add_staged_document(env.docs, env.paths, user_id=_USER, project_id=env.project_id, name="notes.txt", staged=staged)
|
|
assert result is not None and result[1] is True
|
|
row = result[0]
|
|
assert original_file_path(env.paths, user_id=_USER, row=row).is_file()
|
|
assert not staged.staging_path.exists()
|
|
assert "_open_staging" in calls
|
|
assert "write" in calls
|
|
# Symlink-resolving shelf path resolution is offloaded too.
|
|
assert "resolve_document_paths" in calls
|
|
assert "_place_staging" in calls
|
|
finally:
|
|
await close_engine()
|
|
|
|
|
|
async def test_list_content_missing_check_dispatches_off_the_loop(tmp_path, monkeypatch) -> None:
|
|
"""The shelf list's batched original integrity check (``_content_intact_batch``,
|
|
one pass for the whole page) must go through ``run_file_io``."""
|
|
from _router_auth_helpers import call_unwrapped
|
|
|
|
from app.gateway.routers import project_documents as docs_router
|
|
|
|
monkeypatch.setattr(docs_router, "get_effective_user_id", lambda: _USER)
|
|
calls = _spy_offload(monkeypatch)
|
|
env = await _make_env(tmp_path, monkeypatch)
|
|
try:
|
|
staged = await stage_document_bytes(env.paths, user_id=_USER, project_id=env.project_id, chunks=[b"listed"], max_bytes=1 << 20)
|
|
result = await add_staged_document(env.docs, env.paths, user_id=_USER, project_id=env.project_id, name="notes.txt", staged=staged)
|
|
assert result is not None
|
|
state = SimpleNamespace(project_repo=ProjectRepository(get_session_factory()), project_document_repo=env.docs)
|
|
request = SimpleNamespace(app=SimpleNamespace(state=state))
|
|
from deerflow.runtime.user_context import reset_current_user, set_current_user
|
|
|
|
token = set_current_user(SimpleNamespace(id=_USER))
|
|
try:
|
|
calls.clear()
|
|
response = await call_unwrapped(docs_router.list_project_documents, env.project_id, request=request, limit=100, offset=0)
|
|
finally:
|
|
reset_current_user(token)
|
|
assert [d.content_missing for d in response.documents] == [False]
|
|
assert "_content_intact_batch" in calls
|
|
finally:
|
|
await close_engine()
|
|
|
|
|
|
async def test_dedup_hit_staging_cleanup_dispatches_off_the_loop(tmp_path, monkeypatch) -> None:
|
|
"""The dedup-hit branch removes the staged duplicate via the offload."""
|
|
calls = _spy_offload(monkeypatch)
|
|
env = await _make_env(tmp_path, monkeypatch)
|
|
try:
|
|
first = await stage_document_bytes(env.paths, user_id=_USER, project_id=env.project_id, chunks=[b"same"], max_bytes=1 << 20)
|
|
await add_staged_document(env.docs, env.paths, user_id=_USER, project_id=env.project_id, name="first.txt", staged=first)
|
|
calls.clear()
|
|
duplicate = await stage_document_bytes(env.paths, user_id=_USER, project_id=env.project_id, chunks=[b"same"], max_bytes=1 << 20)
|
|
result = await add_staged_document(env.docs, env.paths, user_id=_USER, project_id=env.project_id, name="second.txt", staged=duplicate)
|
|
assert result is not None and result[1] is False
|
|
assert not duplicate.staging_path.exists()
|
|
assert "_remove_staging" in calls
|
|
# No placement happened for the discarded duplicate.
|
|
assert "_place_staging" not in calls
|
|
finally:
|
|
await close_engine()
|
|
|
|
|
|
async def test_tool_read_dispatches_off_the_loop(tmp_path, monkeypatch) -> None:
|
|
"""The original integrity check (``_content_intact``), text detection
|
|
(``is_text_file_by_content``), the windowed content read
|
|
(``_read_text_window``) and the cached count (``_cached_char_count``)
|
|
must go through ``run_file_io``."""
|
|
calls = _spy_offload(monkeypatch)
|
|
env = await _make_env(tmp_path, monkeypatch)
|
|
try:
|
|
staged = await stage_document_bytes(env.paths, user_id=_USER, project_id=env.project_id, chunks=[b"hello shelf"], max_bytes=1 << 20)
|
|
result = await add_staged_document(env.docs, env.paths, user_id=_USER, project_id=env.project_id, name="notes.txt", staged=staged)
|
|
row, _ = result
|
|
calls.clear()
|
|
payload = json.loads(await _read_project_document_impl(_runtime(env.project_id), document_id=row["id"], offset=0, limit=100))
|
|
assert payload["content"] == "hello shelf"
|
|
assert "_content_intact" in calls
|
|
assert "resolve_document_paths" in calls
|
|
assert "is_text_file_by_content" in calls
|
|
assert "_read_text_window" in calls
|
|
assert "_cached_char_count" in calls
|
|
finally:
|
|
await close_engine()
|
|
|
|
|
|
async def test_conversion_publish_path_dispatches_off_the_loop(tmp_path, monkeypatch) -> None:
|
|
"""First read of a convertible document validates the original
|
|
(``_content_intact``) and runs the whole convert + temp write + atomic
|
|
rename (``_convert_and_publish``, inside the locked conversion callback)
|
|
through the offload."""
|
|
|
|
async def fake_convert(file_path, output_path=None):
|
|
output_path.write_text("# converted markdown", encoding="utf-8")
|
|
return output_path
|
|
|
|
monkeypatch.setattr(documents_mod, "convert_file_to_markdown", fake_convert)
|
|
monkeypatch.setattr("deerflow.projects.tools._resolve_auto_convert", lambda: True)
|
|
calls = _spy_offload(monkeypatch)
|
|
env = await _make_env(tmp_path, monkeypatch)
|
|
try:
|
|
staged = await stage_document_bytes(env.paths, user_id=_USER, project_id=env.project_id, chunks=[b"\x00docx"], max_bytes=1 << 20)
|
|
result = await add_staged_document(env.docs, env.paths, user_id=_USER, project_id=env.project_id, name="report.docx", staged=staged)
|
|
row, _ = result
|
|
calls.clear()
|
|
payload = json.loads(await _read_project_document_impl(_runtime(env.project_id), document_id=row["id"], offset=0, limit=100))
|
|
assert payload["content"] == "# converted markdown"
|
|
assert "_content_intact" in calls
|
|
assert "resolve_document_paths" in calls
|
|
assert "_convert_and_publish" in calls
|
|
assert "_read_text_window" in calls
|
|
assert "_cached_char_count" in calls
|
|
finally:
|
|
await close_engine()
|