mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-07-27 16:37:55 +00:00
* feat(persistence): wire alembic migrations + bootstrap schema on startup Closes #3682. Pre-#3658 DBs lack the `runs.token_usage_by_model` column because alembic was never wired up — startup only ran `create_all`, which never ALTERs existing tables. Adds a hybrid bootstrap in FastAPI lifespan (replaces bare `create_all`): - empty DB → create_all + stamp head - legacy DB → stamp 0001_baseline + upgrade head - versioned DB → upgrade head Concurrency: Postgres `pg_advisory_lock` (cross-process); SQLite per-engine `asyncio.Lock` + 30s `PRAGMA busy_timeout` on both prod and alembic engines. Column revisions use `safe_add_column` / `safe_drop_column` idempotent helpers as fallback. Other bits: - 0001 baseline (chain root) + 0002 add `runs.token_usage_by_model` - `include_object` filter so alembic ignores LangGraph checkpointer tables - `make migrate-rev MSG="..."` for authoring new revisions (no migrate/stamp targets — startup is the only execution path) - Tests: three-branch decision, concurrency, #3682 regression, env filter, blocking-IO gate anchor - CLAUDE.md: new "Schema migrations" section * fix(style): fix lint error * perf(persistence): address review feedback on alembic bootstrap Behavioural fixes - _SQLITE_LOCKS now keyed via WeakKeyDictionary so id-reuse after GC cannot return a stale, loop-bound lock and the cache cannot leak one entry per disposed engine. - safe_add_column compares nullable / server_default against the desired column when the name already exists and emits a warning on drift, surfacing manual-ALTER workarounds instead of silently no-op'ing. - _postgres_lock issues SET LOCAL idle_in_transaction_session_timeout=0 before pg_advisory_lock, so managed Postgres cannot kill the idle lock-holding session mid-upgrade and silently release the advisory lock. - legacy branch now backfills missing baseline tables via a restricted create_all (Base.metadata.create_all scoped to _BASELINE_TABLE_NAMES). Restores pre-#1930 upgraders whose channel_* tables were never provisioned, without pre-empting future create_table revisions for newly-added models. Schema parity - runs.token_usage_by_model gains server_default=text("'{}'") in both the ORM model and the 0001_baseline create_table, matching what 0002 adds via ALTER. create_all and alembic-upgrade paths now produce identical column definitions. - New parity test compares Base.metadata.create_all output against a pure alembic upgrade base->head, asserting column-set, nullable, and server_default agree across all tables (normalized through the same helper safe_add_column's drift check uses). Guards - test_baseline_table_names_constant_matches_0001 pins _BASELINE_TABLE_NAMES to 0001_baseline.upgrade()'s actual output -- the constant cannot drift silently when someone edits 0001. - test_legacy_backfill_skips_non_baseline_tables verifies the restricted backfill does not create a phantom table on Base.metadata, modelling a future revision that would otherwise collide on op.create_table. Doc residuals - Three-branch decision table is now consistent across bootstrap.py top docstring, engine.py comment, test module docstring, and CLAUDE.md. - Stale test anchor in blocking_io/test_persistence_engine_sqlite.py docstring now points at the real file. * fix(style): fix lint error * fix(persistence): close drift detection holes - _check_column_drift compares column type via a family equivalence allowlist ({JSON, JSONB}). Catches the wrong-type workaround `TEXT NOT NULL DEFAULT '{}'` that previously slipped through silently, while keeping Postgres JSON/JSONB dialect reflection quiet. Reflected and desired type are also echoed in every drift warning's payload for operator triage. - Extract _escape_url_for_alembic so bootstrap._alembic_safe_url and scripts/_autogen_revision share the ConfigParser % escape rule instead of duplicating it. - backend/README.md: add `make migrate-rev MSG=...` to Commands and a Schema Migrations section per the repo's README/CLAUDE.md sync policy. - test_base_to_dict.py: scope the test ORM class to an isolated MetaData so the create_all-vs-alembic parity test (added in the previous commit) is not polluted by the phantom table on the full pytest session.
190 lines
8.0 KiB
Python
190 lines
8.0 KiB
Python
"""Idempotent helpers for alembic column revisions.
|
|
|
|
Column revisions in ``versions/`` should use these helpers instead of raw
|
|
``op.add_column`` / ``op.drop_column`` so re-running a column change against a
|
|
DB that already has (or has already removed) the column is a safe no-op.
|
|
|
|
Two reasons we need idempotency:
|
|
|
|
1. **Defence-in-depth on top of bootstrap locking.** ``bootstrap_schema()``
|
|
serialises Postgres with an advisory lock and SQLite within one process
|
|
with an ``asyncio.Lock``. If a retry happens anyway (manual ALTER,
|
|
misconfiguration, SQLite cross-process contention), the revision must still
|
|
be safe to re-run.
|
|
|
|
2. **Same posture that made ``Base.metadata.create_all`` forgiving.**
|
|
``create_all`` skips existing tables. Column migrations should mirror that
|
|
forgiving behavior by skipping columns already in the desired state.
|
|
|
|
Drift warning
|
|
-------------
|
|
|
|
Name-match alone can hide a column that a manual ``ALTER`` (for example the
|
|
#3682 workaround that ran ``ALTER TABLE runs ADD COLUMN token_usage_by_model
|
|
JSON`` without ``NOT NULL DEFAULT '{}'``, or the wrong-type variant
|
|
``ALTER TABLE runs ADD COLUMN token_usage_by_model TEXT NOT NULL DEFAULT
|
|
'{}'``) left in a shape that diverges from what ``Base.metadata.create_all``
|
|
would produce on a fresh DB. To surface that silent drift, ``safe_add_column``
|
|
compares the existing column's ``nullable`` / ``server_default`` / ``type``
|
|
against the desired ``sa.Column`` and emits ``logger.warning`` on mismatch.
|
|
Type comparison goes through ``_type_equivalent``, which treats known
|
|
dialect-synonym pairs (e.g. ``JSON`` vs ``JSONB``) as equivalent to avoid
|
|
false positives while still catching wholesale type mismatches like
|
|
``TEXT`` vs ``JSON``. We do not auto-repair -- a warning is enough for
|
|
operators to notice and decide.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
|
|
import sqlalchemy as sa
|
|
from alembic import op
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
def _inspector() -> sa.Inspector:
|
|
return sa.inspect(op.get_bind())
|
|
|
|
|
|
def _normalize_default(value: object) -> str | None:
|
|
"""Normalize a server-default value for cross-source comparison.
|
|
|
|
The desired value comes from ``sa.Column.server_default`` (a
|
|
``DefaultClause`` / ``TextClause`` literal, ``None``, or a Python literal);
|
|
the reflected value comes from ``Inspector.get_columns()['default']`` as a
|
|
dialect-rendered string. Strip outer parens / whitespace / Postgres-style
|
|
type casts so textually-equivalent forms compare equal across dialects.
|
|
"""
|
|
if value is None:
|
|
return None
|
|
if isinstance(value, sa.sql.elements.TextClause):
|
|
text = value.text
|
|
elif isinstance(value, sa.schema.DefaultClause) and isinstance(value.arg, sa.sql.elements.TextClause):
|
|
text = value.arg.text
|
|
else:
|
|
text = str(value)
|
|
text = text.strip()
|
|
# Strip a single layer of outer parens that some dialects wrap defaults in.
|
|
if text.startswith("(") and text.endswith(")"):
|
|
text = text[1:-1].strip()
|
|
# Strip Postgres-style type casts like ``'{}'::jsonb``.
|
|
if "::" in text:
|
|
text = text.split("::", 1)[0].strip()
|
|
return text or None
|
|
|
|
|
|
def _normalize_type(value: object) -> str:
|
|
"""Normalize a SQLAlchemy ``TypeEngine`` (or reflected type) for comparison.
|
|
|
|
Returns the upper-cased type-class name with any parameters stripped
|
|
(e.g. ``JSON()`` → ``"JSON"``, ``VARCHAR(255)`` → ``"VARCHAR"``). Length
|
|
parameters are dropped on purpose: drift warnings target wholesale type
|
|
misconfigurations (the JSON-vs-TEXT review case), not dialect-rendered
|
|
size defaults. An empty string signals "missing info" -- callers should
|
|
not equality-check empty strings.
|
|
"""
|
|
if value is None:
|
|
return ""
|
|
s = value if isinstance(value, str) else repr(value)
|
|
return s.upper().split("(", 1)[0].strip()
|
|
|
|
|
|
# Known dialect-synonym pairs that must NOT fire a type-drift warning.
|
|
# Postgres reflects ``JSON`` as ``JSONB`` (and vice versa depending on how
|
|
# the column was provisioned); the model's ``sa.JSON`` plus this allowlist
|
|
# keeps a Postgres deployment quiet while still catching genuine type errors
|
|
# like ``TEXT NOT NULL DEFAULT '{}'`` re-adds.
|
|
#
|
|
# Add a new pair here ONLY when a real reflection-vs-model mismatch is
|
|
# proven to be a false positive in a deployment -- not pre-emptively, since
|
|
# overly broad equivalence would re-open the silent-drift hole this helper
|
|
# exists to close.
|
|
_EQUIVALENT_TYPE_FAMILIES: tuple[frozenset[str], ...] = (frozenset({"JSON", "JSONB"}),)
|
|
|
|
|
|
def _type_equivalent(actual: object, desired: object) -> bool:
|
|
"""True if *actual* and *desired* are the same type or a known equivalent.
|
|
|
|
Returns True when either side is missing reflected info so missing-data
|
|
cases never false-positive into a noisy warning.
|
|
"""
|
|
a = _normalize_type(actual)
|
|
d = _normalize_type(desired)
|
|
if not a or not d:
|
|
return True
|
|
if a == d:
|
|
return True
|
|
pair = frozenset({a, d})
|
|
return any(pair <= fam for fam in _EQUIVALENT_TYPE_FAMILIES)
|
|
|
|
|
|
def _check_column_drift(table: str, desired: sa.Column, actual: dict) -> None:
|
|
"""Warn if an existing column's attributes diverge from the desired model.
|
|
|
|
Equality is checked on ``nullable`` and ``server_default`` directly, and
|
|
on ``type`` via ``_type_equivalent`` (which treats known dialect-synonym
|
|
pairs like ``JSON`` vs ``JSONB`` as equivalent). The reflected and
|
|
desired type reprs are also echoed in the warning payload regardless of
|
|
whether type was the failing dimension, so an operator triaging the log
|
|
line sees the type context at a glance.
|
|
"""
|
|
diffs: list[str] = []
|
|
|
|
desired_nullable = True if desired.nullable is None else bool(desired.nullable)
|
|
actual_nullable = bool(actual.get("nullable", True))
|
|
if desired_nullable != actual_nullable:
|
|
diffs.append(f"nullable actual={actual_nullable} desired={desired_nullable}")
|
|
|
|
desired_default = _normalize_default(desired.server_default)
|
|
actual_default = _normalize_default(actual.get("default"))
|
|
if desired_default != actual_default:
|
|
diffs.append(f"server_default actual={actual_default!r} desired={desired_default!r}")
|
|
|
|
if not _type_equivalent(actual.get("type"), desired.type):
|
|
diffs.append(f"type actual={_normalize_type(actual.get('type'))!r} desired={_normalize_type(desired.type)!r}")
|
|
|
|
if diffs:
|
|
logger.warning(
|
|
"safe_add_column: %s.%s already exists but drifts from the model definition (%s); actual_type=%r desired_type=%r; leaving as-is -- a manual ALTER may be needed to match the model.",
|
|
table,
|
|
desired.name,
|
|
"; ".join(diffs),
|
|
actual.get("type"),
|
|
desired.type,
|
|
)
|
|
|
|
|
|
def safe_add_column(table: str, column: sa.Column) -> None:
|
|
"""``op.add_column`` that no-ops when the table or column is missing/present.
|
|
|
|
- Missing table => nothing to add to. Skip silently because bootstrap only
|
|
supports legacy DBs that already have the baseline table set.
|
|
- Column already exists => no-op. Before returning, ``_check_column_drift``
|
|
compares the existing column's nullability / server_default / type
|
|
against the desired ``column`` and ``logger.warning``\\ s on mismatch so
|
|
manually-applied workarounds do not silently survive as latent drift.
|
|
"""
|
|
insp = _inspector()
|
|
if table not in insp.get_table_names():
|
|
return
|
|
existing = {c["name"]: c for c in insp.get_columns(table)}
|
|
if column.name in existing:
|
|
_check_column_drift(table, column, existing[column.name])
|
|
return
|
|
with op.batch_alter_table(table) as batch:
|
|
batch.add_column(column)
|
|
|
|
|
|
def safe_drop_column(table: str, column_name: str) -> None:
|
|
"""``op.drop_column`` that no-ops when the table or column is already gone."""
|
|
insp = _inspector()
|
|
if table not in insp.get_table_names():
|
|
return
|
|
existing = {c["name"] for c in insp.get_columns(table)}
|
|
if column_name not in existing:
|
|
return
|
|
with op.batch_alter_table(table) as batch:
|
|
batch.drop_column(column_name)
|