Fix UI issues

services/production/app/services/production_service.py

@@ -436,7 +436,7 @@ class ProductionService:
                         )
                     )
                     recent_quality_result = await batch_repo.session.execute(recent_quality_query)
-                    average_quality_score = recent_quality_result.scalar() or 8.5  # Default fallback
+                    average_quality_score = recent_quality_result.scalar() or 0.0
 
                 return ProductionDashboardSummary(
                     active_batches=len(active_batches),

services/recipes/app/api/internal_demo.py

@@ -441,7 +441,8 @@ async def get_recipe_count(
     _: bool = Depends(verify_internal_api_key)
 ):
     """
-    Get count of active recipes for onboarding status check.
+    Get count of recipes for onboarding status check.
+    Counts DRAFT and ACTIVE recipes (excludes ARCHIVED/DISCONTINUED).
     Internal endpoint for tenant service.
     """
     try:
@@ -452,7 +453,7 @@ async def get_recipe_count(
             select(func.count()).select_from(Recipe)
             .where(
                 Recipe.tenant_id == UUID(tenant_id),
-                Recipe.status == RecipeStatus.ACTIVE
+                Recipe.status.in_([RecipeStatus.DRAFT, RecipeStatus.ACTIVE, RecipeStatus.TESTING])
             )
         )
 

services/training/app/api/websocket_operations.py

@@ -9,12 +9,20 @@ import structlog
 from app.websocket.manager import websocket_manager
 from shared.auth.jwt_handler import JWTHandler
 from app.core.config import settings
+from app.services.training_service import EnhancedTrainingService
+from shared.database.base import create_database_manager
 
 logger = structlog.get_logger()
 
 router = APIRouter(tags=["websocket"])
 
 
+def get_enhanced_training_service():
+    """Create EnhancedTrainingService instance"""
+    database_manager = create_database_manager(settings.DATABASE_URL, "training-service")
+    return EnhancedTrainingService(database_manager)
+
+
 @router.websocket("/api/v1/tenants/{tenant_id}/training/jobs/{job_id}/live")
 async def training_progress_websocket(
     websocket: WebSocket,
@@ -68,6 +76,44 @@ async def training_progress_websocket(
     # Connect to WebSocket manager
     await websocket_manager.connect(job_id, websocket)
 
+    # Helper function to send current job status
+    async def send_current_status():
+        """Fetch and send the current job status to the client"""
+        try:
+            training_service = get_enhanced_training_service()
+            status_info = await training_service.get_training_status(job_id)
+
+            if status_info and not status_info.get("error"):
+                # Map status to WebSocket message type
+                ws_type = "progress"
+                if status_info.get("status") == "completed":
+                    ws_type = "completed"
+                elif status_info.get("status") == "failed":
+                    ws_type = "failed"
+
+                await websocket.send_json({
+                    "type": ws_type,
+                    "job_id": job_id,
+                    "data": {
+                        "progress": status_info.get("progress", 0),
+                        "current_step": status_info.get("current_step"),
+                        "status": status_info.get("status"),
+                        "products_total": status_info.get("products_total", 0),
+                        "products_completed": status_info.get("products_completed", 0),
+                        "products_failed": status_info.get("products_failed", 0),
+                        "estimated_time_remaining_seconds": status_info.get("estimated_time_remaining_seconds"),
+                        "message": status_info.get("message")
+                    }
+                })
+                logger.info("Sent current job status to client",
+                           job_id=job_id,
+                           status=status_info.get("status"),
+                           progress=status_info.get("progress"))
+        except Exception as e:
+            logger.error("Failed to send current job status",
+                        job_id=job_id,
+                        error=str(e))
+
     try:
         # Send connection confirmation
         await websocket.send_json({
@@ -76,21 +122,29 @@ async def training_progress_websocket(
             "message": "Connected to training progress stream"
         })
 
+        # Immediately send current job status after connection
+        # This handles the race condition where training completes before WebSocket connects
+        await send_current_status()
+
         # Keep connection alive and handle client messages
         ping_count = 0
         while True:
             try:
-                # Receive messages from client (ping, etc.)
+                # Receive messages from client (ping, get_status, etc.)
                 data = await websocket.receive_text()
 
                 # Handle ping/pong
                 if data == "ping":
                     await websocket.send_text("pong")
                     ping_count += 1
-                    logger.info("WebSocket ping/pong",
+                    logger.debug("WebSocket ping/pong",
                               job_id=job_id,
                               ping_count=ping_count,
                               connection_healthy=True)
+                # Handle get_status request
+                elif data == "get_status":
+                    await send_current_status()
+                    logger.info("Status requested by client", job_id=job_id)
 
             except WebSocketDisconnect:
                 logger.info("Client disconnected", job_id=job_id)