Refactor imports across application files: update model import paths from 'app.models' to 'app.model' for consistency and clarity, ensuring correct module references throughout the codebase.

Dockerfile

@@ -34,7 +34,7 @@ COPY . .
 # Debug: Show destination directory structure
 RUN echo "Contents of /app:" && ls -la /app && \
     echo "\nContents of /app/app:" && ls -la /app/app && \
-    echo "\nContents of /app/app/models:" && ls -la app/app/models
+    echo "\nContents of /app/app/model:" && ls -la app/app/model
 
 # Set up permissions
 RUN chmod +x /app/scripts/run.sh && \

alembic/env.py

@@ -5,7 +5,7 @@ from sqlalchemy import pool
 
 from alembic import context
 
-from app.models.database import Base
+from app.model.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.model.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.model.database import Base
 
 # Get database URL from environment or use SQLite as default
 DATABASE_URL = os.getenv(

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.model.database import Base, get_db
 
 # Setup logging
 os.makedirs("logs", exist_ok=True)

app/model/__init__.py

@@ -0,0 +1,10 @@
+"""Models package initialization."""
+from app.model.database import Base, Audiobook, AudiobookChunk, TextChunk, AudiobookStatus
+
+__all__ = [
+    'Base',
+    'Audiobook',
+    'AudiobookChunk',
+    'TextChunk',
+    'AudiobookStatus'
+] 

app/model/database.py

@@ -0,0 +1,80 @@
+"""Database models and configuration."""
+import os
+from datetime import datetime
+from enum import Enum
+from sqlalchemy import create_engine, Column, Integer, String, Text, DateTime, ForeignKey, Enum as SQLEnum
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import sessionmaker, relationship
+
+# Get database URL from environment or use SQLite as default
+DATABASE_URL = os.getenv("DATABASE_URL", "sqlite:///app/storage/audiobooks.db")
+
+# Create engine
+engine = create_engine(DATABASE_URL)
+
+# Create session factory
+SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
+
+# Create declarative base
+Base = declarative_base()
+
+class AudiobookStatus(str, Enum):
+    """Status of an audiobook."""
+    PENDING = "pending"
+    PROCESSING = "processing"
+    COMPLETED = "completed"
+    FAILED = "failed"
+
+class Audiobook(Base):
+    """Audiobook model."""
+    __tablename__ = "audiobooks"
+
+    id = Column(String, primary_key=True)
+    title = Column(String, nullable=False)
+    author = Column(String, nullable=False)
+    voice_id = Column(String(50), nullable=False)
+    status = Column(SQLEnum(AudiobookStatus), nullable=False, default=AudiobookStatus.PENDING)
+    text_file_path = Column(String)
+    text_content = Column(Text)
+    audio_file_path = Column(String)
+    error_message = Column(Text)
+    created_at = Column(DateTime, default=datetime.utcnow)
+    updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
+
+    # Relationships
+    chunks = relationship("AudiobookChunk", back_populates="audiobook")
+
+class AudiobookChunk(Base):
+    """Model for audiobook chunks for large books."""
+    __tablename__ = "audiobook_chunks"
+
+    id = Column(Integer, primary_key=True)
+    audiobook_id = Column(String, ForeignKey("audiobooks.id"))
+    chunk_number = Column(Integer, nullable=False)
+    text_content = Column(Text, nullable=False)
+    audio_file_path = Column(String)
+    status = Column(SQLEnum(AudiobookStatus), nullable=False, default=AudiobookStatus.PENDING)
+    created_at = Column(DateTime, default=datetime.utcnow)
+    updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
+
+    # Relationships
+    audiobook = relationship("Audiobook", back_populates="chunks")
+
+class TextChunk(Base):
+    """Model for text chunks."""
+    __tablename__ = "text_chunks"
+
+    id = Column(Integer, primary_key=True)
+    audiobook_id = Column(String, ForeignKey("audiobooks.id"))
+    chunk_number = Column(Integer, nullable=False)
+    text_content = Column(Text, nullable=False)
+    created_at = Column(DateTime, default=datetime.utcnow)
+
+# Dependency to get database session
+def get_db():
+    """Get database session."""
+    db = SessionLocal()
+    try:
+        yield db
+    finally:
+        db.close() 

scripts/migrate.py

@@ -26,8 +26,8 @@ logger.info(f"Checking existence of {models_db_path}: {os.path.exists(models_db_
 
 try:
     # Direct import, assuming PYTHONPATH is correct
-    from app.models.database import Base
-    logger.info("Successfully imported Base from app.models.database")
+    from app.model.database import Base
+    logger.info("Successfully imported Base from app.model.database")
 except ImportError as e:
     logger.error(f"Error importing Base: {e}")
     # Log directory contents for deeper debugging