aligning with backend

api/greedyoptim_api.py

@@ -53,7 +53,7 @@ app.add_middleware(
 class TrainsetStatusInput(BaseModel):
     """Single trainset operational status"""
     trainset_id: str
-    operational_status: str = Field(..., description="Available, In-Service, Maintenance, Standby, Out-of-Order")
+    operational_status: str = Field(..., description="IN_SERVICE, STANDBY, MAINTENANCE, OUT_OF_SERVICE, TESTING (or legacy: Available, In-Service, Maintenance, Standby, Out-of-Order)")
     last_maintenance_date: Optional[str] = None
     total_mileage_km: Optional[float] = None
     age_years: Optional[float] = None
@@ -63,7 +63,7 @@ class FitnessCertificateInput(BaseModel):
     """Fitness certificate for a trainset"""
     trainset_id: str
     department: str = Field(..., description="Safety, Operations, Technical, Electrical, Mechanical")
-    status: str = Field(..., description="Valid, Expired, Expiring-Soon, Suspended")
+    status: str = Field(..., description="ISSUED, EXPIRED, SUSPENDED, PENDING, IN_PROGRESS, REVOKED, RENEWED, CANCELLED (or legacy: Valid, Expired, Expiring-Soon, Suspended)")
     issue_date: Optional[str] = None
     expiry_date: Optional[str] = None
 
@@ -82,7 +82,7 @@ class ComponentHealthInput(BaseModel):
     """Component health status"""
     trainset_id: str
     component: str = Field(..., description="Brakes, HVAC, Doors, Propulsion, etc.")
-    status: str = Field(..., description="Good, Fair, Warning, Critical")
+    status: str = Field(..., description="EXCELLENT, GOOD, FAIR, POOR, CRITICAL, FAILED (or legacy: Good, Fair, Warning, Critical)")
     wear_level: Optional[float] = Field(None, ge=0, le=100)
     last_inspection: Optional[str] = None
 

greedyOptim/error_handling.py

@@ -37,11 +37,57 @@ class DataValidator:
         'component_health': ['trainset_id', 'component', 'status']
     }
     
+    # Accept both legacy and new backend formats
     VALID_STATUSES = {
-        'operational': ['Available', 'In-Service', 'Maintenance', 'Standby', 'Out-of-Order'],
-        'certificate': ['Valid', 'Expired', 'Expiring-Soon', 'Suspended'],
+        'operational': [
+            # Legacy format
+            'Available', 'In-Service', 'Maintenance', 'Standby', 'Out-of-Order',
+            # New backend format
+            'IN_SERVICE', 'STANDBY', 'MAINTENANCE', 'OUT_OF_SERVICE', 'TESTING'
+        ],
+        'certificate': [
+            # Legacy format
+            'Valid', 'Expired', 'Expiring-Soon', 'Suspended',
+            # New backend format
+            'PENDING', 'IN_PROGRESS', 'ISSUED', 'EXPIRED', 'SUSPENDED', 
+            'REVOKED', 'RENEWED', 'CANCELLED'
+        ],
         'job': ['Open', 'In-Progress', 'Closed', 'Pending-Parts'],
-        'component': ['Good', 'Fair', 'Warning', 'Critical']
+        'component': [
+            # Legacy format
+            'Good', 'Fair', 'Warning', 'Critical',
+            # New backend format
+            'EXCELLENT', 'GOOD', 'FAIR', 'POOR', 'CRITICAL', 'FAILED'
+        ]
+    }
+    
+    # Mapping from backend format to internal format for optimization logic
+    STATUS_MAPPINGS = {
+        'operational': {
+            'IN_SERVICE': 'In-Service',
+            'STANDBY': 'Standby',
+            'MAINTENANCE': 'Maintenance',
+            'OUT_OF_SERVICE': 'Out-of-Order',
+            'TESTING': 'Maintenance',  # Treat testing as maintenance for optimization
+        },
+        'certificate': {
+            'PENDING': 'Expiring-Soon',
+            'IN_PROGRESS': 'Expiring-Soon',
+            'ISSUED': 'Valid',
+            'EXPIRED': 'Expired',
+            'SUSPENDED': 'Suspended',
+            'REVOKED': 'Expired',
+            'RENEWED': 'Valid',
+            'CANCELLED': 'Expired',
+        },
+        'component': {
+            'EXCELLENT': 'Good',
+            'GOOD': 'Good',
+            'FAIR': 'Fair',
+            'POOR': 'Warning',
+            'CRITICAL': 'Critical',
+            'FAILED': 'Critical',
+        }
     }
     
     @classmethod

greedyOptim/evaluator.py

@@ -9,6 +9,38 @@ from typing import Dict, List, Tuple, Optional
 from .models import OptimizationConfig, TrainsetConstraints
 
 
+# Status normalization mappings (backend format -> internal format)
+CERTIFICATE_STATUS_MAP = {
+    'PENDING': 'Expiring-Soon',
+    'IN_PROGRESS': 'Expiring-Soon',
+    'ISSUED': 'Valid',
+    'EXPIRED': 'Expired',
+    'SUSPENDED': 'Suspended',
+    'REVOKED': 'Expired',
+    'RENEWED': 'Valid',
+    'CANCELLED': 'Expired',
+}
+
+COMPONENT_STATUS_MAP = {
+    'EXCELLENT': 'Good',
+    'GOOD': 'Good',
+    'FAIR': 'Fair',
+    'POOR': 'Warning',
+    'CRITICAL': 'Critical',
+    'FAILED': 'Critical',
+}
+
+
+def normalize_certificate_status(status: str) -> str:
+    """Normalize certificate status to internal format."""
+    return CERTIFICATE_STATUS_MAP.get(status, status)
+
+
+def normalize_component_status(status: str) -> str:
+    """Normalize component status to internal format."""
+    return COMPONENT_STATUS_MAP.get(status, status)
+
+
 class TrainsetSchedulingEvaluator:
     """Multi-objective evaluator for trainset scheduling optimization."""
     
@@ -68,7 +100,9 @@ class TrainsetSchedulingEvaluator:
             has_valid_certs = True
             if trainset_id in self.fitness_map:
                 for dept, cert in self.fitness_map[trainset_id].items():
-                    if cert['status'] in ['Expired']:
+                    # Normalize status to handle both legacy and backend formats
+                    status = normalize_certificate_status(cert['status'])
+                    if status in ['Expired']:
                         has_valid_certs = False
                         break
                     try:
@@ -94,7 +128,9 @@ class TrainsetSchedulingEvaluator:
             component_warnings = []
             if trainset_id in self.health_map:
                 for health in self.health_map[trainset_id]:
-                    if health['status'] == 'Warning' and health['wear_level'] > 90:
+                    # Normalize status to handle both legacy and backend formats
+                    status = normalize_component_status(health['status'])
+                    if status in ['Warning', 'Critical'] and health.get('wear_level', 0) > 90:
                         component_warnings.append(health['component'])
             
             # Check maintenance status