Refactor model structure: update import paths from 'app.modelz' to 'app.models' across multiple files for consistency, remove obsolete 'modelz' directory, and adjust Dockerfile and migration script to reflect these changes, enhancing clarity and organization in the codebase.

Dockerfile

@@ -19,7 +19,8 @@ RUN apt-get update && apt-get install -y \
 # Create necessary directories first
 RUN mkdir -p /app/storage/audio \
     /app/storage/text \
-    /app/storage/temp
+    /app/storage/temp \
+    /app/app/models
 
 # Copy requirements first to leverage Docker cache
 COPY requirements.txt .
@@ -34,7 +35,7 @@ COPY . .
 # Debug: Show destination directory structure
 RUN echo "Contents of /app:" && ls -la /app && \
     echo "\nContents of /app/app:" && ls -la /app/app && \
-    echo "\nContents of /app/app/modelz:" && ls -la app/app/modelz
+    echo "\nContents of /app/app/models:" && ls -la /app/app/models
 
 # Set up permissions
 RUN chmod +x /app/scripts/run.sh && \

alembic/env.py

@@ -5,7 +5,7 @@ from sqlalchemy import pool
 
 from alembic import context
 
-from app.modelz.database import Base
+from app.models.database import Base
 from app.config import get_settings
 
 # this is the Alembic Config object, which provides

app/api/audiobook_routes.py

@@ -11,7 +11,7 @@ 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.modelz.database import Audiobook, AudiobookStatus, AudiobookChunk, TextChunk
+from app.models.database import Audiobook, AudiobookStatus, AudiobookChunk, TextChunk
 from app.services.storage import storage
 from app.db import get_db
 import torchaudio

app/api/routes.py

@@ -16,7 +16,7 @@ import numpy as np
 from fastapi import APIRouter, Request, HTTPException, BackgroundTasks, Body, Response, Query
 from fastapi.responses import StreamingResponse
 from app.api.schemas import SpeechRequest, ResponseFormat, Voice
-from app.modelz import Segment
+from app.model import Segment
 from app.api.streaming import AudioChunker
 from app.prompt_engineering import split_into_segments
 

app/api/streaming.py

@@ -10,7 +10,7 @@ from fastapi import APIRouter, Request, HTTPException
 from fastapi.responses import StreamingResponse
 from app.api.schemas import SpeechRequest, ResponseFormat
 from app.prompt_engineering import split_into_segments
-from app.modelz import Segment
+from app.model import Segment
 
 logger = logging.getLogger(__name__)
 router = APIRouter()

app/db.py

