central/sql/migrations/024_add_config_enrichment.sql
Matt Johnson 04c1d07b3f feat(3-K.5): operator-settable EnrichmentConfig (config plumbing)
Bridge PR for v0.5.0. PR J wired the supervisor with a hardcoded
EnrichmentConfig() default; PR K added real backends to the registry but
left no operator path to select one. K.5 closes that gap by mirroring the
config.adapters storage + LISTEN/NOTIFY hot-reload pattern.

config.enrichment (migration 024): single-row table (id BOOLEAN PK CHECK
(id = true), mirroring config.system). Columns enricher_class, backend_class,
backend_settings JSONB, cache_ttl_s, updated_at. Reuses the existing
config.set_updated_at + config.notify_config_change triggers (the NOTIFY
function's ELSE branch emits 'enrichment:' for this keyless single-row table).
Seeds framework DEFAULTS ONLY — GeocoderEnricher + NoOpBackend, empty
backend_settings, 24h TTL. NO URLs/IPs/auth in the seed; a fresh deploy runs
NoOp out of the box. Idempotent (CREATE IF NOT EXISTS / DROP TRIGGER IF
EXISTS / INSERT ON CONFLICT DO NOTHING).

Supervisor:
- Reads config.enrichment at startup (start() -> config_source
  .get_enrichment_config()), overriding the constructor default.
- Hot-reloads via _on_config_change(table == "enrichment"): re-reads the row,
  rebuilds the enricher set, and invalidates the enrichment cache when the
  enricher/backend/settings changed (a new backend must not keep serving the
  old backend's cached bundles until TTL). TTL-only changes retain the cache.
- build_enrichers now takes an explicit EnrichmentCache (the supervisor owns
  it so it can invalidate); cache no longer built inside build_enrichers.

ConfigStore / ConfigSource: get_enrichment_config() (falls back to defaults if
the row is somehow absent) + upsert_enrichment_config(). Mirrors the adapter
accessors.

cache.py: EnrichmentCache.invalidate(enricher_name=None) — DELETE all or
enricher-scoped; returns rows deleted.

GUI /enrichment: GET renders the EnrichmentConfig form via the generic
describe_fields machinery (no enrichment-specific Jinja); POST validates via
Pydantic, writes config.enrichment, and lets the NOTIFY trigger propagate the
hot-reload. New enrichment.html + a nav link. backend_settings (a dict field)
needed a generic "json" widget in describe_fields + the template — usable by
any dict-typed settings field, not enrichment-specific.

Necessary deviation (surfaced): PR K shipped a deployment-specific default
DEFAULT_BASE_URL = "http://192.168.1.130:8440" in navi.py. Bar (b) forbids
deployer IPs in src, and operator-settable base_url is exactly K.5's purpose,
so the default is changed to http://localhost:8440 (matching Photon/Nominatim
defaults). The live integration smoke (tests/, env-gated, skipped) now reads
the endpoint from NAVI_BASE_URL — no IP anywhere in src.

Tests (test_enrichment_config_plumbing.py, 10): ConfigStore read / default
fallback / upsert-passes-dict; cache invalidate all + scoped; supervisor builds
NaviBackend from config; hot-reload rebuilds + invalidates on backend change;
no-invalidate on TTL-only change; describe_fields json widget; /enrichment GET
render. test_firms updated for the build_enrichers signature change.

Hot-reload mechanism mirrored: Postgres LISTEN/NOTIFY on channel
'config_changed' (payload 'table:key'), same path adapters/streams use; the
supervisor's existing _on_config_change dispatch gains an "enrichment" branch.

Verification: full pytest 535 passed, 1 skipped (was 525; +10). Migration
applied cleanly on the live prod schema; SELECT * FROM config.enrichment
returns the NoOp default row. grep subject_for_event/_ADAPTER_REGISTRY and
grep 100.64.0./192.168.1. in src both empty.

Does NOT activate NaviBackend (ships NoOp default; operator action) and does
NOT declare enrichment_locations on other adapters (PR L scope).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-20 18:52:22 +00:00

44 lines
2.2 KiB
SQL

-- Migration: 024_add_config_enrichment
-- Adds config.enrichment — the single-row, operator-settable enrichment config
-- the supervisor reads at startup and hot-reloads via LISTEN/NOTIFY.
--
-- Single-row pattern mirrors config.system (id BOOLEAN PK CHECK (id = true)).
-- Seeds framework DEFAULTS ONLY: GeocoderEnricher + NoOpBackend, empty
-- backend_settings, 24h cache TTL. NO deployment-specific values (no URLs,
-- IPs, or auth) — operators set base_url / auth via the /enrichment GUI page
-- after this merges.
--
-- The seed mirrors central.config_models.EnrichmentConfig() defaults.
-- Regenerate via:
-- sudo -u central .venv/bin/python -c \
-- "from central.config_models import EnrichmentConfig; print(EnrichmentConfig().model_dump_json())"
--
-- Idempotent per docs/migrations.md (CREATE TABLE IF NOT EXISTS, INSERT ...
-- ON CONFLICT DO NOTHING, DROP TRIGGER IF EXISTS before CREATE TRIGGER).
CREATE TABLE IF NOT EXISTS config.enrichment (
id BOOLEAN PRIMARY KEY DEFAULT true CHECK (id = true),
enricher_class TEXT NOT NULL DEFAULT 'GeocoderEnricher',
backend_class TEXT NOT NULL DEFAULT 'NoOpBackend',
backend_settings JSONB NOT NULL DEFAULT '{}'::jsonb,
cache_ttl_s INTEGER NOT NULL DEFAULT 86400,
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
);
-- Reuse the existing updated_at trigger function (migration 002).
DROP TRIGGER IF EXISTS enrichment_set_updated_at ON config.enrichment;
CREATE TRIGGER enrichment_set_updated_at
BEFORE UPDATE ON config.enrichment
FOR EACH ROW
EXECUTE FUNCTION config.set_updated_at();
-- Reuse the existing NOTIFY function (migration 001) so the supervisor's
-- LISTEN/NOTIFY hot-reload picks up enrichment changes. The function's ELSE
-- branch emits 'enrichment:' (empty key — single-row table has no natural key).
DROP TRIGGER IF EXISTS enrichment_notify ON config.enrichment;
CREATE TRIGGER enrichment_notify
AFTER INSERT OR UPDATE OR DELETE ON config.enrichment
FOR EACH ROW EXECUTE FUNCTION config.notify_config_change();
-- Seed the single framework-default row (NoOp; no deployment-specific values).
INSERT INTO config.enrichment (id) VALUES (true) ON CONFLICT DO NOTHING;