Changes as per review again because I'm dumb

Signed-off-by: Pat O'Connor <[email protected]>

Author: chipspeak

src/codeflare_sdk/ray/rayjobs/config.py

@@ -559,7 +559,7 @@ def add_script_volumes(
         logger.info(
             f"Added script volume '{configmap_name}' to cluster config: mount_path={mount_path}"
         )
-        
+
     def validate_configmap_size(self, scripts: Dict[str, str]) -> None:
         total_size = sum(len(content.encode("utf-8")) for content in scripts.values())
         if total_size > 1024 * 1024:  # 1MB

src/codeflare_sdk/ray/rayjobs/rayjob.py

@@ -455,7 +455,7 @@ def _handle_script_volumes_for_new_cluster(self, scripts: Dict[str, str]):
         """Handle script volumes for new clusters (uses ManagedClusterConfig)."""
         # Validate ConfigMap size before creation
         self._cluster_config.validate_configmap_size(scripts)
-        
+
         # Build ConfigMap spec using config.py
         configmap_spec = self._cluster_config.build_script_configmap_spec(
             job_name=self.name, namespace=self.namespace, scripts=scripts
@@ -473,7 +473,7 @@ def _handle_script_volumes_for_existing_cluster(self, scripts: Dict[str, str]):
         """Handle script volumes for existing clusters (updates RayCluster CR)."""
         # Create config builder for utility methods
         config_builder = ManagedClusterConfig()
-        
+
         # Validate ConfigMap size before creation
         config_builder.validate_configmap_size(scripts)
 
@@ -594,7 +594,7 @@ def mount_exists(mounts_list, mount_name):
         try:
             self._cluster_api.patch_ray_cluster(
                 name=self.cluster_name,
-                ray_cluster=ray_cluster,
+                ray_patch=ray_cluster,
                 k8s_namespace=self.namespace,
             )
             logger.info(

src/codeflare_sdk/ray/rayjobs/test_rayjob.py

@@ -1150,6 +1150,8 @@ class MockClusterConfig:
 
         rayjob._cluster_config = MockClusterConfig()
         rayjob._validate_cluster_config_image()  # Should not raise
+
+
 def test_extract_script_files_from_entrypoint_single_script(mocker, tmp_path):
     """Test extracting a single script file from entrypoint."""
     # Mock kubernetes config loading
@@ -1738,15 +1740,15 @@ def test_update_existing_cluster_get_cluster_error(mocker):
     mock_rayjob_api = mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
 
     # Mock RayClusterApi with error
-    mock_cluster_api_class = mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
+    mock_cluster_api_class = mocker.patch(
+        "codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi"
+    )
     mock_cluster_api_instance = mocker.Mock()
     mock_cluster_api_class.return_value = mock_cluster_api_instance
 
     from kubernetes.client import ApiException
 
-    mock_cluster_api_instance.get_ray_cluster.side_effect = ApiException(
-        status=404
-    )
+    mock_cluster_api_instance.get_ray_cluster.side_effect = ApiException(status=404)
 
     from codeflare_sdk.ray.rayjobs.config import ManagedClusterConfig
 
@@ -1770,7 +1772,9 @@ def test_update_existing_cluster_patch_error(mocker):
     mock_rayjob_api = mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayjobApi")
 
     # Mock RayClusterApi
-    mock_cluster_api_class = mocker.patch("codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi")
+    mock_cluster_api_class = mocker.patch(
+        "codeflare_sdk.ray.rayjobs.rayjob.RayClusterApi"
+    )
     mock_cluster_api_instance = mocker.Mock()
     mock_cluster_api_class.return_value = mock_cluster_api_instance
 
@@ -1794,9 +1798,7 @@ def test_update_existing_cluster_patch_error(mocker):
 
     from kubernetes.client import ApiException
 
-    mock_cluster_api_instance.patch_ray_cluster.side_effect = ApiException(
-        status=500
-    )
+    mock_cluster_api_instance.patch_ray_cluster.side_effect = ApiException(status=500)
 
     from codeflare_sdk.ray.rayjobs.config import ManagedClusterConfig