REFACTOR API gateway

services/training/app/api/training.py

@@ -3,11 +3,11 @@
 # ================================================================
 """Training API endpoints with unified authentication"""
 
-from fastapi import APIRouter, Depends, HTTPException, BackgroundTasks, Query
+from fastapi import APIRouter, Depends, HTTPException, BackgroundTasks, Query, Path
 from typing import List, Optional, Dict, Any
 from datetime import datetime
 import structlog
-import uuid
+from uuid import UUID, uuid4
 
 from app.schemas.training import (
     TrainingJobRequest, 
@@ -49,7 +49,7 @@ def get_training_service() -> TrainingService:
 async def start_training_job(
     request: TrainingJobRequest,
     background_tasks: BackgroundTasks,
-    tenant_id: str = Depends(get_current_tenant_id_dep),
+    tenant_id: UUID = Path(..., description="Tenant ID"),
     current_user: Dict[str, Any] = Depends(get_current_user_dep),
     training_service: TrainingService = Depends(get_training_service),
     db: AsyncSession = Depends(get_db_session) # Ensure db is available
@@ -57,11 +57,11 @@ async def start_training_job(
     """Start a new training job for all products"""
     try:
         
-        new_job_id = str(uuid.uuid4())
+        new_job_id = str(uuid4())
         
         logger.info("Starting training job",
                    tenant_id=tenant_id,
-                   job_id=uuid.uuid4(),
+                   job_id=uuid4(),
                    config=request.dict())
 
         # Create training job
@@ -115,7 +115,7 @@ async def get_training_jobs(
     status: Optional[TrainingStatus] = Query(None, description="Filter jobs by status"),
     limit: int = Query(100, ge=1, le=1000),
     offset: int = Query(0, ge=0),
-    tenant_id: str = Depends(get_current_tenant_id_dep),
+    tenant_id: UUID = Path(..., description="Tenant ID"),
     current_user: Dict[str, Any] = Depends(get_current_user_dep),
     training_service: TrainingService = Depends(get_training_service)
 ):
@@ -149,7 +149,7 @@ async def get_training_jobs(
 @router.get("/jobs/{job_id}", response_model=TrainingJobResponse)
 async def get_training_job(
     job_id: str,
-    tenant_id: str = Depends(get_current_tenant_id_dep),
+    tenant_id: UUID = Path(..., description="Tenant ID"),
     current_user: Dict[str, Any] = Depends(get_current_user_dep),
     training_service: TrainingService = Depends(get_training_service)
 ):
@@ -182,7 +182,7 @@ async def get_training_job(
 @router.get("/jobs/{job_id}/progress", response_model=TrainingJobProgress)
 async def get_training_progress(
     job_id: str,
-    tenant_id: str = Depends(get_current_tenant_id_dep),
+    tenant_id: UUID = Path(..., description="Tenant ID"),
     current_user: Dict[str, Any] = Depends(get_current_user_dep),
     training_service: TrainingService = Depends(get_training_service)
 ):
@@ -212,7 +212,7 @@ async def get_training_progress(
 @router.post("/jobs/{job_id}/cancel")
 async def cancel_training_job(
     job_id: str,
-    tenant_id: str = Depends(get_current_tenant_id_dep),
+    tenant_id: UUID = Path(..., description="Tenant ID"),
     current_user: Dict[str, Any] = Depends(get_current_user_dep),
     training_service: TrainingService = Depends(get_training_service)
 ):
@@ -259,7 +259,7 @@ async def train_single_product(
     product_name: str,
     request: SingleProductTrainingRequest,
     background_tasks: BackgroundTasks,
-    tenant_id: str = Depends(get_current_tenant_id_dep),
+    tenant_id: UUID = Path(..., description="Tenant ID"),
     current_user: Dict[str, Any] = Depends(get_current_user_dep),
     training_service: TrainingService = Depends(get_training_service),
     db: AsyncSession = Depends(get_db_session)
@@ -312,7 +312,7 @@ async def train_single_product(
 @router.post("/validate", response_model=DataValidationResponse)
 async def validate_training_data(
     request: DataValidationRequest,
-    tenant_id: str = Depends(get_current_tenant_id_dep),
+    tenant_id: UUID = Path(..., description="Tenant ID"),
     current_user: Dict[str, Any] = Depends(get_current_user_dep),
     training_service: TrainingService = Depends(get_training_service)
 ):
@@ -343,7 +343,7 @@ async def validate_training_data(
 @router.get("/models")
 async def get_trained_models(
     product_name: Optional[str] = Query(None),
-    tenant_id: str = Depends(get_current_tenant_id_dep),
+    tenant_id: UUID = Path(..., description="Tenant ID"),
     current_user: Dict[str, Any] = Depends(get_current_user_dep),
     training_service: TrainingService = Depends(get_training_service)
 ):
@@ -374,7 +374,7 @@ async def get_trained_models(
 @require_role("admin")  # Only admins can delete models
 async def delete_model(
     model_id: str,
-    tenant_id: str = Depends(get_current_tenant_id_dep),
+    tenant_id: UUID = Path(..., description="Tenant ID"),
     current_user: Dict[str, Any] = Depends(get_current_user_dep),
     training_service: TrainingService = Depends(get_training_service)
 ):
@@ -411,7 +411,7 @@ async def delete_model(
 async def get_training_stats(
     start_date: Optional[datetime] = Query(None),
     end_date: Optional[datetime] = Query(None),
-    tenant_id: str = Depends(get_current_tenant_id_dep),
+    tenant_id: UUID = Path(..., description="Tenant ID"),
     current_user: Dict[str, Any] = Depends(get_current_user_dep),
     training_service: TrainingService = Depends(get_training_service)
 ):
@@ -442,7 +442,7 @@ async def get_training_stats(
 async def retrain_all_products(
     request: TrainingJobRequest,
     background_tasks: BackgroundTasks,
-    tenant_id: str = Depends(get_current_tenant_id_dep),
+    tenant_id: UUID = Path(..., description="Tenant ID"),
     current_user: Dict[str, Any] = Depends(get_current_user_dep),
     training_service: TrainingService = Depends(get_training_service)
 ):