Update Dockerfile and application imports: modify PYTHONPATH in Dockerfile and run script to include additional app directory, enhance model imports in audiobook_routes.py and migrations/env.py, and add missing imports in main.py.

Dockerfile

@@ -6,7 +6,7 @@ ENV PYTHONUNBUFFERED=1 \
     PYTHONDONTWRITEBYTECODE=1 \
     PIP_NO_CACHE_DIR=1 \
     PIP_DISABLE_PIP_VERSION_CHECK=1 \
-    PYTHONPATH=/app
+    PYTHONPATH=/app:/app/app
 
 # Create and set working directory
 WORKDIR /app

app/api/audiobook_routes.py

@@ -3,13 +3,15 @@ Audiobook creation routes for the CSM-1B TTS API.
 """
 import os
 import uuid
+import json
+import shutil
 import logging
 from datetime import datetime
 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
+from app.app.models.database import Audiobook, AudiobookStatus, AudiobookChunk, TextChunk
 from app.services.storage import storage
 from app.db import get_db
 import torchaudio

app/main.py

@@ -18,6 +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.app.models.database import Base, get_db
 
 # Setup logging
 os.makedirs("logs", exist_ok=True)

migrations/env.py

@@ -14,16 +14,12 @@ if app_dir not in sys.path:
 
 # Import your models here
 try:
-    from app.models import Base, Audiobook, TextChunk, AudiobookStatus
+    from app.app.models.database import Base, Audiobook, TextChunk, AudiobookStatus
 except ImportError as e:
-    # Try alternate import path
-    try:
-        from app.app.models import Base, Audiobook, TextChunk, AudiobookStatus
-    except ImportError as e2:
-        raise Exception(
-            f"Failed to import models. PYTHONPATH: {os.environ.get('PYTHONPATH')}, "
-            f"sys.path: {sys.path}, Error: {str(e)}, Secondary error: {str(e2)}"
-        )
+    raise Exception(
+        f"Failed to import models. PYTHONPATH: {os.environ.get('PYTHONPATH')}, "
+        f"sys.path: {sys.path}, Error: {str(e)}"
+    )
 
 # this is the Alembic Config object
 config = context.config

scripts/run.sh

@@ -8,8 +8,8 @@ export WORKERS=${WORKERS:-1}
 export LOG_LEVEL=${LOG_LEVEL:-"info"}
 export DATABASE_URL=${DATABASE_URL:-"sqlite:///app/storage/audiobooks.db"}
 
-# Set Python path to include the app directory
-export PYTHONPATH="/app:${PYTHONPATH:-}"
+# Set Python path to include both app directories
+export PYTHONPATH="/app:/app/app:${PYTHONPATH:-}"
 
 # Create storage directories if they don't exist
 mkdir -p /app/storage/audio
@@ -50,7 +50,7 @@ fi
 
 # Run database migrations
 echo "Running database migrations..."
-PYTHONPATH="/app:${PYTHONPATH:-}" alembic upgrade head || {
+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..."
 }