From 415fe7eba955508840afd5dadcce84825e4493b7 Mon Sep 17 00:00:00 2001 From: Bryan Van Deusen Date: Tue, 17 Mar 2026 21:12:06 -0400 Subject: [PATCH] feat: add migration runner and wire into create_app Co-Authored-By: Claude Sonnet 4.6 --- fablednetmon/app.py | 16 +++++++- fablednetmon/core/migration_runner.py | 54 +++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 fablednetmon/core/migration_runner.py diff --git a/fablednetmon/app.py b/fablednetmon/app.py index ce865af..feeeab5 100644 --- a/fablednetmon/app.py +++ b/fablednetmon/app.py @@ -35,11 +35,20 @@ def create_app( from unittest.mock import MagicMock app.db_sessionmaker = MagicMock() + # Run migrations (core + plugin) synchronously before event loop starts + if not testing: + from .core.migration_runner import run_migrations, get_plugin_migration_dirs + _plugin_dir = Path(app.config["PLUGIN_DIR"]) + _plugin_migration_dirs = get_plugin_migration_dirs( + _plugin_dir, app.config["PLUGINS"] + ) + run_migrations(app.config["DATABASE_URL"], _plugin_migration_dirs) + # Alert pipeline from .core.alerts import init_alerts init_alerts(app) - # Register blueprints + # Register core blueprints from .auth.routes import auth_bp from .dashboard.routes import dashboard_bp from .hosts.routes import hosts_bp @@ -58,6 +67,11 @@ def create_app( if not testing: _register_core_tasks(app, cfg) + # Load plugins + if not testing: + from .core.plugin_manager import load_plugins + load_plugins(app) + # Health check @app.get("/health") async def health(): diff --git a/fablednetmon/core/migration_runner.py b/fablednetmon/core/migration_runner.py new file mode 100644 index 0000000..7239239 --- /dev/null +++ b/fablednetmon/core/migration_runner.py @@ -0,0 +1,54 @@ +from __future__ import annotations +import logging +from pathlib import Path + +logger = logging.getLogger(__name__) + + +def run_migrations(db_url: str, plugin_migration_dirs: list[Path] | None = None) -> None: + """Run core + plugin Alembic migrations synchronously. + + Called during create_app() before the event loop starts. + Applies all pending migrations in dependency order. + Plugin migration dirs are included via Alembic's version_locations. + """ + from alembic import command + from alembic.config import Config + + core_migrations = Path(__file__).parent.parent / "migrations" + core_versions = core_migrations / "versions" + + cfg = Config() + cfg.set_main_option("script_location", str(core_migrations)) + cfg.set_main_option("sqlalchemy.url", db_url) + + # Build version_locations: core + any plugin version directories + version_locs = [str(core_versions)] + for plugin_dir in (plugin_migration_dirs or []): + pv = plugin_dir / "versions" + if pv.exists(): + version_locs.append(str(pv)) + + if len(version_locs) > 1: + cfg.set_main_option("version_locations", " ".join(version_locs)) + + logger.info("Running migrations (version_locations: %s)", " ".join(version_locs)) + command.upgrade(cfg, "heads") + logger.info("Migrations complete") + + +def get_plugin_migration_dirs(plugin_dir: Path, plugins_cfg: dict) -> list[Path]: + """Return migration directories for all enabled plugins that have one. + + Does not import any Python code — filesystem scan only. + Used to collect migration dirs before importing plugins, so migrations + can run before plugin Python code is loaded. + """ + dirs = [] + for name, cfg in plugins_cfg.items(): + if not cfg.get("enabled", False): + continue + mdir = plugin_dir / name / "migrations" + if mdir.exists(): + dirs.append(mdir) + return dirs