mirror of
https://github.com/lrnselfreliance/wrolpi.git
synced 2026-10-26 10:51:36 -04:00
The database now lives at <media>/config/wrolpi.db so a library (files, configs, AND database) travels with the drive between WROLPi systems. Core: - wrolpi/db.py: lazy SQLite engine factory (WAL, busy_timeout=30s, foreign_keys=ON); get_db_curs yields a plain sqlite3.Cursor; native sqlite3 paramstyle everywhere (no compatibility shims); global sqlite3 adapters keep raw-SQL datetime formats identical to the ORM's. - wrolpi/fts.py: FTS5 external-content search replacing tsvector/GIN. Injection-proof websearch->FTS5 translator, bm25(10,4,2,1) reproducing A/B/C/D weighting, fast(abc)/deep column filtering, snippet headlines. Stemming contract pinned by dedicated tests (watch/watches/watched/ watching are interchangeable). - wrolpi/schema_ddl.py: SQLite triggers shared verbatim by the alembic baseline and test DBs; fixes the channel video_count DELETE/UPDATE bugs and a latent total_size bug (it used the video id as channel id). - wrolpi/db_bootstrap.py: startup auto-create/migrate; refuses databases written by a newer WROLPi (db_version_mismatch); SQLite 3.40 floor; network-filesystem refusal; never creates/migrates/trusts a database beneath an unmounted production media directory (shadow-DB guard). - Alembic: 85 Postgres-era migrations squashed into one baseline; revision ids are dates (2026_07_10_1350) so filenames self-sort and alembic_version says when a schema was created; render_as_batch=True. - All raw Postgres SQL rewritten (ANY->json_each IN, array_agg @> -> HAVING COUNT(DISTINCT), unnest->executemany/UPDATE..FROM, generate_series histograms->strftime GROUP BY, DISTINCT ON-> row_number(), writable CTEs->two statements, jsonb_*->json_*, explicit NULLS FIRST/LAST, LIMIT-before-OFFSET). Simple statements converted to SQLAlchemy instead (flag upsert, download retry/summary/tag checks, channel-by-tag estimate, Directory delete). - Config imports count skipped entries; background dumps are blocked after a lossy import so partial imports can never overwrite YAML configs (they are the sole source of truth for rebuilds now). - Search tolerates explicit JSON nulls for limit/offset (Postgres treated OFFSET NULL as 0; SQLite errors). - file_group.id/doc_section.id render as INTEGER PRIMARY KEY on SQLite (BIGINT is not a rowid alias; FTS5 content_rowid requires it). Ops teardown: docker-compose db service, CI postgres sidecars, initialize_api_db.sh, controller postgresql service, psycopg2-binary all removed. upgrade.sh stops/disables postgresql (data is NOT deleted; `systemctl enable --now postgresql` restores it); systemd units no longer Want postgresql.service. Existing-user upgrade: first boot creates+migrates the DB, configs import (tags recreate their FileGroups from disk), a refresh rebuilds the library index. QA'd on the 10.0.0.8 RPi: rebuild matched the Postgres baseline exactly; survived an uncontrolled hard reboot with clean integrity checks. Accepted behavior changes: FTS5 has no stopwords; bm25 length normalization shifts some rank orders; fast-path d_headline is un-highlighted; all-negative queries match nothing. Deferred: Debian/trixie package lists (incl. sqlite3 CLI), Cypress re-baseline, VACUUM INTO snapshots, exFAT/NTFS warning, auto-kicked rebuild refresh with progress UX. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
151 lines
6 KiB
Python
151 lines
6 KiB
Python
"""One-time migration from the legacy DB-backed / single-file inventory system to per-inventory config files.
|
|
|
|
Runs on startup (idempotent): if any ``config/inventory/*.yaml`` files already exist, it does nothing. Otherwise it
|
|
converts the legacy ``config/inventories.yaml`` (or, as a fallback, the legacy ``inventory``/``item`` DB tables) into
|
|
per-inventory files typed ``food``, then backs up and renames the old file so it is not re-read.
|
|
"""
|
|
import shutil
|
|
|
|
from wrolpi.common import logger, read_config_data
|
|
from wrolpi.dates import now
|
|
from .defaults import default_fields, slugify
|
|
|
|
logger = logger.getChild(__name__)
|
|
|
|
# Legacy pint unit names that are not valid mathjs unit names. Unrecognized units are kept verbatim (the item
|
|
# simply won't aggregate in the frontend until the user picks a known unit).
|
|
LEGACY_UNIT_MAP = {
|
|
'pound': 'lb',
|
|
'pounds': 'lb',
|
|
'lbs': 'lb',
|
|
}
|
|
|
|
# Legacy item columns we carry over (mapped onto the default food field schema).
|
|
_LEGACY_ITEM_KEYS = ('brand', 'name', 'category', 'subcategory', 'count', 'expiration_date')
|
|
|
|
|
|
def normalize_unit(unit) -> str:
|
|
if not unit:
|
|
return unit
|
|
return LEGACY_UNIT_MAP.get(str(unit).strip().lower(), unit)
|
|
|
|
|
|
def _convert_item(legacy: dict, item_id: int) -> dict:
|
|
item = dict(id=item_id)
|
|
for key in _LEGACY_ITEM_KEYS:
|
|
value = legacy.get(key)
|
|
if value is not None and value != '':
|
|
item[key] = str(value) if not isinstance(value, str) else value
|
|
size = legacy.get('item_size')
|
|
if size is not None and size != '':
|
|
item['item_size'] = str(size)
|
|
unit = normalize_unit(legacy.get('unit'))
|
|
if unit:
|
|
item['item_size_unit'] = unit
|
|
return item
|
|
|
|
|
|
def _convert_inventory(legacy: dict, fallback_name: str) -> dict:
|
|
name = (legacy.get('name') or fallback_name or 'Inventory').strip()
|
|
created = legacy.get('created_at') or now().isoformat()
|
|
items = []
|
|
for legacy_item in legacy.get('items') or []:
|
|
# Skip soft-deleted legacy items.
|
|
if legacy_item.get('deleted_at'):
|
|
continue
|
|
items.append(_convert_item(legacy_item, len(items) + 1))
|
|
return dict(
|
|
name=name,
|
|
type='food',
|
|
created_at=str(created),
|
|
viewed_at=str(legacy.get('viewed_at') or created),
|
|
fields=default_fields('food'),
|
|
items=items,
|
|
)
|
|
|
|
|
|
def _legacy_inventories_from_db() -> list:
|
|
"""Read legacy inventories/items straight from the DB if the tables still exist (pre-drop installs)."""
|
|
from wrolpi.db import get_db_curs
|
|
inventories = []
|
|
try:
|
|
with get_db_curs() as curs:
|
|
curs.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='inventory'")
|
|
if curs.fetchone() is None:
|
|
return []
|
|
curs.execute('SELECT id, name, created_at, viewed_at FROM inventory WHERE deleted_at IS NULL')
|
|
rows = curs.fetchall()
|
|
for row in rows:
|
|
inv = dict(id=row[0], name=row[1], created_at=row[2], viewed_at=row[3], items=[])
|
|
curs.execute(
|
|
'SELECT brand, name, item_size, unit, count, category, subcategory, expiration_date '
|
|
'FROM item WHERE inventory_id = ? AND deleted_at IS NULL', (row[0],))
|
|
for item in curs.fetchall():
|
|
inv['items'].append(dict(
|
|
brand=item[0], name=item[1], item_size=item[2], unit=item[3], count=item[4],
|
|
category=item[5], subcategory=item[6], expiration_date=item[7],
|
|
))
|
|
inventories.append(inv)
|
|
except Exception as e:
|
|
logger.debug(f'No legacy inventory DB tables to migrate: {e}')
|
|
return []
|
|
return inventories
|
|
|
|
|
|
def migrate_legacy_inventory(config) -> bool:
|
|
"""Migrate legacy inventory data into per-inventory config files. Returns True if a migration happened."""
|
|
# Already migrated (per-inventory files exist).
|
|
if config.discover():
|
|
return False
|
|
|
|
legacy_file = config.get_directory().parent / 'inventories.yaml'
|
|
legacy_inventories = []
|
|
source = None
|
|
|
|
if legacy_file.is_file():
|
|
try:
|
|
data = read_config_data(legacy_file)
|
|
legacy_inventories = data.get('inventories') or []
|
|
source = 'file'
|
|
except Exception as e:
|
|
logger.error(f'Failed to read legacy inventories.yaml: {e}', exc_info=e)
|
|
|
|
if not legacy_inventories:
|
|
legacy_inventories = _legacy_inventories_from_db()
|
|
if legacy_inventories:
|
|
source = 'db'
|
|
|
|
if not legacy_inventories:
|
|
return False
|
|
|
|
logger.info(f'Migrating {len(legacy_inventories)} legacy inventories from {source}')
|
|
used_slugs = set()
|
|
for index, legacy in enumerate(legacy_inventories):
|
|
entity = _convert_inventory(legacy, fallback_name=f'Inventory {index + 1}')
|
|
# Dedupe against a stable base slug with an incrementing suffix (food, food-2, food-3, ...); reassigning
|
|
# `slug` in the loop would grow the string unboundedly and could collide with an existing config.
|
|
base_slug = slugify(entity['name'])
|
|
slug = base_slug
|
|
suffix = 2
|
|
while slug in used_slugs:
|
|
slug = f'{base_slug}-{suffix}'
|
|
suffix += 1
|
|
used_slugs.add(slug)
|
|
entity['slug'] = slug
|
|
try:
|
|
config.create(slug, entity)
|
|
except Exception as e:
|
|
logger.error(f'Failed to migrate inventory {entity["name"]}: {e}', exc_info=e)
|
|
|
|
# Back up and retire the legacy file so it is not migrated again.
|
|
if legacy_file.is_file():
|
|
try:
|
|
backup_dir = legacy_file.parent / 'backup'
|
|
backup_dir.mkdir(parents=True, exist_ok=True)
|
|
date_str = now().strftime('%Y%m%d')
|
|
shutil.copy(legacy_file, backup_dir / f'inventories-{date_str}.yaml')
|
|
legacy_file.rename(legacy_file.with_suffix('.yaml.migrated'))
|
|
except Exception as e:
|
|
logger.error(f'Failed to retire legacy inventories.yaml: {e}', exc_info=e)
|
|
|
|
return True
|