Refactor application structure: update model import paths from 'app.model' to 'app.modelz' across multiple files for consistency, and introduce new database models in 'app.modelz.database' to enhance organization and clarity in the codebase.

Dockerfile

@@ -34,7 +34,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/model:" && ls -la app/app/model
+    echo "\nContents of /app/app/modelz:" && ls -la app/app/modelz
 
 # 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.model.database import Base
+from app.modelz.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.model.database import Audiobook, AudiobookStatus, AudiobookChunk, TextChunk
+from app.modelz.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.model import Segment
+from app.modelz 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.model import Segment
+from app.modelz 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.model.database import Base
+from app.modelz.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.model import Segment
+from app.modelz 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.model.database import Base, get_db
+from app.modelz.database import Base, get_db
 
 # Setup logging
 os.makedirs("logs", exist_ok=True)

app/{model → modelz}/__init__.py

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

app/voice_cloning.py

@@ -21,7 +21,7 @@ import torchaudio
 from pydantic import BaseModel
 from fastapi import UploadFile
 
-from app.model import Segment
+from app.modelz 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.model import Segment
+    from app.modelz 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.model import Segment
+from app.modelz 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/models/database.py"
+models_db_path = "/app/app/modelz/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.model.database import Base
-    logger.info("Successfully imported Base from app.model.database")
+    from app.modelz.database import Base
+    logger.info("Successfully imported Base from app.modelz.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/models:")
-    if os.path.exists("/app/app/models"):
+    logger.info("Contents of /app/app/modelz:")
+    if os.path.exists("/app/app/modelz"):
         try:
-            logger.info(os.listdir("/app/app/models"))
+            logger.info(os.listdir("/app/app/modelz"))
         except Exception as list_err:
-            logger.error(f"Could not list /app/app/models: {list_err}")
+            logger.error(f"Could not list /app/app/modelz: {list_err}")
     raise
 
 def run_migrations():