Fix alembic_version creation (#477)

* Add script_location for alembic in Makefile
Signed-off-by: Madhav Kandukuri <[email protected]>

* Fix alembic_version creation
Signed-off-by: Madhav Kandukuri <[email protected]>

* Ruff fixes
Signed-off-by: Madhav Kandukuri <[email protected]>

* Fix doctest
Signed-off-by: Madhav Kandukuri <[email protected]>

Author: madhav165

Makefile

@@ -2337,24 +2337,24 @@ alembic-install:
 
 db-new:
 	@echo "➜ Generating revision: $(MSG)"
-	$(ALEMBIC) revision --autogenerate -m $(MSG)
+	$(ALEMBIC) -c mcpgateway/alembic.ini revision --autogenerate -m $(MSG)
 
 db-up:
 	@echo "➜ Upgrading database to head ..."
-	$(ALEMBIC) upgrade head
+	$(ALEMBIC) -c mcpgateway/alembic.ini upgrade head
 
 db-down:
 	@echo "➜ Downgrading database → $(REV) ..."
-	$(ALEMBIC) downgrade $(REV)
+	$(ALEMBIC) -c mcpgateway/alembic.ini downgrade $(REV)
 
 db-current:
-	$(ALEMBIC) current
+	$(ALEMBIC) -c mcpgateway/alembic.ini current
 
 db-history:
-	$(ALEMBIC) history --verbose
+	$(ALEMBIC) -c mcpgateway/alembic.ini history --verbose
 
 db-revision-id:
-	@$(ALEMBIC) current --verbose | awk '/Current revision/ {print $$3}'
+	@$(ALEMBIC) -c mcpgateway/alembic.ini current --verbose | awk '/Current revision/ {print $$3}'
 
 
 # =============================================================================

mcpgateway/alembic/env.py

@@ -40,6 +40,7 @@
     This file is automatically executed by Alembic and should not be
     imported or run directly by application code.
 """
+
 # Standard
 from importlib.resources import files
 from logging.config import fileConfig
@@ -61,7 +62,12 @@
 
 
 # Create config object - this is the standard way in Alembic
-config = Config()
+config = getattr(context, "config", None) or Config()
+
+def _inside_alembic() -> bool:
+    """Return True only when this file is running under Alembic CLI."""
+    return getattr(context, "_proxy", None) is not None
+
 config.set_main_option("script_location", str(files("mcpgateway").joinpath("alembic")))
 
 # Interpret the config file for Python logging.
@@ -121,22 +127,27 @@ def run_migrations_online() -> None:
     and associate a connection with the context.
 
     """
-    connectable = engine_from_config(
-        config.get_section(config.config_ini_section, {}),
-        prefix="sqlalchemy.",
-        poolclass=pool.NullPool,
-    )
-
-    with connectable.connect() as connection:
+    connection = config.attributes.get("connection")
+    if connection is None:
+        connectable = engine_from_config(
+            config.get_section(config.config_ini_section, {}),
+            prefix="sqlalchemy.",
+            poolclass=pool.NullPool,
+        )
+
+        with connectable.connect() as connection:
+            context.configure(connection=connection, target_metadata=target_metadata)
+
+            with context.begin_transaction():
+                context.run_migrations()
+    else:
         context.configure(connection=connection, target_metadata=target_metadata)
 
         with context.begin_transaction():
             context.run_migrations()
 
-
-# Only run migrations if executed as a script (not on import)
-if __name__ == "__main__":
+if _inside_alembic():
     if context.is_offline_mode():
         run_migrations_offline()
     else:
-        run_migrations_online()
+        run_migrations_online()

mcpgateway/bootstrap_db.py

@@ -49,17 +49,21 @@ async def main() -> None:
     engine = create_engine(settings.database_url)
     ini_path = files("mcpgateway").joinpath("alembic.ini")
     cfg = Config(str(ini_path))  # path in container
-    cfg.attributes["configure_logger"] = False
+    cfg.attributes["configure_logger"] = True
 
-    command.ensure_version(cfg)
+    with engine.begin() as conn:
+        cfg.attributes["connection"] = conn
+        cfg.set_main_option("sqlalchemy.url", settings.database_url)
+
+        insp = inspect(conn)
+
+        if "gateways" not in insp.get_table_names():
+            logger.info("Empty DB detected - creating baseline schema")
+            Base.metadata.create_all(bind=conn)
+            command.stamp(cfg, "head")
+        else:
+            command.upgrade(cfg, "head")
 
-    insp = inspect(engine)
-    if "gateways" not in insp.get_table_names():
-        logger.info("Empty DB detected - creating baseline schema")
-        Base.metadata.create_all(engine)
-        command.stamp(cfg, "head")  # record baseline
-    else:
-        command.upgrade(cfg, "head")  # apply any new revisions
     logger.info("Database ready")
 
 

pyproject.toml

@@ -272,6 +272,7 @@ import_heading_localfolder = "Local"        # header for ad-hoc scripts / tests
 ###############################################################################
 known_first_party          = ["mcpgateway"]    # treat "mcpgateway.*" as FIRSTPARTY
 known_local_folder         = ["tests", "scripts"]  # treat these folders as LOCALFOLDER
+known_third_party          = ["alembic"] # treat "alembic" as THIRDPARTY
 # src_paths                = ["src/mcpgateway"]    # uncomment only if package moves under src/
 
 ###############################################################################

tests/playwright/conftest.py

@@ -3,6 +3,7 @@
 Playwright test configuration - Simple version without python-dotenv.
 This assumes environment variables are loaded by the Makefile.
 """
+
 # Standard
 import base64
 import os