mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-11-22 04:51:04 +00:00
* feat(subagents): continue native batches and honor item dependencies * docs: link native batch follow-up changelog entries * test(migrations): pin isolated history-seed upgrade to 0050 * fix(subagents): preserve follow-up scope, blockers and fair scheduling * test(memory): freeze capacity evaluation time * fix(subagents): guard follow-up admission and retain run controls * fix(subagents): enforce runs:cancel on tool cancellation of follow-up batches * style(tests): format test_batch_followup_host with ruff * fix(subagents): drop the admission checkpoint check and keep SDK cancel compatible The checkpoint check inside run admission waited on the checkpoint saver's lock while holding the SQLite write lock, which could make another chat's checkpoint write fail. Remove it; dispatch still checks the conversation before admission. A follow-up waiting for an unanswered question now keeps its claim until the lease expires instead of rereading the conversation every poll. Cancel passes the caller's run authority only to submitters that take it, so existing SDK submitters keep the two-argument call. Document that retrying a prerequisite by hand does not requeue its blocked items, and list 0052 as the migration head. --------- Co-authored-by: Totoro-qaq <279883115+Totoro-qaq@users.noreply.github.com> Co-authored-by: Willem Jiang <willem.jiang@gmail.com>
837 lines
41 KiB
Python
837 lines
41 KiB
Python
from __future__ import annotations
|
|
|
|
import uuid
|
|
from collections import Counter
|
|
from datetime import UTC, datetime, timedelta
|
|
from typing import Any
|
|
|
|
from sqlalchemy import func, or_, select, update
|
|
from sqlalchemy.exc import IntegrityError
|
|
from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
|
|
from sqlalchemy.orm import aliased, defer
|
|
|
|
from deerflow.persistence.extension_leases.model import ExtensionExecutionLeaseRow
|
|
from deerflow.persistence.run.model import RunRow
|
|
from deerflow.persistence.subagent_batches.model import SubagentBatchDependencyRow, SubagentBatchItemRow, SubagentBatchRow
|
|
from deerflow.subagents.acceptance_checks import AcceptanceVerdict, validate_acceptance_verdict
|
|
from deerflow.subagents.batch_dependencies import batch_dependencies
|
|
from deerflow.subagents.batch_runtime import BATCH_CONTINUATION_NAMESPACE, BatchItemInput, batch_continuation_key
|
|
from deerflow.subagents.report_contract import normalize_acceptance_criteria
|
|
from deerflow.utils.time import coerce_iso
|
|
|
|
BATCH_ACTIVE_STATUSES = ("queued", "running", "paused")
|
|
BATCH_TERMINAL_STATUSES = ("completed", "failed", "cancelled")
|
|
ITEM_ACTIVE_STATUSES = ("queued", "leased", "running")
|
|
ITEM_TERMINAL_STATUSES = ("succeeded", "failed", "cancelled")
|
|
_BATCH_PUBLIC_FIELDS = (
|
|
"id",
|
|
"thread_id",
|
|
"title",
|
|
"subagent_type",
|
|
"status",
|
|
"total_items",
|
|
"max_live_items",
|
|
"max_running_items",
|
|
"max_attempts",
|
|
"created_at",
|
|
"updated_at",
|
|
"completed_at",
|
|
)
|
|
_BATCH_TIMESTAMP_FIELDS = ("created_at", "updated_at", "completed_at")
|
|
_ITEM_PUBLIC_FIELDS = (
|
|
"id",
|
|
"batch_id",
|
|
"item_key",
|
|
"position",
|
|
"status",
|
|
"attempt",
|
|
"model_name",
|
|
"result_preview",
|
|
"result_truncated",
|
|
"error",
|
|
"stop_reason",
|
|
"token_usage",
|
|
"acceptance_criteria",
|
|
"started_at",
|
|
"completed_at",
|
|
"created_at",
|
|
"updated_at",
|
|
)
|
|
_ITEM_TIMESTAMP_FIELDS = ("started_at", "completed_at", "created_at", "updated_at")
|
|
|
|
|
|
class SubagentBatchRepository:
|
|
"""Durable batch/item state with lease-based multi-worker claiming."""
|
|
|
|
def __init__(self, session_factory: async_sessionmaker[AsyncSession]) -> None:
|
|
self._sf = session_factory
|
|
|
|
@staticmethod
|
|
def _batch_dict(row: SubagentBatchRow) -> dict[str, Any]:
|
|
"""Return the stable owner-facing projection, never execution context."""
|
|
data = {key: getattr(row, key) for key in _BATCH_PUBLIC_FIELDS}
|
|
for key in _BATCH_TIMESTAMP_FIELDS:
|
|
if data.get(key) is not None:
|
|
data[key] = coerce_iso(data[key])
|
|
if row.continuation_status is not None:
|
|
data.update(continuation_status=row.continuation_status, continuation_run_id=row.continuation_run_id)
|
|
return data
|
|
|
|
@staticmethod
|
|
def _execution_batch_dict(row: SubagentBatchRow) -> dict[str, Any]:
|
|
"""Return worker-only fields required to reconstruct an execution."""
|
|
return {
|
|
"id": row.id,
|
|
"user_id": row.user_id,
|
|
"thread_id": row.thread_id,
|
|
"run_id": row.run_id,
|
|
"execution_spec": row.execution_spec,
|
|
}
|
|
|
|
@staticmethod
|
|
def _item_dict(row: SubagentBatchItemRow, *, include_result: bool = False) -> dict[str, Any]:
|
|
data = {key: getattr(row, key) for key in _ITEM_PUBLIC_FIELDS}
|
|
data["acceptance_verdict"] = validate_acceptance_verdict(row.acceptance_verdict)
|
|
if include_result:
|
|
data["result"] = row.result
|
|
data["result_artifact"] = row.result_artifact
|
|
for key in _ITEM_TIMESTAMP_FIELDS:
|
|
if data.get(key) is not None:
|
|
data[key] = coerce_iso(data[key])
|
|
return data
|
|
|
|
async def create_batch(
|
|
self,
|
|
*,
|
|
batch_id: str,
|
|
user_id: str,
|
|
thread_id: str,
|
|
run_id: str | None,
|
|
tool_call_id: str | None,
|
|
submission_key: str,
|
|
title: str,
|
|
subagent_type: str,
|
|
items: list[BatchItemInput],
|
|
max_live_items: int,
|
|
max_running_items: int,
|
|
max_attempts: int,
|
|
execution_spec: dict[str, Any],
|
|
continuation: dict[str, Any] | None = None,
|
|
) -> dict[str, Any]:
|
|
dependencies = batch_dependencies(items)
|
|
now = datetime.now(UTC)
|
|
batch = SubagentBatchRow(
|
|
id=batch_id,
|
|
user_id=user_id,
|
|
thread_id=thread_id,
|
|
run_id=run_id,
|
|
tool_call_id=tool_call_id,
|
|
submission_key=submission_key,
|
|
title=title,
|
|
subagent_type=subagent_type,
|
|
status="queued",
|
|
total_items=len(items),
|
|
max_live_items=max_live_items,
|
|
max_running_items=max_running_items,
|
|
max_attempts=max_attempts,
|
|
execution_spec=execution_spec,
|
|
continuation_json=continuation,
|
|
continuation_status="pending" if continuation is not None else None,
|
|
created_at=now,
|
|
updated_at=now,
|
|
)
|
|
rows = [
|
|
SubagentBatchItemRow(
|
|
id=f"batch-item-{uuid.uuid4().hex}",
|
|
batch_id=batch_id,
|
|
item_key=item["key"],
|
|
position=position,
|
|
prompt=item["prompt"],
|
|
acceptance_criteria=normalize_acceptance_criteria(item.get("acceptance_criteria")) or None,
|
|
status="pending",
|
|
attempt=0,
|
|
result_truncated=False,
|
|
created_at=now,
|
|
updated_at=now,
|
|
)
|
|
for position, item in enumerate(items)
|
|
]
|
|
async with self._sf() as session:
|
|
try:
|
|
session.add(batch)
|
|
# The models intentionally do not declare an ORM relationship;
|
|
# flush the parent explicitly so SQLite's immediate FK check
|
|
# never observes item inserts before their batch row. Keep the
|
|
# flush inside the idempotency handler: a duplicate submission
|
|
# key can fail here before commit.
|
|
await session.flush()
|
|
session.add_all(rows)
|
|
if dependencies:
|
|
await session.flush()
|
|
identities = {row.item_key: row.id for row in rows}
|
|
session.add_all(SubagentBatchDependencyRow(item_id=identities[key], prerequisite_id=identities[dependency]) for key, required in dependencies.items() for dependency in required)
|
|
await session.commit()
|
|
except IntegrityError:
|
|
await session.rollback()
|
|
existing = (
|
|
await session.execute(
|
|
select(SubagentBatchRow).where(
|
|
SubagentBatchRow.user_id == user_id,
|
|
SubagentBatchRow.submission_key == submission_key,
|
|
)
|
|
)
|
|
).scalar_one_or_none()
|
|
if existing is not None:
|
|
return await self._with_counts(session, existing)
|
|
raise
|
|
return await self._with_counts(session, batch)
|
|
|
|
async def _counts(self, session: AsyncSession, batch_id: str) -> Counter[str]:
|
|
rows = await session.execute(select(SubagentBatchItemRow.status, func.count()).where(SubagentBatchItemRow.batch_id == batch_id).group_by(SubagentBatchItemRow.status))
|
|
return Counter({status: int(count) for status, count in rows})
|
|
|
|
async def _with_counts(self, session: AsyncSession, batch: SubagentBatchRow) -> dict[str, Any]:
|
|
counts = await self._counts(session, batch.id)
|
|
data = self._batch_dict(batch)
|
|
data["counts"] = {status: counts.get(status, 0) for status in ("pending", "queued", "leased", "running", "succeeded", "failed", "cancelled")}
|
|
return data
|
|
|
|
async def get_batch(self, batch_id: str, *, user_id: str) -> dict[str, Any] | None:
|
|
async with self._sf() as session:
|
|
batch = await session.get(SubagentBatchRow, batch_id)
|
|
if batch is None or batch.user_id != user_id:
|
|
return None
|
|
return await self._with_counts(session, batch)
|
|
|
|
async def list_by_thread(self, thread_id: str, *, user_id: str, limit: int = 20) -> list[dict[str, Any]]:
|
|
async with self._sf() as session:
|
|
rows = list(
|
|
(
|
|
await session.execute(
|
|
select(SubagentBatchRow)
|
|
.where(
|
|
SubagentBatchRow.thread_id == thread_id,
|
|
SubagentBatchRow.user_id == user_id,
|
|
)
|
|
.order_by(SubagentBatchRow.created_at.desc(), SubagentBatchRow.id.desc())
|
|
.limit(limit)
|
|
)
|
|
).scalars()
|
|
)
|
|
return [await self._with_counts(session, row) for row in rows]
|
|
|
|
async def list_items(
|
|
self,
|
|
batch_id: str,
|
|
*,
|
|
user_id: str,
|
|
offset: int = 0,
|
|
limit: int = 100,
|
|
status: str | None = None,
|
|
include_prompt: bool = False,
|
|
include_result: bool = False,
|
|
) -> list[dict[str, Any]] | None:
|
|
async with self._sf() as session:
|
|
batch = await session.get(SubagentBatchRow, batch_id)
|
|
if batch is None or batch.user_id != user_id:
|
|
return None
|
|
stmt = select(SubagentBatchItemRow).where(SubagentBatchItemRow.batch_id == batch_id)
|
|
# Full reports and evidence reach max_result_chars each; the polled
|
|
# item list returns only previews, so leave them out of the SELECT.
|
|
if not include_result:
|
|
stmt = stmt.options(defer(SubagentBatchItemRow.result, raiseload=True), defer(SubagentBatchItemRow.result_artifact, raiseload=True))
|
|
if not include_prompt:
|
|
stmt = stmt.options(defer(SubagentBatchItemRow.prompt, raiseload=True))
|
|
if status is not None:
|
|
stmt = stmt.where(SubagentBatchItemRow.status == status)
|
|
stmt = stmt.order_by(SubagentBatchItemRow.position).offset(offset).limit(limit)
|
|
rows = list((await session.execute(stmt)).scalars())
|
|
values = []
|
|
for row in rows:
|
|
value = self._item_dict(row, include_result=include_result)
|
|
if include_prompt:
|
|
value["prompt"] = row.prompt
|
|
values.append(value)
|
|
return values
|
|
|
|
@staticmethod
|
|
def _dependencies_ready():
|
|
prerequisite = aliased(SubagentBatchItemRow)
|
|
return (
|
|
~select(SubagentBatchDependencyRow.item_id)
|
|
.join(prerequisite, prerequisite.id == SubagentBatchDependencyRow.prerequisite_id)
|
|
.where(
|
|
SubagentBatchDependencyRow.item_id == SubagentBatchItemRow.id,
|
|
or_(prerequisite.status != "succeeded", prerequisite.stop_reason.is_not(None)),
|
|
)
|
|
.exists()
|
|
)
|
|
|
|
async def _fail_blocked_dependencies(self, session, batch, *, now):
|
|
prerequisite = aliased(SubagentBatchItemRow)
|
|
blocked = (
|
|
select(SubagentBatchDependencyRow.item_id)
|
|
.join(prerequisite, prerequisite.id == SubagentBatchDependencyRow.prerequisite_id)
|
|
.where(
|
|
prerequisite.batch_id == batch.id,
|
|
or_(prerequisite.status.in_(("failed", "cancelled")), (prerequisite.status == "succeeded") & prerequisite.stop_reason.is_not(None)),
|
|
)
|
|
.cte("blocked_batch_dependencies", recursive=True)
|
|
)
|
|
blocked = blocked.union(select(SubagentBatchDependencyRow.item_id).join(blocked, SubagentBatchDependencyRow.prerequisite_id == blocked.c.item_id))
|
|
if (await session.execute(select(blocked.c.item_id).limit(1))).first() is None:
|
|
return
|
|
changed = await session.execute(
|
|
update(SubagentBatchItemRow)
|
|
.where(
|
|
SubagentBatchItemRow.batch_id == batch.id,
|
|
SubagentBatchItemRow.status.in_(("pending", "queued")),
|
|
SubagentBatchItemRow.id.in_(select(blocked.c.item_id)),
|
|
)
|
|
.values(status="failed", error="A prerequisite did not complete successfully", completed_at=now, updated_at=now)
|
|
.returning(SubagentBatchItemRow.id)
|
|
.execution_options(synchronize_session=False)
|
|
)
|
|
if changed.first() is not None:
|
|
await self._refresh_batch_status(session, batch, now=now)
|
|
|
|
async def claim_continuations(self, *, now: datetime, lease_owner: str, lease_seconds: int, limit: int = 8, exclude_batch_ids: tuple[str, ...] = ()) -> list[dict]:
|
|
"""Claim one follow-up after terminal results commit; retries retain the batch ID."""
|
|
live_claim = (
|
|
select(ExtensionExecutionLeaseRow.resource_id)
|
|
.where(
|
|
ExtensionExecutionLeaseRow.namespace == BATCH_CONTINUATION_NAMESPACE,
|
|
ExtensionExecutionLeaseRow.resource_id == SubagentBatchRow.id,
|
|
ExtensionExecutionLeaseRow.expires_at >= now.timestamp(),
|
|
)
|
|
.exists()
|
|
)
|
|
ready = or_(SubagentBatchRow.continuation_status == "pending", (SubagentBatchRow.continuation_status == "dispatching") & ~live_claim)
|
|
claimed = []
|
|
async with self._sf() as session:
|
|
rows = (
|
|
(
|
|
await session.execute(
|
|
select(SubagentBatchRow)
|
|
.where(SubagentBatchRow.status.in_(("completed", "failed")), SubagentBatchRow.id.not_in(exclude_batch_ids), ready)
|
|
.order_by(SubagentBatchRow.updated_at, SubagentBatchRow.completed_at, SubagentBatchRow.id)
|
|
.limit(limit)
|
|
.with_for_update(skip_locked=True)
|
|
)
|
|
)
|
|
.scalars()
|
|
.all()
|
|
)
|
|
for batch in rows:
|
|
changed = await session.execute(
|
|
update(SubagentBatchRow).where(SubagentBatchRow.id == batch.id, SubagentBatchRow.status.in_(("completed", "failed")), ready).values(continuation_status="dispatching").execution_options(synchronize_session=False)
|
|
)
|
|
if changed.rowcount == 1:
|
|
await session.refresh(batch)
|
|
fence = await session.get(ExtensionExecutionLeaseRow, (BATCH_CONTINUATION_NAMESPACE, batch.id), with_for_update=True)
|
|
expires = (now + timedelta(seconds=lease_seconds)).timestamp()
|
|
if fence is None:
|
|
fence = ExtensionExecutionLeaseRow(namespace=BATCH_CONTINUATION_NAMESPACE, resource_id=batch.id, user_id=batch.user_id, holder_id=lease_owner, epoch=1, expires_at=expires)
|
|
session.add(fence)
|
|
else:
|
|
fence.holder_id, fence.epoch, fence.expires_at = lease_owner, fence.epoch + 1, expires
|
|
claimed.append(
|
|
{
|
|
**self._execution_batch_dict(batch),
|
|
"status": batch.status,
|
|
"continuation": batch.continuation_json,
|
|
"execution_fence": {"namespace": BATCH_CONTINUATION_NAMESPACE, "resource_id": batch.id, "holder_id": lease_owner, "epoch": fence.epoch},
|
|
}
|
|
)
|
|
await session.commit()
|
|
return claimed
|
|
|
|
async def finish_continuation(self, batch_id: str, *, lease_owner: str, status: str, run_id: str | None = None) -> bool:
|
|
if status not in ("pending", "dispatched", "suppressed"):
|
|
raise ValueError("Invalid continuation outcome")
|
|
async with self._sf() as session:
|
|
changed = await session.execute(
|
|
update(SubagentBatchRow)
|
|
.where(
|
|
SubagentBatchRow.id == batch_id,
|
|
SubagentBatchRow.continuation_status == "dispatching",
|
|
select(ExtensionExecutionLeaseRow.resource_id)
|
|
.where(
|
|
ExtensionExecutionLeaseRow.namespace == BATCH_CONTINUATION_NAMESPACE,
|
|
ExtensionExecutionLeaseRow.resource_id == batch_id,
|
|
ExtensionExecutionLeaseRow.holder_id == lease_owner,
|
|
)
|
|
.exists(),
|
|
)
|
|
.values(continuation_status=status, continuation_run_id=run_id, updated_at=datetime.now(UTC))
|
|
)
|
|
await session.commit()
|
|
return changed.rowcount == 1
|
|
|
|
async def list_continuation_batches_for_run(self, run_id: str) -> list[dict]:
|
|
async with self._sf() as session:
|
|
rows = (await session.execute(select(SubagentBatchRow).where(SubagentBatchRow.run_id == run_id, SubagentBatchRow.continuation_status.in_(("pending", "dispatching"))))).scalars().all()
|
|
return [self._execution_batch_dict(row) for row in rows]
|
|
|
|
async def continuation_run_id(self, batch_id: str, *, user_id: str) -> str | None:
|
|
async with self._sf() as session:
|
|
return await session.scalar(select(RunRow.run_id).where(RunRow.user_id == user_id, RunRow.idempotency_key == batch_continuation_key(batch_id)))
|
|
|
|
async def suppress_thread_continuations(self, thread_id: str, *, goal_created_at: str | None = None) -> None:
|
|
"""Called while the host owns the thread's Goal/deletion operation."""
|
|
async with self._sf() as session:
|
|
batches = select(SubagentBatchRow.id).where(SubagentBatchRow.thread_id == thread_id, SubagentBatchRow.continuation_status.in_(("pending", "dispatching")))
|
|
if goal_created_at is not None:
|
|
batches = batches.where(SubagentBatchRow.continuation_json["goal"]["created_at"].as_string() == goal_created_at, SubagentBatchRow.continuation_json["goal"]["status"].as_string() == "active")
|
|
# Match claim/cancel lock order: batch first, then execution fence.
|
|
ids = list((await session.scalars(batches.order_by(SubagentBatchRow.completed_at, SubagentBatchRow.id).with_for_update())).all())
|
|
if not ids:
|
|
return
|
|
ids = list(
|
|
(
|
|
await session.scalars(
|
|
update(SubagentBatchRow).where(SubagentBatchRow.id.in_(ids), SubagentBatchRow.continuation_status.in_(("pending", "dispatching"))).values(continuation_status="suppressed").returning(SubagentBatchRow.id)
|
|
)
|
|
).all()
|
|
)
|
|
await session.execute(
|
|
update(ExtensionExecutionLeaseRow).where(ExtensionExecutionLeaseRow.namespace == BATCH_CONTINUATION_NAMESPACE, ExtensionExecutionLeaseRow.resource_id.in_(ids)).values(expires_at=0, epoch=ExtensionExecutionLeaseRow.epoch + 1)
|
|
)
|
|
await session.commit()
|
|
|
|
async def latest_run_state(self, thread_id: str, *, user_id: str) -> dict | None:
|
|
async with self._sf() as session:
|
|
row = (
|
|
(
|
|
await session.execute(
|
|
select(RunRow.status, RunRow.stop_reason).where(RunRow.thread_id == thread_id, RunRow.user_id == user_id, RunRow.operation_kind == "run").order_by(RunRow.created_at.desc(), RunRow.run_id.desc()).limit(1)
|
|
)
|
|
)
|
|
.mappings()
|
|
.one_or_none()
|
|
)
|
|
return dict(row) if row is not None else None
|
|
|
|
async def claim_items(
|
|
self,
|
|
*,
|
|
now: datetime,
|
|
lease_owner: str,
|
|
lease_seconds: int,
|
|
limit: int,
|
|
exclude_item_ids: tuple[str, ...] = (),
|
|
) -> list[dict[str, Any]]:
|
|
"""Recover expired attempts, then promote and claim only runnable work."""
|
|
if limit <= 0:
|
|
return []
|
|
claimed: list[dict[str, Any]] = []
|
|
async with self._sf() as session:
|
|
expired_items = select(SubagentBatchItemRow.id).where(
|
|
SubagentBatchItemRow.batch_id == SubagentBatchRow.id,
|
|
SubagentBatchItemRow.status.in_(("leased", "running")),
|
|
SubagentBatchItemRow.lease_expires_at < now,
|
|
SubagentBatchItemRow.id.not_in(exclude_item_ids),
|
|
)
|
|
batches = list(
|
|
(
|
|
await session.execute(
|
|
select(SubagentBatchRow)
|
|
.where(or_(SubagentBatchRow.status.in_(("queued", "running")), (SubagentBatchRow.status == "paused") & expired_items.exists()))
|
|
.order_by(SubagentBatchRow.created_at, SubagentBatchRow.id)
|
|
.with_for_update(skip_locked=True)
|
|
)
|
|
).scalars()
|
|
)
|
|
for batch in batches:
|
|
if len(claimed) >= limit:
|
|
break
|
|
runnable_batch = select(SubagentBatchRow.id).where(SubagentBatchRow.id == batch.id, SubagentBatchRow.status.in_(("queued", "running")))
|
|
|
|
expired = list(
|
|
(
|
|
await session.execute(
|
|
select(SubagentBatchItemRow)
|
|
.where(
|
|
SubagentBatchItemRow.batch_id == batch.id,
|
|
SubagentBatchItemRow.status.in_(("leased", "running")),
|
|
SubagentBatchItemRow.lease_expires_at < now,
|
|
SubagentBatchItemRow.id.not_in(exclude_item_ids),
|
|
)
|
|
.with_for_update(skip_locked=True)
|
|
)
|
|
).scalars()
|
|
)
|
|
terminalized_expired = False
|
|
for item in expired:
|
|
values = {"lease_owner": None, "lease_expires_at": None, "updated_at": now}
|
|
terminal = item.cancel_requested_at is not None or item.attempt >= batch.max_attempts
|
|
if item.cancel_requested_at is not None:
|
|
values.update(status="cancelled", completed_at=now)
|
|
elif item.attempt >= batch.max_attempts:
|
|
values.update(status="failed", error=item.error or "Execution lease expired after the maximum retry count", completed_at=now)
|
|
else:
|
|
values.update(status="queued", error="Previous worker lease expired; retrying")
|
|
recovered = await session.execute(
|
|
update(SubagentBatchItemRow)
|
|
.where(
|
|
SubagentBatchItemRow.id == item.id,
|
|
SubagentBatchItemRow.status.in_(("leased", "running")),
|
|
SubagentBatchItemRow.lease_owner == item.lease_owner,
|
|
SubagentBatchItemRow.lease_expires_at == item.lease_expires_at,
|
|
)
|
|
.values(**values)
|
|
.execution_options(synchronize_session=False)
|
|
)
|
|
if recovered.rowcount == 1:
|
|
# A heartbeat may have renewed after SQLite's unlocked
|
|
# expiry read. Only the unchanged expired claim is ours.
|
|
await session.refresh(item)
|
|
terminalized_expired |= terminal
|
|
|
|
if terminalized_expired:
|
|
await self._refresh_batch_status(session, batch, now=now)
|
|
|
|
# Pausing blocks new work, not recovery of an abandoned attempt.
|
|
# Retryable items remain queued until an explicit resume.
|
|
if batch.status == "paused":
|
|
continue
|
|
|
|
await self._fail_blocked_dependencies(session, batch, now=now)
|
|
|
|
counts = await self._counts(session, batch.id)
|
|
live = counts["queued"] + counts["leased"] + counts["running"]
|
|
promote_count = max(0, batch.max_live_items - live)
|
|
if promote_count:
|
|
pending = list(
|
|
(
|
|
await session.execute(
|
|
select(SubagentBatchItemRow)
|
|
.where(
|
|
SubagentBatchItemRow.batch_id == batch.id,
|
|
SubagentBatchItemRow.status == "pending",
|
|
self._dependencies_ready(),
|
|
)
|
|
.order_by(SubagentBatchItemRow.position)
|
|
.limit(promote_count)
|
|
.with_for_update(skip_locked=True)
|
|
)
|
|
).scalars()
|
|
)
|
|
for item in pending:
|
|
promoted = await session.execute(
|
|
update(SubagentBatchItemRow)
|
|
.where(
|
|
SubagentBatchItemRow.id == item.id,
|
|
SubagentBatchItemRow.status == "pending",
|
|
self._dependencies_ready(),
|
|
SubagentBatchItemRow.cancel_requested_at.is_(None),
|
|
SubagentBatchItemRow.batch_id.in_(runnable_batch),
|
|
)
|
|
.values(status="queued", updated_at=now)
|
|
.execution_options(synchronize_session=False)
|
|
)
|
|
if promoted.rowcount == 1:
|
|
await session.refresh(item)
|
|
|
|
counts = await self._counts(session, batch.id)
|
|
batch_available = max(0, batch.max_running_items - counts["leased"] - counts["running"])
|
|
take = min(limit - len(claimed), batch_available)
|
|
if take <= 0:
|
|
continue
|
|
runnable = list(
|
|
(
|
|
await session.execute(
|
|
select(SubagentBatchItemRow)
|
|
.where(
|
|
SubagentBatchItemRow.batch_id == batch.id,
|
|
SubagentBatchItemRow.status == "queued",
|
|
self._dependencies_ready(),
|
|
SubagentBatchItemRow.cancel_requested_at.is_(None),
|
|
SubagentBatchItemRow.id.not_in(exclude_item_ids),
|
|
)
|
|
.order_by(SubagentBatchItemRow.position)
|
|
.limit(take)
|
|
.with_for_update(skip_locked=True)
|
|
)
|
|
).scalars()
|
|
)
|
|
expires_at = now + timedelta(seconds=lease_seconds)
|
|
batch_claimed = False
|
|
for item in runnable:
|
|
# SQLite's SELECT FOR UPDATE is unlocked: only a successful
|
|
# conditional write grants this pass ownership of the item.
|
|
won = await session.execute(
|
|
update(SubagentBatchItemRow)
|
|
.where(
|
|
SubagentBatchItemRow.id == item.id,
|
|
SubagentBatchItemRow.status == "queued",
|
|
self._dependencies_ready(),
|
|
SubagentBatchItemRow.cancel_requested_at.is_(None),
|
|
SubagentBatchItemRow.batch_id.in_(runnable_batch),
|
|
)
|
|
.values(status="leased", attempt=SubagentBatchItemRow.attempt + 1, lease_owner=lease_owner, lease_expires_at=expires_at, started_at=now, updated_at=now, error=None)
|
|
.execution_options(synchronize_session=False)
|
|
)
|
|
if won.rowcount != 1:
|
|
continue
|
|
await session.refresh(item)
|
|
value = self._item_dict(item)
|
|
value["prompt"] = item.prompt
|
|
value["batch"] = self._execution_batch_dict(batch)
|
|
claimed.append(value)
|
|
batch_claimed = True
|
|
if batch_claimed:
|
|
await session.refresh(batch)
|
|
batch.status = "running"
|
|
batch.updated_at = now
|
|
await session.commit()
|
|
return claimed
|
|
|
|
async def _owned_item_for_update(self, session: AsyncSession, item_id: str, lease_owner: str, *, statuses: tuple[str, ...] = ("leased", "running")) -> tuple[SubagentBatchItemRow | None, SubagentBatchRow | None]:
|
|
# Match claim/control paths' parent-before-item lock order on PostgreSQL.
|
|
batch_id = await session.scalar(select(SubagentBatchItemRow.batch_id).where(SubagentBatchItemRow.id == item_id))
|
|
if batch_id is None:
|
|
return None, None
|
|
batch = await session.get(SubagentBatchRow, batch_id, with_for_update=True)
|
|
item = (
|
|
await session.execute(
|
|
select(SubagentBatchItemRow)
|
|
.where(
|
|
SubagentBatchItemRow.id == item_id,
|
|
SubagentBatchItemRow.lease_owner == lease_owner,
|
|
SubagentBatchItemRow.status.in_(statuses),
|
|
)
|
|
.with_for_update()
|
|
)
|
|
).scalar_one_or_none()
|
|
return item, batch
|
|
|
|
@staticmethod
|
|
async def _write_owned_item(session: AsyncSession, item_id: str, lease_owner: str, values: dict[str, Any], *, statuses: tuple[str, ...] = ("leased", "running")) -> bool:
|
|
# SQLite ignores FOR UPDATE. Fence at the write itself, not only the
|
|
# earlier SELECT; never flush a dirty ORM snapshot over a newer claim.
|
|
result = await session.execute(
|
|
update(SubagentBatchItemRow)
|
|
.where(
|
|
SubagentBatchItemRow.id == item_id,
|
|
SubagentBatchItemRow.lease_owner == lease_owner,
|
|
SubagentBatchItemRow.status.in_(statuses),
|
|
)
|
|
.values(**values)
|
|
.execution_options(synchronize_session=False)
|
|
)
|
|
return result.rowcount == 1
|
|
|
|
async def renew_item_lease(self, item_id: str, *, lease_owner: str, lease_seconds: int, now: datetime) -> dict[str, bool]:
|
|
async with self._sf() as session:
|
|
item, batch = await self._owned_item_for_update(session, item_id, lease_owner)
|
|
if item is None or batch is None:
|
|
cancel_requested = batch is not None and (batch.status == "cancelled" or await session.scalar(select(SubagentBatchItemRow.cancel_requested_at).where(SubagentBatchItemRow.id == item_id)) is not None)
|
|
return {"valid": False, "cancel_requested": cancel_requested}
|
|
if item.cancel_requested_at is not None or batch.status == "cancelled":
|
|
return {"valid": False, "cancel_requested": True}
|
|
valid = await self._write_owned_item(session, item_id, lease_owner, {"lease_expires_at": now + timedelta(seconds=lease_seconds), "updated_at": now})
|
|
cancel_requested = False
|
|
if not valid:
|
|
await session.refresh(item)
|
|
await session.refresh(batch)
|
|
cancel_requested = item.cancel_requested_at is not None or batch.status == "cancelled"
|
|
await session.commit()
|
|
return {"valid": valid, "cancel_requested": cancel_requested}
|
|
|
|
async def mark_item_running(self, item_id: str, *, lease_owner: str, now: datetime) -> bool:
|
|
async with self._sf() as session:
|
|
item, _batch = await self._owned_item_for_update(session, item_id, lease_owner, statuses=("leased",))
|
|
if item is None or item.cancel_requested_at is not None:
|
|
return False
|
|
valid = await self._write_owned_item(session, item_id, lease_owner, {"status": "running", "started_at": now, "updated_at": now}, statuses=("leased",))
|
|
await session.commit()
|
|
return valid
|
|
|
|
async def finalize_item(
|
|
self,
|
|
item_id: str,
|
|
*,
|
|
lease_owner: str,
|
|
succeeded: bool,
|
|
result: str | None,
|
|
result_preview: str | None,
|
|
result_truncated: bool,
|
|
error: str | None,
|
|
stop_reason: str | None,
|
|
token_usage: dict[str, Any] | None,
|
|
model_name: str | None,
|
|
completed_at: datetime,
|
|
acceptance_verdict: AcceptanceVerdict | None = None,
|
|
result_artifact: dict[str, Any] | None = None,
|
|
) -> bool:
|
|
async with self._sf() as session:
|
|
item, batch = await self._owned_item_for_update(session, item_id, lease_owner)
|
|
if item is None:
|
|
return False
|
|
cancelled = item.cancel_requested_at is not None or batch is None or batch.status == "cancelled"
|
|
values = {
|
|
"lease_owner": None,
|
|
"lease_expires_at": None,
|
|
"model_name": model_name,
|
|
"stop_reason": stop_reason,
|
|
"token_usage": token_usage,
|
|
"updated_at": completed_at,
|
|
"acceptance_verdict": None,
|
|
"result_artifact": None,
|
|
}
|
|
if cancelled:
|
|
values.update(status="cancelled", error="Cancelled by user", completed_at=completed_at)
|
|
elif succeeded:
|
|
values.update(
|
|
status="succeeded",
|
|
acceptance_verdict=validate_acceptance_verdict(acceptance_verdict),
|
|
result=result,
|
|
result_artifact=result_artifact,
|
|
result_preview=result_preview,
|
|
result_truncated=result_truncated,
|
|
error=None,
|
|
completed_at=completed_at,
|
|
)
|
|
elif item.attempt < batch.max_attempts:
|
|
values.update(status="queued", error=error, started_at=None)
|
|
else:
|
|
values.update(status="failed", error=error, completed_at=completed_at)
|
|
if not await self._write_owned_item(session, item_id, lease_owner, values):
|
|
return False
|
|
if batch is not None:
|
|
# A SQLite parent read has no row lock: preserve a concurrent
|
|
# pause before deriving the batch projection under our write lock.
|
|
await session.refresh(batch)
|
|
await self._refresh_batch_status(session, batch, now=completed_at)
|
|
await session.commit()
|
|
return True
|
|
|
|
async def requeue_item_after_admission_failure(self, item_id: str, *, lease_owner: str, error: str | None, now: datetime) -> bool:
|
|
"""Release unadmitted work without consuming its execution attempt."""
|
|
async with self._sf() as session:
|
|
item, batch = await self._owned_item_for_update(session, item_id, lease_owner)
|
|
if item is None:
|
|
return False
|
|
cancelled = item.cancel_requested_at is not None or batch is None or batch.status == "cancelled"
|
|
values = {"lease_owner": None, "lease_expires_at": None, "updated_at": now}
|
|
if cancelled:
|
|
values.update(status="cancelled", error="Cancelled by user", completed_at=now)
|
|
else:
|
|
values.update(status="queued", attempt=max(0, item.attempt - 1), started_at=None, error=error)
|
|
if not await self._write_owned_item(session, item_id, lease_owner, values):
|
|
return False
|
|
if batch is not None:
|
|
await session.refresh(batch)
|
|
await self._refresh_batch_status(session, batch, now=now)
|
|
await session.commit()
|
|
return True
|
|
|
|
async def _refresh_batch_status(self, session: AsyncSession, batch: SubagentBatchRow, *, now: datetime) -> None:
|
|
counts = await self._counts(session, batch.id)
|
|
terminal = sum(counts[state] for state in ITEM_TERMINAL_STATUSES)
|
|
if terminal >= batch.total_items:
|
|
if batch.status != "cancelled":
|
|
batch.status = "failed" if counts["failed"] > 0 and counts["succeeded"] == 0 else "completed"
|
|
batch.completed_at = now
|
|
elif batch.status not in ("paused", "cancelled"):
|
|
batch.status = "running"
|
|
batch.updated_at = now
|
|
|
|
async def pause_batch(self, batch_id: str, *, user_id: str) -> dict[str, Any] | None:
|
|
return await self._set_control(batch_id, user_id=user_id, action="pause")
|
|
|
|
async def resume_batch(self, batch_id: str, *, user_id: str) -> dict[str, Any] | None:
|
|
return await self._set_control(batch_id, user_id=user_id, action="resume")
|
|
|
|
async def cancel_batch(self, batch_id: str, *, user_id: str) -> dict[str, Any] | None:
|
|
return await self._set_control(batch_id, user_id=user_id, action="cancel")
|
|
|
|
async def _set_control(self, batch_id: str, *, user_id: str, action: str) -> dict[str, Any] | None:
|
|
now = datetime.now(UTC)
|
|
async with self._sf() as session:
|
|
batch = await session.get(SubagentBatchRow, batch_id, with_for_update=True)
|
|
if batch is None or batch.user_id != user_id:
|
|
return None
|
|
if action == "cancel" and batch.continuation_status is not None:
|
|
await session.execute(update(SubagentBatchRow).where(SubagentBatchRow.id == batch.id, SubagentBatchRow.user_id == user_id).values(continuation_status="cancelled").execution_options(synchronize_session=False))
|
|
await session.refresh(batch)
|
|
await session.execute(
|
|
update(ExtensionExecutionLeaseRow)
|
|
.where(ExtensionExecutionLeaseRow.namespace == BATCH_CONTINUATION_NAMESPACE, ExtensionExecutionLeaseRow.resource_id == batch.id)
|
|
.values(expires_at=0, epoch=ExtensionExecutionLeaseRow.epoch + 1)
|
|
)
|
|
if action == "pause" and batch.status in ("queued", "running"):
|
|
batch.status = "paused"
|
|
elif action == "resume" and batch.status == "paused":
|
|
batch.status = "queued"
|
|
elif action == "cancel" and batch.status not in BATCH_TERMINAL_STATUSES:
|
|
batch.status = "cancelled"
|
|
batch.completed_at = now
|
|
items = list(
|
|
(
|
|
await session.execute(
|
|
select(SubagentBatchItemRow)
|
|
.where(
|
|
SubagentBatchItemRow.batch_id == batch_id,
|
|
SubagentBatchItemRow.status.not_in(ITEM_TERMINAL_STATUSES),
|
|
)
|
|
.with_for_update()
|
|
)
|
|
).scalars()
|
|
)
|
|
for item in items:
|
|
item.cancel_requested_at = now
|
|
item.updated_at = now
|
|
item.status = "cancelled"
|
|
item.error = "Cancelled by user"
|
|
item.lease_owner = None
|
|
item.lease_expires_at = None
|
|
item.completed_at = now
|
|
batch.updated_at = now
|
|
await session.commit()
|
|
return await self._with_counts(session, batch)
|
|
|
|
async def retry_item(self, batch_id: str, item_id: str, *, user_id: str) -> dict[str, Any] | None:
|
|
now = datetime.now(UTC)
|
|
async with self._sf() as session:
|
|
batch = await session.get(SubagentBatchRow, batch_id, with_for_update=True)
|
|
if batch is None or batch.user_id != user_id:
|
|
return None
|
|
item = await session.get(SubagentBatchItemRow, item_id, with_for_update=True)
|
|
if item is None or item.batch_id != batch_id or item.status != "failed":
|
|
return None
|
|
item.status = "pending"
|
|
item.attempt = 0
|
|
item.error = None
|
|
item.result = None
|
|
item.result_artifact = None
|
|
item.result_preview = None
|
|
item.result_truncated = False
|
|
item.acceptance_verdict = None
|
|
item.completed_at = None
|
|
item.cancel_requested_at = None
|
|
item.updated_at = now
|
|
# SQLite ignores FOR UPDATE: flush first so this transaction holds the
|
|
# write lock, then re-read the batch a cancel may have committed since.
|
|
await session.flush()
|
|
await session.refresh(batch)
|
|
# Cancellation is final; reopening the batch would run work the user
|
|
# stopped. Returning without commit discards the item reset.
|
|
if batch.status == "cancelled":
|
|
return None
|
|
if batch.continuation_status in ("pending", "dispatching"):
|
|
batch.continuation_status = "pending"
|
|
await session.flush()
|
|
await session.execute(
|
|
update(ExtensionExecutionLeaseRow)
|
|
.where(ExtensionExecutionLeaseRow.namespace == BATCH_CONTINUATION_NAMESPACE, ExtensionExecutionLeaseRow.resource_id == batch.id)
|
|
.values(expires_at=0, epoch=ExtensionExecutionLeaseRow.epoch + 1)
|
|
)
|
|
if batch.status != "paused":
|
|
batch.status = "queued"
|
|
batch.completed_at = None
|
|
batch.updated_at = now
|
|
await session.commit()
|
|
return self._item_dict(item)
|