RongJie G 06c827903a
feat(persistence): add expand-phase thread incarnation storage (#5216)
* feat(persistence): expand thread incarnation storage

Add nullable thread and MCP task incarnation columns while preserving mixed-version writes. New thread records receive stable incarnation IDs, and new task rows copy the matching owned or shared thread incarnation without changing any read, claim, session, or deletion behavior.

* test(persistence): pin incarnation rollback compatibility

* test(api): pin internal thread response boundary

* fix(persistence): rebase incarnation rollout after projects

---------

Co-authored-by: CorgiBoyG <CorgiBoyG@users.noreply.github.com>
2026-09-09 15:52:09 +08:00

408 lines
18 KiB
Python

"""SQLAlchemy-backed thread metadata repository."""
from __future__ import annotations
import logging
import uuid
from datetime import UTC, datetime
from typing import Any
from sqlalchemy import case, column, select, table, text, update
from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
from sqlalchemy.orm.attributes import flag_modified
from deerflow.persistence.json_compat import json_match
from deerflow.persistence.thread_meta.base import PROJECT_FILTER_UNSET, THREAD_ARCHIVED_METADATA_KEY, THREAD_PINNED_METADATA_KEY, THREAD_PROJECT_METADATA_KEY, InvalidMetadataFilterError, ThreadMetaStore, _ProjectFilterUnset
from deerflow.persistence.thread_meta.model import ThreadMetaRow
from deerflow.runtime.user_context import AUTO, _AutoSentinel, resolve_user_id
from deerflow.utils.time import coerce_iso
logger = logging.getLogger(__name__)
class ThreadMetaRepository(ThreadMetaStore):
def __init__(self, session_factory: async_sessionmaker[AsyncSession]) -> None:
self._sf = session_factory
@staticmethod
def _row_to_dict(row: ThreadMetaRow) -> dict[str, Any]:
d = row.to_dict()
d["metadata"] = dict(d.pop("metadata_json", None) or {})
project_id = d.pop("project_id", None)
if project_id is not None:
d["metadata"][THREAD_PROJECT_METADATA_KEY] = project_id
for key in ("created_at", "updated_at"):
val = d.get(key)
if isinstance(val, datetime):
# SQLite drops tzinfo despite ``DateTime(timezone=True)``;
# ``coerce_iso`` normalizes naive values as UTC so the wire format always carries tz.
d[key] = coerce_iso(val)
return d
async def create(
self,
thread_id: str,
*,
assistant_id: str | None = None,
user_id: str | None | _AutoSentinel = AUTO,
display_name: str | None = None,
metadata: dict | None = None,
project_id: str | None = None,
) -> dict:
# Auto-resolve user_id from contextvar when AUTO; explicit None
# creates an orphan row (used by migration scripts).
resolved_user_id = resolve_user_id(user_id, method_name="ThreadMetaRepository.create")
now = datetime.now(UTC)
async with self._sf() as session:
if session.get_bind().dialect.name == "sqlite":
await session.execute(text("BEGIN IMMEDIATE"))
if project_id is not None:
from deerflow.persistence.projects import ProjectNotAssignableError
from deerflow.persistence.projects.model import ProjectRow
# Lock the project row (FOR UPDATE on Postgres; the clause
# renders nothing on SQLite) so a concurrent
# ProjectRepository.delete — which holds the same lock across
# its membership-clear and DELETE — either commits first (this
# read then finds no row) or waits for this transaction.
# RFC v2 §14.14: no dangling ``threads_meta.project_id``.
locked = await session.scalar(
select(ProjectRow.id)
.where(
ProjectRow.id == project_id,
ProjectRow.user_id == resolved_user_id,
ProjectRow.status == "active",
)
.with_for_update()
)
if locked is None:
raise ProjectNotAssignableError(project_id)
row = ThreadMetaRow(
thread_id=thread_id,
incarnation=uuid.uuid4().hex,
assistant_id=assistant_id,
user_id=resolved_user_id,
display_name=display_name,
status="idle",
metadata_json=metadata or {},
project_id=project_id,
created_at=now,
updated_at=now,
)
session.add(row)
await session.commit()
await session.refresh(row)
return self._row_to_dict(row)
async def claim_unowned(self, thread_id: str, owner: str) -> bool:
claim_target = table(
ThreadMetaRow.__tablename__,
column(ThreadMetaRow.thread_id.key),
column(ThreadMetaRow.user_id.key),
)
async with self._sf() as session:
result = await session.execute(
update(claim_target)
.where(
claim_target.c.thread_id == thread_id,
claim_target.c.user_id.is_(None),
)
.values(user_id=owner)
)
await session.commit()
return result.rowcount > 0
async def set_project(
self,
thread_id: str,
project_id: str | None,
*,
user_id: str | None | _AutoSentinel = AUTO,
) -> bool:
resolved_user_id = resolve_user_id(user_id, method_name="ThreadMetaRepository.set_project")
from deerflow.persistence.projects.model import ProjectRow
async with self._sf() as session:
if session.get_bind().dialect.name == "sqlite":
# Read-then-write transaction: take the write lock up front
# (create() precedent) so a concurrent writer cannot
# interleave between the project check and the UPDATE.
await session.execute(text("BEGIN IMMEDIATE"))
if project_id is not None:
# Lock the project row (FOR UPDATE on Postgres; the clause
# renders nothing on SQLite) so a concurrent
# ProjectRepository.delete — which holds the same lock across
# its membership-clear and DELETE — either commits first (this
# read then finds no row) or waits for this transaction.
# RFC v2 §14.14: no dangling ``threads_meta.project_id``.
locked = await session.scalar(
select(ProjectRow.id)
.where(
ProjectRow.id == project_id,
ProjectRow.user_id == resolved_user_id,
ProjectRow.status == "active",
)
.with_for_update()
)
if locked is None:
await session.commit()
return False
stmt = (
update(ThreadMetaRow)
.where(ThreadMetaRow.thread_id == thread_id)
.values(
project_id=project_id,
# Explicit self-assignment: satisfies the column so the
# ``onupdate`` hook does not bump recency (pin precedent, G5).
updated_at=ThreadMetaRow.__table__.c.updated_at,
)
)
if resolved_user_id is not None:
stmt = stmt.where(ThreadMetaRow.user_id == resolved_user_id)
result = await session.execute(stmt)
await session.commit()
return result.rowcount > 0
async def get(
self,
thread_id: str,
*,
user_id: str | None | _AutoSentinel = AUTO,
) -> dict | None:
resolved_user_id = resolve_user_id(user_id, method_name="ThreadMetaRepository.get")
async with self._sf() as session:
row = await session.get(ThreadMetaRow, thread_id)
if row is None:
return None
# Enforce owner filter unless explicitly bypassed (user_id=None).
if resolved_user_id is not None and row.user_id != resolved_user_id:
return None
return self._row_to_dict(row)
async def check_access(self, thread_id: str, user_id: str, *, require_existing: bool = False) -> bool:
"""Check if ``user_id`` has access to ``thread_id``.
Two modes — one row, two distinct semantics depending on what
the caller is about to do:
- ``require_existing=False`` (default, permissive):
Returns True for: row missing (untracked legacy thread),
``row.user_id`` is None (shared / pre-auth data),
or ``row.user_id == user_id``. Use for **read-style**
decorators where treating an untracked thread as accessible
preserves backward-compat.
- ``require_existing=True`` (strict):
Returns True **only** when the row exists AND
(``row.user_id == user_id`` OR ``row.user_id is None``).
Use for **destructive / mutating** decorators (DELETE, PATCH,
state-update) so a thread that has *already been deleted*
cannot be re-targeted by any caller — closing the
delete-idempotence cross-user gap where the row vanishing
made every other user appear to "own" it.
"""
async with self._sf() as session:
row = await session.get(ThreadMetaRow, thread_id)
if row is None:
return not require_existing
if row.user_id is None:
return True
return row.user_id == user_id
async def search(
self,
*,
metadata: dict[str, Any] | None = None,
status: str | None = None,
archived: bool | None = None,
project_id: str | None | _ProjectFilterUnset = PROJECT_FILTER_UNSET,
limit: int = 100,
offset: int = 0,
user_id: str | None | _AutoSentinel = AUTO,
) -> list[dict[str, Any]]:
"""Search threads with optional metadata and status filters.
Owner filter is enforced by default: caller must be in a user
context. Pass ``user_id=None`` to bypass (migration/CLI).
"""
resolved_user_id = resolve_user_id(user_id, method_name="ThreadMetaRepository.search")
pinned_order = case(
(json_match(ThreadMetaRow.metadata_json, THREAD_PINNED_METADATA_KEY, True), 1),
else_=0,
)
stmt = select(ThreadMetaRow).order_by(
pinned_order.desc(),
ThreadMetaRow.updated_at.desc(),
ThreadMetaRow.thread_id.desc(),
)
if resolved_user_id is not None:
stmt = stmt.where(ThreadMetaRow.user_id == resolved_user_id)
if status:
stmt = stmt.where(ThreadMetaRow.status == status)
if metadata:
applied = 0
for key, value in metadata.items():
try:
stmt = stmt.where(json_match(ThreadMetaRow.metadata_json, key, value))
applied += 1
except (ValueError, TypeError) as exc:
logger.warning("Skipping metadata filter key %s: %s", ascii(key), exc)
if applied == 0:
# Comma-separated plain string (no list repr / nested
# quoting) so the 400 detail surfaced by the Gateway is
# easy for clients to read. Sorted for determinism.
rejected_keys = ", ".join(sorted(str(k) for k in metadata))
raise InvalidMetadataFilterError(f"All metadata filter keys were rejected as unsafe: {rejected_keys}")
if archived is not None:
# CASE handles missing/JSON-null keys and non-boolean legacy values
# identically on SQLite and Postgres, including for the active view.
archive_flag = case((json_match(ThreadMetaRow.metadata_json, THREAD_ARCHIVED_METADATA_KEY, True), 1), else_=0)
stmt = stmt.where(archive_flag == int(archived))
if not isinstance(project_id, _ProjectFilterUnset):
if project_id is None:
stmt = stmt.where(ThreadMetaRow.project_id.is_(None))
else:
stmt = stmt.where(ThreadMetaRow.project_id == project_id)
stmt = stmt.limit(limit).offset(offset)
async with self._sf() as session:
result = await session.execute(stmt)
return [self._row_to_dict(r) for r in result.scalars()]
async def _check_ownership(self, session: AsyncSession, thread_id: str, resolved_user_id: str | None) -> bool:
"""Return True if the row exists and is owned (or filter bypassed)."""
if resolved_user_id is None:
return True # explicit bypass
row = await session.get(ThreadMetaRow, thread_id)
return row is not None and row.user_id == resolved_user_id
async def update_display_name(
self,
thread_id: str,
display_name: str,
*,
remove_metadata_keys: tuple[str, ...] = (),
user_id: str | None | _AutoSentinel = AUTO,
) -> None:
"""Update the display name and remove caller-selected stale metadata atomically."""
resolved_user_id = resolve_user_id(user_id, method_name="ThreadMetaRepository.update_display_name")
async with self._sf() as session:
if session.get_bind().dialect.name == "sqlite":
await session.execute(text("BEGIN IMMEDIATE"))
row = await session.get(ThreadMetaRow, thread_id)
else:
result = await session.execute(select(ThreadMetaRow).where(ThreadMetaRow.thread_id == thread_id).with_for_update())
row = result.scalar_one_or_none()
if row is None or (resolved_user_id is not None and row.user_id != resolved_user_id):
return
row.display_name = display_name
metadata = dict(row.metadata_json or {})
for key in remove_metadata_keys:
metadata.pop(key, None)
row.metadata_json = metadata
row.updated_at = datetime.now(UTC)
await session.commit()
async def update_status(
self,
thread_id: str,
status: str,
*,
user_id: str | None | _AutoSentinel = AUTO,
) -> None:
resolved_user_id = resolve_user_id(user_id, method_name="ThreadMetaRepository.update_status")
async with self._sf() as session:
if not await self._check_ownership(session, thread_id, resolved_user_id):
return
await session.execute(update(ThreadMetaRow).where(ThreadMetaRow.thread_id == thread_id).values(status=status, updated_at=datetime.now(UTC)))
await session.commit()
async def update_metadata(
self,
thread_id: str,
metadata: dict,
*,
touch: bool = True,
user_id: str | None | _AutoSentinel = AUTO,
) -> None:
"""Merge ``metadata`` into ``metadata_json``.
The row is locked before the read-modify-write merge so concurrent
callers cannot replace each other's keys. SQLite acquires its write
transaction before reading; databases with row-level locking use
``SELECT ... FOR UPDATE``. No-op if the row does not exist or the
user_id check fails.
``touch`` refreshes ``updated_at`` (default); pass ``touch=False`` to
preserve recency ordering for metadata-only changes such as pin/unpin.
"""
resolved_user_id = resolve_user_id(user_id, method_name="ThreadMetaRepository.update_metadata")
async with self._sf() as session:
if session.get_bind().dialect.name == "sqlite":
# A deferred SQLite transaction does not reserve the writer
# until the UPDATE, which is too late for a read-modify-write
# merge. BEGIN IMMEDIATE serializes writers before the read,
# including writers in other processes using the same file.
await session.execute(text("BEGIN IMMEDIATE"))
row = await session.get(ThreadMetaRow, thread_id)
else:
result = await session.execute(select(ThreadMetaRow).where(ThreadMetaRow.thread_id == thread_id).with_for_update())
row = result.scalar_one_or_none()
if row is None:
return
if resolved_user_id is not None and row.user_id != resolved_user_id:
return
merged = dict(row.metadata_json or {})
merged.update(metadata)
row.metadata_json = merged
if touch:
row.updated_at = datetime.now(UTC)
else:
# ``updated_at`` has an ``onupdate`` hook that fires on any row
# UPDATE unless the column has an explicit SET value. Mark the
# current value dirty so SQLAlchemy emits it in SET, skips the
# hook, and preserves recency ordering.
flag_modified(row, "updated_at")
await session.commit()
async def update_owner(
self,
thread_id: str,
owner_user_id: str,
*,
user_id: str | None | _AutoSentinel = AUTO,
) -> None:
"""Move a thread metadata row to ``owner_user_id``."""
resolved_user_id = resolve_user_id(user_id, method_name="ThreadMetaRepository.update_owner")
async with self._sf() as session:
if session.get_bind().dialect.name == "sqlite":
await session.execute(text("BEGIN IMMEDIATE"))
row = await session.get(ThreadMetaRow, thread_id)
else:
row = (await session.execute(select(ThreadMetaRow).where(ThreadMetaRow.thread_id == thread_id).with_for_update())).scalar_one_or_none()
if row is None or (resolved_user_id is not None and row.user_id != resolved_user_id):
return
row.user_id = owner_user_id
row.updated_at = datetime.now(UTC)
await session.commit()
async def delete(
self,
thread_id: str,
*,
user_id: str | None | _AutoSentinel = AUTO,
) -> None:
resolved_user_id = resolve_user_id(user_id, method_name="ThreadMetaRepository.delete")
async with self._sf() as session:
if session.get_bind().dialect.name == "sqlite":
await session.execute(text("BEGIN IMMEDIATE"))
row = await session.get(ThreadMetaRow, thread_id)
else:
row = (await session.execute(select(ThreadMetaRow).where(ThreadMetaRow.thread_id == thread_id).with_for_update())).scalar_one_or_none()
if row is None or (resolved_user_id is not None and row.user_id != resolved_user_id):
return
await session.delete(row)
await session.commit()