mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-08-04 11:58:36 +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(...).
223 lines
7.6 KiB
Python
223 lines
7.6 KiB
Python
"""Async checkpointer factory.
|
|
|
|
Provides an **async context manager** for long-running async servers that need
|
|
proper resource cleanup.
|
|
|
|
Supported backends: memory, sqlite, postgres.
|
|
|
|
Usage (e.g. FastAPI lifespan)::
|
|
|
|
from deerflow.runtime.checkpointer.async_provider import make_checkpointer
|
|
|
|
async with make_checkpointer() as checkpointer:
|
|
app.state.checkpointer = checkpointer # InMemorySaver if not configured
|
|
|
|
For sync usage see :mod:`deerflow.runtime.checkpointer.provider`.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import contextlib
|
|
import logging
|
|
from collections.abc import AsyncIterator
|
|
|
|
from langgraph.types import Checkpointer
|
|
|
|
from deerflow.config.app_config import AppConfig, get_app_config
|
|
from deerflow.persistence.postgres_schema import create_schema_sql, dsn_with_search_path, normalize_libpq_dsn
|
|
from deerflow.runtime.checkpointer.provider import (
|
|
POSTGRES_CONN_REQUIRED,
|
|
POSTGRES_INSTALL,
|
|
SQLITE_INSTALL,
|
|
)
|
|
from deerflow.runtime.store._sqlite_utils import ensure_sqlite_parent_dir, resolve_sqlite_conn_str
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
def _prepare_sqlite_checkpointer_path(raw: str) -> str:
|
|
conn_str = resolve_sqlite_conn_str(raw)
|
|
ensure_sqlite_parent_dir(conn_str)
|
|
return conn_str
|
|
|
|
|
|
def _prepare_database_sqlite_checkpointer_path(db_config) -> str:
|
|
conn_str = db_config.checkpointer_sqlite_path
|
|
ensure_sqlite_parent_dir(conn_str)
|
|
return conn_str
|
|
|
|
|
|
def _build_postgres_pool(conn_string: str, schema: str = ""):
|
|
"""Build an AsyncConnectionPool with TCP keepalive and connection checking."""
|
|
from psycopg.rows import dict_row
|
|
from psycopg_pool import AsyncConnectionPool
|
|
|
|
kwargs = {
|
|
"autocommit": True,
|
|
"prepare_threshold": 0,
|
|
"row_factory": dict_row,
|
|
"keepalives": 1,
|
|
"keepalives_idle": 60,
|
|
"keepalives_interval": 10,
|
|
"keepalives_count": 6,
|
|
}
|
|
# Inject search_path into the DSN (merging with any libpq options already in
|
|
# the conn string) rather than via kwargs["options"], which psycopg applies
|
|
# *on top of* the conninfo and would silently drop a DSN-supplied option
|
|
# such as statement_timeout. This also strips a SQLAlchemy ``+driver``
|
|
# suffix so libpq can parse the DSN. Matches the sync/DSN paths.
|
|
dsn = dsn_with_search_path(normalize_libpq_dsn(conn_string), schema)
|
|
|
|
return AsyncConnectionPool(
|
|
dsn,
|
|
kwargs=kwargs,
|
|
check=AsyncConnectionPool.check_connection,
|
|
)
|
|
|
|
|
|
async def _ensure_postgres_schema_with_pool(pool, schema: str) -> None:
|
|
"""Create the configured schema before LangGraph creates its tables."""
|
|
statement = create_schema_sql(schema)
|
|
if statement is None:
|
|
return
|
|
async with pool.connection() as conn:
|
|
await conn.execute(statement)
|
|
|
|
|
|
def _ensure_postgres_imports():
|
|
"""Import and return (AsyncPostgresSaver, AsyncConnectionPool), raising ImportError on failure."""
|
|
try:
|
|
from langgraph.checkpoint.postgres.aio import AsyncPostgresSaver
|
|
except ImportError as exc:
|
|
raise ImportError(POSTGRES_INSTALL) from exc
|
|
|
|
try:
|
|
from psycopg_pool import AsyncConnectionPool
|
|
except ImportError as exc:
|
|
raise ImportError(POSTGRES_INSTALL) from exc
|
|
|
|
return AsyncPostgresSaver, AsyncConnectionPool
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Async factory
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
@contextlib.asynccontextmanager
|
|
async def _async_checkpointer(config) -> AsyncIterator[Checkpointer]:
|
|
"""Async context manager that constructs and tears down a checkpointer."""
|
|
if config.type == "memory":
|
|
from langgraph.checkpoint.memory import InMemorySaver
|
|
|
|
yield InMemorySaver()
|
|
return
|
|
|
|
if config.type == "sqlite":
|
|
try:
|
|
from langgraph.checkpoint.sqlite.aio import AsyncSqliteSaver
|
|
except ImportError as exc:
|
|
raise ImportError(SQLITE_INSTALL) from exc
|
|
|
|
conn_str = await asyncio.to_thread(_prepare_sqlite_checkpointer_path, config.connection_string or "store.db")
|
|
async with AsyncSqliteSaver.from_conn_string(conn_str) as saver:
|
|
await saver.setup()
|
|
yield saver
|
|
return
|
|
|
|
if config.type == "postgres":
|
|
if not config.connection_string:
|
|
raise ValueError(POSTGRES_CONN_REQUIRED)
|
|
|
|
AsyncPostgresSaver, _ = _ensure_postgres_imports()
|
|
pool = _build_postgres_pool(config.connection_string, config.postgres_schema)
|
|
async with pool:
|
|
await _ensure_postgres_schema_with_pool(pool, config.postgres_schema)
|
|
saver = AsyncPostgresSaver(conn=pool)
|
|
await saver.setup()
|
|
yield saver
|
|
return
|
|
|
|
raise ValueError(f"Unknown checkpointer type: {config.type!r}")
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Public async context manager
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
@contextlib.asynccontextmanager
|
|
async def _async_checkpointer_from_database(db_config) -> AsyncIterator[Checkpointer]:
|
|
"""Async context manager that constructs a checkpointer from unified DatabaseConfig."""
|
|
if db_config.backend == "memory":
|
|
from langgraph.checkpoint.memory import InMemorySaver
|
|
|
|
yield InMemorySaver()
|
|
return
|
|
|
|
if db_config.backend == "sqlite":
|
|
try:
|
|
from langgraph.checkpoint.sqlite.aio import AsyncSqliteSaver
|
|
except ImportError as exc:
|
|
raise ImportError(SQLITE_INSTALL) from exc
|
|
|
|
conn_str = await asyncio.to_thread(_prepare_database_sqlite_checkpointer_path, db_config)
|
|
async with AsyncSqliteSaver.from_conn_string(conn_str) as saver:
|
|
await saver.setup()
|
|
yield saver
|
|
return
|
|
|
|
if db_config.backend == "postgres":
|
|
if not db_config.postgres_url:
|
|
raise ValueError("database.postgres_url is required for the postgres backend")
|
|
|
|
AsyncPostgresSaver, _ = _ensure_postgres_imports()
|
|
pool = _build_postgres_pool(db_config.postgres_url, db_config.postgres_schema)
|
|
async with pool:
|
|
await _ensure_postgres_schema_with_pool(pool, db_config.postgres_schema)
|
|
saver = AsyncPostgresSaver(conn=pool)
|
|
await saver.setup()
|
|
yield saver
|
|
return
|
|
|
|
raise ValueError(f"Unknown database backend: {db_config.backend!r}")
|
|
|
|
|
|
@contextlib.asynccontextmanager
|
|
async def make_checkpointer(app_config: AppConfig | None = None) -> AsyncIterator[Checkpointer]:
|
|
"""Async context manager that yields a checkpointer for the caller's lifetime.
|
|
Resources are opened on enter and closed on exit -- no global state::
|
|
|
|
async with make_checkpointer(app_config) as checkpointer:
|
|
app.state.checkpointer = checkpointer
|
|
|
|
Yields an ``InMemorySaver`` when no checkpointer is configured in *config.yaml*.
|
|
|
|
Priority:
|
|
1. Legacy ``checkpointer:`` config section (backward compatible)
|
|
2. Unified ``database:`` config section
|
|
3. Default InMemorySaver
|
|
"""
|
|
|
|
if app_config is None:
|
|
app_config = get_app_config()
|
|
|
|
# Legacy: standalone checkpointer config takes precedence
|
|
if app_config.checkpointer is not None:
|
|
async with _async_checkpointer(app_config.checkpointer) as saver:
|
|
yield saver
|
|
return
|
|
|
|
# Unified database config
|
|
db_config = getattr(app_config, "database", None)
|
|
if db_config is not None and db_config.backend != "memory":
|
|
async with _async_checkpointer_from_database(db_config) as saver:
|
|
yield saver
|
|
return
|
|
|
|
# Default: in-memory
|
|
from langgraph.checkpoint.memory import InMemorySaver
|
|
|
|
yield InMemorySaver()
|