Make migrations for both tasks and OSM DB

Author: jeffmaki

alembic.ini

@@ -1,5 +1,9 @@
-[alembic]
-script_location = alembic
+[task]
+script_location = alembic_task
+sqlalchemy.url = postgresql+asyncpg://postgres:postgres@localhost:5432/tasking_manager
+
+[osm]
+script_location = alembic_osm
 sqlalchemy.url = postgresql+asyncpg://postgres:postgres@localhost:5432/tasking_manager
 
 [loggers]

alembic/versions/9221408912dd_add_user_role_table.py

@@ -0,0 +1,91 @@
+import asyncio
+import importlib
+import os
+import sys
+from logging.config import fileConfig
+from pathlib import Path
+
+# Add the project root directory to the Python path
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
+
+from sqlalchemy import pool
+from sqlalchemy.engine import Connection
+from sqlalchemy.ext.asyncio import async_engine_from_config
+
+from alembic import context
+from api.core.config import settings
+from api.core.database import Base
+
+# Automatically import all models
+src_path = Path(__file__).parent.parent / "api" / "src"
+for path in src_path.rglob("*.py"):
+    if path.name != "__init__.py":
+        module_path = str(path.relative_to(Path(__file__).parent.parent)).replace(
+            os.sep, "."
+        )[:-3]
+        try:
+            importlib.import_module(module_path)
+        except Exception as e:
+            print(f"Failed to import {module_path}: {e}")
+
+# this is the Alembic Config object
+config = context.config
+
+# Interpret the config file for Python logging
+if config.config_file_name is not None:
+    fileConfig(config.config_file_name)
+
+# Set sqlalchemy.url from settings
+config.set_main_option("sqlalchemy.url", settings.OSM_DATABASE_URL)
+
+# Add your model's MetaData object here for 'autogenerate' support
+target_metadata = Base.metadata
+
+
+def run_migrations_offline() -> None:
+    """Run migrations in 'offline' mode."""
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(
+        url=url,
+        target_metadata=target_metadata,
+        literal_binds=True,
+        dialect_opts={"paramstyle": "named"},
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def do_run_migrations(connection: Connection) -> None:
+    context.configure(connection=connection, target_metadata=target_metadata)
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+async def run_async_migrations() -> None:
+    """In this scenario we need to create an Engine
+    and associate a connection with the context."""
+
+    connectable = async_engine_from_config(
+        config.get_section(config.config_ini_section, {}),
+        prefix="sqlalchemy.",
+        poolclass=pool.NullPool,
+    )
+
+    async with connectable.connect() as connection:
+        await connection.run_sync(do_run_migrations)
+
+    await connectable.dispose()
+
+
+def run_migrations_online() -> None:
+    """Run migrations in 'online' mode."""
+
+    asyncio.run(run_async_migrations())
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()

alembic_osm/env.py

@@ -0,0 +1,72 @@
+"""add user role table
+
+Revision ID: 9221408912dd
+Revises:
+Create Date: 2026-01-29 14:54:10.669000
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+from sqlalchemy import inspect, text
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '9221408912dd'
+down_revision: Union[str, None] = None
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    bind = op.get_bind()
+    insp = inspect(bind)
+
+    # Add unique constraint on users.auth_uid (if not already present)
+    constraint_exists = bind.execute(
+        text("SELECT 1 FROM pg_constraint WHERE conname = 'auth_uid_unique'")
+    ).scalar()
+    if not constraint_exists:
+        op.create_unique_constraint('auth_uid_unique', 'users', ['auth_uid'])
+
+    # Create the workspace_role enum type (if not already present)
+    result = bind.execute(
+        text("SELECT 1 FROM pg_type WHERE typname = 'workspace_role'")
+    )
+    if not result.scalar():
+        workspace_role = sa.Enum('lead', 'validator', 'contributor', name='workspace_role')
+        workspace_role.create(bind)
+
+    # Create the user_workspace_roles table (if not already present)
+    if not insp.has_table('user_workspace_roles'):
+        op.create_table(
+            'user_workspace_roles',
+            sa.Column('user_auth_uid', sa.Uuid(), nullable=False),
+            sa.Column('workspace_id', sa.BigInteger(), nullable=False),
+            sa.Column('role', sa.Enum('lead', 'validator', 'contributor', name='workspace_role', create_type=False), nullable=False),
+            sa.ForeignKeyConstraint(['user_auth_uid'], ['users.auth_uid']),
+            sa.PrimaryKeyConstraint('user_auth_uid', 'workspace_id')
+        )
+
+
+def downgrade() -> None:
+    bind = op.get_bind()
+    insp = inspect(bind)
+
+    if insp.has_table('user_workspace_roles'):
+        op.drop_table('user_workspace_roles')
+
+    # Drop the enum type
+    result = bind.execute(
+        text("SELECT 1 FROM pg_type WHERE typname = 'workspace_role'")
+    )
+    if result.scalar():
+        workspace_role = sa.Enum('lead', 'validator', 'contributor', name='workspace_role')
+        workspace_role.drop(bind)
+
+    constraint_exists = bind.execute(
+        text("SELECT 1 FROM pg_constraint WHERE conname = 'auth_uid_unique'")
+    ).scalar()
+    if constraint_exists:
+        op.drop_constraint('auth_uid_unique', 'users', type_='unique')

alembic/script.py.mako alembic_osm/script.py.makoalembic/script.py.mako renamed to alembic_osm/script.py.mako

@@ -35,7 +35,7 @@
 if config.config_file_name is not None:
     fileConfig(config.config_file_name)
 
-# Set sqlalchemy.url
+# Set sqlalchemy.url from settings
 config.set_main_option("sqlalchemy.url", settings.TASK_DATABASE_URL)
 
 # Add your model's MetaData object here for 'autogenerate' support

alembic_osm/versions/9221408912dd_add_user_role_table.py

@@ -0,0 +1,26 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision: str = ${repr(up_revision)}
+down_revision: Union[str, None] = ${repr(down_revision)}
+branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
+depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
+
+
+def upgrade() -> None:
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade() -> None:
+    ${downgrades if downgrades else "pass"}

alembic/env.py alembic_task/env.pyalembic/env.py renamed to alembic_task/env.py

@@ -15,17 +15,18 @@ def run_migrations():
         current_dir = os.path.dirname(os.path.abspath(__file__))
         sys.path.insert(0, current_dir)
 
-        # Use sys.executable to run the Alembic module
-        result = subprocess.run(
-            [sys.executable, "-m", "alembic", "upgrade", "head"],
-            capture_output=True,
-            text=True,
-            check=True,
-        )
+        # Run migrations for each database
+        for db_name in ("task", "osm"):
+            print(f"Running migrations for '{db_name}' database...")
+            result = subprocess.run(
+                [sys.executable, "-m", "alembic", "-n", db_name, "upgrade", "head"],
+                capture_output=True,
+                text=True,
+                check=True,
+            )
 
-        # Print the output if there's any
-        if result.stdout:
-            print("Migration output:", result.stdout)
+            if result.stdout:
+                print(f"Migration output ({db_name}):", result.stdout)
 
         print("Migrations completed successfully!")