mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-07-29 09:26:00 +00:00
* Make the sync checkpointer honor the unified database config
The sync checkpointer factory (`get_checkpointer` and `checkpointer_context`)
read only the legacy `checkpointer:` config section and fell back to
`InMemorySaver` when it was absent — it never consulted `database:`. The async
`make_checkpointer` factory and both sync/async Store providers already resolve
the unified `database:` section (legacy `checkpointer:` takes precedence,
otherwise `database:` drives the backend), so the sync checkpointer was the
lone outlier.
Consequence: with `database: {backend: sqlite|postgres}` and no legacy
`checkpointer:` section, the sync checkpointer silently returned `InMemorySaver`
while the Store — same process, same config — correctly persisted to
sqlite/postgres. Embedded callers (`DeerFlowClient`) and the TUI hit this: e.g.
the TUI writes `threads_meta` rows to sqlite (thread appears in the Web UI) but
its checkpoints went to memory and were lost on exit. This also contradicts
backend/AGENTS.md ("the unified `database` section selects the Gateway's
LangGraph checkpointer, LangGraph Store, and DeerFlow SQL repositories").
Mirror the sync Store provider: add `_resolve_checkpointer_config` /
`_get_checkpointer_config` (legacy precedence, else translate `database:` into
a CheckpointerConfig) and route both the singleton and the context manager
through them. The Gateway is unaffected — it uses the async path.
Adds a TestCheckpointerDatabaseConfig suite mirroring the Store's database
tests (singleton + context-manager honor `database:`, legacy precedence,
explicit-memory, missing-config fallback). The two `uses_database_config`
tests fail (return InMemorySaver) before the fix and pass after.
* Handle database=None in sync checkpointer resolution
The unified-config change made `checkpointer_context` / `get_checkpointer`
consult `app_config.database` when no legacy `checkpointer:` section is set.
`AppConfig.database` is always a `DatabaseConfig` in production, but the
existing regression test for issue #1016
(`test_checkpointer_none_fix.py::test_sync_checkpointer_context_returns_in_memory_saver_when_not_configured`)
mocks the app config with `database` left unset, exercising a `database=None`
path that now raised `ValueError: Unknown database backend`.
Mirror the async `make_checkpointer` factory, which already tolerates
`database=None` (falls back to memory), by treating a `None` database as the
memory backend in `_resolve_checkpointer_config`. Update the sync test to set
`mock_config.database = None`, matching its async sibling in the same file.
* Address review: mirror None-guard in store resolver, add sqlite coverage
216 lines
7.7 KiB
Python
216 lines
7.7 KiB
Python
"""Sync Store factory.
|
|
|
|
Provides a **sync singleton** and a **sync context manager** for CLI tools
|
|
and the embedded :class:`~deerflow.client.DeerFlowClient`.
|
|
|
|
The deprecated ``checkpointer`` section takes precedence when present;
|
|
otherwise Store follows the unified ``database`` section. Supported backends:
|
|
memory, sqlite, postgres.
|
|
|
|
Usage::
|
|
|
|
from deerflow.runtime.store.provider import get_store, store_context
|
|
|
|
# Singleton — reused across calls, closed on process exit
|
|
store = get_store()
|
|
|
|
# One-shot — fresh connection, closed on block exit
|
|
with store_context() as store:
|
|
store.put(("ns",), "key", {"value": 1})
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import contextlib
|
|
import logging
|
|
import threading
|
|
from collections.abc import Iterator
|
|
|
|
from langgraph.store.base import BaseStore
|
|
|
|
from deerflow.config.app_config import AppConfig, get_app_config
|
|
from deerflow.config.checkpointer_config import CheckpointerConfig, ensure_config_loaded, get_checkpointer_config
|
|
from deerflow.runtime.store._sqlite_utils import ensure_sqlite_parent_dir, resolve_sqlite_conn_str
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Error message constants
|
|
# ---------------------------------------------------------------------------
|
|
|
|
SQLITE_STORE_INSTALL = "langgraph-checkpoint-sqlite is required for the SQLite store. Install it with: uv add langgraph-checkpoint-sqlite"
|
|
POSTGRES_STORE_INSTALL = (
|
|
"langgraph-checkpoint-postgres is required for the PostgreSQL store. Install the package extra with: pip install 'deerflow-harness[postgres]' (or use: uv sync --all-packages --extra postgres when developing locally)"
|
|
)
|
|
POSTGRES_CONN_REQUIRED = "checkpointer.connection_string is required for the postgres backend"
|
|
|
|
|
|
def _resolve_store_config(app_config: AppConfig) -> CheckpointerConfig:
|
|
"""Resolve the Store backend from legacy or unified application config.
|
|
|
|
The legacy ``checkpointer`` section remains authoritative when present so
|
|
Store and Checkpointer continue to use the same backend. Otherwise the
|
|
unified ``database`` section drives the Store as documented.
|
|
"""
|
|
if app_config.checkpointer is not None:
|
|
return app_config.checkpointer
|
|
|
|
database = app_config.database
|
|
if database is None or database.backend == "memory":
|
|
return CheckpointerConfig(type="memory")
|
|
if database.backend == "sqlite":
|
|
return CheckpointerConfig(type="sqlite", connection_string=database.checkpointer_sqlite_path)
|
|
if database.backend == "postgres":
|
|
if not database.postgres_url:
|
|
raise ValueError("database.postgres_url is required for the postgres backend")
|
|
return CheckpointerConfig(type="postgres", connection_string=database.postgres_url)
|
|
raise ValueError(f"Unknown database backend: {database.backend!r}")
|
|
|
|
|
|
def _get_store_config() -> CheckpointerConfig:
|
|
"""Load Store config without holding the provider singleton lock."""
|
|
ensure_config_loaded()
|
|
|
|
# Preserve callers that initialise the legacy config singleton directly.
|
|
legacy_config = get_checkpointer_config()
|
|
if legacy_config is not None:
|
|
return legacy_config
|
|
try:
|
|
app_config = get_app_config()
|
|
except FileNotFoundError:
|
|
return CheckpointerConfig(type="memory")
|
|
return _resolve_store_config(app_config)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Sync factory
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
@contextlib.contextmanager
|
|
def _sync_store_cm(config) -> Iterator[BaseStore]:
|
|
"""Context manager that creates and tears down a sync Store.
|
|
|
|
The ``config`` argument is a
|
|
:class:`~deerflow.config.checkpointer_config.CheckpointerConfig` instance —
|
|
the same object used by the checkpointer factory.
|
|
"""
|
|
if config.type == "memory":
|
|
from langgraph.store.memory import InMemoryStore
|
|
|
|
logger.info("Store: using InMemoryStore (in-process, not persistent)")
|
|
yield InMemoryStore()
|
|
return
|
|
|
|
if config.type == "sqlite":
|
|
try:
|
|
from langgraph.store.sqlite import SqliteStore
|
|
except ImportError as exc:
|
|
raise ImportError(SQLITE_STORE_INSTALL) from exc
|
|
|
|
conn_str = resolve_sqlite_conn_str(config.connection_string or "store.db")
|
|
ensure_sqlite_parent_dir(conn_str)
|
|
|
|
with SqliteStore.from_conn_string(conn_str) as store:
|
|
store.setup()
|
|
logger.info("Store: using SqliteStore (%s)", conn_str)
|
|
yield store
|
|
return
|
|
|
|
if config.type == "postgres":
|
|
try:
|
|
from langgraph.store.postgres import PostgresStore # type: ignore[import]
|
|
except ImportError as exc:
|
|
raise ImportError(POSTGRES_STORE_INSTALL) from exc
|
|
|
|
if not config.connection_string:
|
|
raise ValueError(POSTGRES_CONN_REQUIRED)
|
|
|
|
with PostgresStore.from_conn_string(config.connection_string) as store:
|
|
store.setup()
|
|
logger.info("Store: using PostgresStore")
|
|
yield store
|
|
return
|
|
|
|
raise ValueError(f"Unknown store backend type: {config.type!r}")
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Sync singleton
|
|
# ---------------------------------------------------------------------------
|
|
|
|
_store: BaseStore | None = None
|
|
_store_ctx = None # open context manager keeping the connection alive
|
|
_store_lock = threading.Lock()
|
|
|
|
|
|
def get_store() -> BaseStore:
|
|
"""Return the global sync Store singleton, creating it on first call.
|
|
|
|
The legacy ``checkpointer`` section takes precedence when configured;
|
|
otherwise the unified ``database`` section selects the backend.
|
|
|
|
Raises:
|
|
ImportError: If the required package for the configured backend is not installed.
|
|
ValueError: If the selected backend is missing its required connection value.
|
|
"""
|
|
global _store, _store_ctx
|
|
|
|
if _store is not None:
|
|
return _store
|
|
|
|
# Config loading can reset both persistence singletons. Resolve the full
|
|
# config outside this provider lock to avoid lock-order inversion.
|
|
config = _get_store_config()
|
|
|
|
with _store_lock:
|
|
if _store is not None:
|
|
return _store
|
|
|
|
store_ctx = _sync_store_cm(config)
|
|
store = store_ctx.__enter__()
|
|
_store_ctx = store_ctx
|
|
_store = store
|
|
return _store
|
|
|
|
|
|
def reset_store() -> None:
|
|
"""Reset the sync singleton, forcing recreation on the next call.
|
|
|
|
Closes any open backend connections and clears the cached instance.
|
|
Useful in tests or after a configuration change.
|
|
"""
|
|
global _store, _store_ctx
|
|
with _store_lock:
|
|
if _store_ctx is not None:
|
|
try:
|
|
_store_ctx.__exit__(None, None, None)
|
|
except Exception:
|
|
logger.warning("Error during store cleanup", exc_info=True)
|
|
_store_ctx = None
|
|
_store = None
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Sync context manager
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
@contextlib.contextmanager
|
|
def store_context() -> Iterator[BaseStore]:
|
|
"""Sync context manager that yields a Store and cleans up on exit.
|
|
|
|
Unlike :func:`get_store`, this does **not** cache the instance — each
|
|
``with`` block creates and destroys its own connection. Use it in CLI
|
|
scripts or tests where you want deterministic cleanup::
|
|
|
|
with store_context() as store:
|
|
store.put(("threads",), thread_id, {...})
|
|
|
|
The legacy ``checkpointer`` section takes precedence when configured;
|
|
otherwise the unified ``database`` section selects the backend.
|
|
"""
|
|
config = _resolve_store_config(get_app_config())
|
|
with _sync_store_cm(config) as store:
|
|
yield store
|