Updated model worker resource requests/limits

Author: Bobbins228

src/codeflare_sdk/cluster/cluster.py

@@ -880,10 +880,10 @@ def _map_to_ray_cluster(rc) -> Optional[RayCluster]:
         status=status,
         # for now we are not using autoscaling so same replicas is fine
         workers=rc["spec"]["workerGroupSpecs"][0]["replicas"],
-        worker_mem_max=rc["spec"]["workerGroupSpecs"][0]["template"]["spec"][
+        worker_mem_limits=rc["spec"]["workerGroupSpecs"][0]["template"]["spec"][
             "containers"
         ][0]["resources"]["limits"]["memory"],
-        worker_mem_min=rc["spec"]["workerGroupSpecs"][0]["template"]["spec"][
+        worker_mem_requests=rc["spec"]["workerGroupSpecs"][0]["template"]["spec"][
             "containers"
         ][0]["resources"]["requests"]["memory"],
         worker_cpu=rc["spec"]["workerGroupSpecs"][0]["template"]["spec"]["containers"][
@@ -927,8 +927,8 @@ def _copy_to_ray(cluster: Cluster) -> RayCluster:
         name=cluster.config.name,
         status=cluster.status(print_to_console=False)[0],
         workers=cluster.config.num_workers,
-        worker_mem_min=cluster.config.worker_memory_requests,
-        worker_mem_max=cluster.config.worker_memory_limits,
+        worker_mem_requests=cluster.config.worker_memory_requests,
+        worker_mem_limits=cluster.config.worker_memory_limits,
         worker_cpu=cluster.config.worker_cpu_requests,
         worker_gpu=cluster.config.num_worker_gpus,
         namespace=cluster.config.namespace,

src/codeflare_sdk/cluster/model.py

@@ -78,8 +78,8 @@ class RayCluster:
     head_mem_limits: str
     head_gpu: int
     workers: int
-    worker_mem_min: str
-    worker_mem_max: str
+    worker_mem_requests: str
+    worker_mem_limits: str
     worker_cpu: int
     worker_gpu: int
     namespace: str

src/codeflare_sdk/utils/pretty_print.py

@@ -136,7 +136,7 @@ def print_clusters(clusters: List[RayCluster]):
         name = cluster.name
         dashboard = cluster.dashboard
         workers = str(cluster.workers)
-        memory = f"{cluster.worker_mem_min}~{cluster.worker_mem_max}"
+        memory = f"{cluster.worker_mem_requests}~{cluster.worker_mem_limits}"
         cpu = str(cluster.worker_cpu)
         gpu = str(cluster.worker_gpu)
 

tests/unit_test.py

@@ -893,8 +893,8 @@ def test_ray_details(mocker, capsys):
         name="raytest1",
         status=RayClusterStatus.READY,
         workers=1,
-        worker_mem_min="2G",
-        worker_mem_max="2G",
+        worker_mem_requests="2G",
+        worker_mem_limits="2G",
         worker_cpu=1,
         worker_gpu=0,
         namespace="ns",
@@ -934,8 +934,8 @@ def test_ray_details(mocker, capsys):
     assert ray2.name == "raytest2"
     assert ray1.namespace == ray2.namespace
     assert ray1.workers == ray2.workers
-    assert ray1.worker_mem_min == ray2.worker_mem_min
-    assert ray1.worker_mem_max == ray2.worker_mem_max
+    assert ray1.worker_mem_requests == ray2.worker_mem_requests
+    assert ray1.worker_mem_limits == ray2.worker_mem_limits
     assert ray1.worker_cpu == ray2.worker_cpu
     assert ray1.worker_gpu == ray2.worker_gpu
     try:
@@ -2322,8 +2322,8 @@ def test_cluster_status(mocker):
         name="test",
         status=RayClusterStatus.UNKNOWN,
         workers=1,
-        worker_mem_min=2,
-        worker_mem_max=2,
+        worker_mem_requests=2,
+        worker_mem_limits=2,
         worker_cpu=1,
         worker_gpu=0,
         namespace="ns",