c810e9f809
* fix(harness): hydrate run history from RunStore and persist cancellation status fix: - Make RunManager.get() async and hydrate from RunStore when in-memory record is missing - Merge store rows into list_by_thread() with in-memory precedence for active runs - Persist interrupted status to RunStore in cancel() and create_or_reject(interrupt|rollback) - Extract _persist_status() to reuse the best-effort store update pattern - Await run_mgr.get() in all gateway endpoints - Return 409 with distinct message for store-only runs not active on current worker Closes #2812, Closes #2813 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(harness): consistent sort and guarded hydration in RunManager fix: - list_by_thread() now sorts by created_at desc (newest first) even when no RunStore is configured, matching the store-backed code path - guard _record_from_store() call sites in get() and list_by_thread() with best-effort error handling so a single malformed store row cannot turn read paths into 500s test: - update test_list_by_thread assertion to expect newest-first order - seed MemoryRunStore via public put() API instead of writing to _runs * fix(harness): guard store-only runs from streaming and fix get() TOCTOU Add RunRecord.store_only flag set by _record_from_store so callers can distinguish hydrated history from live in-memory runs. join_run and stream_existing_run (action=None) now return 409 instead of hanging forever on an empty MemoryStreamBridge channel. Re-check _runs under lock after the store await in RunManager.get() so a concurrent create() that lands between the two checks returns the authoritative in-memory record rather than a stale store-hydrated copy. Co-Authored-By: Claude Sonnet 4 <noreply@anthropic.com> * fix(harness): reorder bridge fetch in join_run and make list_by_thread limit explicit Move get_stream_bridge() after the store_only guard in join_run so a missing bridge cannot produce 503 for historical runs before the 409 guard fires. Add limit parameter to RunManager.list_by_thread (default 100, matching the store's page size) and pass it explicitly to the store call. Update docstring to document the limit instead of claiming all runs are returned. Co-Authored-By: Claude Sonnet 4 <noreply@anthropic.com> * fix(harness): cap list_by_thread result to limit after merge Apply [:limit] to all return paths in list_by_thread so the method consistently returns at most limit records regardless of how many in-memory runs exist, making the limit parameter a true upper bound on the response size rather than just a store-query hint. Co-Authored-By: Claude Sonnet 4 <noreply@anthropic.com> * fix `list_by_thread` docstring Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * fix(runtime): add update_model_name to RunStore to prevent SQL integrity errors RunManager.update_model_name() was calling _persist_to_store() which uses RunStore.put(), but RunRepository.put() is insert-only. This caused integrity errors when updating model_name for existing runs in SQL-backed stores. fix: - Add abstract update_model_name method to RunStore base class - Implement update_model_name in MemoryRunStore - Implement update_model_name in RunRepository with proper normalization - Add _persist_model_name helper in RunManager - Update RunManager.update_model_name to use the new method test: - Add tests for update_model_name functionality - Add integration tests for RunManager with SQL-backed store Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(runtime): handle NULL status/on_disconnect in _record_from_store `dict.get(key, default)` only uses the default when the key is absent, so a SQL row with an explicit NULL status would pass `None` to `RunStatus(None)` and raise, breaking hydration for otherwise valid rows. Switch to `row.get(...) or fallback` so both missing and NULL values get a safe default. Add tests for get() and list_by_thread() with a NULL status row to prevent regression. Co-Authored-By: Claude Sonnet 4 <noreply@anthropic.com> * fix(runs): address PR review feedback on store consistency changes - Fix list_by_thread limit semantics: pass store_limit = max(0, limit - len(memory_records)) to store so newer store records are not crowded out by in-memory records - Remove dead code: cancelled guard after raise is always True, simplify to if wait and record.task - Document _record_from_store NULL fallback policy (status→pending, on_disconnect→cancel) in docstring Co-Authored-By: Claude Sonnet 4 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
432 lines
16 KiB
Python
432 lines
16 KiB
Python
"""Tests for RunRepository (SQLAlchemy-backed RunStore).
|
|
|
|
Uses a temp SQLite DB to test ORM-backed CRUD operations.
|
|
"""
|
|
|
|
import re
|
|
|
|
import pytest
|
|
from sqlalchemy.dialects import postgresql
|
|
|
|
from deerflow.persistence.run import RunRepository
|
|
from deerflow.runtime import RunManager, RunStatus
|
|
|
|
|
|
async def _make_repo(tmp_path):
|
|
from deerflow.persistence.engine import get_session_factory, init_engine
|
|
|
|
url = f"sqlite+aiosqlite:///{tmp_path / 'test.db'}"
|
|
await init_engine("sqlite", url=url, sqlite_dir=str(tmp_path))
|
|
return RunRepository(get_session_factory())
|
|
|
|
|
|
async def _cleanup():
|
|
from deerflow.persistence.engine import close_engine
|
|
|
|
await close_engine()
|
|
|
|
|
|
class TestRunRepository:
|
|
@pytest.mark.anyio
|
|
async def test_put_and_get(self, tmp_path):
|
|
repo = await _make_repo(tmp_path)
|
|
await repo.put("r1", thread_id="t1", status="pending")
|
|
row = await repo.get("r1")
|
|
assert row is not None
|
|
assert row["run_id"] == "r1"
|
|
assert row["thread_id"] == "t1"
|
|
assert row["status"] == "pending"
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_get_missing_returns_none(self, tmp_path):
|
|
repo = await _make_repo(tmp_path)
|
|
assert await repo.get("nope") is None
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_update_status(self, tmp_path):
|
|
repo = await _make_repo(tmp_path)
|
|
await repo.put("r1", thread_id="t1")
|
|
await repo.update_status("r1", "running")
|
|
row = await repo.get("r1")
|
|
assert row["status"] == "running"
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_update_status_with_error(self, tmp_path):
|
|
repo = await _make_repo(tmp_path)
|
|
await repo.put("r1", thread_id="t1")
|
|
await repo.update_status("r1", "error", error="boom")
|
|
row = await repo.get("r1")
|
|
assert row["status"] == "error"
|
|
assert row["error"] == "boom"
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_list_by_thread(self, tmp_path):
|
|
repo = await _make_repo(tmp_path)
|
|
await repo.put("r1", thread_id="t1")
|
|
await repo.put("r2", thread_id="t1")
|
|
await repo.put("r3", thread_id="t2")
|
|
rows = await repo.list_by_thread("t1")
|
|
assert len(rows) == 2
|
|
assert all(r["thread_id"] == "t1" for r in rows)
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_list_by_thread_owner_filter(self, tmp_path):
|
|
repo = await _make_repo(tmp_path)
|
|
await repo.put("r1", thread_id="t1", user_id="alice")
|
|
await repo.put("r2", thread_id="t1", user_id="bob")
|
|
rows = await repo.list_by_thread("t1", user_id="alice")
|
|
assert len(rows) == 1
|
|
assert rows[0]["user_id"] == "alice"
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_delete(self, tmp_path):
|
|
repo = await _make_repo(tmp_path)
|
|
await repo.put("r1", thread_id="t1")
|
|
await repo.delete("r1")
|
|
assert await repo.get("r1") is None
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_delete_nonexistent_is_noop(self, tmp_path):
|
|
repo = await _make_repo(tmp_path)
|
|
await repo.delete("nope") # should not raise
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_list_pending(self, tmp_path):
|
|
repo = await _make_repo(tmp_path)
|
|
await repo.put("r1", thread_id="t1", status="pending")
|
|
await repo.put("r2", thread_id="t1", status="running")
|
|
await repo.put("r3", thread_id="t2", status="pending")
|
|
pending = await repo.list_pending()
|
|
assert len(pending) == 2
|
|
assert all(r["status"] == "pending" for r in pending)
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_update_run_completion(self, tmp_path):
|
|
repo = await _make_repo(tmp_path)
|
|
await repo.put("r1", thread_id="t1", status="running")
|
|
await repo.update_run_completion(
|
|
"r1",
|
|
status="success",
|
|
total_input_tokens=100,
|
|
total_output_tokens=50,
|
|
total_tokens=150,
|
|
llm_call_count=2,
|
|
lead_agent_tokens=120,
|
|
subagent_tokens=20,
|
|
middleware_tokens=10,
|
|
message_count=3,
|
|
last_ai_message="The answer is 42",
|
|
first_human_message="What is the meaning?",
|
|
)
|
|
row = await repo.get("r1")
|
|
assert row["status"] == "success"
|
|
assert row["total_tokens"] == 150
|
|
assert row["llm_call_count"] == 2
|
|
assert row["lead_agent_tokens"] == 120
|
|
assert row["message_count"] == 3
|
|
assert row["last_ai_message"] == "The answer is 42"
|
|
assert row["first_human_message"] == "What is the meaning?"
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_metadata_preserved(self, tmp_path):
|
|
repo = await _make_repo(tmp_path)
|
|
await repo.put("r1", thread_id="t1", metadata={"key": "value"})
|
|
row = await repo.get("r1")
|
|
assert row["metadata"] == {"key": "value"}
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_kwargs_with_non_serializable(self, tmp_path):
|
|
"""kwargs containing non-JSON-serializable objects should be safely handled."""
|
|
repo = await _make_repo(tmp_path)
|
|
|
|
class Dummy:
|
|
pass
|
|
|
|
await repo.put("r1", thread_id="t1", kwargs={"obj": Dummy()})
|
|
row = await repo.get("r1")
|
|
assert "obj" in row["kwargs"]
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_update_run_completion_preserves_existing_fields(self, tmp_path):
|
|
"""update_run_completion does not overwrite thread_id or assistant_id."""
|
|
repo = await _make_repo(tmp_path)
|
|
await repo.put("r1", thread_id="t1", assistant_id="agent1", status="running")
|
|
await repo.update_run_completion("r1", status="success", total_tokens=100)
|
|
row = await repo.get("r1")
|
|
assert row["thread_id"] == "t1"
|
|
assert row["assistant_id"] == "agent1"
|
|
assert row["total_tokens"] == 100
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_aggregate_tokens_by_thread_counts_completed_runs_only(self, tmp_path):
|
|
repo = await _make_repo(tmp_path)
|
|
await repo.put("success-run", thread_id="t1", status="running")
|
|
await repo.update_run_completion(
|
|
"success-run",
|
|
status="success",
|
|
total_input_tokens=70,
|
|
total_output_tokens=30,
|
|
total_tokens=100,
|
|
lead_agent_tokens=80,
|
|
subagent_tokens=15,
|
|
middleware_tokens=5,
|
|
)
|
|
await repo.put("error-run", thread_id="t1", status="running")
|
|
await repo.update_run_completion(
|
|
"error-run",
|
|
status="error",
|
|
total_input_tokens=20,
|
|
total_output_tokens=30,
|
|
total_tokens=50,
|
|
lead_agent_tokens=40,
|
|
subagent_tokens=10,
|
|
)
|
|
await repo.put("running-run", thread_id="t1", status="running")
|
|
await repo.update_run_completion(
|
|
"running-run",
|
|
status="running",
|
|
total_input_tokens=900,
|
|
total_output_tokens=99,
|
|
total_tokens=999,
|
|
lead_agent_tokens=999,
|
|
)
|
|
await repo.put("other-thread-run", thread_id="t2", status="running")
|
|
await repo.update_run_completion(
|
|
"other-thread-run",
|
|
status="success",
|
|
total_tokens=888,
|
|
lead_agent_tokens=888,
|
|
)
|
|
|
|
agg = await repo.aggregate_tokens_by_thread("t1")
|
|
|
|
assert agg["total_tokens"] == 150
|
|
assert agg["total_input_tokens"] == 90
|
|
assert agg["total_output_tokens"] == 60
|
|
assert agg["total_runs"] == 2
|
|
assert agg["by_model"] == {"unknown": {"tokens": 150, "runs": 2}}
|
|
assert agg["by_caller"] == {
|
|
"lead_agent": 120,
|
|
"subagent": 25,
|
|
"middleware": 5,
|
|
}
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_list_by_thread_ordered_desc(self, tmp_path):
|
|
"""list_by_thread returns newest first."""
|
|
repo = await _make_repo(tmp_path)
|
|
await repo.put("r1", thread_id="t1", created_at="2024-01-01T00:00:00+00:00")
|
|
await repo.put("r2", thread_id="t1", created_at="2024-01-02T00:00:00+00:00")
|
|
rows = await repo.list_by_thread("t1")
|
|
assert rows[0]["run_id"] == "r2"
|
|
assert rows[1]["run_id"] == "r1"
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_list_by_thread_limit(self, tmp_path):
|
|
repo = await _make_repo(tmp_path)
|
|
for i in range(5):
|
|
await repo.put(f"r{i}", thread_id="t1")
|
|
rows = await repo.list_by_thread("t1", limit=2)
|
|
assert len(rows) == 2
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_owner_none_returns_all(self, tmp_path):
|
|
repo = await _make_repo(tmp_path)
|
|
await repo.put("r1", thread_id="t1", user_id="alice")
|
|
await repo.put("r2", thread_id="t1", user_id="bob")
|
|
rows = await repo.list_by_thread("t1", user_id=None)
|
|
assert len(rows) == 2
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_model_name_persistence(self, tmp_path):
|
|
"""RunRepository should persist, normalize, and truncate model_name correctly via SQL."""
|
|
from deerflow.persistence.engine import get_session_factory, init_engine
|
|
|
|
url = f"sqlite+aiosqlite:///{tmp_path / 'test.db'}"
|
|
await init_engine("sqlite", url=url, sqlite_dir=str(tmp_path))
|
|
repo = RunRepository(get_session_factory())
|
|
|
|
await repo.put("run-1", thread_id="thread-1", model_name="gpt-4o")
|
|
row = await repo.get("run-1")
|
|
assert row is not None
|
|
assert row["model_name"] == "gpt-4o"
|
|
|
|
long_name = "a" * 200
|
|
await repo.put("run-2", thread_id="thread-1", model_name=long_name)
|
|
row2 = await repo.get("run-2")
|
|
assert row2["model_name"] == "a" * 128
|
|
|
|
await repo.put("run-3", thread_id="thread-1", model_name=123)
|
|
row3 = await repo.get("run-3")
|
|
assert row3["model_name"] == "123"
|
|
|
|
await repo.put("run-4", thread_id="thread-1", model_name=None)
|
|
row4 = await repo.get("run-4")
|
|
assert row4["model_name"] is None
|
|
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_aggregate_tokens_by_thread_reuses_shared_model_name_expression(self):
|
|
captured = []
|
|
|
|
class FakeResult:
|
|
def all(self):
|
|
return []
|
|
|
|
class FakeSession:
|
|
async def execute(self, stmt):
|
|
captured.append(stmt)
|
|
return FakeResult()
|
|
|
|
class FakeSessionContext:
|
|
async def __aenter__(self):
|
|
return FakeSession()
|
|
|
|
async def __aexit__(self, exc_type, exc, tb):
|
|
return None
|
|
|
|
repo = RunRepository(lambda: FakeSessionContext())
|
|
|
|
agg = await repo.aggregate_tokens_by_thread("t1")
|
|
assert agg == {
|
|
"total_tokens": 0,
|
|
"total_input_tokens": 0,
|
|
"total_output_tokens": 0,
|
|
"total_runs": 0,
|
|
"by_model": {},
|
|
"by_caller": {"lead_agent": 0, "subagent": 0, "middleware": 0},
|
|
}
|
|
assert len(captured) == 1
|
|
|
|
stmt = captured[0]
|
|
compiled_sql = str(stmt.compile(dialect=postgresql.dialect()))
|
|
select_sql, group_by_sql = compiled_sql.split(" GROUP BY ", maxsplit=1)
|
|
model_expr_pattern = r"coalesce\(runs\.model_name, %\(([^)]+)\)s\)"
|
|
|
|
select_match = re.search(model_expr_pattern + r" AS model", select_sql)
|
|
group_by_match = re.fullmatch(model_expr_pattern, group_by_sql.strip())
|
|
|
|
assert select_match is not None
|
|
assert group_by_match is not None
|
|
assert select_match.group(1) == group_by_match.group(1)
|
|
|
|
@pytest.mark.anyio
|
|
async def test_run_manager_hydrates_store_only_run_from_sql(self, tmp_path):
|
|
"""RunManager should hydrate historical runs from SQL-backed store."""
|
|
repo = await _make_repo(tmp_path)
|
|
await repo.put(
|
|
"sql-store-only",
|
|
thread_id="thread-1",
|
|
assistant_id="lead_agent",
|
|
status="success",
|
|
metadata={"source": "sql"},
|
|
kwargs={"input": "value"},
|
|
model_name="model-a",
|
|
)
|
|
manager = RunManager(store=repo)
|
|
|
|
record = await manager.get("sql-store-only")
|
|
rows = await manager.list_by_thread("thread-1")
|
|
|
|
assert record is not None
|
|
assert record.run_id == "sql-store-only"
|
|
assert record.status == RunStatus.success
|
|
assert record.metadata == {"source": "sql"}
|
|
assert record.kwargs == {"input": "value"}
|
|
assert record.model_name == "model-a"
|
|
assert [run.run_id for run in rows] == ["sql-store-only"]
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_run_manager_cancel_persists_interrupted_status_to_sql(self, tmp_path):
|
|
"""RunManager.cancel should write interrupted status to SQL-backed store."""
|
|
repo = await _make_repo(tmp_path)
|
|
manager = RunManager(store=repo)
|
|
record = await manager.create("thread-1")
|
|
await manager.set_status(record.run_id, RunStatus.running)
|
|
|
|
cancelled = await manager.cancel(record.run_id)
|
|
row = await repo.get(record.run_id)
|
|
|
|
assert cancelled is True
|
|
assert row is not None
|
|
assert row["status"] == "interrupted"
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_update_model_name(self, tmp_path):
|
|
"""RunRepository.update_model_name should update model_name for existing run."""
|
|
repo = await _make_repo(tmp_path)
|
|
await repo.put("r1", thread_id="t1", model_name="initial-model")
|
|
await repo.update_model_name("r1", "updated-model")
|
|
row = await repo.get("r1")
|
|
assert row["model_name"] == "updated-model"
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_update_model_name_normalizes_value(self, tmp_path):
|
|
"""RunRepository.update_model_name should normalize and truncate model_name."""
|
|
repo = await _make_repo(tmp_path)
|
|
await repo.put("r1", thread_id="t1")
|
|
long_name = "a" * 200
|
|
await repo.update_model_name("r1", long_name)
|
|
row = await repo.get("r1")
|
|
assert row["model_name"] == "a" * 128
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_update_model_name_to_none(self, tmp_path):
|
|
"""RunRepository.update_model_name should allow setting model_name to None."""
|
|
repo = await _make_repo(tmp_path)
|
|
await repo.put("r1", thread_id="t1", model_name="initial-model")
|
|
await repo.update_model_name("r1", None)
|
|
row = await repo.get("r1")
|
|
assert row["model_name"] is None
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_run_manager_update_model_name_persists_to_sql(self, tmp_path):
|
|
"""RunManager.update_model_name should persist to SQL-backed store without integrity error."""
|
|
repo = await _make_repo(tmp_path)
|
|
manager = RunManager(store=repo)
|
|
record = await manager.create("thread-1")
|
|
|
|
await manager.update_model_name(record.run_id, "gpt-4o")
|
|
|
|
row = await repo.get(record.run_id)
|
|
assert row is not None
|
|
assert row["model_name"] == "gpt-4o"
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_run_manager_update_model_name_twice(self, tmp_path):
|
|
"""RunManager.update_model_name should support multiple updates."""
|
|
repo = await _make_repo(tmp_path)
|
|
manager = RunManager(store=repo)
|
|
record = await manager.create("thread-1")
|
|
|
|
await manager.update_model_name(record.run_id, "model-1")
|
|
await manager.update_model_name(record.run_id, "model-2")
|
|
|
|
row = await repo.get(record.run_id)
|
|
assert row["model_name"] == "model-2"
|
|
await _cleanup()
|