Refactor Dockerfile and add run script: streamline multi-stage build, set up application structure, and create a new run script for environment initialization and database migration; update migrations/env.py for improved error handling during model import.

Dockerfile

@@ -1,95 +1,47 @@
-# Multi-stage build for authenticated model downloads
-FROM python:3.10-slim AS model-downloader
-# Install huggingface-cli
-RUN pip install huggingface_hub
-# Set working directory
-WORKDIR /model-downloader
-# Create directory for downloaded models
-RUN mkdir -p /model-downloader/models
-# This will run when building the image
-# You'll need to pass your Hugging Face token at build time
-ARG HF_TOKEN
-ENV HF_TOKEN=${HF_TOKEN}
-# Login and download model
-RUN if [ -n "$HF_TOKEN" ]; then \
-    huggingface-cli login --token ${HF_TOKEN}; \
-    huggingface-cli download sesame/csm-1b ckpt.pt --local-dir /model-downloader/models; \
-    else echo "No HF_TOKEN provided, model download will be skipped"; fi
-
-# Now for the main application stage
+# Use Python 3.10 as the base 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
+
+# Create and set working directory
+WORKDIR /app
+
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
     build-essential \
-    ffmpeg \
-    git \
     netcat-openbsd \
+    ffmpeg \
     && rm -rf /var/lib/apt/lists/*
 
-# Set working directory
-WORKDIR /app
+# Create app user
+RUN useradd -m -u 1000 app && \
+    chown -R app:app /app
 
-# Install Python dependencies
+# Copy requirements file
 COPY requirements.txt .
-RUN pip install --no-cache-dir -r requirements.txt
-
-# Install additional dependencies for database and storage
-RUN pip install --no-cache-dir \
-    sqlalchemy==2.0.27 \
-    aiofiles==23.2.1 \
-    psycopg2-binary==2.9.9 \
-    alembic==1.13.1
-
-# Create necessary directories with proper package structure
-RUN mkdir -p /app/storage/audio \
-    /app/storage/text \
-    /app/models \
-    /app/tokenizers \
-    /app/voice_memories \
-    /app/voice_references \
-    /app/voice_profiles \
-    /app/cloned_voices \
-    /app/audio_cache \
-    /app/static \
-    /app/logs \
-    /app/migrations/versions \
-    /app/app/models
 
-# Create Python package structure
-RUN touch /app/app/__init__.py \
-    /app/app/models/__init__.py
-
-# Copy the model from the model-downloader stage
-COPY --from=model-downloader /model-downloader/models /app/models
+# Install Python dependencies
+RUN pip install --no-cache-dir -r requirements.txt
 
 # Copy application code
 COPY . .
 
-# Copy and set up entrypoint script
-COPY docker-entrypoint.sh /usr/local/bin/
-RUN chmod +x /usr/local/bin/docker-entrypoint.sh
-
-# Create volume mount points
-VOLUME ["/app/storage", "/app/models", "/app/logs"]
-
-# Set environment variables
-ENV PYTHONPATH=/app \
-    DATABASE_URL=sqlite:///app/storage/audiobooks.db \
-    STORAGE_PATH=/app/storage
+# Create necessary directories
+RUN mkdir -p /app/storage/audio /app/storage/text /app/storage/temp && \
+    chown -R app:app /app/storage
 
-# Set permissions for all directories
-RUN chown -R nobody:nogroup /app && \
-    chmod -R 755 /app && \
-    # Make migrations directory writable
-    chmod -R 777 /app/migrations && \
-    chmod -R 777 /app/storage
+# Switch to app user
+USER app
 
-# Switch to non-root user
-USER nobody
+# Make run script executable
+RUN chmod +x scripts/run.sh
 
 # Expose port
 EXPOSE 7860
 
 # Set the entrypoint
-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["/app/scripts/run.sh"]

migrations/env.py

@@ -7,11 +7,19 @@ from sqlalchemy import pool
 
 from alembic import context
 
-# Add the application root directory to the Python path
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+# Add the application directory to the Python path
+app_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+if app_dir not in sys.path:
+    sys.path.insert(0, app_dir)
 
 # Import your models here
-from app.models.database import Base
+try:
+    from app.models.database import Base
+except ImportError as e:
+    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

@@ -0,0 +1,45 @@
+#!/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"}
+
+# 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
+
+# Run database migrations
+echo "Running database migrations..."
+alembic upgrade head
+
+# Create necessary directories if they don't exist
+mkdir -p /app/storage/audio
+mkdir -p /app/storage/text
+mkdir -p /app/storage/temp
+
+# Set proper permissions
+chown -R app:app /app/storage
+
+echo "Starting CSM-1B TTS API server..."
+echo "Host: $HOST"
+echo "Port: $PORT"
+echo "Workers: $WORKERS"
+echo "Log Level: $LOG_LEVEL"
+
+# Start the FastAPI application using uvicorn
+exec uvicorn app.main:app \
+    --host "$HOST" \
+    --port "$PORT" \
+    --workers "$WORKERS" \
+    --log-level "$LOG_LEVEL"