Enhance Dockerfile and application structure: set PYTHONPATH in Dockerfile and run script, add __init__.py to app package, and improve model import error handling in migrations/env.py.

Dockerfile

@@ -5,7 +5,8 @@ FROM python:3.10-slim
 ENV PYTHONUNBUFFERED=1 \
     PYTHONDONTWRITEBYTECODE=1 \
     PIP_NO_CACHE_DIR=1 \
-    PIP_DISABLE_PIP_VERSION_CHECK=1
+    PIP_DISABLE_PIP_VERSION_CHECK=1 \
+    PYTHONPATH=/app
 
 # Create and set working directory
 WORKDIR /app

app/__init__.py

@@ -0,0 +1 @@
+"""App package.""" 

migrations/env.py

@@ -14,13 +14,16 @@ if app_dir not in sys.path:
 
 # Import your models here
 try:
-    from app.models import Base
-    from app.models.models import Audiobook, TextChunk  # Import models to register them
+    from app.models import Base, Audiobook, TextChunk, AudiobookStatus
 except ImportError as e:
-    raise Exception(
-        f"Failed to import models. PYTHONPATH: {os.environ.get('PYTHONPATH')}, "
-        f"sys.path: {sys.path}, Error: {str(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)}"
+        )
 
 # this is the Alembic Config object
 config = context.config

scripts/run.sh

@@ -8,6 +8,9 @@ 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:-}"
+
 # Create storage directories if they don't exist
 mkdir -p /app/storage/audio
 mkdir -p /app/storage/text
@@ -47,7 +50,7 @@ fi
 
 # Run database migrations
 echo "Running database migrations..."
-alembic upgrade head || {
+PYTHONPATH="/app:${PYTHONPATH:-}" alembic upgrade head || {
     echo "Warning: Database migration failed. This might be expected for first run."
     echo "Continuing with application startup..."
 }