address comments

Author: michaelshin

centml/cli/cluster.py

@@ -3,7 +3,14 @@
 from typing import Dict
 import click
 from tabulate import tabulate
-from centml.sdk import DeploymentType, DeploymentStatus, ServiceStatus, ApiException, HardwareInstanceResponse
+from centml.sdk import (
+    DeploymentType,
+    DeploymentStatus,
+    ServiceStatus,
+    RolloutStatus,
+    ApiException,
+    HardwareInstanceResponse,
+)
 from centml.sdk.api import get_centml_client
 
 # convert deployment type enum to a user friendly name
@@ -27,6 +34,12 @@
     "compute": DeploymentType.COMPUTE_V2,
     "rag": DeploymentType.RAG,
 }
+rollout_status_to_service_status_map = {
+    RolloutStatus.HEALTHY: ServiceStatus.HEALTHY,
+    RolloutStatus.MISSING: ServiceStatus.MISSING,
+    RolloutStatus.PROGRESSING: ServiceStatus.INITIALIZING,
+    RolloutStatus.DEGRADED: ServiceStatus.ERROR,
+}
 
 
 def handle_exception(func):
@@ -82,8 +95,11 @@ def _get_ready_status(deployment, service_status):
         (DeploymentStatus.PAUSED, None): ("paused", "yellow", "black"),
         (DeploymentStatus.DELETED, None): ("deleted", "white", "black"),
         (DeploymentStatus.ACTIVE, ServiceStatus.HEALTHY): ("ready", "green", "black"),
+        (DeploymentStatus.ACTIVE, ServiceStatus.SCALINGUP): ("starting", "black", "white"),
+        (DeploymentStatus.ACTIVE, ServiceStatus.PULLING): ("starting", "black", "white"),
         (DeploymentStatus.ACTIVE, ServiceStatus.INITIALIZING): ("starting", "black", "white"),
         (DeploymentStatus.ACTIVE, ServiceStatus.MISSING): ("starting", "black", "white"),
+        (DeploymentStatus.ACTIVE, ServiceStatus.NOTREADY): ("starting", "black", "white"),
         (DeploymentStatus.ACTIVE, ServiceStatus.ERROR): ("error", "red", "black"),
         (DeploymentStatus.ACTIVE, ServiceStatus.CREATECONTAINERCONFIGERROR): (
             "createContainerConfigError",
@@ -100,6 +116,32 @@ def _get_ready_status(deployment, service_status):
     return click.style(style[0], fg=style[1], bg=style[2])
 
 
+def _get_service_status(status_response, revision_number):
+    if status_response is None:
+        return None
+
+    service_status = getattr(status_response, "service_status", None)
+    if service_status is not None:
+        return service_status
+
+    revision_pod_details_list = getattr(status_response, "revision_pod_details_list", None) or []
+    current_revision = next(
+        (
+            revision
+            for revision in revision_pod_details_list
+            if getattr(revision, "revision_number", None) == revision_number
+        ),
+        (
+            revision_pod_details_list[0]
+            if revision_pod_details_list and getattr(revision_pod_details_list[0], "revision_number") is None
+            else None
+        ),
+    )
+    revision_status = getattr(current_revision, "revision_status", None)
+
+    return revision_status or rollout_status_to_service_status_map.get(getattr(status_response, "rollout_status", None))
+
+
 def _append_status_error_message(messages, seen_messages, label, error_message):
     if not error_message or error_message in seen_messages:
         return
@@ -177,7 +219,8 @@ def get(type, id):
             sys.exit("Please enter correct deployment type")
 
         deployment_status = cclient.get_status(deployment.id) if deployment.status == DeploymentStatus.ACTIVE else None
-        service_status = deployment_status.service_status if deployment_status is not None else None
+        revision_number = getattr(deployment, "revision_number", None)
+        service_status = _get_service_status(deployment_status, revision_number)
         ready_status = _get_ready_status(deployment, service_status)
         status_error_messages = _get_status_error_messages(deployment_status)
         _, id_to_hw_map = _get_hw_to_id_map(cclient, deployment.cluster_id)

tests/test_cli_cluster.py

@@ -1,6 +1,42 @@
 from types import SimpleNamespace
 
-from centml.cli.cluster import _get_status_error_messages
+from centml.cli.cluster import _get_service_status, _get_status_error_messages
+from centml.sdk import RolloutStatus, ServiceStatus
+
+
+def test_service_status_uses_legacy_service_status_when_present():
+    status_response = SimpleNamespace(service_status=ServiceStatus.HEALTHY)
+
+    assert _get_service_status(status_response, revision_number=None) == ServiceStatus.HEALTHY
+
+
+def test_service_status_maps_v3_healthy_rollout_status():
+    status_response = SimpleNamespace(rollout_status=RolloutStatus.HEALTHY)
+
+    assert _get_service_status(status_response, revision_number=None) == ServiceStatus.HEALTHY
+
+
+def test_service_status_uses_current_v3_revision_status():
+    status_response = SimpleNamespace(
+        rollout_status=RolloutStatus.PROGRESSING,
+        revision_pod_details_list=[
+            SimpleNamespace(revision_number=1, revision_status=ServiceStatus.HEALTHY),
+            SimpleNamespace(revision_number=2, revision_status=ServiceStatus.SCALINGUP),
+        ],
+    )
+
+    assert _get_service_status(status_response, revision_number=2) == ServiceStatus.SCALINGUP
+
+
+def test_service_status_uses_v3_revision_without_revision_number_as_fallback():
+    status_response = SimpleNamespace(
+        rollout_status=RolloutStatus.DEGRADED,
+        revision_pod_details_list=[
+            SimpleNamespace(revision_number=None, revision_status=ServiceStatus.IMAGEPULLBACKOFF)
+        ],
+    )
+
+    assert _get_service_status(status_response, revision_number=2) == ServiceStatus.IMAGEPULLBACKOFF
 
 
 def test_status_error_messages_include_revision_and_pod_messages():