appwrapper status implemented (#2)

Co-authored-by: Atin Sood <asood@us.ibm.com>

Author: atinsood

src/codeflare_sdk/cluster/cluster.py

@@ -1,5 +1,5 @@
 from .config import ClusterConfiguration
-from ..utils.pretty_print import RayCluster
+from ..utils.pretty_print import RayCluster, AppWrapper
 from ..utils import pretty_print
 import openshift as oc
 from typing import List, Optional
@@ -14,17 +14,19 @@ def up(self):
         pass
 
     def down(self, name):
+        # FIXME on what the exact details should be
+        # 1. delete the appwrapper and that should delete the cluster
         pass
 
     def status(self, print_to_console=True):
         cluster = _ray_cluster_status(self.config.name)
         if cluster:
             if print_to_console:
-                pretty_print.print_clusters([cluster])                
+                pretty_print.print_clusters([cluster])
             return cluster.status
         else:
             return None
-        
+
 
 def list_all_clusters(print_to_console=True):
     clusters = _get_ray_clusters()
@@ -41,17 +43,19 @@ def _get_appwrappers(namespace='default'):
     return app_wrappers
 
 
+def _app_wrapper_status(name, namespace='default') -> Optional[AppWrapper]:
+    with oc.project(namespace), oc.timeout(10*60):
+        cluster = oc.selector(f'appwrapper/{name}').object()
+    if cluster:
+        return _map_to_app_wrapper(cluster)
+    
 def _ray_cluster_status(name, namespace='default') -> Optional[RayCluster]:
-
+    # FIXME should we check the appwrapper first
     with oc.project(namespace), oc.timeout(10*60):
         cluster = oc.selector(f'rayclusters/{name}').object()
 
     if cluster:
         return _map_to_ray_cluster(cluster)
-    else:
-        return None
-    
-
 
 
 def _get_ray_clusters(namespace='default') -> List[RayCluster]:
@@ -65,7 +69,7 @@ def _get_ray_clusters(namespace='default') -> List[RayCluster]:
     return list_of_clusters
 
 
-def _map_to_ray_cluster(cluster):
+def _map_to_ray_cluster(cluster)->RayCluster:
     cluster_model = cluster.model
     return RayCluster(
         name=cluster.name(), status=cluster_model.status.state,
@@ -77,3 +81,11 @@ def _map_to_ray_cluster(cluster):
             0].template.spec.containers[0].resources.requests.memory,
         worker_cpu=cluster_model.spec.workerGroupSpecs[0].template.spec.containers[0].resources.limits.cpu,
         worker_gpu=0)
+
+
+def _map_to_app_wrapper(cluster)->AppWrapper:
+    cluster_model = cluster.model
+    return AppWrapper(
+        name=cluster.name(), status=cluster_model.status.state,
+        can_run=cluster_model.status.canrun,
+        job_state=cluster_model.status.queuejobstate)

src/codeflare_sdk/utils/pretty_print.py

@@ -20,6 +20,14 @@ class RayCluster:
     worker_cpu: int
     worker_gpu: int
 
+@dataclass
+class AppWrapper:
+    name: str
+    status:str
+    can_run: bool
+    job_state: str
+
+
 def _print_no_cluster_found():
     pass
 

tests/test_clusters.py

@@ -1,4 +1,4 @@
-from codeflare_sdk.cluster.cluster import list_all_clusters
+from codeflare_sdk.cluster.cluster import list_all_clusters, _app_wrapper_status
 from codeflare_sdk.cluster.cluster import Cluster, ClusterConfiguration
 
 #for now these tests assume that the cluster was already created
@@ -9,5 +9,7 @@ def test_cluster_status():
     cluster = Cluster(ClusterConfiguration(name='raycluster-autoscaler'))
     cluster.status()
 
-
+def test_app_wrapper_status():
+    print(_app_wrapper_status('raycluster-autoscaler'))
 
+