Start fixing forecast service API 10

services/training/app/api/models.py

@@ -6,6 +6,7 @@ from fastapi import APIRouter, Depends, HTTPException, status, Path
 from sqlalchemy.ext.asyncio import AsyncSession
 from typing import List
 import structlog
+from sqlalchemy import text
 
 from app.core.database import get_db
 from app.schemas.training import TrainedModelResponse
@@ -31,7 +32,8 @@ async def get_active_model(
     Get the active model for a product - used by forecasting service
     """
     try:
-        query = """
+        # ✅ FIX: Wrap SQL with text() for SQLAlchemy 2.0
+        query = text("""
             SELECT * FROM trained_models 
             WHERE tenant_id = :tenant_id 
             AND product_name = :product_name 
@@ -39,7 +41,7 @@ async def get_active_model(
             AND is_production = true
             ORDER BY created_at DESC 
             LIMIT 1
-        """
+        """)
         
         result = await db.execute(query, {
             "tenant_id": tenant_id,
@@ -54,12 +56,12 @@ async def get_active_model(
                 detail=f"No active model found for product {product_name}"
             )
         
-        # Update last_used_at
-        update_query = """
+        # ✅ FIX: Wrap update query with text() too
+        update_query = text("""
             UPDATE trained_models 
             SET last_used_at = :now 
             WHERE id = :model_id
-        """
+        """)
         
         await db.execute(update_query, {
             "now": datetime.utcnow(),
@@ -78,10 +80,10 @@ async def get_active_model(
                 "rmse": model_record.rmse,
                 "r2_score": model_record.r2_score
             },
-            "created_at": model_record.created_at.isoformat(),
+            "created_at": model_record.created_at.isoformat() if model_record.created_at else None,
             "training_period": {
-                "start_date": model_record.training_start_date.isoformat(),
-                "end_date": model_record.training_end_date.isoformat()
+                "start_date": model_record.training_start_date.isoformat() if model_record.training_start_date else None,
+                "end_date": model_record.training_end_date.isoformat() if model_record.training_end_date else None
             }
         }