Refactor Dockerfile and migration scripts: update Dockerfile to use Python slim image, streamline environment variable settings, and enhance permissions handling. Modify migrate.py to improve module path management and error handling, and update run.sh for better directory structure and debugging output.

Dockerfile

@@ -1,14 +1,12 @@
-# Use Python 3.10 as the base image
+# Use Python 3.10 slim image
 FROM python:3.10-slim
 
 # Set environment variables
 ENV PYTHONUNBUFFERED=1 \
     PYTHONDONTWRITEBYTECODE=1 \
-    PIP_NO_CACHE_DIR=1 \
-    PIP_DISABLE_PIP_VERSION_CHECK=1 \
-    PYTHONPATH=/app:/app/app
+    PYTHONPATH="/app:/app/app"
 
-# Create and set working directory
+# Set working directory
 WORKDIR /app
 
 # Install system dependencies
@@ -18,28 +16,29 @@ RUN apt-get update && apt-get install -y \
     ffmpeg \
     && rm -rf /var/lib/apt/lists/*
 
-# Copy requirements file
-COPY requirements.txt .
+# Create app user
+RUN useradd -m -u 1000 app && \
+    chown -R app:app /app
 
-# Install Python dependencies
+# Copy requirements first to leverage Docker cache
+COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
 # Copy application code
 COPY . .
 
-# Create necessary directories and set permissions
+# Create storage directories
 RUN mkdir -p /app/storage/audio /app/storage/text /app/storage/temp && \
-    # Make run script executable before changing ownership
-    chmod +x /app/scripts/run.sh && \
-    # Create app user and set ownership
-    useradd -m -u 1000 app && \
-    chown -R app:app /app
+    chown -R app:app /app/storage
 
 # Switch to app user
 USER app
 
+# Make run script executable
+RUN chmod +x /app/scripts/run.sh
+
 # Expose port
 EXPOSE 7860
 
-# Set the entrypoint
+# Set entrypoint
 ENTRYPOINT ["/app/scripts/run.sh"]

scripts/migrate.py

@@ -5,11 +5,31 @@ import logging
 from alembic.config import Config
 from alembic import command
 
-# Add the project root to the Python path
-project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-sys.path.insert(0, project_root)
+# Add potential module paths to Python path
+possible_paths = [
+    # Docker path
+    "/app",
+    # Local development path
+    os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
+]
 
-from app.models.database import Base
+# Add paths to Python path
+for path in possible_paths:
+    if path not in sys.path and os.path.exists(path):
+        sys.path.insert(0, path)
+
+try:
+    from app.models.database import Base
+except ImportError as e:
+    print(f"Error importing Base: {e}")
+    print("Current sys.path:", sys.path)
+    print("Contents of /app directory:")
+    if os.path.exists("/app"):
+        print(os.listdir("/app"))
+    print("Contents of app directory:")
+    if os.path.exists("app"):
+        print(os.listdir("app"))
+    raise
 
 # Configure logging
 logging.basicConfig(
@@ -26,6 +46,10 @@ def run_migrations():
         # Get the project root directory (one level up)
         project_root = os.path.dirname(current_dir)
         
+        # In Docker, the project root is /app
+        if os.path.exists("/app/alembic.ini"):
+            project_root = "/app"
+        
         # Create Alembic configuration
         alembic_cfg = Config(os.path.join(project_root, "alembic.ini"))
         

scripts/run.sh

@@ -1,66 +1,27 @@
 #!/bin/bash
-set -e
 
-# Initialize environment variables with defaults if not set
-export PORT=${PORT:-7860}
-export HOST=${HOST:-"0.0.0.0"}
-export WORKERS=${WORKERS:-1}
-export LOG_LEVEL=${LOG_LEVEL:-"info"}
-export DATABASE_URL=${DATABASE_URL:-"sqlite:///app/storage/audiobooks.db"}
+# Exit on error
+set -e
 
-# Set Python path to include both app directories
-export PYTHONPATH="/app:/app/app:${PYTHONPATH:-}:$(dirname $(dirname $(realpath $0)))"
+# Get the absolute path of the script directory
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
 
-# Create storage directories if they don't exist
-mkdir -p /app/storage/audio
-mkdir -p /app/storage/text
-mkdir -p /app/storage/temp
+# Add project root and app directory to Python path
+export PYTHONPATH="${PROJECT_ROOT}:${PROJECT_ROOT}/app:${PYTHONPATH:-}"
 
-# Initialize database if using SQLite
-if [[ "$DATABASE_URL" == sqlite* ]]; then
-    echo "Using SQLite database at: $DATABASE_URL"
-    # Create the database directory if it doesn't exist
-    DB_DIR=$(dirname "${DATABASE_URL#sqlite:///}")
-    mkdir -p "$DB_DIR"
-    
-    # Initialize alembic if not already initialized
-    if [ ! -d "migrations" ]; then
-        echo "Initializing alembic..."
-        alembic init migrations
-    fi
-    
-    # Create initial migration if none exists
-    if [ ! -d "migrations/versions" ] || [ -z "$(ls -A migrations/versions)" ]; then
-        echo "Creating initial migration..."
-        alembic revision --autogenerate -m "Initial migration"
-    fi
-fi
+# Create storage directory if it doesn't exist
+mkdir -p "${PROJECT_ROOT}/app/storage"
 
-# Wait for database to be ready (if using external database)
-if [ ! -z "$DATABASE_URL" ] && [[ "$DATABASE_URL" != sqlite* ]]; then
-    host=$(echo $DATABASE_URL | awk -F[@//] '{print $4}' | cut -d: -f1)
-    port=$(echo $DATABASE_URL | awk -F[@//] '{print $4}' | cut -d: -f2 | cut -d/ -f1)
-    
-    echo "Waiting for database at $host:$port..."
-    while ! nc -z $host $port; do
-        sleep 1
-    done
-    echo "Database is ready!"
-fi
+# Print current working directory and Python path for debugging
+echo "Current directory: $(pwd)"
+echo "PYTHONPATH: ${PYTHONPATH}"
+echo "Project root: ${PROJECT_ROOT}"
 
 # Run database migrations
 echo "Running database migrations..."
-python scripts/migrate.py
-
-echo "Starting CSM-1B TTS API server..."
-echo "Host: $HOST"
-echo "Port: $PORT"
-echo "Workers: $WORKERS"
-echo "Log Level: $LOG_LEVEL"
+python "${SCRIPT_DIR}/migrate.py"
 
-# Start the FastAPI application using uvicorn
-exec uvicorn app.main:app \
-    --host "$HOST" \
-    --port "$PORT" \
-    --workers "$WORKERS" \
-    --log-level "$LOG_LEVEL" 
+# Start the FastAPI application with uvicorn
+echo "Starting FastAPI application..."
+uvicorn app.main:app --host 0.0.0.0 --port 7860 --reload