Refactor application structure: rename 'models' directory to 'db_models', update import paths across multiple files, and enhance Dockerfile to create and populate the new directory, improving organization and clarity in the codebase.

Dockerfile

@@ -23,7 +23,7 @@ RUN useradd -m -u 1000 app
 RUN mkdir -p /app/storage/audio \
     /app/storage/text \
     /app/storage/temp \
-    /app/app/models \
+    /app/app/db_models \
     && chown -R app:app /app
 
 # Copy requirements first to leverage Docker cache
@@ -33,11 +33,11 @@ RUN pip install --no-cache-dir -r requirements.txt
 # Copy the entire application code
 COPY --chown=app:app . .
 
-# Create and populate the models directory
-RUN mkdir -p /app/app/models && \
-    echo '"""Database models and configuration."""\nfrom sqlalchemy.ext.declarative import declarative_base\nBase = declarative_base()' > /app/app/models/__init__.py && \
-    echo '"""Database models."""\nfrom datetime import datetime\nfrom sqlalchemy import Column, Integer, String, DateTime, Float, Text, JSON, Boolean\nfrom sqlalchemy.ext.declarative import declarative_base\n\nBase = declarative_base()\n\nclass Audiobook(Base):\n    """Model for storing audiobook information."""\n    __tablename__ = "audiobooks"\n\n    id = Column(String(36), primary_key=True)\n    title = Column(String(255), nullable=False)\n    author = Column(String(255))\n    voice_id = Column(String(50), nullable=False)\n    status = Column(String(20), nullable=False, default="pending")\n    created_at = Column(DateTime, nullable=False, default=datetime.utcnow)\n    updated_at = Column(DateTime, nullable=False, default=datetime.utcnow, onupdate=datetime.utcnow)\n    duration = Column(Float)\n    file_path = Column(String(255))\n    error = Column(Text)\n    metadata = Column(JSON)\n\nclass Voice(Base):\n    """Model for storing voice information."""\n    __tablename__ = "voices"\n\n    id = Column(String(36), primary_key=True)\n    name = Column(String(255), nullable=False)\n    type = Column(String(50), nullable=False)\n    speaker_id = Column(Integer)\n    created_at = Column(DateTime, nullable=False, default=datetime.utcnow)\n    is_active = Column(Boolean, default=True)\n    metadata = Column(JSON)\n\nclass AudioCache(Base):\n    """Model for caching generated audio."""\n    __tablename__ = "audio_cache"\n\n    id = Column(String(36), primary_key=True)\n    hash = Column(String(64), nullable=False, unique=True)\n    format = Column(String(10), nullable=False)\n    created_at = Column(DateTime, nullable=False, default=datetime.utcnow)\n    file_path = Column(String(255), nullable=False)\n    metadata = Column(JSON)' > /app/app/models/database.py && \
-    chown -R app:app /app/app/models
+# Create and populate the db_models directory
+RUN mkdir -p /app/app/db_models && \
+    echo '"""Database models and configuration."""\nfrom sqlalchemy.ext.declarative import declarative_base\nBase = declarative_base()' > /app/app/db_models/__init__.py && \
+    echo '"""Database models."""\nfrom datetime import datetime\nfrom sqlalchemy import Column, Integer, String, DateTime, Float, Text, JSON, Boolean\nfrom sqlalchemy.ext.declarative import declarative_base\n\nBase = declarative_base()\n\nclass Audiobook(Base):\n    """Model for storing audiobook information."""\n    __tablename__ = "audiobooks"\n\n    id = Column(String(36), primary_key=True)\n    title = Column(String(255), nullable=False)\n    author = Column(String(255))\n    voice_id = Column(String(50), nullable=False)\n    status = Column(String(20), nullable=False, default="pending")\n    created_at = Column(DateTime, nullable=False, default=datetime.utcnow)\n    updated_at = Column(DateTime, nullable=False, default=datetime.utcnow, onupdate=datetime.utcnow)\n    duration = Column(Float)\n    file_path = Column(String(255))\n    error = Column(Text)\n    metadata = Column(JSON)\n\nclass Voice(Base):\n    """Model for storing voice information."""\n    __tablename__ = "voices"\n\n    id = Column(String(36), primary_key=True)\n    name = Column(String(255), nullable=False)\n    type = Column(String(50), nullable=False)\n    speaker_id = Column(Integer)\n    created_at = Column(DateTime, nullable=False, default=datetime.utcnow)\n    is_active = Column(Boolean, default=True)\n    metadata = Column(JSON)\n\nclass AudioCache(Base):\n    """Model for caching generated audio."""\n    __tablename__ = "audio_cache"\n\n    id = Column(String(36), primary_key=True)\n    hash = Column(String(64), nullable=False, unique=True)\n    format = Column(String(10), nullable=False)\n    created_at = Column(DateTime, nullable=False, default=datetime.utcnow)\n    file_path = Column(String(255), nullable=False)\n    metadata = Column(JSON)' > /app/app/db_models/database.py && \
+    chown -R app:app /app/app/db_models
 
 # Make scripts executable
 RUN chmod +x /app/scripts/*.sh

alembic/env.py

@@ -5,7 +5,7 @@ from sqlalchemy import pool
 
 from alembic import context
 
-from app.models.database import Base
+from app.db_models.database import Base
 from app.config import get_settings
 
 # this is the Alembic Config object, which provides

app/api/audiobook_routes.py

@@ -11,7 +11,7 @@ from typing import Optional, List
 from fastapi import APIRouter, Request, HTTPException, BackgroundTasks, UploadFile, File, Form, Depends
 from fastapi.responses import FileResponse, JSONResponse
 from sqlalchemy.orm import Session
-from app.models.database import Audiobook, AudiobookStatus, AudiobookChunk, TextChunk
+from app.db_models.database import Audiobook, AudiobookStatus, AudiobookChunk, TextChunk
 from app.services.storage import storage
 from app.db import get_db
 import torchaudio

app/db.py

@@ -2,7 +2,7 @@
 import os
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
-from app.models.database import Base
+from app.db_models.database import Base
 
 # Get database URL from environment or use SQLite as default
 DATABASE_URL = os.getenv(

app/db_models/.gitkeep

@@ -0,0 +1,2 @@
+# This file ensures the models directory is tracked by Git
+# Even if it's empty 

app/db_models/__init__.py

@@ -0,0 +1,61 @@
+"""Models package initialization."""
+from app.db_models.database import Base, Audiobook, AudiobookChunk, TextChunk, AudiobookStatus
+
+__all__ = [
+    'Base',
+    'Audiobook',
+    'AudiobookChunk',
+    'TextChunk',
+    'AudiobookStatus'
+]
+
+"""
+Database configuration and session management.
+"""
+import os
+from sqlalchemy import create_engine
+from sqlalchemy.orm import sessionmaker
+from sqlalchemy.ext.declarative import declarative_base
+
+# Get database URL from environment or use SQLite as default
+DATABASE_URL = os.getenv("DATABASE_URL", "sqlite:///app/storage/audiobooks.db")
+
+# Create engine with connection pool settings
+engine = create_engine(
+    DATABASE_URL,
+    pool_size=5,
+    max_overflow=10,
+    pool_timeout=30,
+    pool_recycle=1800,
+    echo=False  # Set to True for SQL query logging
+)
+
+# Create session factory
+SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
+
+def get_db():
+    """Get database session."""
+    db = SessionLocal()
+    try:
+        yield db
+    finally:
+        db.close()
+
+# Import models to ensure they are registered with SQLAlchemy
+from .database import Base, Audiobook, Voice, AudioCache
+
+# Create all tables
+def init_db():
+    """Initialize database tables."""
+    Base.metadata.create_all(bind=engine)
+
+__all__ = [
+    'Base',
+    'Audiobook',
+    'Voice',
+    'AudioCache',
+    'get_db',
+    'init_db',
+    'engine',
+    'SessionLocal'
+] 

app/db_models/database.py

@@ -0,0 +1,47 @@
+"""
+Database models for the TTS API.
+"""
+from datetime import datetime
+from sqlalchemy import Column, Integer, String, DateTime, Float, Text, JSON, Boolean
+from sqlalchemy.ext.declarative import declarative_base
+
+Base = declarative_base()
+
+class Audiobook(Base):
+    """Model for storing audiobook information."""
+    __tablename__ = 'audiobooks'
+
+    id = Column(String(36), primary_key=True)
+    title = Column(String(255), nullable=False)
+    author = Column(String(255))
+    voice_id = Column(String(50), nullable=False)
+    status = Column(String(20), nullable=False, default='pending')  # pending, processing, completed, failed
+    created_at = Column(DateTime, nullable=False, default=datetime.utcnow)
+    updated_at = Column(DateTime, nullable=False, default=datetime.utcnow, onupdate=datetime.utcnow)
+    duration = Column(Float)  # Duration in seconds
+    file_path = Column(String(255))  # Path to the audio file
+    error = Column(Text)  # Error message if status is 'failed'
+    metadata = Column(JSON)  # Additional metadata
+
+class Voice(Base):
+    """Model for storing voice information."""
+    __tablename__ = 'voices'
+
+    id = Column(String(36), primary_key=True)
+    name = Column(String(255), nullable=False)
+    type = Column(String(50), nullable=False)  # standard, cloned
+    speaker_id = Column(Integer)
+    created_at = Column(DateTime, nullable=False, default=datetime.utcnow)
+    is_active = Column(Boolean, default=True)
+    metadata = Column(JSON)  # Store voice-specific settings and data
+
+class AudioCache(Base):
+    """Model for caching generated audio."""
+    __tablename__ = 'audio_cache'
+
+    id = Column(String(36), primary_key=True)
+    hash = Column(String(64), nullable=False, unique=True)  # Hash of input parameters
+    format = Column(String(10), nullable=False)  # Audio format (mp3, wav, etc.)
+    created_at = Column(DateTime, nullable=False, default=datetime.utcnow)
+    file_path = Column(String(255), nullable=False)
+    metadata = Column(JSON)  # Store generation parameters 

app/main.py

@@ -18,7 +18,7 @@ from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import RedirectResponse, FileResponse
 from fastapi.staticfiles import StaticFiles
 from app.api.routes import router as api_router
-from app.models.database import Base, get_db
+from app.db_models.database import Base, get_db
 
 # Setup logging
 os.makedirs("logs", exist_ok=True)

scripts/migrate.py

@@ -22,7 +22,7 @@ def run_migrations():
         logger.info(f"Python Path (sys.path): {sys.path}")
         
         # Import the database configuration
-        from app.models import init_db
+        from app.db_models import init_db
         
         # Initialize database tables
         init_db()