port appwrapper status to v1beta2 names

Author: dgrove-oss

src/codeflare_sdk/cluster/cluster.py

@@ -274,25 +274,23 @@ def status(
             appwrapper = _app_wrapper_status(self.config.name, self.config.namespace)
             if appwrapper:
                 if appwrapper.status in [
-                    AppWrapperStatus.RUNNING,
-                    AppWrapperStatus.COMPLETED,
-                    AppWrapperStatus.RUNNING_HOLD_COMPLETION,
+                    AppWrapperStatus.RESUMING,
+                    AppWrapperStatus.RESETTING,
                 ]:
                     ready = False
                     status = CodeFlareClusterStatus.STARTING
                 elif appwrapper.status in [
                     AppWrapperStatus.FAILED,
-                    AppWrapperStatus.DELETED,
                 ]:
                     ready = False
                     status = CodeFlareClusterStatus.FAILED  # should deleted be separate
                     return status, ready  # exit early, no need to check ray status
                 elif appwrapper.status in [
-                    AppWrapperStatus.PENDING,
-                    AppWrapperStatus.QUEUEING,
+                    AppWrapperStatus.SUSPENDED,
+                    AppWrapperStatus.SUSPENDING,
                 ]:
                     ready = False
-                    if appwrapper.status == AppWrapperStatus.PENDING:
+                    if appwrapper.status == AppWrapperStatus.SUSPENDED:
                         status = CodeFlareClusterStatus.QUEUED
                     else:
                         status = CodeFlareClusterStatus.QUEUEING
@@ -567,9 +565,7 @@ def list_all_queued(
     in a given namespace.
     """
     if appwrapper:
-        resources = _get_app_wrappers(
-            namespace, filter=[AppWrapperStatus.RUNNING, AppWrapperStatus.PENDING]
-        )
+        resources = _get_app_wrappers(namespace, filter=[AppWrapperStatus.SUSPENDED])
         if print_to_console:
             pretty_print.print_app_wrappers_status(resources)
     else:
@@ -897,18 +893,14 @@ def _map_to_ray_cluster(rc) -> Optional[RayCluster]:
 
 
 def _map_to_app_wrapper(aw) -> AppWrapper:
-    if "status" in aw and "canrun" in aw["status"]:
+    if "status" in aw:
         return AppWrapper(
             name=aw["metadata"]["name"],
             status=AppWrapperStatus(aw["status"]["state"].lower()),
-            can_run=aw["status"]["canrun"],
-            job_state=aw["status"]["queuejobstate"],
         )
     return AppWrapper(
         name=aw["metadata"]["name"],
-        status=AppWrapperStatus("queueing"),
-        can_run=False,
-        job_state="Still adding to queue",
+        status=AppWrapperStatus("suspended"),
     )
 
 

src/codeflare_sdk/cluster/model.py

@@ -37,16 +37,17 @@ class RayClusterStatus(Enum):
 
 class AppWrapperStatus(Enum):
     """
-    Defines the possible reportable states of an AppWrapper.
+    Defines the possible reportable phases of an AppWrapper.
     """
 
-    QUEUEING = "queueing"
-    PENDING = "pending"
+    SUSPENDED = "suspended"
+    RESUMING = "resuming"
     RUNNING = "running"
+    RESETTING = "resetting"
+    SUSPENDING = "suspending"
+    SUCCEEDED = "succeeded"
     FAILED = "failed"
-    DELETED = "deleted"
-    COMPLETED = "completed"
-    RUNNING_HOLD_COMPLETION = "runningholdcompletion"
+    TERMINATING = "terminating"
 
 
 class CodeFlareClusterStatus(Enum):
@@ -91,5 +92,3 @@ class AppWrapper:
 
     name: str
     status: AppWrapperStatus
-    can_run: bool
-    job_state: str

tests/unit_test.py

@@ -790,34 +790,30 @@ def test_print_no_cluster(capsys):
 def test_print_appwrappers(capsys):
     aw1 = AppWrapper(
         name="awtest1",
-        status=AppWrapperStatus.PENDING,
-        can_run=False,
-        job_state="queue-state",
+        status=AppWrapperStatus.SUSPENDED,
     )
     aw2 = AppWrapper(
         name="awtest2",
         status=AppWrapperStatus.RUNNING,
-        can_run=False,
-        job_state="queue-state",
     )
     try:
         print_app_wrappers_status([aw1, aw2])
     except:
         assert 1 == 0
     captured = capsys.readouterr()
     assert captured.out == (
-        "╭───────────────────────╮\n"
-        "│    🚀 Cluster Queue   │\n"
-        "│       Status 🚀       │\n"
-        "│ +---------+---------+ │\n"
-        "│ | Name    | Status  | │\n"
-        "│ +=========+=========+ │\n"
-        "│ | awtest1 | pending | │\n"
-        "│ |         |         | │\n"
-        "│ | awtest2 | running | │\n"
-        "│ |         |         | │\n"
-        "│ +---------+---------+ │\n"
-        "╰───────────────────────╯\n"
+        "╭─────────────────────────╮\n"
+        "│     🚀 Cluster Queue    │\n"
+        "│        Status 🚀        │\n"
+        "│ +---------+-----------+ │\n"
+        "│ | Name    | Status    | │\n"
+        "│ +=========+===========+ │\n"
+        "│ | awtest1 | suspended | │\n"
+        "│ |         |           | │\n"
+        "│ | awtest2 | running   | │\n"
+        "│ |         |           | │\n"
+        "│ +---------+-----------+ │\n"
+        "╰─────────────────────────╯\n"
     )
 
 
@@ -2062,7 +2058,7 @@ def get_aw_obj(group, version, namespace, plural):
                     "filterignore": True,
                     "queuejobstate": "Dispatched",
                     "sender": "before manageQueueJob - afterEtcdDispatching",
-                    "state": "Pending",
+                    "state": "Suspended",
                     "systempriority": 9,
                 },
             },
@@ -2382,18 +2378,18 @@ def test_list_queue(mocker, capsys):
     list_all_queued("ns", appwrapper=True)
     captured = capsys.readouterr()
     assert captured.out == (
-        "╭──────────────────────────╮\n"
-        "│  🚀 Cluster Queue Status │\n"
-        "│            🚀            │\n"
-        "│ +------------+---------+ │\n"
-        "│ | Name       | Status  | │\n"
-        "│ +============+=========+ │\n"
-        "│ | quicktest1 | running | │\n"
-        "│ |            |         | │\n"
-        "│ | quicktest2 | pending | │\n"
-        "│ |            |         | │\n"
-        "│ +------------+---------+ │\n"
-        "╰──────────────────────────╯\n"
+        "╭────────────────────────────╮\n"
+        "│   🚀 Cluster Queue Status  │\n"
+        "│             🚀             │\n"
+        "│ +------------+-----------+ │\n"
+        "│ | Name       | Status    | │\n"
+        "│ +============+===========+ │\n"
+        "│ | quicktest1 | running   | │\n"
+        "│ |            |           | │\n"
+        "│ | quicktest2 | suspended | │\n"
+        "│ |            |           | │\n"
+        "│ +------------+-----------+ │\n"
+        "╰────────────────────────────╯\n"
     )
 
 
@@ -2443,9 +2439,7 @@ def test_list_queue_rayclusters(mocker, capsys):
 def test_cluster_status(mocker):
     mocker.patch("kubernetes.client.ApisApi.get_api_versions")
     mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
-    fake_aw = AppWrapper(
-        "test", AppWrapperStatus.FAILED, can_run=True, job_state="unused"
-    )
+    fake_aw = AppWrapper("test", AppWrapperStatus.FAILED)
     fake_ray = RayCluster(
         name="test",
         status=RayClusterStatus.UNKNOWN,
@@ -2482,29 +2476,24 @@ def test_cluster_status(mocker):
     assert status == CodeFlareClusterStatus.FAILED
     assert ready == False
 
-    fake_aw.status = AppWrapperStatus.DELETED
-    status, ready = cf.status()
-    assert status == CodeFlareClusterStatus.FAILED
-    assert ready == False
-
-    fake_aw.status = AppWrapperStatus.PENDING
+    fake_aw.status = AppWrapperStatus.SUSPENDED
     status, ready = cf.status()
     assert status == CodeFlareClusterStatus.QUEUED
     assert ready == False
 
-    fake_aw.status = AppWrapperStatus.COMPLETED
+    fake_aw.status = AppWrapperStatus.RESUMING
     status, ready = cf.status()
     assert status == CodeFlareClusterStatus.STARTING
     assert ready == False
 
-    fake_aw.status = AppWrapperStatus.RUNNING_HOLD_COMPLETION
+    fake_aw.status = AppWrapperStatus.RESETTING
     status, ready = cf.status()
     assert status == CodeFlareClusterStatus.STARTING
     assert ready == False
 
     fake_aw.status = AppWrapperStatus.RUNNING
     status, ready = cf.status()
-    assert status == CodeFlareClusterStatus.STARTING
+    assert status == CodeFlareClusterStatus.UNKNOWN
     assert ready == False
 
     mocker.patch(