mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-05-22 16:06:50 +00:00
2eeb597985
* fix(runs): expose active progress counters * fix(runs): avoid delayed progress flush on completion * fix(runs): tighten progress snapshot semantics * fix(runs): preserve omitted progress fields * chore(runs): remove duplicate journal initialization
554 lines
20 KiB
Python
554 lines
20 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
|
|
from deerflow.runtime.runs.store.base import RunStore
|
|
|
|
|
|
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 _CustomRunStoreWithoutProgress(RunStore):
|
|
async def put(self, *args, **kwargs):
|
|
return None
|
|
|
|
async def get(self, *args, **kwargs):
|
|
return None
|
|
|
|
async def list_by_thread(self, *args, **kwargs):
|
|
return []
|
|
|
|
async def update_status(self, *args, **kwargs):
|
|
return None
|
|
|
|
async def delete(self, *args, **kwargs):
|
|
return None
|
|
|
|
async def update_model_name(self, *args, **kwargs):
|
|
return None
|
|
|
|
async def update_run_completion(self, *args, **kwargs):
|
|
return None
|
|
|
|
async def list_pending(self, *args, **kwargs):
|
|
return []
|
|
|
|
async def aggregate_tokens_by_thread(self, *args, **kwargs):
|
|
return {}
|
|
|
|
|
|
@pytest.mark.anyio
|
|
async def test_update_run_progress_defaults_to_noop_for_custom_store():
|
|
store = _CustomRunStoreWithoutProgress()
|
|
|
|
await store.update_run_progress("r1", total_tokens=1)
|
|
|
|
|
|
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_update_run_progress_keeps_status_running(self, tmp_path):
|
|
repo = await _make_repo(tmp_path)
|
|
await repo.put("r1", thread_id="t1", status="running")
|
|
await repo.update_run_progress(
|
|
"r1",
|
|
total_input_tokens=40,
|
|
total_output_tokens=10,
|
|
total_tokens=50,
|
|
llm_call_count=1,
|
|
message_count=2,
|
|
last_ai_message="partial answer",
|
|
)
|
|
row = await repo.get("r1")
|
|
assert row["status"] == "running"
|
|
assert row["total_tokens"] == 50
|
|
assert row["llm_call_count"] == 1
|
|
assert row["message_count"] == 2
|
|
assert row["last_ai_message"] == "partial answer"
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_update_run_progress_preserves_omitted_fields(self, tmp_path):
|
|
repo = await _make_repo(tmp_path)
|
|
await repo.put("r1", thread_id="t1", status="running")
|
|
await repo.update_run_progress(
|
|
"r1",
|
|
total_input_tokens=40,
|
|
total_output_tokens=10,
|
|
total_tokens=50,
|
|
llm_call_count=1,
|
|
lead_agent_tokens=30,
|
|
subagent_tokens=20,
|
|
message_count=2,
|
|
)
|
|
|
|
await repo.update_run_progress("r1", total_tokens=60, last_ai_message="updated")
|
|
|
|
row = await repo.get("r1")
|
|
assert row["total_input_tokens"] == 40
|
|
assert row["total_output_tokens"] == 10
|
|
assert row["total_tokens"] == 60
|
|
assert row["llm_call_count"] == 1
|
|
assert row["lead_agent_tokens"] == 30
|
|
assert row["subagent_tokens"] == 20
|
|
assert row["message_count"] == 2
|
|
assert row["last_ai_message"] == "updated"
|
|
await _cleanup()
|
|
|
|
@pytest.mark.anyio
|
|
async def test_update_run_progress_skips_terminal_runs(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_tokens=100, llm_call_count=1)
|
|
|
|
await repo.update_run_progress("r1", total_tokens=200, llm_call_count=2)
|
|
|
|
row = await repo.get("r1")
|
|
assert row["status"] == "success"
|
|
assert row["total_tokens"] == 100
|
|
assert row["llm_call_count"] == 1
|
|
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_aggregate_tokens_by_thread_can_include_active_runs(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_tokens=100, lead_agent_tokens=100)
|
|
await repo.put("running-run", thread_id="t1", status="running")
|
|
await repo.update_run_progress("running-run", total_tokens=25, lead_agent_tokens=20, subagent_tokens=5)
|
|
|
|
without_active = await repo.aggregate_tokens_by_thread("t1")
|
|
with_active = await repo.aggregate_tokens_by_thread("t1", include_active=True)
|
|
|
|
assert without_active["total_tokens"] == 100
|
|
assert without_active["total_runs"] == 1
|
|
assert with_active["total_tokens"] == 125
|
|
assert with_active["total_runs"] == 2
|
|
assert with_active["by_caller"] == {
|
|
"lead_agent": 120,
|
|
"subagent": 5,
|
|
"middleware": 0,
|
|
}
|
|
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()
|