Update Alembic configuration and migration scripts: change script location and version path in alembic.ini, add env.py for migration management, create initial migration script for audiobooks table, and implement migration execution in a new migrate.py script.

alembic.ini

@@ -1,9 +1,9 @@
 [alembic]
 # path to migration scripts
-script_location = migrations
+script_location = alembic
 
 # template used to generate migration files
-file_template = %%(year)d%%(month).2d%%(day).2d_%%(hour).2d%%(minute).2d%%(second).2d_%%(slug)s
+file_template = %%(year)d%%(month).2d%%(day).2d_%%(hour).2d%%(minute).2d_%%(rev)s_%%(slug)s
 
 # timezone to use when rendering the date
 # within the migration file as well as the filename.
@@ -24,16 +24,27 @@ revision_environment = false
 # versions/ directory
 sourceless = false
 
-# version location specification; this defaults
-# to migrations/versions.  When using multiple version
-# directories, initial revisions must be specified with --version-path
-version_locations = %(here)s/migrations/versions
+# version location specification; This defaults
+# to alembic/versions.  When using multiple version
+# directories, initial revisions must be specified with --version-path.
+# The path separator used here should be the separator specified by "version_path_separator" below.
+version_locations = %(here)s/alembic/versions
+
+# version path separator; As mentioned above, this is the character used to split
+# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
+# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas.
+# Valid values for version_path_separator are:
+#
+# version_path_separator = :
+# version_path_separator = ;
+# version_path_separator = space
+version_path_separator = os
 
 # the output encoding used when revision files
 # are written from script.py.mako
 output_encoding = utf-8
 
-sqlalchemy.url = driver://user:pass@localhost/dbname
+sqlalchemy.url = sqlite:///app/storage/database.db
 
 [post_write_hooks]
 # post_write_hooks defines scripts or Python functions that are run

alembic/env.py

@@ -0,0 +1,82 @@
+from logging.config import fileConfig
+
+from sqlalchemy import engine_from_config
+from sqlalchemy import pool
+
+from alembic import context
+
+from app.models import Base
+from app.config import get_settings
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+if config.config_file_name is not None:
+    fileConfig(config.config_file_name)
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+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.
+
+def run_migrations_offline() -> None:
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+    settings = get_settings()
+    url = settings.DATABASE_URL
+    context.configure(
+        url=url,
+        target_metadata=target_metadata,
+        literal_binds=True,
+        dialect_opts={"paramstyle": "named"},
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online() -> None:
+    """Run migrations in 'online' mode.
+
+    In this scenario we need to create an Engine
+    and associate a connection with the context.
+
+    """
+    settings = get_settings()
+    configuration = config.get_section(config.config_ini_section)
+    configuration["sqlalchemy.url"] = settings.DATABASE_URL
+    connectable = engine_from_config(
+        configuration,
+        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()
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online() 

alembic/script.py.mako

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

alembic/versions/001_initial_migration.py

@@ -0,0 +1,35 @@
+"""Initial migration
+
+Revision ID: 001
+Revises: 
+Create Date: 2024-03-27
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '001'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.create_table(
+        'audiobooks',
+        sa.Column('id', sa.String(36), primary_key=True),
+        sa.Column('title', sa.String(255), nullable=False),
+        sa.Column('author', sa.String(255), nullable=False),
+        sa.Column('voice_id', sa.String(50), nullable=False),
+        sa.Column('status', sa.String(20), nullable=False),
+        sa.Column('text_file_path', sa.String(255), nullable=True),
+        sa.Column('audio_file_path', sa.String(255), nullable=True),
+        sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
+        sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), onupdate=sa.text('CURRENT_TIMESTAMP'), nullable=False),
+    )
+
+
+def downgrade() -> None:
+    op.drop_table('audiobooks') 

app/db.py

@@ -1,39 +1,29 @@
 """Database connection and session management."""
 import os
 from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker, Session
-from contextlib import contextmanager
+from sqlalchemy.orm import sessionmaker
 from app.models.database import Base
 
 # Get database URL from environment or use SQLite as default
-DATABASE_URL = os.environ.get(
+DATABASE_URL = os.getenv(
     "DATABASE_URL",
-    "sqlite:///app/audiobooks.db"
+    "sqlite:///app/storage/audiobooks.db"
 )
 
 # Create engine
-engine = create_engine(
-    DATABASE_URL,
-    echo=False,  # Set to True for SQL logging
-    pool_pre_ping=True,  # Enable connection health checks
-)
+engine = create_engine(DATABASE_URL)
 
 # Create session factory
-SessionLocal = sessionmaker(
-    bind=engine,
-    autocommit=False,
-    autoflush=False,
-)
+SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
+
+def init_db():
+    """Initialize the database, creating all tables."""
+    Base.metadata.create_all(bind=engine)
 
-@contextmanager
-def get_db() -> Session:
-    """Get database session."""
+def get_db():
+    """Get a database session."""
     db = SessionLocal()
     try:
         yield db
     finally:
-        db.close()
-
-def init_db():
-    """Initialize database."""
-    Base.metadata.create_all(bind=engine) 
+        db.close() 

scripts/migrate.py

@@ -0,0 +1,38 @@
+import os
+import sys
+import logging
+from alembic.config import Config
+from alembic import command
+
+# Configure logging
+logging.basicConfig(
+    level=logging.INFO,
+    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s'
+)
+logger = logging.getLogger(__name__)
+
+def run_migrations():
+    """Run database migrations using Alembic."""
+    try:
+        # Get the directory containing this script
+        current_dir = os.path.dirname(os.path.abspath(__file__))
+        # Get the project root directory (one level up)
+        project_root = os.path.dirname(current_dir)
+        
+        # Create Alembic configuration
+        alembic_cfg = Config(os.path.join(project_root, "alembic.ini"))
+        
+        # Set the script location
+        alembic_cfg.set_main_option("script_location", os.path.join(project_root, "alembic"))
+        
+        # Run the migration
+        logger.info("Starting database migration...")
+        command.upgrade(alembic_cfg, "head")
+        logger.info("Database migration completed successfully.")
+        
+    except Exception as e:
+        logger.error(f"Error during database migration: {str(e)}")
+        sys.exit(1)
+
+if __name__ == "__main__":
+    run_migrations() 

scripts/run.sh

@@ -50,10 +50,7 @@ fi
 
 # Run database migrations
 echo "Running database migrations..."
-PYTHONPATH="/app:/app/app:${PYTHONPATH:-}" alembic upgrade head || {
-    echo "Warning: Database migration failed. This might be expected for first run."
-    echo "Continuing with application startup..."
-}
+python scripts/migrate.py
 
 echo "Starting CSM-1B TTS API server..."
 echo "Host: $HOST"