mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-08-01 19:06:01 +00:00
* feat(persistence): support custom postgres schema * fix(persistence): address CI lint/test failures and review feedback - Map missing psycopg import to actionable POSTGRES_INSTALL guidance in sync/async schema-creation helpers - Accept SQLAlchemy compound DSN schemes (postgresql+asyncpg) when injecting search_path, normalizing to a libpq-consumable DSN - Guard keyword-DSN tests with importorskip so they skip without psycopg - Set database=None in sync checkpointer none-fix test to avoid MagicMock backend resolution - Apply ruff import sort and format * fix(persistence): address pg-schema review feedback - Restrict postgres_schema regex to lowercase-only so the quoted CREATE SCHEMA matches the unquoted search_path (PG case-folds it), fixing the mixed-case bug where tables silently fell back to public. - Replace shlex.join/split with libpq-correct backslash escaping for the options parameter so values containing spaces survive intact. - Add normalize_libpq_dsn() and route the async checkpointer pool through dsn_with_search_path() so a +asyncpg suffix is stripped and existing DSN options (e.g. statement_timeout) are merged instead of overridden. - Extract shared ensure_postgres_schema()/ensure_postgres_schema_async() helpers (mapping missing psycopg to the install hint) used by all four provider sites. - Tests: reject mixed-case schemas, preserve space-containing libpq option, cover normalize_libpq_dsn, and assert pool search_path via DSN. * fix(persistence): align pg-schema test with merged store API The main merge moved the sync Store factory to the single-path _resolve_store_config/_sync_store_cm design, dropping the PR's _sync_store_from_database helper. The integration test still imported the removed symbol, breaking test collection (backend-unit-tests). Resolve the store config from a DatabaseConfig and drive it through _sync_store_cm instead. * fix(persistence): address pg-schema review feedback - reject trailing/leading whitespace in postgres_schema via re.fullmatch (a $-anchored re.match let "deerflow\n" through, silently landing tables in public) - re-escape all whitespace (TAB/CR/LF) when re-joining libpq options so a caller's pre-existing options value round-trips losslessly - re-validate the identifier inside create_schema_sql as defense-in-depth at the SQL-emitting boundary - accept the postgres:// short scheme in the alembic search_path injection - close the sync psycopg connection explicitly (psycopg3 __exit__ does not close()), mirroring the async path - drop the partial checkpointer/store reset on a database config change; database is restart-required and the ORM engine is not rebuilt, so a partial reset would half-migrate the deployment * docs(config): complete the postgres_schema migration checklist Address PR review (P1): the documented `public`->schema migration only moved runs, run_events, threads_meta, feedback, and users. That strands every other DeerFlow-owned table -- the four channel_* tables, both scheduled_* tables, agents, and (critically) alembic_version -- in `public`. On restart bootstrap treats the partially-populated target schema as unversioned, re-baselines it, and replays migrations while the real rows stay invisible in `public`. List the full owned set explicitly, call out alembic_version as required, and keep the "discover the rest" query for version-drift safety. * refactor(checkpointer): drop test-only _sync_checkpointer_from_database Address PR review: the helper was only reached by the env-gated integration test and re-implemented the DatabaseConfig->CheckpointerConfig backend resolution that _resolve_checkpointer_config already owns, so a future backend added there would silently miss this path. Mirror the store side of the same test, which reuses the production path directly: _resolve_checkpointer_config(...) + _sync_checkpointer_cm(...).
229 lines
8.8 KiB
Python
229 lines
8.8 KiB
Python
"""Tests for hardened PostgreSQL async engine configuration."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import sys
|
|
from time import monotonic
|
|
from types import ModuleType
|
|
from unittest.mock import AsyncMock, MagicMock, call, patch
|
|
|
|
import pytest
|
|
|
|
from deerflow.config.database_config import DatabaseConfig
|
|
from deerflow.persistence import engine as engine_mod
|
|
|
|
|
|
def test_postgres_engine_kwargs_include_connection_hardening() -> None:
|
|
kwargs = engine_mod._postgres_engine_kwargs(echo=False, pool_size=5)
|
|
|
|
assert kwargs["echo"] is False
|
|
assert kwargs["pool_size"] == 5
|
|
assert kwargs["pool_pre_ping"] is True
|
|
assert kwargs["pool_recycle"] == engine_mod.POSTGRES_POOL_RECYCLE_SECONDS
|
|
assert kwargs["connect_args"]["command_timeout"] == engine_mod.POSTGRES_COMMAND_TIMEOUT_SECONDS
|
|
assert kwargs["json_serializer"] is engine_mod._json_serializer
|
|
|
|
|
|
def test_database_command_timeout_defaults_to_30_seconds() -> None:
|
|
config = DatabaseConfig()
|
|
|
|
assert config.command_timeout == 30
|
|
|
|
|
|
def test_database_pool_recycle_defaults_to_300_seconds() -> None:
|
|
config = DatabaseConfig()
|
|
|
|
assert config.pool_recycle == 300
|
|
|
|
|
|
def test_postgres_engine_kwargs_preserve_caller_values() -> None:
|
|
kwargs = engine_mod._postgres_engine_kwargs(echo=True, pool_size=20, pool_recycle=120, command_timeout=90)
|
|
|
|
assert kwargs["echo"] is True
|
|
assert kwargs["pool_size"] == 20
|
|
assert kwargs["pool_recycle"] == 120
|
|
assert kwargs["connect_args"] == {"command_timeout": 90}
|
|
|
|
|
|
def test_postgres_engine_kwargs_allow_command_timeout_opt_out() -> None:
|
|
config = DatabaseConfig(command_timeout=None)
|
|
kwargs = engine_mod._postgres_engine_kwargs(echo=False, pool_size=5, command_timeout=config.command_timeout)
|
|
|
|
assert config.command_timeout is None
|
|
assert kwargs["connect_args"] == {}
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_configured_command_timeout_ends_stalled_command() -> None:
|
|
config = DatabaseConfig(
|
|
backend="postgres",
|
|
postgres_url="postgresql://user:password@localhost/deerflow",
|
|
command_timeout=0.01,
|
|
)
|
|
|
|
class _StalledAsyncpgEngine:
|
|
def __init__(self, command_timeout: float) -> None:
|
|
self.command_timeout = command_timeout
|
|
|
|
async def checkout(self) -> None:
|
|
async with asyncio.timeout(self.command_timeout):
|
|
await asyncio.Event().wait()
|
|
|
|
async def dispose(self) -> None:
|
|
return None
|
|
|
|
def _create_engine(_url: str, **kwargs) -> _StalledAsyncpgEngine:
|
|
assert kwargs["pool_pre_ping"] is True
|
|
return _StalledAsyncpgEngine(kwargs["connect_args"]["command_timeout"])
|
|
|
|
bootstrap_schema = AsyncMock()
|
|
|
|
with (
|
|
patch.dict(sys.modules, {"asyncpg": ModuleType("asyncpg")}),
|
|
patch.object(engine_mod, "create_async_engine", side_effect=_create_engine),
|
|
patch.object(engine_mod, "async_sessionmaker", return_value=MagicMock()),
|
|
patch("deerflow.persistence.bootstrap.bootstrap_schema", new=bootstrap_schema),
|
|
):
|
|
try:
|
|
await engine_mod.init_engine_from_config(config)
|
|
engine = engine_mod.get_engine()
|
|
assert isinstance(engine, _StalledAsyncpgEngine)
|
|
started_at = monotonic()
|
|
with pytest.raises(TimeoutError):
|
|
await engine.checkout()
|
|
elapsed = monotonic() - started_at
|
|
|
|
assert engine.command_timeout == config.command_timeout
|
|
assert elapsed < 1
|
|
finally:
|
|
await engine_mod.close_engine()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_init_engine_from_config_preserves_longer_command_timeout_override() -> None:
|
|
config = DatabaseConfig(
|
|
backend="postgres",
|
|
postgres_url="postgresql://user:password@localhost/deerflow",
|
|
pool_recycle=120,
|
|
command_timeout=90,
|
|
)
|
|
mock_engine = MagicMock()
|
|
mock_engine.dispose = AsyncMock()
|
|
bootstrap_schema = AsyncMock()
|
|
|
|
with (
|
|
patch.dict(sys.modules, {"asyncpg": ModuleType("asyncpg")}),
|
|
patch.object(engine_mod, "create_async_engine", return_value=mock_engine) as create_engine,
|
|
patch.object(engine_mod, "async_sessionmaker", return_value=MagicMock()),
|
|
patch("deerflow.persistence.bootstrap.bootstrap_schema", new=bootstrap_schema),
|
|
):
|
|
try:
|
|
await engine_mod.init_engine_from_config(config)
|
|
|
|
kwargs = create_engine.call_args.kwargs
|
|
assert kwargs["connect_args"]["command_timeout"] == 90
|
|
assert kwargs["pool_recycle"] == 120
|
|
finally:
|
|
await engine_mod.close_engine()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_init_engine_postgres_uses_hardened_kwargs() -> None:
|
|
url = "postgresql+asyncpg://user:password@localhost/deerflow"
|
|
mock_engine = MagicMock()
|
|
mock_engine.dispose = AsyncMock()
|
|
bootstrap_schema = AsyncMock()
|
|
|
|
with (
|
|
patch.dict(sys.modules, {"asyncpg": ModuleType("asyncpg")}),
|
|
patch.object(engine_mod, "create_async_engine", return_value=mock_engine) as create_engine,
|
|
patch.object(engine_mod, "async_sessionmaker", return_value=MagicMock()),
|
|
patch("deerflow.persistence.bootstrap.bootstrap_schema", new=bootstrap_schema),
|
|
):
|
|
try:
|
|
await engine_mod.init_engine(backend="postgres", url=url, echo=True, pool_size=12)
|
|
|
|
create_engine.assert_called_once_with(url, **engine_mod._postgres_engine_kwargs(echo=True, pool_size=12))
|
|
bootstrap_schema.assert_awaited_once_with(mock_engine, backend="postgres", postgres_schema="")
|
|
finally:
|
|
await engine_mod.close_engine()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_init_engine_postgres_retry_uses_hardened_kwargs() -> None:
|
|
url = "postgresql+asyncpg://user:password@localhost/deerflow"
|
|
initial_engine = MagicMock()
|
|
initial_engine.dispose = AsyncMock()
|
|
retry_engine = MagicMock()
|
|
retry_engine.dispose = AsyncMock()
|
|
bootstrap_schema = AsyncMock(side_effect=[Exception("database does not exist"), None])
|
|
auto_create = AsyncMock()
|
|
|
|
with (
|
|
patch.dict(sys.modules, {"asyncpg": ModuleType("asyncpg")}),
|
|
patch.object(engine_mod, "create_async_engine", side_effect=[initial_engine, retry_engine]) as create_engine,
|
|
patch.object(engine_mod, "async_sessionmaker", return_value=MagicMock()),
|
|
patch.object(engine_mod, "_auto_create_postgres_db", new=auto_create),
|
|
patch("deerflow.persistence.bootstrap.bootstrap_schema", new=bootstrap_schema),
|
|
):
|
|
try:
|
|
await engine_mod.init_engine(backend="postgres", url=url, echo=False, pool_size=8)
|
|
|
|
kwargs = engine_mod._postgres_engine_kwargs(echo=False, pool_size=8)
|
|
assert create_engine.call_args_list == [call(url, **kwargs), call(url, **kwargs)]
|
|
auto_create.assert_awaited_once_with(url)
|
|
initial_engine.dispose.assert_awaited_once()
|
|
assert bootstrap_schema.await_args_list == [
|
|
call(initial_engine, backend="postgres", postgres_schema=""),
|
|
call(retry_engine, backend="postgres", postgres_schema=""),
|
|
]
|
|
finally:
|
|
await engine_mod.close_engine()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_init_engine_sqlite_omits_postgres_kwargs_and_keeps_wal_listener(tmp_path) -> None:
|
|
url = f"sqlite+aiosqlite:///{tmp_path / 'deerflow.db'}"
|
|
mock_engine = MagicMock()
|
|
mock_engine.sync_engine = object()
|
|
mock_engine.dispose = AsyncMock()
|
|
bootstrap_schema = AsyncMock()
|
|
registered: dict[str, object] = {}
|
|
|
|
def _capture_listener(target, event_name):
|
|
assert target is mock_engine.sync_engine
|
|
assert event_name == "connect"
|
|
|
|
def _decorator(fn):
|
|
registered["listener"] = fn
|
|
return fn
|
|
|
|
return _decorator
|
|
|
|
with (
|
|
patch.object(engine_mod, "create_async_engine", return_value=mock_engine) as create_engine,
|
|
patch.object(engine_mod, "async_sessionmaker", return_value=MagicMock()),
|
|
patch("sqlalchemy.event.listens_for", new=_capture_listener),
|
|
patch("deerflow.persistence.bootstrap.bootstrap_schema", new=bootstrap_schema),
|
|
):
|
|
try:
|
|
await engine_mod.init_engine(backend="sqlite", url=url, echo=True, sqlite_dir=str(tmp_path))
|
|
|
|
create_engine.assert_called_once_with(url, echo=True, json_serializer=engine_mod._json_serializer)
|
|
|
|
cursor = MagicMock()
|
|
dbapi_connection = MagicMock()
|
|
dbapi_connection.cursor.return_value = cursor
|
|
listener = registered["listener"]
|
|
listener(dbapi_connection, None)
|
|
assert [entry.args[0] for entry in cursor.execute.call_args_list] == [
|
|
"PRAGMA journal_mode=WAL;",
|
|
"PRAGMA synchronous=NORMAL;",
|
|
"PRAGMA foreign_keys=ON;",
|
|
"PRAGMA busy_timeout=30000;",
|
|
]
|
|
cursor.close.assert_called_once_with()
|
|
finally:
|
|
await engine_mod.close_engine()
|