Update main

main.py

@@ -3,20 +3,22 @@ from pathlib import Path
 import logging
 from contextlib import asynccontextmanager
 
+from fastapi import FastAPI
+from fastapi.middleware.cors import CORSMiddleware
+import uvicorn
+
+# --- Logging ---
 logging.basicConfig(
     level=logging.INFO,
     format="%(asctime)s - %(name)s - %(levelname)s - %(message)s"
 )
 logger = logging.getLogger(__name__)
 
-# Add app directory
+# --- Ajouter app dir au PATH ---
 app_dir = Path(__file__).parent
 sys.path.insert(0, str(app_dir))
 
-from fastapi import FastAPI
-from fastapi.middleware.cors import CORSMiddleware
-import uvicorn
-
+# --- Config ---
 from config import (
     API_TITLE, API_DESCRIPTION, API_VERSION,
     HUGGINGFACE_API_KEY, HUGGINGFACE_STANCE_MODEL_ID, HUGGINGFACE_LABEL_MODEL_ID,
@@ -25,6 +27,14 @@ from config import (
     PRELOAD_MODELS_ON_STARTUP, LOAD_STANCE_MODEL, LOAD_KPA_MODEL
 )
 
+# --- Import des singletons de services ---
+from services.stance_model_manager import stance_model_manager
+from services.label_model_manager import kpa_model_manager
+
+from services.stt_service import speech_to_text
+from services.tts_service import text_to_speech
+
+# --- Lifespan / startup API ---
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     logger.info("="*60)
@@ -33,20 +43,18 @@ async def lifespan(app: FastAPI):
 
     if PRELOAD_MODELS_ON_STARTUP:
 
-        # Load stance model
+        # Charger stance model
         if LOAD_STANCE_MODEL:
             try:
-                from services.stance_model_manager import load_model as load_stance
-                load_stance(HUGGINGFACE_STANCE_MODEL_ID, HUGGINGFACE_API_KEY)
+                stance_model_manager.load_model(HUGGINGFACE_STANCE_MODEL_ID, HUGGINGFACE_API_KEY)
                 logger.info("✓ Stance model loaded")
             except Exception as e:
                 logger.error(f"✗ Failed loading stance model: {e}")
 
-        # Load KPA model
+        # Charger KPA model
         if LOAD_KPA_MODEL:
             try:
-                from services.label_model_manager import load_model as load_kpa
-                load_kpa(HUGGINGFACE_LABEL_MODEL_ID, HUGGINGFACE_API_KEY)
+                kpa_model_manager.load_model(HUGGINGFACE_LABEL_MODEL_ID, HUGGINGFACE_API_KEY)
                 logger.info("✓ KPA model loaded")
             except Exception as e:
                 logger.error(f"✗ Failed loading KPA model: {e}")
@@ -55,7 +63,7 @@ async def lifespan(app: FastAPI):
     yield
     logger.info("🛑 Shutting down...")
 
-# ------------- FASTAPI APP -------------
+# --- FastAPI app ---
 app = FastAPI(
     title=API_TITLE,
     description=API_DESCRIPTION,
@@ -63,7 +71,7 @@ app = FastAPI(
     lifespan=lifespan
 )
 
-# ------------- CORS -------------
+# --- CORS ---
 app.add_middleware(
     CORSMiddleware,
     allow_origins=CORS_ORIGINS,
@@ -72,9 +80,7 @@ app.add_middleware(
     allow_headers=CORS_HEADERS,
 )
 
-# ============ ROUTES ============
-
-# STT route (Groq Whisper)
+# --- Routes ---
 try:
     from routes.stt_routes import router as stt_router
     app.include_router(stt_router, prefix="/api/v1/stt", tags=["Speech To Text"])
@@ -82,7 +88,6 @@ try:
 except Exception as e:
     logger.warning(f"⚠ Failed loading STT route: {e}")
 
-# TTS route (Groq PlayAI TTS)
 try:
     from routes.tts_routes import router as tts_router
     app.include_router(tts_router, prefix="/api/v1/tts", tags=["Text To Speech"])
@@ -90,7 +95,6 @@ try:
 except Exception as e:
     logger.warning(f"⚠ Failed loading TTS route: {e}")
 
-# Main NLP system routes
 try:
     from routes import api_router
     app.include_router(api_router)
@@ -98,8 +102,7 @@ try:
 except Exception as e:
     logger.warning(f"⚠ Failed loading main API routes: {e}")
 
-# ------------------ BASIC ROUTES ------------------
-
+# --- Basic routes ---
 @app.get("/health")
 async def health():
     return {"status": "healthy", "service": "NLP Debater + Groq Voice"}
@@ -113,5 +116,6 @@ async def root():
         "voice_tts": "/api/v1/tts"
     }
 
+# --- Run server ---
 if __name__ == "__main__":
     uvicorn.run("main:app", host=HOST, port=PORT, reload=RELOAD)

services/__init__.py

@@ -5,7 +5,7 @@ from .label_model_manager import KpaModelManager, kpa_model_manager
 
 # NEW imports
 from .stt_service import speech_to_text
-from .tts_service import generate_tts
+from .tts_service import text_to_speech
 
 __all__ = [
     "StanceModelManager",
@@ -15,5 +15,5 @@ __all__ = [
 
     # NEW exports
     "speech_to_text",
-    "generate_tts",
+    "text_to_speech",
 ]