moving to models (#3)

* appwrapper status implemented

* moved model to its own file

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, AppWrapper
+from .model import RayCluster, AppWrapper
 from ..utils import pretty_print
 import openshift as oc
 from typing import List, Optional
@@ -14,6 +14,8 @@ 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
         # FIXME on what the exact details should be
         # 1. delete the appwrapper and that should delete the cluster
         pass
@@ -42,7 +44,7 @@ def _get_appwrappers(namespace='default'):
         app_wrappers = oc.selector('appwrappers').qnames()
     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()

src/codeflare_sdk/cluster/model.py

@@ -0,0 +1,19 @@
+from dataclasses import dataclass
+
+@dataclass
+class RayCluster:
+    name: str
+    status: str
+    min_workers: int
+    max_workers: int
+    worker_mem_min: str
+    worker_mem_max: str
+    worker_cpu: int
+    worker_gpu: int
+
+@dataclass
+class AppWrapper:
+    name: str
+    status:str
+    can_run: bool
+    job_state: str

src/codeflare_sdk/utils/pretty_print.py

@@ -1,32 +1,11 @@
-from ast import Str
-from turtle import st
 from rich import print
 from rich.table import Table
 from rich.console import Console
 from rich.layout import Layout
 from rich.panel import Panel
 from rich import box
-from dataclasses import dataclass
 from typing import List
-
-@dataclass
-class RayCluster:
-    name: str
-    status: str
-    min_workers: int
-    max_workers: int
-    worker_mem_min: str
-    worker_mem_max: str
-    worker_cpu: int
-    worker_gpu: int
-
-@dataclass
-class AppWrapper:
-    name: str
-    status:str
-    can_run: bool
-    job_state: str
-
+from ..cluster.model import RayCluster, AppWrapper
 
 def _print_no_cluster_found():
     pass

tests/test_clusters.py

@@ -12,4 +12,3 @@ def test_cluster_status():
 def test_app_wrapper_status():
     print(_app_wrapper_status('raycluster-autoscaler'))
 
-