mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-09-16 17:46:20 +00:00
* feat(projects): project workspaces with scoped chats and thread membership
Backend:
- projects table model and migration; fail-closed ProjectRepository with
ownership checks, CRUD/archive/restore/delete router, and atomic thread
move between projects
- threads_meta.project_id column exposed as reserved deerflow_project_id
metadata; project-aware thread create/search with pagination bounds and
membership echoed in create responses
- first-run admission assigns the project only at genuine first run, seeded
at write time and dropped when invalid; serialized against project
deletion and thread assignment
- branch creation inherits the source thread's project membership (an
archived/deleted project degrades the branch to unassigned instead of
failing the request)
Frontend:
- projects data layer, thread move API, and sidebar projects section with
flat/grouped modes, archived-project threads, and stable virtual-list
offsets
- project detail page with project-scoped new chat
(/workspace/chats/new?project=) and paginated thread list
- move-to-project thread menu, new-project dialog, archived-project gates
- project-scoped new chats pre-create the thread with membership before the
first submit or /goal set, so runs never proceed outside the project
- goal-set preparation is fenced against conversation switches: a stale
continuation is dropped instead of saving the goal or launching the
abandoned submission on the newly opened conversation
- project thread lists join thread lifecycle invalidations (stop, pin) so
an open project page never keeps stale titles, recency, or pagination
* fix(chats): keep archive undo toast when the sidebar row unmounts
The archive success toast was fired from per-mutate callbacks passed to
mutation.mutate. React Query drops those handlers when the observer
component unmounts before the mutation settles; archiving the open chat
removes its sidebar row mid-flight, so the undo toast never appeared and
the e2e archive-undo test timed out waiting for it.
Move the success/error handlers to the mutation level (useArchiveThread
options, same pattern as useMoveThreadToProject) where callbacks are
delivered even after the originating row unmounts.
* fix(projects): pin project thread listing contract and exclude archived chats
GET /api/projects/{id}/threads returned the thread store row verbatim
(list[dict], no response_model): user_id/assistant_id leaked, any future
ThreadMetaRow column would auto-leak, and the OpenAPI schema was empty.
Return a narrow ProjectThreadResponse (the exact fields ProjectThread
declares) with the same metadata secret redaction the surrounding thread
endpoints get from _MetadataRedactingResponse.
The listing also ran search() without the archived filter, so a retired
chat rendered as a normal row on the project page while the sidebar hid
it. Search archived=False to mirror the sidebar's archived:false lists;
restore stays on the global Archived tab.
Both regressions pinned by new router tests: wire-shape allowlist and
archived-member exclusion.
* docs(migrations): record the 0019/0020 chain against the bootstrap reservation
The tree now chains 0018 -> 0019_projects -> 0020_threads_meta_project_id,
so migrations/AGENTS.md was stale twice over: the revision index stopped at
0018 and the rolling-forward section still claimed the tree 'deliberately
remains at 0018'.
Document the new head and record the intentional numeric-prefix reuse of
0019: 0019_projects is in-chain while 0019_thread_incarnations stays the
reserved, allowlisted out-of-tree rollout id. The owning rollout revision
must re-parent onto this tree's head when it merges so alembic never sees
two heads off 0018; bootstrap.py now cross-references that note next to
_FORWARD_COMPATIBLE_REVISION.
* fix(chats): invalidate project thread lists on archive/restore
useArchiveThread refreshed the infinite sidebar cache, threads/search and
the per-thread metadata cache but not the project-scoped list
([...PROJECTS_QUERY_KEY, 'threads', id]) this PR adds — the one thread
mutation not wired to that key, after usePinThread, useRenameThread,
useDeleteThread, useMoveThreadToProject and invalidateStoppedThreadCaches.
An archive from a sidebar row while a project page is open therefore left
the archived chat rendered as a normal row until remount (and undo left it
missing). Invalidate the prefix in the mutation-level success handler.
Regression test asserts the project-list prefix is invalidated on success.
* fix(projects): fetch project discovery only in grouped sidebar mode
RecentChatList mounted two useProjects queries per sidebar render, but
knownProjectIds is consumed only by the grouped-mode exclusion filter; in
the default flat mode every page load paid two GET /api/projects?status=
round trips for data nothing read. Gate both queries on grouped mode —
GroupedProjectList fetches the same keys when the toggle is on and
TanStack dedupes the observers.
Also set retry: false on useProject: a deleted or foreign project 404s
deterministically, and the page renders a dedicated not-found state for
it, so the default 1s/2s/4s retry backoff kept deep links in 'loading'
for ~7s before that state appeared. Matches useThreadMetadata /
useThreadTokenUsage.
* fix(threads): fail closed on project-scoped create in memory mode
MemoryThreadMetaStore.create accepted project_id and silently ignored it,
making memory mode the one membership path that fails open: POST
/api/threads with a project id returned 200 and the run started
unassigned, violating the invariant that a run never proceeds outside the
selected project (the SQL store raises ProjectNotAssignableError inside
the insert transaction for the same request).
Raise ProjectNotAssignableError whenever project_id is present so the
router's existing 404 mapping applies, the frontend keeps the composer
text for a retry, and memory mode behaves exactly like SQL mode.
set_project already reports rejection; create now matches it.
Store-level test (raises, nothing persisted, project filter stays empty,
unscoped creates still work) plus a router-level test asserting the 404
and that no row is left behind.
* fix(projects): window the project page thread list
ProjectThreadsSection rendered every loaded page as a plain Link row, so a
long-lived project accumulated unbounded DOM on the page's scroll surface:
each load-more appended another 100 rows and every formatTimeAgo tick
re-rendered the whole list.
Reuse VirtualThreadList (now generic over any row shape with a
thread_id), pointing its scroll parent at this page's ScrollArea viewport
via the shared [data-slot="scroll-area-viewport"] selector used by
/workspace/chats; under the 60-row threshold it falls back to the plain
render, so small projects are unchanged.
* fix(projects): restore row dividers and pin them with a render test
The row class template literal concatenated transition-colors directly
with the conditional border-b token, so non-final rows rendered the
invalid class 'transition-colorsborder-b' and lost both the divider and
the transition. Compose the row classes with cn() and a boolean guard
instead.
The section moved out of page.tsx into a testable component so the row
markup finally has coverage: a DOM test asserts every row except the
final data row carries border-b (index-based, not last: — correct under
virtualization where the last mounted row is not the last data row), and
the untitled fallback plus load-more button render for a partial page.
* fix(projects): validate forward schemas and fence membership reads
151 lines
5.2 KiB
Python
151 lines
5.2 KiB
Python
"""Concurrency safety tests for ``bootstrap_schema``.
|
|
|
|
The contract: N concurrent callers against the same DB always converge to
|
|
``alembic_version == head`` without exceptions and without duplicate schema
|
|
mutations.
|
|
|
|
We model concurrency at the *async-task* level here (multiple coroutines
|
|
inside one process). SQLite is single-node by deployment, so within-process
|
|
serialisation -- which is what the per-engine ``_SQLITE_LOCKS`` entry
|
|
provides -- is the realistic boundary. Cross-process serialisation falls
|
|
through to SQLite's own write lock + ``PRAGMA busy_timeout`` plus the
|
|
idempotent revision helpers.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
import sqlalchemy as sa
|
|
from sqlalchemy.ext.asyncio import create_async_engine
|
|
|
|
import deerflow.persistence.models # noqa: F401
|
|
from deerflow.persistence import bootstrap as bootstrap_mod
|
|
from deerflow.persistence.bootstrap import bootstrap_schema
|
|
|
|
pytestmark = pytest.mark.asyncio
|
|
|
|
|
|
HEAD = "0020_threads_meta_project_id"
|
|
|
|
|
|
def _url(tmp_path: Path) -> str:
|
|
return f"sqlite+aiosqlite:///{(tmp_path / 'concurrent.db').as_posix()}"
|
|
|
|
|
|
async def _alembic_version(engine) -> str | None:
|
|
async with engine.connect() as conn:
|
|
row = await conn.execute(sa.text("SELECT version_num FROM alembic_version"))
|
|
return row.scalar()
|
|
|
|
|
|
async def _runs_columns(engine) -> set[str]:
|
|
async with engine.connect() as conn:
|
|
return await conn.run_sync(lambda c: {col["name"] for col in sa.inspect(c).get_columns("runs")})
|
|
|
|
|
|
async def test_two_concurrent_bootstrap_callers_converge(tmp_path: Path) -> None:
|
|
engine = create_async_engine(_url(tmp_path))
|
|
try:
|
|
await asyncio.gather(
|
|
bootstrap_schema(engine, backend="sqlite"),
|
|
bootstrap_schema(engine, backend="sqlite"),
|
|
)
|
|
assert await _alembic_version(engine) == HEAD
|
|
assert "token_usage_by_model" in await _runs_columns(engine)
|
|
finally:
|
|
await engine.dispose()
|
|
|
|
|
|
async def test_five_concurrent_bootstrap_callers_converge(tmp_path: Path) -> None:
|
|
engine = create_async_engine(_url(tmp_path))
|
|
try:
|
|
await asyncio.gather(*(bootstrap_schema(engine, backend="sqlite") for _ in range(5)))
|
|
assert await _alembic_version(engine) == HEAD
|
|
finally:
|
|
await engine.dispose()
|
|
|
|
|
|
async def test_cancelled_caller_does_not_block_others(tmp_path: Path) -> None:
|
|
"""Cancelling one task mid-bootstrap must not strand the lock or the DB.
|
|
|
|
After the cancel, a subsequent ``bootstrap_schema`` call must still reach
|
|
head.
|
|
"""
|
|
engine = create_async_engine(_url(tmp_path))
|
|
try:
|
|
task = asyncio.create_task(bootstrap_schema(engine, backend="sqlite"))
|
|
# Give the event loop a turn so the task can start; then cancel.
|
|
await asyncio.sleep(0)
|
|
task.cancel()
|
|
# Cancelled task may have raced past the lock; swallow either outcome.
|
|
try:
|
|
await task
|
|
except (asyncio.CancelledError, Exception): # noqa: BLE001
|
|
pass
|
|
|
|
# Lock must be free for the next caller.
|
|
await bootstrap_schema(engine, backend="sqlite")
|
|
assert await _alembic_version(engine) == HEAD
|
|
finally:
|
|
await engine.dispose()
|
|
|
|
|
|
async def test_late_caller_after_head_is_noop(monkeypatch, tmp_path: Path) -> None:
|
|
"""When the first caller leaves the DB at head, the second observes
|
|
'versioned' and skips create_all / stamp -- it only runs upgrade head,
|
|
which is alembic-no-op.
|
|
|
|
We use a monkeypatched ``_upgrade`` counter to assert the second caller's
|
|
upgrade ran but did no real work (no new revision applied).
|
|
"""
|
|
engine = create_async_engine(_url(tmp_path))
|
|
try:
|
|
# First caller: empty branch.
|
|
await bootstrap_schema(engine, backend="sqlite")
|
|
first_version = await _alembic_version(engine)
|
|
assert first_version == HEAD
|
|
|
|
upgrade_calls: list[str] = []
|
|
original_upgrade = bootstrap_mod._upgrade
|
|
|
|
def counting_upgrade(cfg, rev: str) -> None:
|
|
upgrade_calls.append(rev)
|
|
original_upgrade(cfg, rev)
|
|
|
|
monkeypatch.setattr(bootstrap_mod, "_upgrade", counting_upgrade)
|
|
|
|
# Second caller: versioned branch -> calls _upgrade('head').
|
|
await bootstrap_schema(engine, backend="sqlite")
|
|
assert upgrade_calls == ["head"]
|
|
assert await _alembic_version(engine) == HEAD
|
|
finally:
|
|
await engine.dispose()
|
|
|
|
|
|
async def test_slow_upgrade_does_not_corrupt_concurrent_state(monkeypatch, tmp_path: Path) -> None:
|
|
"""Inject a delay into the upgrade path; concurrent callers must still
|
|
converge to head with no exceptions."""
|
|
engine = create_async_engine(_url(tmp_path))
|
|
try:
|
|
original_upgrade = bootstrap_mod._upgrade
|
|
|
|
def slow_upgrade(cfg, rev: str) -> None:
|
|
import time # noqa: PLC0415
|
|
|
|
time.sleep(0.2)
|
|
original_upgrade(cfg, rev)
|
|
|
|
monkeypatch.setattr(bootstrap_mod, "_upgrade", slow_upgrade)
|
|
|
|
await asyncio.gather(
|
|
bootstrap_schema(engine, backend="sqlite"),
|
|
bootstrap_schema(engine, backend="sqlite"),
|
|
bootstrap_schema(engine, backend="sqlite"),
|
|
)
|
|
assert await _alembic_version(engine) == HEAD
|
|
finally:
|
|
await engine.dispose()
|