Skip to content

Commit 4d97794

Browse files
author
Ruban Hussain
committed
feature: SDK Defaults Config - SDK-wide S3 Key Prefix - added for new code since initial commit
1 parent 3b2e493 commit 4d97794

File tree

5 files changed

+16
-6
lines changed

5 files changed

+16
-6
lines changed

src/sagemaker/djl_inference/model.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -503,12 +503,16 @@ def partition(
503503
self.key_prefix, self.name, self.image_uri
504504
)
505505
if s3_output_uri is None:
506-
bucket = self.bucket or self.sagemaker_session.default_bucket()
507-
s3_output_uri = f"s3://{bucket}/{deploy_key_prefix}"
506+
bucket, deploy_key_prefix = s3.determine_bucket_and_prefix(
507+
bucket=self.bucket,
508+
key_prefix=deploy_key_prefix,
509+
sagemaker_session=self.sagemaker_session,
510+
)
511+
s3_output_uri = s3_path_join("s3://", bucket, deploy_key_prefix)
508512
else:
509-
s3_output_uri = f"{s3_output_uri}/{deploy_key_prefix}"
513+
s3_output_uri = s3_path_join(s3_output_uri, deploy_key_prefix)
510514

511-
self.save_mp_checkpoint_path = f"{s3_output_uri}/aot-partitioned-checkpoints"
515+
self.save_mp_checkpoint_path = s3_path_join(s3_output_uri, "aot-partitioned-checkpoints")
512516

513517
container_def = self._upload_model_to_s3(upload_as_tar=False)
514518
estimator = _create_estimator(

src/sagemaker/predictor_async.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ def _upload_data_to_s3(
179179
self.s3_client.put_object(
180180
Body=data, Bucket=bucket, Key=key, ContentType=self.serializer.CONTENT_TYPE
181181
)
182-
input_path = input_path or "s3://{}/{}".format(self.sagemaker_session.default_bucket(), key)
182+
input_path = input_path or "s3://{}/{}".format(bucket, key)
183183

184184
return input_path
185185

src/sagemaker/processing.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,7 @@ def _normalize_outputs(self, outputs=None):
468468
"s3:/",
469469
self.sagemaker_session.default_bucket(),
470470
*(
471+
# don't include default_bucket_prefix if it is None or ""
471472
[self.sagemaker_session.default_bucket_prefix]
472473
if self.sagemaker_session.default_bucket_prefix
473474
else []

src/sagemaker/remote_function/job.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,11 @@ def __init__(
248248
self.s3_root_uri = resolve_value_from_config(
249249
direct_input=s3_root_uri,
250250
config_path=REMOTE_FUNCTION_S3_ROOT_URI,
251-
default_value=os.path.join("s3://", self.sagemaker_session.default_bucket()),
251+
default_value=s3_path_join(
252+
"s3://",
253+
self.sagemaker_session.default_bucket(),
254+
self.sagemaker_session.default_bucket_prefix,
255+
),
252256
sagemaker_session=self.sagemaker_session,
253257
)
254258

src/sagemaker/transformer.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ def transform(
263263
"s3:/",
264264
self.sagemaker_session.default_bucket(),
265265
*(
266+
# don't include default_bucket_prefix if it is None or ""
266267
[self.sagemaker_session.default_bucket_prefix]
267268
if self.sagemaker_session.default_bucket_prefix
268269
else []

0 commit comments

Comments
 (0)