@@ -2,7 +2,7 @@
 import os
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
-from app.modelz.database import Base
+from app.models.database import Base
 
 # Get database URL from environment or use SQLite as default
 DATABASE_URL = os.getenv(

app/generator.py

@@ -8,7 +8,7 @@ import os
 from huggingface_hub import hf_hub_download
 from transformers import AutoTokenizer
 from tokenizers.processors import TemplateProcessing
-from app.modelz import Segment
+from app.model import Segment
 from app.text_normalizer import clean_text_for_tts
 from app.text_normalizer import TextNormalizer
 

app/main.py

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

app/modelz/__init__.py

@@ -1,10 +0,0 @@
-"""Models package initialization."""
-from app.modelz.database import Base, Audiobook, AudiobookChunk, TextChunk, AudiobookStatus
-
-__all__ = [
-    'Base',
-    'Audiobook',
-    'AudiobookChunk',
-    'TextChunk',
-    'AudiobookStatus'
-] 

app/modelz/database.py

@@ -1,80 +0,0 @@
-"""Database models and configuration."""
-import os
-from datetime import datetime
-from enum import Enum
-from sqlalchemy import create_engine, Column, Integer, String, Text, DateTime, ForeignKey, Enum as SQLEnum
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import sessionmaker, relationship
-
-# Get database URL from environment or use SQLite as default
-DATABASE_URL = os.getenv("DATABASE_URL", "sqlite:///app/storage/audiobooks.db")
-
-# Create engine
-engine = create_engine(DATABASE_URL)
-
-# Create session factory
-SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
-
-# Create declarative base
-Base = declarative_base()
-
-class AudiobookStatus(str, Enum):
-    """Status of an audiobook."""
-    PENDING = "pending"
-    PROCESSING = "processing"
-    COMPLETED = "completed"
-    FAILED = "failed"
-
-class Audiobook(Base):
-    """Audiobook model."""
-    __tablename__ = "audiobooks"
-
-    id = Column(String, primary_key=True)
-    title = Column(String, nullable=False)
-    author = Column(String, nullable=False)
-    voice_id = Column(String(50), nullable=False)
-    status = Column(SQLEnum(AudiobookStatus), nullable=False, default=AudiobookStatus.PENDING)
-    text_file_path = Column(String)
-    text_content = Column(Text)
-    audio_file_path = Column(String)
-    error_message = Column(Text)
-    created_at = Column(DateTime, default=datetime.utcnow)
-    updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
-
-    # Relationships
-    chunks = relationship("AudiobookChunk", back_populates="audiobook")
-
-class AudiobookChunk(Base):
-    """Model for audiobook chunks for large books."""
-    __tablename__ = "audiobook_chunks"
-
-    id = Column(Integer, primary_key=True)
-    audiobook_id = Column(String, ForeignKey("audiobooks.id"))
-    chunk_number = Column(Integer, nullable=False)
-    text_content = Column(Text, nullable=False)
-    audio_file_path = Column(String)
-    status = Column(SQLEnum(AudiobookStatus), nullable=False, default=AudiobookStatus.PENDING)
-    created_at = Column(DateTime, default=datetime.utcnow)
-    updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
-
-    # Relationships
-    audiobook = relationship("Audiobook", back_populates="chunks")
-
-class TextChunk(Base):
-    """Model for text chunks."""
-    __tablename__ = "text_chunks"
-
-    id = Column(Integer, primary_key=True)
-    audiobook_id = Column(String, ForeignKey("audiobooks.id"))
-    chunk_number = Column(Integer, nullable=False)
-    text_content = Column(Text, nullable=False)
-    created_at = Column(DateTime, default=datetime.utcnow)
-
-# Dependency to get database session
-def get_db():
-    """Get database session."""
-    db = SessionLocal()
-    try:
-        yield db
-    finally:
-        db.close() 

app/voice_cloning.py

@@ -21,7 +21,7 @@ import torchaudio
 from pydantic import BaseModel
 from fastapi import UploadFile
 
-from app.modelz import Segment
+from app.model import Segment
 
 # Set up logging
 logger = logging.getLogger(__name__)

app/voice_enhancement.py

@@ -476,7 +476,7 @@ def get_voice_segments(voice_name: str, device: torch.device) -> List:
     Returns:
         List of context segments
     """
-    from app.modelz import Segment
+    from app.model import Segment
     
     if voice_name not in VOICE_PROFILES:
         logger.warning(f"Voice {voice_name} not found, defaulting to alloy")

app/voice_memory.py

@@ -7,7 +7,7 @@ import random
 import logging
 from typing import Dict, List, Optional
 from dataclasses import dataclass
-from app.modelz import Segment
+from app.model import Segment
 
 # Setup logging
 logger = logging.getLogger(__name__)

scripts/migrate.py

@@ -21,13 +21,13 @@ logger = logging.getLogger(__name__)
 logger.info(f"Current directory: {os.getcwd()}")
 logger.info(f"Python Path (sys.path): {sys.path}")
 
-models_db_path = "/app/app/modelz/database.py"
+models_db_path = "/app/app/models/database.py"
 logger.info(f"Checking existence of {models_db_path}: {os.path.exists(models_db_path)}")
 
 try:
     # Direct import, assuming PYTHONPATH is correct
-    from app.modelz.database import Base
-    logger.info("Successfully imported Base from app.modelz.database")
+    from app.models.database import Base
+    logger.info("Successfully imported Base from app.models.database")
 except ImportError as e:
     logger.error(f"Error importing Base: {e}")
     # Log directory contents for deeper debugging
@@ -43,12 +43,12 @@ except ImportError as e:
             logger.info(os.listdir("/app/app"))
         except Exception as list_err:
             logger.error(f"Could not list /app/app: {list_err}")
-    logger.info("Contents of /app/app/modelz:")
-    if os.path.exists("/app/app/modelz"):
+    logger.info("Contents of /app/app/models:")
+    if os.path.exists("/app/app/models"):
         try:
-            logger.info(os.listdir("/app/app/modelz"))
+            logger.info(os.listdir("/app/app/models"))
         except Exception as list_err:
-            logger.error(f"Could not list /app/app/modelz: {list_err}")
+            logger.error(f"Could not list /app/app/models: {list_err}")
     raise
 
 def run_migrations():