Restart alembic versions with the table creation

mcpgateway/alembic/env.py

@@ -57,10 +57,6 @@
 from mcpgateway.config import settings
 from mcpgateway.db import Base
 
-# from mcpgateway.db import get_metadata
-# target_metadata = get_metadata()
-
-
 # Create config object - this is the standard way in Alembic
 config = getattr(context, "config", None) or Config()
 
@@ -111,18 +107,9 @@ def _inside_alembic() -> bool:
         disable_existing_loggers=False,
     )
 
-# First-Party
-# add your model's MetaData object here
-# for 'autogenerate' support
-# from myapp import mymodel
 
 target_metadata = Base.metadata
 
-# other values from the config, defined by the needs of env.py,
-# can be acquired:
-# my_important_option = config.get_main_option("my_important_option")
-# ... etc.
-
 config.set_main_option(
     "sqlalchemy.url",
     settings.database_url,

mcpgateway/bootstrap_db.py

@@ -59,8 +59,8 @@ async def main() -> None:
 
         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")
+            Base.metadata.create_all(bind=conn)
         else:
             command.upgrade(cfg, "head")
 

mcpgateway/main.py

@@ -147,15 +147,6 @@
 # Wait for database to be ready before creating tables
 wait_for_db_ready(max_tries=int(settings.db_max_retries), interval=int(settings.db_retry_interval_ms) / 1000, sync=True)  # Converting ms to s
 
-# Create database tables
-try:
-    loop = asyncio.get_running_loop()
-except RuntimeError:
-    asyncio.run(bootstrap_db())
-else:
-    loop.create_task(bootstrap_db())
-
-
 # Initialize services
 tool_service = ToolService()
 resource_service = ResourceService()
@@ -209,6 +200,7 @@ async def lifespan(_app: FastAPI) -> AsyncIterator[None]:
     """
     logger.info("Starting MCP Gateway services")
     try:
+        await bootstrap_db()
         await tool_service.initialize()
         await resource_service.initialize()
         await prompt_service.initialize()