Refactor Dockerfile and migration script: simplify PYTHONPATH configuration in Dockerfile, enhance directory creation, and improve error handling in migrate.py by logging directory contents on import failure.

Dockerfile

@@ -4,7 +4,7 @@ FROM python:3.10-slim
 # Set environment variables
 ENV PYTHONUNBUFFERED=1 \
     PYTHONDONTWRITEBYTECODE=1 \
-    PYTHONPATH="/app:/app/app"
+    PYTHONPATH="/app"
 
 # Set working directory
 WORKDIR /app
@@ -20,13 +20,14 @@ RUN apt-get update && apt-get install -y \
 COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
+# Create necessary directories
+RUN mkdir -p /app/app/models /app/storage/audio /app/storage/text /app/storage/temp
+
 # Copy application code
 COPY . .
 
-# Create storage directories and set up permissions
-RUN mkdir -p /app/storage/audio /app/storage/text /app/storage/temp && \
-    # Make run script executable
-    chmod +x /app/scripts/run.sh && \
+# Set up permissions
+RUN chmod +x /app/scripts/run.sh && \
     # Create app user
     useradd -m -u 1000 app && \
     # Set ownership of all files and directories

scripts/migrate.py

@@ -5,31 +5,10 @@ import logging
 from alembic.config import Config
 from alembic import command
 
-# 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__))),
-]
-
-# 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
+# Add the project root to Python path
+project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+if project_root not in sys.path:
+    sys.path.insert(0, project_root)
 
 # Configure logging
 logging.basicConfig(
@@ -38,6 +17,24 @@ logging.basicConfig(
 )
 logger = logging.getLogger(__name__)
 
+try:
+    from app.models.database import Base
+except ImportError as e:
+    logger.error(f"Error importing Base: {e}")
+    logger.info(f"Current sys.path: {sys.path}")
+    logger.info("Contents of project root:")
+    if os.path.exists(project_root):
+        logger.info(os.listdir(project_root))
+    logger.info("Contents of app directory:")
+    app_dir = os.path.join(project_root, "app")
+    if os.path.exists(app_dir):
+        logger.info(os.listdir(app_dir))
+    logger.info("Contents of models directory:")
+    models_dir = os.path.join(app_dir, "models")
+    if os.path.exists(models_dir):
+        logger.info(os.listdir(models_dir))
+    raise
+
 def run_migrations():
     """Run database migrations using Alembic."""
     try:
@@ -46,10 +43,6 @@ 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"))