mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-09-16 17:46:20 +00:00
* feat(extensions): observe task lifecycle and system model calls PR 1 (#4636) gave extensions a middleware chain, and a middleware only sees what passes through the agent graph. Two runtime surfaces stay invisible to it: when a lead run or a subagent begins and ends, and the DeerFlow-owned model calls made outside the graph. This slice adds both, with no new Gateway surface -- routers, services, and the reference extension stay in PR 3. Contract (deerflow-extension-api 0.1.1) --------------------------------------- Two contribution kinds join `middlewares` on the registry: `task_lifecycle` (`on_task_start` / `on_task_stop`, receiving a `TaskInfo` and a conservative `TaskOutcome` of completed / aborted / failed) and `system_model_observer` (`on_system_model_call`, receiving a `SystemOperationKind`, a `SystemModelRequest` snapshot, and a `SystemModelResult` carrying either the response or the provider exception plus a duration). `SystemModelRequest.messages` normalizes to a tuple at construction. Goal evaluation and memory extraction pass a message list while title generation and summarization pass one prompt string, and a bare `str` already satisfies `Sequence` -- without normalization an observer iterating `request.messages` would silently walk characters. Copying also makes the frozen snapshot immutable in fact rather than only by declaration, since observations may run after the call site returns and keeps mutating its own list. Registry marks and rollbacks become per-bucket and positional, so an `install()` that fails after registering two different kinds cannot leave one of them behind. `needs_task_store` now covers all three kinds: a deployment that registers only lifecycle hooks still gets a task store. Task lifecycle -------------- The lead worker notifies start after the run has started and stop after completion persistence and the completion hook, but before clearing the finalizing barrier and publishing the stream end -- holding the barrier across stop is what keeps a same-thread replacement run from overlapping this task's lifecycle. Cancellation raised out of the stop notification is deferred, not propagated in place, so a cancelled run still clears the barrier and emits its end frame. A subagent with a parent `run_id` wraps its execution in the same pair inside `finally`, reporting `parent_task_id` so a delegation tree is reconstructable; a subagent without a `run_id` (embedded client, standalone LangGraph Server) logs and skips rather than inventing a parent. Contributors run in registration order inside one shared 3s budget and every failure is logged and failed open. System model calls ------------------ Four kinds cover the model calls the middleware chain cannot see: goal evaluation, memory extraction, title generation, and summarization. Each site reports both terminal paths without changing the provider exception the host observes, short-circuits on `has_system_model_observers`, and passes the live task store when the runtime has one (detached work gets an isolated store). The sync summarization half stays unobserved on purpose -- it and its only host caller are the sync side of an async-only runtime, so notifying there would block a thread on a call site the host never reaches; the reason is recorded at the call site. The DeerMem backend must stay vendorable and cannot import the extension API, so it reports through a new `MemoryCallbacks.on_memory_llm_result` host hook that the DeerFlow-side callbacks translate into an observation. Notification loop ----------------- Extension resources must be touched on the loop that created them, but subagents can execute on isolated loops and DeerMem runs on a worker thread. The Gateway registers its serving loop before any runtime dependency starts and resets it last through the exit stack, so every startup-failure and cancellation path is covered. Awaited hooks raised on another loop are dispatched across with `run_coroutine_threadsafe` and awaited under the same budget; synchronous sites submit fire-and-forget work. Shutdown stops accepting detached observations before the memory flush -- that flush runs on a worker thread and can emit memory observations -- while keeping the loop alive for awaited task hooks until run and subagent drain completes. Tests ----- `test_extension_task_lifecycle.py`, `test_extension_subagent_lifecycle.py`, and `test_extension_system_model_calls.py` cover ordering, fail-open, budget exhaustion, snapshot binding under a concurrent singleton replacement, the loop-dispatch and shutdown-suspension paths, and both terminal paths at every call site. `test_gateway_run_drain_shutdown.py` pins the stop-before-barrier and drain ordering. * fix(extensions): decide notification fail-open by origin, observe cancellation `_notify_each` only guarded `Exception`, so a contributor letting a `CancelledError` escape — an extension implementing an internal timeout with cancellation, say — skipped its successors and reached the worker's deferred-interrupt path, ending an otherwise successful run as cancelled. Fail-open is about where a failure came from, not its base class: only a genuine cancellation of the host task increments `Task.cancelling()`, so propagate on that and contain everything else. `KeyboardInterrupt` / `SystemExit` still propagate. `observe_system_model_call` skipped observers on cancellation for the same base-class reason, leaving goal / title / summarization silent on a terminal path that is routine — interrupt/rollback admission and shutdown both cancel the run task, with the provider tokens already spent. Awaiting observers there is unreliable (a repeated cancel interrupts that await before any of them runs), so report through the same non-blocking submission the synchronous memory bridge uses, then propagate the cancellation untouched. DeerMem keeps `BaseException` around its provider call, now with the reason recorded: that path runs on a worker thread, where cancelling the awaiting side never interrupts the running thread, so `CancelledError` cannot arrive at all. Its host-hook wrapper narrows to `Exception` — only the hook's own failures are non-fatal, and an observability path must not swallow a process teardown signal. * fix(extensions): warn on budget exhaustion, scope observer logs by task, propagate teardown Review response on #4684: - The memory observation bridge caught BaseException, which would swallow a teardown signal raised while dispatching; it now catches Exception, matching the boundary the DeerMem-side call site documents and tests. - A notification-budget timeout raised mid-hook fell into the generic hook-failure path and logged an asyncio-internal traceback; it now logs a warning like the pre-hook budget skip, while a TimeoutError a contributor raises on its own stays classified as a hook failure. - System model observer logs passed the operation kind as the task id, so log lines said "task goal/title/..."; they now carry the task scope id alongside the kind.
407 lines
15 KiB
Python
407 lines
15 KiB
Python
"""Regression tests for graceful run-task drain on Gateway shutdown.
|
|
|
|
Guards bytedance/deer-flow issue #3373:
|
|
|
|
psycopg_pool.PoolClosed: the pool 'pool-1' is already closed
|
|
|
|
Root cause: chat runs are fire-and-forget background ``asyncio`` tasks
|
|
(``app/gateway/services.py`` -> ``asyncio.create_task(run_agent(...))``) owned
|
|
by nobody. On shutdown, ``langgraph_runtime``'s ``AsyncExitStack`` tore down the
|
|
checkpointer's postgres pool while those tasks were still mid-graph. langgraph's
|
|
``AsyncPregelLoop._checkpointer_put_after_previous`` then ran its
|
|
``finally: await checkpointer.aput(...)`` against the already-closed pool.
|
|
|
|
Fix: ``RunManager.shutdown()`` cancels and *bounded*-awaits every in-flight run,
|
|
and ``langgraph_runtime`` calls it BEFORE the ``AsyncExitStack`` closes the
|
|
checkpointer — so the final checkpoint write lands while the pool is still open.
|
|
The drain must stay bounded (a stuck run must not hang the worker, the
|
|
precondition for the signal-reentrancy deadlock guarded by
|
|
``app.gateway.app._SHUTDOWN_HOOK_TIMEOUT_SECONDS``).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import operator
|
|
from contextlib import asynccontextmanager, suppress
|
|
from types import SimpleNamespace
|
|
from typing import Annotated, TypedDict
|
|
|
|
import pytest
|
|
from langgraph.checkpoint.memory import InMemorySaver
|
|
|
|
from deerflow.runtime import RunManager, RunStatus
|
|
|
|
|
|
# Module-level so langgraph's get_type_hints (which resolves annotations against
|
|
# module globals under `from __future__ import annotations`) can see Annotated.
|
|
class _CountState(TypedDict):
|
|
count: Annotated[int, operator.add]
|
|
|
|
|
|
class _CloseableSaver(InMemorySaver):
|
|
"""InMemorySaver that fails writes once closed, like a closed pool."""
|
|
|
|
def __init__(self) -> None:
|
|
super().__init__()
|
|
self._closed = False
|
|
self.writes_after_close: list[str] = []
|
|
|
|
def close(self) -> None:
|
|
self._closed = True
|
|
|
|
async def aput(self, *args, **kwargs):
|
|
if self._closed:
|
|
self.writes_after_close.append("aput")
|
|
raise RuntimeError("checkpointer is closed")
|
|
return await super().aput(*args, **kwargs)
|
|
|
|
async def aput_writes(self, *args, **kwargs):
|
|
if self._closed:
|
|
self.writes_after_close.append("aput_writes")
|
|
raise RuntimeError("checkpointer is closed")
|
|
return await super().aput_writes(*args, **kwargs)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_shutdown_cancels_and_awaits_inflight_run():
|
|
"""shutdown() cancels the in-flight task, waits for it, marks it interrupted."""
|
|
rm = RunManager()
|
|
record = await rm.create("t-drain")
|
|
await rm.set_status(record.run_id, RunStatus.running)
|
|
|
|
started = asyncio.Event()
|
|
cancelled = asyncio.Event()
|
|
|
|
async def worker() -> None:
|
|
try:
|
|
started.set()
|
|
await asyncio.Event().wait()
|
|
except asyncio.CancelledError:
|
|
cancelled.set()
|
|
raise
|
|
|
|
record.task = asyncio.create_task(worker())
|
|
try:
|
|
await asyncio.wait_for(started.wait(), timeout=1.0)
|
|
|
|
await rm.shutdown(timeout=5.0)
|
|
|
|
assert record.task.done()
|
|
assert cancelled.is_set()
|
|
assert record.status == RunStatus.interrupted
|
|
finally:
|
|
if not record.task.done():
|
|
record.task.cancel()
|
|
with suppress(asyncio.CancelledError):
|
|
await record.task
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_shutdown_is_bounded_when_run_ignores_cancellation():
|
|
"""A run that swallows cancellation must not make shutdown() hang."""
|
|
rm = RunManager()
|
|
record = await rm.create("t-stubborn")
|
|
await rm.set_status(record.run_id, RunStatus.running)
|
|
|
|
started = asyncio.Event()
|
|
stop = asyncio.Event()
|
|
|
|
async def stubborn() -> None:
|
|
started.set()
|
|
while not stop.is_set():
|
|
try:
|
|
await asyncio.sleep(3600)
|
|
except asyncio.CancelledError:
|
|
if stop.is_set():
|
|
raise
|
|
# else: swallow — simulates a run stuck in slow cleanup
|
|
|
|
record.task = asyncio.create_task(stubborn())
|
|
try:
|
|
await asyncio.wait_for(started.wait(), timeout=1.0)
|
|
|
|
loop = asyncio.get_running_loop()
|
|
t0 = loop.time()
|
|
await rm.shutdown(timeout=0.3)
|
|
elapsed = loop.time() - t0
|
|
|
|
assert elapsed < 2.0, f"shutdown took {elapsed:.2f}s; drain is not bounded"
|
|
finally:
|
|
# cleanup the deliberately-stubborn task
|
|
stop.set()
|
|
record.task.cancel()
|
|
with suppress(asyncio.CancelledError):
|
|
await record.task
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_shutdown_is_noop_without_inflight_runs():
|
|
"""shutdown() on an idle manager completes cleanly and is idempotent."""
|
|
rm = RunManager()
|
|
await rm.shutdown(timeout=1.0)
|
|
# already-finished runs must not be re-cancelled or error out
|
|
record = await rm.create("t-done")
|
|
await rm.set_status(record.run_id, RunStatus.success)
|
|
await rm.shutdown(timeout=1.0)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_langgraph_runtime_drains_runs_before_closing_checkpointer(monkeypatch):
|
|
"""The wiring order lock for #3373: drain in-flight runs, THEN close the pool.
|
|
|
|
Patches every ``langgraph_runtime`` collaborator down to trivial stand-ins so
|
|
only the bootstrap/teardown ordering runs. The checkpointer probe records when
|
|
its context manager exits (pool close); a ``RunManager.shutdown`` spy records
|
|
when the drain happens. The drain MUST come first.
|
|
"""
|
|
from fastapi import FastAPI
|
|
|
|
from app.gateway.deps import langgraph_runtime
|
|
|
|
events: list[str] = []
|
|
|
|
@asynccontextmanager
|
|
async def probe_checkpointer(_config):
|
|
try:
|
|
yield object()
|
|
finally:
|
|
events.append("checkpointer_closed")
|
|
|
|
@asynccontextmanager
|
|
async def fake_stream_bridge(_config):
|
|
yield object()
|
|
|
|
@asynccontextmanager
|
|
async def fake_store(_config):
|
|
yield object()
|
|
|
|
async def fake_init_engine(_db):
|
|
return None
|
|
|
|
async def fake_close_engine():
|
|
return None
|
|
|
|
async def spy_shutdown(self, *, timeout): # noqa: ANN001
|
|
events.append("runs_drained")
|
|
|
|
def spy_set_extension_notify_loop(loop): # noqa: ANN001
|
|
assert loop is asyncio.get_running_loop()
|
|
events.append("extension_loop_set")
|
|
|
|
def spy_reset_extension_notify_loop():
|
|
events.append("extension_loop_reset")
|
|
|
|
monkeypatch.setattr("deerflow.runtime.checkpointer.async_provider.make_checkpointer", probe_checkpointer)
|
|
monkeypatch.setattr("deerflow.runtime.make_stream_bridge", fake_stream_bridge)
|
|
monkeypatch.setattr("deerflow.runtime.make_store", fake_store)
|
|
monkeypatch.setattr("deerflow.persistence.engine.init_engine_from_config", fake_init_engine)
|
|
monkeypatch.setattr("deerflow.persistence.engine.close_engine", fake_close_engine)
|
|
monkeypatch.setattr("deerflow.persistence.engine.get_session_factory", lambda: None)
|
|
monkeypatch.setattr("deerflow.runtime.events.store.make_run_event_store", lambda _cfg: object())
|
|
monkeypatch.setattr("deerflow.persistence.thread_meta.make_thread_store", lambda _sf, _store: object())
|
|
monkeypatch.setattr(RunManager, "shutdown", spy_shutdown, raising=False)
|
|
monkeypatch.setattr("deerflow.extensions.notify.set_extension_notify_loop", spy_set_extension_notify_loop)
|
|
monkeypatch.setattr("deerflow.extensions.notify.reset_extension_notify_loop", spy_reset_extension_notify_loop)
|
|
|
|
app = FastAPI()
|
|
startup_config = SimpleNamespace(database=SimpleNamespace(backend="memory", checkpoint_channel_mode="full", checkpoint_delta=SimpleNamespace(snapshot_frequency=10)), run_events=None)
|
|
|
|
async with langgraph_runtime(app, startup_config):
|
|
pass
|
|
|
|
assert "runs_drained" in events, "langgraph_runtime never drained in-flight runs on shutdown"
|
|
assert "checkpointer_closed" in events
|
|
assert events.index("runs_drained") < events.index("checkpointer_closed"), f"runs must be drained before the checkpointer pool is closed; got order {events}"
|
|
assert events[0] == "extension_loop_set"
|
|
assert events.index("checkpointer_closed") < events.index("extension_loop_reset"), f"extension loop reset must be the final runtime teardown; got order {events}"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
@pytest.mark.parametrize("startup_error", [RuntimeError("startup failed"), asyncio.CancelledError()])
|
|
async def test_langgraph_runtime_resets_extension_loop_when_startup_exits_early(monkeypatch, startup_error):
|
|
"""A partial startup must not leave a stale process-wide loop binding."""
|
|
from fastapi import FastAPI
|
|
|
|
from app.gateway.deps import langgraph_runtime
|
|
|
|
events: list[str] = []
|
|
|
|
@asynccontextmanager
|
|
async def failing_stream_bridge(_config):
|
|
raise startup_error
|
|
yield # pragma: no cover - makes this an async context manager
|
|
|
|
def spy_set_extension_notify_loop(loop): # noqa: ANN001
|
|
assert loop is asyncio.get_running_loop()
|
|
events.append("extension_loop_set")
|
|
|
|
def spy_reset_extension_notify_loop():
|
|
events.append("extension_loop_reset")
|
|
|
|
monkeypatch.setattr("deerflow.runtime.make_stream_bridge", failing_stream_bridge)
|
|
monkeypatch.setattr("deerflow.extensions.notify.set_extension_notify_loop", spy_set_extension_notify_loop)
|
|
monkeypatch.setattr("deerflow.extensions.notify.reset_extension_notify_loop", spy_reset_extension_notify_loop)
|
|
|
|
app = FastAPI()
|
|
startup_config = SimpleNamespace(
|
|
database=SimpleNamespace(
|
|
backend="memory",
|
|
checkpoint_channel_mode="full",
|
|
checkpoint_delta=SimpleNamespace(snapshot_frequency=10),
|
|
),
|
|
)
|
|
|
|
with pytest.raises(type(startup_error)):
|
|
async with langgraph_runtime(app, startup_config):
|
|
pass
|
|
|
|
assert events == ["extension_loop_set", "extension_loop_reset"]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_drain_flushes_real_graph_checkpoint_before_close():
|
|
"""End-to-end #3373 guard with a REAL langgraph graph + checkpointer.
|
|
|
|
A real run is driven through ``graph.astream`` in a background task, then
|
|
``RunManager.shutdown()`` drains it. The checkpointer raises once closed
|
|
(mirroring ``psycopg_pool.PoolClosed``). Closing only happens AFTER the
|
|
drain — as the gateway's AsyncExitStack does. The drain must let langgraph
|
|
flush its final checkpoint while the checkpointer is still open, so no write
|
|
lands against a closed checkpointer.
|
|
|
|
Unlike the unit/spy tests above, this exercises the real langgraph
|
|
checkpoint-put machinery, so a future langgraph change that cancels (rather
|
|
than awaits) its checkpoint-put task on executor exit would fail this test
|
|
instead of silently regressing #3373.
|
|
"""
|
|
from langgraph.graph import END, START, StateGraph
|
|
|
|
async def slow(_state: _CountState) -> dict:
|
|
await asyncio.sleep(0.1)
|
|
return {"count": 1}
|
|
|
|
saver = _CloseableSaver()
|
|
builder = StateGraph(_CountState)
|
|
for name in ("a", "b", "c"):
|
|
builder.add_node(name, slow)
|
|
builder.add_edge(START, "a")
|
|
builder.add_edge("a", "b")
|
|
builder.add_edge("b", "c")
|
|
builder.add_edge("c", END)
|
|
graph = builder.compile(checkpointer=saver)
|
|
|
|
rm = RunManager()
|
|
record = await rm.create("t-e2e")
|
|
await rm.set_status(record.run_id, RunStatus.running)
|
|
thread_cfg = {"configurable": {"thread_id": "t-e2e"}}
|
|
|
|
started = asyncio.Event()
|
|
|
|
async def run() -> None:
|
|
started.set()
|
|
async for _ in graph.astream({"count": 0}, config=thread_cfg):
|
|
pass
|
|
|
|
record.task = asyncio.create_task(run())
|
|
try:
|
|
await asyncio.wait_for(started.wait(), timeout=1.0)
|
|
|
|
# Deterministically wait until the run is genuinely in-flight — poll for
|
|
# the first persisted checkpoint instead of a fixed sleep (avoids CI
|
|
# flakiness on slow runners / under event-loop contention).
|
|
async def _await_first_checkpoint() -> None:
|
|
while (await saver.aget_tuple(thread_cfg)) is None:
|
|
await asyncio.sleep(0.01)
|
|
|
|
await asyncio.wait_for(_await_first_checkpoint(), timeout=5.0)
|
|
|
|
# The fix: drain while the checkpointer is still open ...
|
|
await rm.shutdown(timeout=5.0)
|
|
# ... and only then close it (mirrors langgraph_runtime's ExitStack).
|
|
saver.close()
|
|
|
|
assert saver.writes_after_close == [], f"a checkpoint write raced a closed checkpointer: {saver.writes_after_close}"
|
|
# The final checkpoint landed before close.
|
|
snapshot = await saver.aget_tuple(thread_cfg)
|
|
assert snapshot is not None
|
|
finally:
|
|
if not record.task.done():
|
|
record.task.cancel()
|
|
with suppress(asyncio.CancelledError):
|
|
await record.task
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_shutdown_preserves_status_of_run_completed_during_drain():
|
|
"""A run that finishes (e.g. success) during the drain window must keep its
|
|
real terminal status — shutdown must not blanket-overwrite it to
|
|
``interrupted`` in memory or in the store (Copilot review on PR #3381)."""
|
|
from deerflow.runtime.runs.store.memory import MemoryRunStore
|
|
|
|
store = MemoryRunStore()
|
|
rm = RunManager(store=store)
|
|
record = await rm.create("t-complete")
|
|
await rm.set_status(record.run_id, RunStatus.running)
|
|
|
|
async def worker() -> None:
|
|
try:
|
|
await asyncio.Event().wait()
|
|
except asyncio.CancelledError:
|
|
# The run had effectively finished; swallow the cancellation and
|
|
# record success, like a run that completed in the same tick the
|
|
# shutdown cancelled it.
|
|
pass
|
|
await rm.set_status(record.run_id, RunStatus.success)
|
|
|
|
record.task = asyncio.create_task(worker())
|
|
try:
|
|
await asyncio.sleep(0) # let the task reach its await point
|
|
|
|
await rm.shutdown(timeout=5.0)
|
|
|
|
assert record.status == RunStatus.success, f"shutdown overwrote in-memory status: {record.status}"
|
|
persisted = await store.get(record.run_id)
|
|
assert persisted is not None and persisted["status"] == "success", f"shutdown overwrote persisted status: {persisted}"
|
|
finally:
|
|
if not record.task.done():
|
|
record.task.cancel()
|
|
with suppress(asyncio.CancelledError):
|
|
await record.task
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_shutdown_surfaces_failed_interrupted_persist(caplog):
|
|
"""A failed interrupted-status persist during the drain must be surfaced (with
|
|
the run_id), not silently swallowed by the gather (maintainer review on
|
|
PR #3381)."""
|
|
import logging
|
|
|
|
from deerflow.runtime.runs.store.memory import MemoryRunStore
|
|
|
|
class _FailingStore(MemoryRunStore):
|
|
async def update_status(self, *args, **kwargs):
|
|
raise RuntimeError("store unavailable")
|
|
|
|
rm = RunManager(store=_FailingStore())
|
|
record = await rm.create("t-failpersist")
|
|
record.status = RunStatus.running # set in memory; the failing store is exercised by the drain
|
|
|
|
started = asyncio.Event()
|
|
|
|
async def worker() -> None:
|
|
started.set()
|
|
await asyncio.Event().wait() # blocks until cancelled by the drain
|
|
|
|
record.task = asyncio.create_task(worker())
|
|
try:
|
|
await asyncio.wait_for(started.wait(), timeout=1.0)
|
|
with caplog.at_level(logging.WARNING, logger="deerflow.runtime.runs.manager"):
|
|
await rm.shutdown(timeout=5.0)
|
|
assert "Could not persist interrupted status for run" in caplog.text, caplog.text
|
|
finally:
|
|
if not record.task.done():
|
|
record.task.cancel()
|
|
with suppress(asyncio.CancelledError):
|
|
await record.task
|