Skip to content

Commit 38a22d3

Browse files
precommit fixes
1 parent 5eacedf commit 38a22d3

File tree

3 files changed

+25
-15
lines changed

3 files changed

+25
-15
lines changed

src/codeflare_sdk/common/utils/test_generate_cert.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ def test_force_regenerate(mocker):
191191
"codeflare_sdk.common.utils.generate_cert._get_tls_base_dir",
192192
return_value=Path(os.getcwd()),
193193
)
194-
194+
195195
# Generate certificates first time
196196
generate_tls_cert("test-regen", "default")
197197
tls_dir = Path(os.getcwd()) / "test-regen-default"
@@ -230,7 +230,7 @@ def test_refresh_tls_cert(mocker):
230230
Test the refresh_tls_cert function
231231
"""
232232
from codeflare_sdk.common.utils.generate_cert import refresh_tls_cert
233-
233+
234234
mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
235235
mocker.patch(
236236
"codeflare_sdk.common.utils.generate_cert.get_secret_name",
@@ -244,7 +244,7 @@ def test_refresh_tls_cert(mocker):
244244
"codeflare_sdk.common.utils.generate_cert._get_tls_base_dir",
245245
return_value=Path(os.getcwd()),
246246
)
247-
247+
248248
# Generate initial certificates
249249
generate_tls_cert("refresh-test", "default")
250250
tls_dir = Path(os.getcwd()) / "refresh-test-default"

src/codeflare_sdk/ray/cluster/build_ray_cluster.py

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,9 @@ def build_ray_cluster(cluster: "codeflare_sdk.ray.cluster.Cluster"):
187187
gcs_ft_options = {"redisAddress": cluster.config.redis_address}
188188

189189
if cluster.config.external_storage_namespace:
190-
gcs_ft_options["externalStorageNamespace"] = (
191-
cluster.config.external_storage_namespace
192-
)
190+
gcs_ft_options[
191+
"externalStorageNamespace"
192+
] = cluster.config.external_storage_namespace
193193

194194
if cluster.config.redis_password_secret:
195195
gcs_ft_options["redisPassword"] = {
@@ -441,18 +441,28 @@ def head_worker_extended_resources_from_cluster(
441441
resource_type = cluster.config.extended_resource_mapping[k]
442442
if resource_type in FORBIDDEN_CUSTOM_RESOURCE_TYPES:
443443
continue
444-
head_worker_extended_resources[0][resource_type] = (
445-
cluster.config.head_extended_resource_requests[k]
446-
+ head_worker_extended_resources[0].get(resource_type, 0)
444+
head_worker_extended_resources[0][
445+
resource_type
446+
] = cluster.config.head_extended_resource_requests[
447+
k
448+
] + head_worker_extended_resources[
449+
0
450+
].get(
451+
resource_type, 0
447452
)
448453

449454
for k in cluster.config.worker_extended_resource_requests.keys():
450455
resource_type = cluster.config.extended_resource_mapping[k]
451456
if resource_type in FORBIDDEN_CUSTOM_RESOURCE_TYPES:
452457
continue
453-
head_worker_extended_resources[1][resource_type] = (
454-
cluster.config.worker_extended_resource_requests[k]
455-
+ head_worker_extended_resources[1].get(resource_type, 0)
458+
head_worker_extended_resources[1][
459+
resource_type
460+
] = cluster.config.worker_extended_resource_requests[
461+
k
462+
] + head_worker_extended_resources[
463+
1
464+
].get(
465+
resource_type, 0
456466
)
457467
return head_worker_extended_resources
458468

src/codeflare_sdk/ray/rayjobs/rayjob.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,9 +281,9 @@ def _build_rayjob_cr(self) -> Dict[str, Any]:
281281
# Add submitterPodTemplate if we have files to mount
282282
if files:
283283
secret_name = f"{self.name}-files"
284-
rayjob_cr["spec"]["submitterPodTemplate"] = (
285-
self._build_submitter_pod_template(files, secret_name)
286-
)
284+
rayjob_cr["spec"][
285+
"submitterPodTemplate"
286+
] = self._build_submitter_pod_template(files, secret_name)
287287

288288
# Configure cluster: either use existing or create new
289289
if self._cluster_config is not None:

0 commit comments

Comments
 (0)