breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url#1772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laurenyu merged 3 commits into from
Jul 30, 2020
Merged

breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url #1772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
515d284
breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url
laurenyu Jul 29, 2020
929e639
Merge branch 'zwei' into deprecate-fw-utils-parse-s3-url
laurenyu Jul 30, 2020
11b3bc7
Merge branch 'zwei' into deprecate-fw-utils-parse-s3-url
laurenyu Jul 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/sagemaker/estimator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,10 @@
from sagemaker.debugger import DebuggerHookConfig
from sagemaker.debugger import TensorBoardOutputConfig # noqa: F401 # pylint: disable=unused-import
from sagemaker.debugger import get_rule_container_image_uri
from sagemaker.s3 import S3Uploader
from sagemaker.s3 import S3Uploader, parse_s3_url

from sagemaker.fw_utils import (
tar_and_upload_dir,
parse_s3_url,
UploadedCode,
validate_source_dir,
_region_supports_debugger,
Expand Down
15 changes: 0 additions & 15 deletions src/sagemaker/fw_utils.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
from collections import namedtuple

import sagemaker.utils
from sagemaker import s3

logger = logging.getLogger("sagemaker")

Expand DownExpand Up@@ -264,20 +263,6 @@ def framework_version_from_tag(image_tag):
return None if tag_match is None else tag_match.group(1)


def parse_s3_url(url):
"""Calls the method with the same name in the s3 module.

:func:~sagemaker.s3.parse_s3_url

Args:
url: A URL, expected with an s3 scheme.

Returns: The return value of s3.parse_s3_url, which is a tuple containing:
str: S3 bucket name str: S3 key
"""
return s3.parse_s3_url(url)


def model_code_key_prefix(code_location_key_prefix, model_name, image):
"""Returns the s3 key prefix for uploading code during model deployment
The location returned is a potential concatenation of 2 parts
Expand Down
7 changes: 3 additions & 4 deletions src/sagemaker/model.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,7 @@
import os

import sagemaker
from sagemaker import fw_utils, image_uris, local, session, utils, git_utils
from sagemaker.fw_utils import UploadedCode
from sagemaker import fw_utils, image_uris, local, s3, session, utils, git_utils
from sagemaker.transformer import Transformer

LOGGER = logging.getLogger("sagemaker")
Expand DownExpand Up@@ -715,7 +714,7 @@ def __init__(
self.git_config = git_config
self.container_log_level = container_log_level
if code_location:
self.bucket, self.key_prefix = fw_utils.parse_s3_url(code_location)
self.bucket, self.key_prefix = s3.parse_s3_url(code_location)
else:
self.bucket, self.key_prefix = None, None
if self.git_config:
Expand DownExpand Up@@ -788,7 +787,7 @@ def _upload_code(self, key_prefix, repack=False):
)

self.repacked_model_data = repacked_model_data
self.uploaded_code = UploadedCode(
self.uploaded_code = fw_utils.UploadedCode(
s3_prefix=self.repacked_model_data, script_name=os.path.basename(self.entry_point)
)

Expand Down
6 changes: 3 additions & 3 deletions src/sagemaker/workflow/airflow.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
import re

import sagemaker
from sagemaker import fw_utils, job, utils, session, vpc_utils
from sagemaker import fw_utils, job, utils, s3, session, vpc_utils
from sagemaker.amazon import amazon_estimator
from sagemaker.tensorflow import TensorFlow

Expand All@@ -33,10 +33,10 @@ def prepare_framework(estimator, s3_operations):
`source_dir` ).
"""
if estimator.code_location is not None:
bucket, key = fw_utils.parse_s3_url(estimator.code_location)
bucket, key = s3.parse_s3_url(estimator.code_location)
key = os.path.join(key, estimator._current_job_name, "source", "sourcedir.tar.gz")
elif estimator.uploaded_code is not None:
bucket, key = fw_utils.parse_s3_url(estimator.uploaded_code.s3_prefix)
bucket, key = s3.parse_s3_url(estimator.uploaded_code.s3_prefix)
else:
bucket = estimator.sagemaker_session._default_bucket
key = os.path.join(estimator._current_job_name, "source", "sourcedir.tar.gz")
Expand Down
12 changes: 6 additions & 6 deletions tests/unit/test_airflow.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@ def test_byo_training_config_all_args(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
"sagemaker.fw_utils.parse_s3_url",
"sagemaker.s3.parse_s3_url",
MagicMock(
return_value=["output", "tensorflow-training-{}/source/sourcedir.tar.gz".format(TIME_STAMP)]
),
Expand DownExpand Up@@ -468,7 +468,7 @@ def test_amazon_alg_training_config_all_args(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
"sagemaker.fw_utils.parse_s3_url",
"sagemaker.s3.parse_s3_url",
MagicMock(
return_value=[
"output",
Expand DownExpand Up@@ -610,7 +610,7 @@ def test_framework_tuning_config(retrieve_image_uri, sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
"sagemaker.fw_utils.parse_s3_url",
"sagemaker.s3.parse_s3_url",
MagicMock(
return_value=[
"output",
Expand DownExpand Up@@ -1020,7 +1020,7 @@ def test_amazon_alg_model_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
"sagemaker.fw_utils.parse_s3_url",
"sagemaker.s3.parse_s3_url",
MagicMock(
return_value=[
"output",
Expand DownExpand Up@@ -1185,7 +1185,7 @@ def test_transform_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
"sagemaker.fw_utils.parse_s3_url",
"sagemaker.s3.parse_s3_url",
MagicMock(
return_value=[
"output",
Expand DownExpand Up@@ -1436,7 +1436,7 @@ def test_deploy_amazon_alg_model_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
"sagemaker.fw_utils.parse_s3_url",
"sagemaker.s3.parse_s3_url",
MagicMock(
return_value=[
"output",
Expand Down
12 changes: 0 additions & 12 deletions tests/unit/test_fw_utils.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -411,18 +411,6 @@ def test_framework_version_from_tag_other():
assert version is None


def test_parse_s3_url():
bucket, key_prefix = fw_utils.parse_s3_url("s3://bucket/code_location")
assert "bucket" == bucket
assert "code_location" == key_prefix


def test_parse_s3_url_fail():
with pytest.raises(ValueError) as error:
fw_utils.parse_s3_url("t3://code_location")
assert "Expecting 's3' scheme" in str(error)


def test_model_code_key_prefix_with_all_values_present():
key_prefix = fw_utils.model_code_key_prefix("prefix", "model_name", "image_uri")
assert key_prefix == "prefix/model_name"
Expand Down
22 changes: 17 additions & 5 deletions tests/unit/test_s3.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
import pytest
from mock import Mock

from sagemaker.s3 import S3Uploader, S3Downloader
from sagemaker import s3

BUCKET_NAME = "mybucket"
REGION = "us-west-2"
Expand All@@ -42,7 +42,7 @@ def sagemaker_session():

def test_upload(sagemaker_session, caplog):
desired_s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
S3Uploader.upload(
s3.S3Uploader.upload(
local_path="/path/to/app.jar",
desired_s3_uri=desired_s3_uri,
sagemaker_session=sagemaker_session,
Expand All@@ -57,7 +57,7 @@ def test_upload(sagemaker_session, caplog):

def test_upload_with_kms_key(sagemaker_session):
desired_s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
S3Uploader.upload(
s3.S3Uploader.upload(
local_path="/path/to/app.jar",
desired_s3_uri=desired_s3_uri,
kms_key=KMS_KEY,
Expand All@@ -73,7 +73,7 @@ def test_upload_with_kms_key(sagemaker_session):

def test_download(sagemaker_session):
s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
S3Downloader.download(
s3.S3Downloader.download(
s3_uri=s3_uri, local_path="/path/for/download/", sagemaker_session=sagemaker_session
)
sagemaker_session.download_data.assert_called_with(
Expand All@@ -86,7 +86,7 @@ def test_download(sagemaker_session):

def test_download_with_kms_key(sagemaker_session):
s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
S3Downloader.download(
s3.S3Downloader.download(
s3_uri=s3_uri,
local_path="/path/for/download/",
kms_key=KMS_KEY,
Expand All@@ -98,3 +98,15 @@ def test_download_with_kms_key(sagemaker_session):
key_prefix=os.path.join(CURRENT_JOB_NAME, SOURCE_NAME),
extra_args={"SSECustomerKey": KMS_KEY},
)


def test_parse_s3_url():
bucket, key_prefix = s3.parse_s3_url("s3://bucket/code_location")
assert "bucket" == bucket
assert "code_location" == key_prefix


def test_parse_s3_url_fail():
with pytest.raises(ValueError) as error:
s3.parse_s3_url("t3://code_location")
assert "Expecting 's3' scheme" in str(error)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url#1772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

laurenyu
merged 3 commits into

from

Jul 30, 2020
 Merged


breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url
#1772
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
515d284

breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url


laurenyu Jul 29, 2020
929e639

Merge branch 'zwei' into deprecate-fw-utils-parse-s3-url


laurenyu Jul 30, 2020
11b3bc7

Merge branch 'zwei' into deprecate-fw-utils-parse-s3-url


laurenyu Jul 30, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 1 addition & 2 deletions
src/sagemaker/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,10 @@
from sagemaker.debugger import DebuggerHookConfig
from sagemaker.debugger import TensorBoardOutputConfig # noqa: F401 # pylint: disable=unused-import
from sagemaker.debugger import get_rule_container_image_uri
from sagemaker.s3 import S3Uploader
from sagemaker.s3 import S3Uploader, parse_s3_url

from sagemaker.fw_utils import (
 tar_and_upload_dir,
 parse_s3_url,
 UploadedCode,
 validate_source_dir,
 _region_supports_debugger,
Expand Down

15 changes: 0 additions & 15 deletions
src/sagemaker/fw_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
from collections import namedtuple

import sagemaker.utils
from sagemaker import s3

logger = logging.getLogger("sagemaker")

Expand DownExpand Up@@ -264,20 +263,6 @@ def framework_version_from_tag(image_tag):
 return None if tag_match is None else tag_match.group(1)


def parse_s3_url(url):
 """Calls the method with the same name in the s3 module.

 :func:~sagemaker.s3.parse_s3_url

 Args:
 url: A URL, expected with an s3 scheme.

 Returns: The return value of s3.parse_s3_url, which is a tuple containing:
 str: S3 bucket name str: S3 key
 """
 return s3.parse_s3_url(url)


def model_code_key_prefix(code_location_key_prefix, model_name, image):
 """Returns the s3 key prefix for uploading code during model deployment
 The location returned is a potential concatenation of 2 parts
Expand Down

7 changes: 3 additions & 4 deletions
src/sagemaker/model.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,7 @@
import os

import sagemaker
from sagemaker import fw_utils, image_uris, local, session, utils, git_utils
from sagemaker.fw_utils import UploadedCode
from sagemaker import fw_utils, image_uris, local, s3, session, utils, git_utils
from sagemaker.transformer import Transformer

LOGGER = logging.getLogger("sagemaker")
Expand DownExpand Up@@ -715,7 +714,7 @@ def __init__(
 self.git_config = git_config
 self.container_log_level = container_log_level
 if code_location:
 self.bucket, self.key_prefix = fw_utils.parse_s3_url(code_location)
 self.bucket, self.key_prefix = s3.parse_s3_url(code_location)
 else:
 self.bucket, self.key_prefix = None, None
 if self.git_config:
Expand DownExpand Up@@ -788,7 +787,7 @@ def _upload_code(self, key_prefix, repack=False):
 )

 self.repacked_model_data = repacked_model_data
 self.uploaded_code = UploadedCode(
 self.uploaded_code = fw_utils.UploadedCode(
 s3_prefix=self.repacked_model_data, script_name=os.path.basename(self.entry_point)
 )

Expand Down

6 changes: 3 additions & 3 deletions
src/sagemaker/workflow/airflow.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
import re

import sagemaker
from sagemaker import fw_utils, job, utils, session, vpc_utils
from sagemaker import fw_utils, job, utils, s3, session, vpc_utils
from sagemaker.amazon import amazon_estimator
from sagemaker.tensorflow import TensorFlow

Expand All@@ -33,10 +33,10 @@ def prepare_framework(estimator, s3_operations):
 `source_dir` ).
 """
 if estimator.code_location is not None:
 bucket, key = fw_utils.parse_s3_url(estimator.code_location)
 bucket, key = s3.parse_s3_url(estimator.code_location)
 key = os.path.join(key, estimator._current_job_name, "source", "sourcedir.tar.gz")
 elif estimator.uploaded_code is not None:
 bucket, key = fw_utils.parse_s3_url(estimator.uploaded_code.s3_prefix)
 bucket, key = s3.parse_s3_url(estimator.uploaded_code.s3_prefix)
 else:
 bucket = estimator.sagemaker_session._default_bucket
 key = os.path.join(estimator._current_job_name, "source", "sourcedir.tar.gz")
Expand Down

12 changes: 6 additions & 6 deletions
tests/unit/test_airflow.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@ def test_byo_training_config_all_args(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=["output", "tensorflow-training-{}/source/sourcedir.tar.gz".format(TIME_STAMP)]
 ),
Expand DownExpand Up@@ -468,7 +468,7 @@ def test_amazon_alg_training_config_all_args(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -610,7 +610,7 @@ def test_framework_tuning_config(retrieve_image_uri, sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -1020,7 +1020,7 @@ def test_amazon_alg_model_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -1185,7 +1185,7 @@ def test_transform_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -1436,7 +1436,7 @@ def test_deploy_amazon_alg_model_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand Down

12 changes: 0 additions & 12 deletions
tests/unit/test_fw_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -411,18 +411,6 @@ def test_framework_version_from_tag_other():
 assert version is None


def test_parse_s3_url():
 bucket, key_prefix = fw_utils.parse_s3_url("s3://bucket/code_location")
 assert "bucket" == bucket
 assert "code_location" == key_prefix


def test_parse_s3_url_fail():
 with pytest.raises(ValueError) as error:
 fw_utils.parse_s3_url("t3://code_location")
 assert "Expecting 's3' scheme" in str(error)


def test_model_code_key_prefix_with_all_values_present():
 key_prefix = fw_utils.model_code_key_prefix("prefix", "model_name", "image_uri")
 assert key_prefix == "prefix/model_name"
Expand Down

22 changes: 17 additions & 5 deletions
tests/unit/test_s3.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
import pytest
from mock import Mock

from sagemaker.s3 import S3Uploader, S3Downloader
from sagemaker import s3

BUCKET_NAME = "mybucket"
REGION = "us-west-2"
Expand All@@ -42,7 +42,7 @@ def sagemaker_session():

def test_upload(sagemaker_session, caplog):
 desired_s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Uploader.upload(
s3.S3Uploader.upload(
 local_path="/path/to/app.jar",
 desired_s3_uri=desired_s3_uri,
 sagemaker_session=sagemaker_session,
Expand All@@ -57,7 +57,7 @@ def test_upload(sagemaker_session, caplog):

def test_upload_with_kms_key(sagemaker_session):
 desired_s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Uploader.upload(
s3.S3Uploader.upload(
 local_path="/path/to/app.jar",
 desired_s3_uri=desired_s3_uri,
 kms_key=KMS_KEY,
Expand All@@ -73,7 +73,7 @@ def test_upload_with_kms_key(sagemaker_session):

def test_download(sagemaker_session):
 s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Downloader.download(
s3.S3Downloader.download(
 s3_uri=s3_uri, local_path="/path/for/download/", sagemaker_session=sagemaker_session
 )
 sagemaker_session.download_data.assert_called_with(
Expand All@@ -86,7 +86,7 @@ def test_download(sagemaker_session):

def test_download_with_kms_key(sagemaker_session):
 s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Downloader.download(
s3.S3Downloader.download(
 s3_uri=s3_uri,
 local_path="/path/for/download/",
 kms_key=KMS_KEY,
Expand All@@ -98,3 +98,15 @@ def test_download_with_kms_key(sagemaker_session):
 key_prefix=os.path.join(CURRENT_JOB_NAME, SOURCE_NAME),
 extra_args={"SSECustomerKey": KMS_KEY},
 )


def test_parse_s3_url():
 bucket, key_prefix = s3.parse_s3_url("s3://bucket/code_location")
 assert "bucket" == bucket
 assert "code_location" == key_prefix


def test_parse_s3_url_fail():
 with pytest.raises(ValueError) as error:
 s3.parse_s3_url("t3://code_location")
 assert "Expecting 's3' scheme" in str(error)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url#1772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

laurenyu
merged 3 commits into

from

Jul 30, 2020
 Merged


breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url
#1772
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
515d284

breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url


laurenyu Jul 29, 2020
929e639

Merge branch 'zwei' into deprecate-fw-utils-parse-s3-url


laurenyu Jul 30, 2020
11b3bc7

Merge branch 'zwei' into deprecate-fw-utils-parse-s3-url


laurenyu Jul 30, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 1 addition & 2 deletions
src/sagemaker/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,10 @@
from sagemaker.debugger import DebuggerHookConfig
from sagemaker.debugger import TensorBoardOutputConfig # noqa: F401 # pylint: disable=unused-import
from sagemaker.debugger import get_rule_container_image_uri
from sagemaker.s3 import S3Uploader
from sagemaker.s3 import S3Uploader, parse_s3_url

from sagemaker.fw_utils import (
 tar_and_upload_dir,
 parse_s3_url,
 UploadedCode,
 validate_source_dir,
 _region_supports_debugger,
Expand Down

15 changes: 0 additions & 15 deletions
src/sagemaker/fw_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
from collections import namedtuple

import sagemaker.utils
from sagemaker import s3

logger = logging.getLogger("sagemaker")

Expand DownExpand Up@@ -264,20 +263,6 @@ def framework_version_from_tag(image_tag):
 return None if tag_match is None else tag_match.group(1)


def parse_s3_url(url):
 """Calls the method with the same name in the s3 module.

 :func:~sagemaker.s3.parse_s3_url

 Args:
 url: A URL, expected with an s3 scheme.

 Returns: The return value of s3.parse_s3_url, which is a tuple containing:
 str: S3 bucket name str: S3 key
 """
 return s3.parse_s3_url(url)


def model_code_key_prefix(code_location_key_prefix, model_name, image):
 """Returns the s3 key prefix for uploading code during model deployment
 The location returned is a potential concatenation of 2 parts
Expand Down

7 changes: 3 additions & 4 deletions
src/sagemaker/model.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,7 @@
import os

import sagemaker
from sagemaker import fw_utils, image_uris, local, session, utils, git_utils
from sagemaker.fw_utils import UploadedCode
from sagemaker import fw_utils, image_uris, local, s3, session, utils, git_utils
from sagemaker.transformer import Transformer

LOGGER = logging.getLogger("sagemaker")
Expand DownExpand Up@@ -715,7 +714,7 @@ def __init__(
 self.git_config = git_config
 self.container_log_level = container_log_level
 if code_location:
 self.bucket, self.key_prefix = fw_utils.parse_s3_url(code_location)
 self.bucket, self.key_prefix = s3.parse_s3_url(code_location)
 else:
 self.bucket, self.key_prefix = None, None
 if self.git_config:
Expand DownExpand Up@@ -788,7 +787,7 @@ def _upload_code(self, key_prefix, repack=False):
 )

 self.repacked_model_data = repacked_model_data
 self.uploaded_code = UploadedCode(
 self.uploaded_code = fw_utils.UploadedCode(
 s3_prefix=self.repacked_model_data, script_name=os.path.basename(self.entry_point)
 )

Expand Down

6 changes: 3 additions & 3 deletions
src/sagemaker/workflow/airflow.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
import re

import sagemaker
from sagemaker import fw_utils, job, utils, session, vpc_utils
from sagemaker import fw_utils, job, utils, s3, session, vpc_utils
from sagemaker.amazon import amazon_estimator
from sagemaker.tensorflow import TensorFlow

Expand All@@ -33,10 +33,10 @@ def prepare_framework(estimator, s3_operations):
 `source_dir` ).
 """
 if estimator.code_location is not None:
 bucket, key = fw_utils.parse_s3_url(estimator.code_location)
 bucket, key = s3.parse_s3_url(estimator.code_location)
 key = os.path.join(key, estimator._current_job_name, "source", "sourcedir.tar.gz")
 elif estimator.uploaded_code is not None:
 bucket, key = fw_utils.parse_s3_url(estimator.uploaded_code.s3_prefix)
 bucket, key = s3.parse_s3_url(estimator.uploaded_code.s3_prefix)
 else:
 bucket = estimator.sagemaker_session._default_bucket
 key = os.path.join(estimator._current_job_name, "source", "sourcedir.tar.gz")
Expand Down

12 changes: 6 additions & 6 deletions
tests/unit/test_airflow.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@ def test_byo_training_config_all_args(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=["output", "tensorflow-training-{}/source/sourcedir.tar.gz".format(TIME_STAMP)]
 ),
Expand DownExpand Up@@ -468,7 +468,7 @@ def test_amazon_alg_training_config_all_args(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -610,7 +610,7 @@ def test_framework_tuning_config(retrieve_image_uri, sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -1020,7 +1020,7 @@ def test_amazon_alg_model_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -1185,7 +1185,7 @@ def test_transform_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -1436,7 +1436,7 @@ def test_deploy_amazon_alg_model_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand Down

12 changes: 0 additions & 12 deletions
tests/unit/test_fw_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -411,18 +411,6 @@ def test_framework_version_from_tag_other():
 assert version is None


def test_parse_s3_url():
 bucket, key_prefix = fw_utils.parse_s3_url("s3://bucket/code_location")
 assert "bucket" == bucket
 assert "code_location" == key_prefix


def test_parse_s3_url_fail():
 with pytest.raises(ValueError) as error:
 fw_utils.parse_s3_url("t3://code_location")
 assert "Expecting 's3' scheme" in str(error)


def test_model_code_key_prefix_with_all_values_present():
 key_prefix = fw_utils.model_code_key_prefix("prefix", "model_name", "image_uri")
 assert key_prefix == "prefix/model_name"
Expand Down

22 changes: 17 additions & 5 deletions
tests/unit/test_s3.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
import pytest
from mock import Mock

from sagemaker.s3 import S3Uploader, S3Downloader
from sagemaker import s3

BUCKET_NAME = "mybucket"
REGION = "us-west-2"
Expand All@@ -42,7 +42,7 @@ def sagemaker_session():

def test_upload(sagemaker_session, caplog):
 desired_s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Uploader.upload(
s3.S3Uploader.upload(
 local_path="/path/to/app.jar",
 desired_s3_uri=desired_s3_uri,
 sagemaker_session=sagemaker_session,
Expand All@@ -57,7 +57,7 @@ def test_upload(sagemaker_session, caplog):

def test_upload_with_kms_key(sagemaker_session):
 desired_s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Uploader.upload(
s3.S3Uploader.upload(
 local_path="/path/to/app.jar",
 desired_s3_uri=desired_s3_uri,
 kms_key=KMS_KEY,
Expand All@@ -73,7 +73,7 @@ def test_upload_with_kms_key(sagemaker_session):

def test_download(sagemaker_session):
 s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Downloader.download(
s3.S3Downloader.download(
 s3_uri=s3_uri, local_path="/path/for/download/", sagemaker_session=sagemaker_session
 )
 sagemaker_session.download_data.assert_called_with(
Expand All@@ -86,7 +86,7 @@ def test_download(sagemaker_session):

def test_download_with_kms_key(sagemaker_session):
 s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Downloader.download(
s3.S3Downloader.download(
 s3_uri=s3_uri,
 local_path="/path/for/download/",
 kms_key=KMS_KEY,
Expand All@@ -98,3 +98,15 @@ def test_download_with_kms_key(sagemaker_session):
 key_prefix=os.path.join(CURRENT_JOB_NAME, SOURCE_NAME),
 extra_args={"SSECustomerKey": KMS_KEY},
 )


def test_parse_s3_url():
 bucket, key_prefix = s3.parse_s3_url("s3://bucket/code_location")
 assert "bucket" == bucket
 assert "code_location" == key_prefix


def test_parse_s3_url_fail():
 with pytest.raises(ValueError) as error:
 s3.parse_s3_url("t3://code_location")
 assert "Expecting 's3' scheme" in str(error)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url#1772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

laurenyu
merged 3 commits into

from

Jul 30, 2020
 Merged


breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url
#1772
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
515d284

breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url


laurenyu Jul 29, 2020
929e639

Merge branch 'zwei' into deprecate-fw-utils-parse-s3-url


laurenyu Jul 30, 2020
11b3bc7

Merge branch 'zwei' into deprecate-fw-utils-parse-s3-url


laurenyu Jul 30, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 1 addition & 2 deletions
src/sagemaker/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,10 @@
from sagemaker.debugger import DebuggerHookConfig
from sagemaker.debugger import TensorBoardOutputConfig # noqa: F401 # pylint: disable=unused-import
from sagemaker.debugger import get_rule_container_image_uri
from sagemaker.s3 import S3Uploader
from sagemaker.s3 import S3Uploader, parse_s3_url

from sagemaker.fw_utils import (
 tar_and_upload_dir,
 parse_s3_url,
 UploadedCode,
 validate_source_dir,
 _region_supports_debugger,
Expand Down

15 changes: 0 additions & 15 deletions
src/sagemaker/fw_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
from collections import namedtuple

import sagemaker.utils
from sagemaker import s3

logger = logging.getLogger("sagemaker")

Expand DownExpand Up@@ -264,20 +263,6 @@ def framework_version_from_tag(image_tag):
 return None if tag_match is None else tag_match.group(1)


def parse_s3_url(url):
 """Calls the method with the same name in the s3 module.

 :func:~sagemaker.s3.parse_s3_url

 Args:
 url: A URL, expected with an s3 scheme.

 Returns: The return value of s3.parse_s3_url, which is a tuple containing:
 str: S3 bucket name str: S3 key
 """
 return s3.parse_s3_url(url)


def model_code_key_prefix(code_location_key_prefix, model_name, image):
 """Returns the s3 key prefix for uploading code during model deployment
 The location returned is a potential concatenation of 2 parts
Expand Down

7 changes: 3 additions & 4 deletions
src/sagemaker/model.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,7 @@
import os

import sagemaker
from sagemaker import fw_utils, image_uris, local, session, utils, git_utils
from sagemaker.fw_utils import UploadedCode
from sagemaker import fw_utils, image_uris, local, s3, session, utils, git_utils
from sagemaker.transformer import Transformer

LOGGER = logging.getLogger("sagemaker")
Expand DownExpand Up@@ -715,7 +714,7 @@ def __init__(
 self.git_config = git_config
 self.container_log_level = container_log_level
 if code_location:
 self.bucket, self.key_prefix = fw_utils.parse_s3_url(code_location)
 self.bucket, self.key_prefix = s3.parse_s3_url(code_location)
 else:
 self.bucket, self.key_prefix = None, None
 if self.git_config:
Expand DownExpand Up@@ -788,7 +787,7 @@ def _upload_code(self, key_prefix, repack=False):
 )

 self.repacked_model_data = repacked_model_data
 self.uploaded_code = UploadedCode(
 self.uploaded_code = fw_utils.UploadedCode(
 s3_prefix=self.repacked_model_data, script_name=os.path.basename(self.entry_point)
 )

Expand Down

6 changes: 3 additions & 3 deletions
src/sagemaker/workflow/airflow.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
import re

import sagemaker
from sagemaker import fw_utils, job, utils, session, vpc_utils
from sagemaker import fw_utils, job, utils, s3, session, vpc_utils
from sagemaker.amazon import amazon_estimator
from sagemaker.tensorflow import TensorFlow

Expand All@@ -33,10 +33,10 @@ def prepare_framework(estimator, s3_operations):
 `source_dir` ).
 """
 if estimator.code_location is not None:
 bucket, key = fw_utils.parse_s3_url(estimator.code_location)
 bucket, key = s3.parse_s3_url(estimator.code_location)
 key = os.path.join(key, estimator._current_job_name, "source", "sourcedir.tar.gz")
 elif estimator.uploaded_code is not None:
 bucket, key = fw_utils.parse_s3_url(estimator.uploaded_code.s3_prefix)
 bucket, key = s3.parse_s3_url(estimator.uploaded_code.s3_prefix)
 else:
 bucket = estimator.sagemaker_session._default_bucket
 key = os.path.join(estimator._current_job_name, "source", "sourcedir.tar.gz")
Expand Down

12 changes: 6 additions & 6 deletions
tests/unit/test_airflow.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@ def test_byo_training_config_all_args(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=["output", "tensorflow-training-{}/source/sourcedir.tar.gz".format(TIME_STAMP)]
 ),
Expand DownExpand Up@@ -468,7 +468,7 @@ def test_amazon_alg_training_config_all_args(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -610,7 +610,7 @@ def test_framework_tuning_config(retrieve_image_uri, sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -1020,7 +1020,7 @@ def test_amazon_alg_model_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -1185,7 +1185,7 @@ def test_transform_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -1436,7 +1436,7 @@ def test_deploy_amazon_alg_model_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand Down

12 changes: 0 additions & 12 deletions
tests/unit/test_fw_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -411,18 +411,6 @@ def test_framework_version_from_tag_other():
 assert version is None


def test_parse_s3_url():
 bucket, key_prefix = fw_utils.parse_s3_url("s3://bucket/code_location")
 assert "bucket" == bucket
 assert "code_location" == key_prefix


def test_parse_s3_url_fail():
 with pytest.raises(ValueError) as error:
 fw_utils.parse_s3_url("t3://code_location")
 assert "Expecting 's3' scheme" in str(error)


def test_model_code_key_prefix_with_all_values_present():
 key_prefix = fw_utils.model_code_key_prefix("prefix", "model_name", "image_uri")
 assert key_prefix == "prefix/model_name"
Expand Down

22 changes: 17 additions & 5 deletions
tests/unit/test_s3.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
import pytest
from mock import Mock

from sagemaker.s3 import S3Uploader, S3Downloader
from sagemaker import s3

BUCKET_NAME = "mybucket"
REGION = "us-west-2"
Expand All@@ -42,7 +42,7 @@ def sagemaker_session():

def test_upload(sagemaker_session, caplog):
 desired_s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Uploader.upload(
s3.S3Uploader.upload(
 local_path="/path/to/app.jar",
 desired_s3_uri=desired_s3_uri,
 sagemaker_session=sagemaker_session,
Expand All@@ -57,7 +57,7 @@ def test_upload(sagemaker_session, caplog):

def test_upload_with_kms_key(sagemaker_session):
 desired_s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Uploader.upload(
s3.S3Uploader.upload(
 local_path="/path/to/app.jar",
 desired_s3_uri=desired_s3_uri,
 kms_key=KMS_KEY,
Expand All@@ -73,7 +73,7 @@ def test_upload_with_kms_key(sagemaker_session):

def test_download(sagemaker_session):
 s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Downloader.download(
s3.S3Downloader.download(
 s3_uri=s3_uri, local_path="/path/for/download/", sagemaker_session=sagemaker_session
 )
 sagemaker_session.download_data.assert_called_with(
Expand All@@ -86,7 +86,7 @@ def test_download(sagemaker_session):

def test_download_with_kms_key(sagemaker_session):
 s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Downloader.download(
s3.S3Downloader.download(
 s3_uri=s3_uri,
 local_path="/path/for/download/",
 kms_key=KMS_KEY,
Expand All@@ -98,3 +98,15 @@ def test_download_with_kms_key(sagemaker_session):
 key_prefix=os.path.join(CURRENT_JOB_NAME, SOURCE_NAME),
 extra_args={"SSECustomerKey": KMS_KEY},
 )


def test_parse_s3_url():
 bucket, key_prefix = s3.parse_s3_url("s3://bucket/code_location")
 assert "bucket" == bucket
 assert "code_location" == key_prefix


def test_parse_s3_url_fail():
 with pytest.raises(ValueError) as error:
 s3.parse_s3_url("t3://code_location")
 assert "Expecting 's3' scheme" in str(error)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url#1772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

laurenyu
merged 3 commits into

from

Jul 30, 2020
 Merged


breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url
#1772
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
515d284

breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url


laurenyu Jul 29, 2020
929e639

Merge branch 'zwei' into deprecate-fw-utils-parse-s3-url


laurenyu Jul 30, 2020
11b3bc7

Merge branch 'zwei' into deprecate-fw-utils-parse-s3-url


laurenyu Jul 30, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 1 addition & 2 deletions
src/sagemaker/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,10 @@
from sagemaker.debugger import DebuggerHookConfig
from sagemaker.debugger import TensorBoardOutputConfig # noqa: F401 # pylint: disable=unused-import
from sagemaker.debugger import get_rule_container_image_uri
from sagemaker.s3 import S3Uploader
from sagemaker.s3 import S3Uploader, parse_s3_url

from sagemaker.fw_utils import (
 tar_and_upload_dir,
 parse_s3_url,
 UploadedCode,
 validate_source_dir,
 _region_supports_debugger,
Expand Down

15 changes: 0 additions & 15 deletions
src/sagemaker/fw_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
from collections import namedtuple

import sagemaker.utils
from sagemaker import s3

logger = logging.getLogger("sagemaker")

Expand DownExpand Up@@ -264,20 +263,6 @@ def framework_version_from_tag(image_tag):
 return None if tag_match is None else tag_match.group(1)


def parse_s3_url(url):
 """Calls the method with the same name in the s3 module.

 :func:~sagemaker.s3.parse_s3_url

 Args:
 url: A URL, expected with an s3 scheme.

 Returns: The return value of s3.parse_s3_url, which is a tuple containing:
 str: S3 bucket name str: S3 key
 """
 return s3.parse_s3_url(url)


def model_code_key_prefix(code_location_key_prefix, model_name, image):
 """Returns the s3 key prefix for uploading code during model deployment
 The location returned is a potential concatenation of 2 parts
Expand Down

7 changes: 3 additions & 4 deletions
src/sagemaker/model.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,7 @@
import os

import sagemaker
from sagemaker import fw_utils, image_uris, local, session, utils, git_utils
from sagemaker.fw_utils import UploadedCode
from sagemaker import fw_utils, image_uris, local, s3, session, utils, git_utils
from sagemaker.transformer import Transformer

LOGGER = logging.getLogger("sagemaker")
Expand DownExpand Up@@ -715,7 +714,7 @@ def __init__(
 self.git_config = git_config
 self.container_log_level = container_log_level
 if code_location:
 self.bucket, self.key_prefix = fw_utils.parse_s3_url(code_location)
 self.bucket, self.key_prefix = s3.parse_s3_url(code_location)
 else:
 self.bucket, self.key_prefix = None, None
 if self.git_config:
Expand DownExpand Up@@ -788,7 +787,7 @@ def _upload_code(self, key_prefix, repack=False):
 )

 self.repacked_model_data = repacked_model_data
 self.uploaded_code = UploadedCode(
 self.uploaded_code = fw_utils.UploadedCode(
 s3_prefix=self.repacked_model_data, script_name=os.path.basename(self.entry_point)
 )

Expand Down

6 changes: 3 additions & 3 deletions
src/sagemaker/workflow/airflow.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
import re

import sagemaker
from sagemaker import fw_utils, job, utils, session, vpc_utils
from sagemaker import fw_utils, job, utils, s3, session, vpc_utils
from sagemaker.amazon import amazon_estimator
from sagemaker.tensorflow import TensorFlow

Expand All@@ -33,10 +33,10 @@ def prepare_framework(estimator, s3_operations):
 `source_dir` ).
 """
 if estimator.code_location is not None:
 bucket, key = fw_utils.parse_s3_url(estimator.code_location)
 bucket, key = s3.parse_s3_url(estimator.code_location)
 key = os.path.join(key, estimator._current_job_name, "source", "sourcedir.tar.gz")
 elif estimator.uploaded_code is not None:
 bucket, key = fw_utils.parse_s3_url(estimator.uploaded_code.s3_prefix)
 bucket, key = s3.parse_s3_url(estimator.uploaded_code.s3_prefix)
 else:
 bucket = estimator.sagemaker_session._default_bucket
 key = os.path.join(estimator._current_job_name, "source", "sourcedir.tar.gz")
Expand Down

12 changes: 6 additions & 6 deletions
tests/unit/test_airflow.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@ def test_byo_training_config_all_args(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=["output", "tensorflow-training-{}/source/sourcedir.tar.gz".format(TIME_STAMP)]
 ),
Expand DownExpand Up@@ -468,7 +468,7 @@ def test_amazon_alg_training_config_all_args(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -610,7 +610,7 @@ def test_framework_tuning_config(retrieve_image_uri, sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -1020,7 +1020,7 @@ def test_amazon_alg_model_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -1185,7 +1185,7 @@ def test_transform_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -1436,7 +1436,7 @@ def test_deploy_amazon_alg_model_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand Down

12 changes: 0 additions & 12 deletions
tests/unit/test_fw_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -411,18 +411,6 @@ def test_framework_version_from_tag_other():
 assert version is None


def test_parse_s3_url():
 bucket, key_prefix = fw_utils.parse_s3_url("s3://bucket/code_location")
 assert "bucket" == bucket
 assert "code_location" == key_prefix


def test_parse_s3_url_fail():
 with pytest.raises(ValueError) as error:
 fw_utils.parse_s3_url("t3://code_location")
 assert "Expecting 's3' scheme" in str(error)


def test_model_code_key_prefix_with_all_values_present():
 key_prefix = fw_utils.model_code_key_prefix("prefix", "model_name", "image_uri")
 assert key_prefix == "prefix/model_name"
Expand Down

22 changes: 17 additions & 5 deletions
tests/unit/test_s3.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
import pytest
from mock import Mock

from sagemaker.s3 import S3Uploader, S3Downloader
from sagemaker import s3

BUCKET_NAME = "mybucket"
REGION = "us-west-2"
Expand All@@ -42,7 +42,7 @@ def sagemaker_session():

def test_upload(sagemaker_session, caplog):
 desired_s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Uploader.upload(
s3.S3Uploader.upload(
 local_path="/path/to/app.jar",
 desired_s3_uri=desired_s3_uri,
 sagemaker_session=sagemaker_session,
Expand All@@ -57,7 +57,7 @@ def test_upload(sagemaker_session, caplog):

def test_upload_with_kms_key(sagemaker_session):
 desired_s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Uploader.upload(
s3.S3Uploader.upload(
 local_path="/path/to/app.jar",
 desired_s3_uri=desired_s3_uri,
 kms_key=KMS_KEY,
Expand All@@ -73,7 +73,7 @@ def test_upload_with_kms_key(sagemaker_session):

def test_download(sagemaker_session):
 s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Downloader.download(
s3.S3Downloader.download(
 s3_uri=s3_uri, local_path="/path/for/download/", sagemaker_session=sagemaker_session
 )
 sagemaker_session.download_data.assert_called_with(
Expand All@@ -86,7 +86,7 @@ def test_download(sagemaker_session):

def test_download_with_kms_key(sagemaker_session):
 s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Downloader.download(
s3.S3Downloader.download(
 s3_uri=s3_uri,
 local_path="/path/for/download/",
 kms_key=KMS_KEY,
Expand All@@ -98,3 +98,15 @@ def test_download_with_kms_key(sagemaker_session):
 key_prefix=os.path.join(CURRENT_JOB_NAME, SOURCE_NAME),
 extra_args={"SSECustomerKey": KMS_KEY},
 )


def test_parse_s3_url():
 bucket, key_prefix = s3.parse_s3_url("s3://bucket/code_location")
 assert "bucket" == bucket
 assert "code_location" == key_prefix


def test_parse_s3_url_fail():
 with pytest.raises(ValueError) as error:
 s3.parse_s3_url("t3://code_location")
 assert "Expecting 's3' scheme" in str(error)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url#1772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

laurenyu
merged 3 commits into

from

Jul 30, 2020
 Merged


breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url
#1772
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
515d284

breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url


laurenyu Jul 29, 2020
929e639

Merge branch 'zwei' into deprecate-fw-utils-parse-s3-url


laurenyu Jul 30, 2020
11b3bc7

Merge branch 'zwei' into deprecate-fw-utils-parse-s3-url


laurenyu Jul 30, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 1 addition & 2 deletions
src/sagemaker/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,10 @@
from sagemaker.debugger import DebuggerHookConfig
from sagemaker.debugger import TensorBoardOutputConfig # noqa: F401 # pylint: disable=unused-import
from sagemaker.debugger import get_rule_container_image_uri
from sagemaker.s3 import S3Uploader
from sagemaker.s3 import S3Uploader, parse_s3_url

from sagemaker.fw_utils import (
 tar_and_upload_dir,
 parse_s3_url,
 UploadedCode,
 validate_source_dir,
 _region_supports_debugger,
Expand Down

15 changes: 0 additions & 15 deletions
src/sagemaker/fw_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
from collections import namedtuple

import sagemaker.utils
from sagemaker import s3

logger = logging.getLogger("sagemaker")

Expand DownExpand Up@@ -264,20 +263,6 @@ def framework_version_from_tag(image_tag):
 return None if tag_match is None else tag_match.group(1)


def parse_s3_url(url):
 """Calls the method with the same name in the s3 module.

 :func:~sagemaker.s3.parse_s3_url

 Args:
 url: A URL, expected with an s3 scheme.

 Returns: The return value of s3.parse_s3_url, which is a tuple containing:
 str: S3 bucket name str: S3 key
 """
 return s3.parse_s3_url(url)


def model_code_key_prefix(code_location_key_prefix, model_name, image):
 """Returns the s3 key prefix for uploading code during model deployment
 The location returned is a potential concatenation of 2 parts
Expand Down

7 changes: 3 additions & 4 deletions
src/sagemaker/model.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,7 @@
import os

import sagemaker
from sagemaker import fw_utils, image_uris, local, session, utils, git_utils
from sagemaker.fw_utils import UploadedCode
from sagemaker import fw_utils, image_uris, local, s3, session, utils, git_utils
from sagemaker.transformer import Transformer

LOGGER = logging.getLogger("sagemaker")
Expand DownExpand Up@@ -715,7 +714,7 @@ def __init__(
 self.git_config = git_config
 self.container_log_level = container_log_level
 if code_location:
 self.bucket, self.key_prefix = fw_utils.parse_s3_url(code_location)
 self.bucket, self.key_prefix = s3.parse_s3_url(code_location)
 else:
 self.bucket, self.key_prefix = None, None
 if self.git_config:
Expand DownExpand Up@@ -788,7 +787,7 @@ def _upload_code(self, key_prefix, repack=False):
 )

 self.repacked_model_data = repacked_model_data
 self.uploaded_code = UploadedCode(
 self.uploaded_code = fw_utils.UploadedCode(
 s3_prefix=self.repacked_model_data, script_name=os.path.basename(self.entry_point)
 )

Expand Down

6 changes: 3 additions & 3 deletions
src/sagemaker/workflow/airflow.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
import re

import sagemaker
from sagemaker import fw_utils, job, utils, session, vpc_utils
from sagemaker import fw_utils, job, utils, s3, session, vpc_utils
from sagemaker.amazon import amazon_estimator
from sagemaker.tensorflow import TensorFlow

Expand All@@ -33,10 +33,10 @@ def prepare_framework(estimator, s3_operations):
 `source_dir` ).
 """
 if estimator.code_location is not None:
 bucket, key = fw_utils.parse_s3_url(estimator.code_location)
 bucket, key = s3.parse_s3_url(estimator.code_location)
 key = os.path.join(key, estimator._current_job_name, "source", "sourcedir.tar.gz")
 elif estimator.uploaded_code is not None:
 bucket, key = fw_utils.parse_s3_url(estimator.uploaded_code.s3_prefix)
 bucket, key = s3.parse_s3_url(estimator.uploaded_code.s3_prefix)
 else:
 bucket = estimator.sagemaker_session._default_bucket
 key = os.path.join(estimator._current_job_name, "source", "sourcedir.tar.gz")
Expand Down

12 changes: 6 additions & 6 deletions
tests/unit/test_airflow.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@ def test_byo_training_config_all_args(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=["output", "tensorflow-training-{}/source/sourcedir.tar.gz".format(TIME_STAMP)]
 ),
Expand DownExpand Up@@ -468,7 +468,7 @@ def test_amazon_alg_training_config_all_args(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -610,7 +610,7 @@ def test_framework_tuning_config(retrieve_image_uri, sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -1020,7 +1020,7 @@ def test_amazon_alg_model_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -1185,7 +1185,7 @@ def test_transform_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -1436,7 +1436,7 @@ def test_deploy_amazon_alg_model_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand Down

12 changes: 0 additions & 12 deletions
tests/unit/test_fw_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -411,18 +411,6 @@ def test_framework_version_from_tag_other():
 assert version is None


def test_parse_s3_url():
 bucket, key_prefix = fw_utils.parse_s3_url("s3://bucket/code_location")
 assert "bucket" == bucket
 assert "code_location" == key_prefix


def test_parse_s3_url_fail():
 with pytest.raises(ValueError) as error:
 fw_utils.parse_s3_url("t3://code_location")
 assert "Expecting 's3' scheme" in str(error)


def test_model_code_key_prefix_with_all_values_present():
 key_prefix = fw_utils.model_code_key_prefix("prefix", "model_name", "image_uri")
 assert key_prefix == "prefix/model_name"
Expand Down

22 changes: 17 additions & 5 deletions
tests/unit/test_s3.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
import pytest
from mock import Mock

from sagemaker.s3 import S3Uploader, S3Downloader
from sagemaker import s3

BUCKET_NAME = "mybucket"
REGION = "us-west-2"
Expand All@@ -42,7 +42,7 @@ def sagemaker_session():

def test_upload(sagemaker_session, caplog):
 desired_s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Uploader.upload(
s3.S3Uploader.upload(
 local_path="/path/to/app.jar",
 desired_s3_uri=desired_s3_uri,
 sagemaker_session=sagemaker_session,
Expand All@@ -57,7 +57,7 @@ def test_upload(sagemaker_session, caplog):

def test_upload_with_kms_key(sagemaker_session):
 desired_s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Uploader.upload(
s3.S3Uploader.upload(
 local_path="/path/to/app.jar",
 desired_s3_uri=desired_s3_uri,
 kms_key=KMS_KEY,
Expand All@@ -73,7 +73,7 @@ def test_upload_with_kms_key(sagemaker_session):

def test_download(sagemaker_session):
 s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Downloader.download(
s3.S3Downloader.download(
 s3_uri=s3_uri, local_path="/path/for/download/", sagemaker_session=sagemaker_session
 )
 sagemaker_session.download_data.assert_called_with(
Expand All@@ -86,7 +86,7 @@ def test_download(sagemaker_session):

def test_download_with_kms_key(sagemaker_session):
 s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Downloader.download(
s3.S3Downloader.download(
 s3_uri=s3_uri,
 local_path="/path/for/download/",
 kms_key=KMS_KEY,
Expand All@@ -98,3 +98,15 @@ def test_download_with_kms_key(sagemaker_session):
 key_prefix=os.path.join(CURRENT_JOB_NAME, SOURCE_NAME),
 extra_args={"SSECustomerKey": KMS_KEY},
 )


def test_parse_s3_url():
 bucket, key_prefix = s3.parse_s3_url("s3://bucket/code_location")
 assert "bucket" == bucket
 assert "code_location" == key_prefix


def test_parse_s3_url_fail():
 with pytest.raises(ValueError) as error:
 s3.parse_s3_url("t3://code_location")
 assert "Expecting 's3' scheme" in str(error)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url#1772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

laurenyu
merged 3 commits into

from

Jul 30, 2020
 Merged


breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url
#1772
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
515d284

breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url


laurenyu Jul 29, 2020
929e639

Merge branch 'zwei' into deprecate-fw-utils-parse-s3-url


laurenyu Jul 30, 2020
11b3bc7

Merge branch 'zwei' into deprecate-fw-utils-parse-s3-url


laurenyu Jul 30, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 1 addition & 2 deletions
src/sagemaker/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,10 @@
from sagemaker.debugger import DebuggerHookConfig
from sagemaker.debugger import TensorBoardOutputConfig # noqa: F401 # pylint: disable=unused-import
from sagemaker.debugger import get_rule_container_image_uri
from sagemaker.s3 import S3Uploader
from sagemaker.s3 import S3Uploader, parse_s3_url

from sagemaker.fw_utils import (
 tar_and_upload_dir,
 parse_s3_url,
 UploadedCode,
 validate_source_dir,
 _region_supports_debugger,
Expand Down

15 changes: 0 additions & 15 deletions
src/sagemaker/fw_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
from collections import namedtuple

import sagemaker.utils
from sagemaker import s3

logger = logging.getLogger("sagemaker")

Expand DownExpand Up@@ -264,20 +263,6 @@ def framework_version_from_tag(image_tag):
 return None if tag_match is None else tag_match.group(1)


def parse_s3_url(url):
 """Calls the method with the same name in the s3 module.

 :func:~sagemaker.s3.parse_s3_url

 Args:
 url: A URL, expected with an s3 scheme.

 Returns: The return value of s3.parse_s3_url, which is a tuple containing:
 str: S3 bucket name str: S3 key
 """
 return s3.parse_s3_url(url)


def model_code_key_prefix(code_location_key_prefix, model_name, image):
 """Returns the s3 key prefix for uploading code during model deployment
 The location returned is a potential concatenation of 2 parts
Expand Down

7 changes: 3 additions & 4 deletions
src/sagemaker/model.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,7 @@
import os

import sagemaker
from sagemaker import fw_utils, image_uris, local, session, utils, git_utils
from sagemaker.fw_utils import UploadedCode
from sagemaker import fw_utils, image_uris, local, s3, session, utils, git_utils
from sagemaker.transformer import Transformer

LOGGER = logging.getLogger("sagemaker")
Expand DownExpand Up@@ -715,7 +714,7 @@ def __init__(
 self.git_config = git_config
 self.container_log_level = container_log_level
 if code_location:
 self.bucket, self.key_prefix = fw_utils.parse_s3_url(code_location)
 self.bucket, self.key_prefix = s3.parse_s3_url(code_location)
 else:
 self.bucket, self.key_prefix = None, None
 if self.git_config:
Expand DownExpand Up@@ -788,7 +787,7 @@ def _upload_code(self, key_prefix, repack=False):
 )

 self.repacked_model_data = repacked_model_data
 self.uploaded_code = UploadedCode(
 self.uploaded_code = fw_utils.UploadedCode(
 s3_prefix=self.repacked_model_data, script_name=os.path.basename(self.entry_point)
 )

Expand Down

6 changes: 3 additions & 3 deletions
src/sagemaker/workflow/airflow.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
import re

import sagemaker
from sagemaker import fw_utils, job, utils, session, vpc_utils
from sagemaker import fw_utils, job, utils, s3, session, vpc_utils
from sagemaker.amazon import amazon_estimator
from sagemaker.tensorflow import TensorFlow

Expand All@@ -33,10 +33,10 @@ def prepare_framework(estimator, s3_operations):
 `source_dir` ).
 """
 if estimator.code_location is not None:
 bucket, key = fw_utils.parse_s3_url(estimator.code_location)
 bucket, key = s3.parse_s3_url(estimator.code_location)
 key = os.path.join(key, estimator._current_job_name, "source", "sourcedir.tar.gz")
 elif estimator.uploaded_code is not None:
 bucket, key = fw_utils.parse_s3_url(estimator.uploaded_code.s3_prefix)
 bucket, key = s3.parse_s3_url(estimator.uploaded_code.s3_prefix)
 else:
 bucket = estimator.sagemaker_session._default_bucket
 key = os.path.join(estimator._current_job_name, "source", "sourcedir.tar.gz")
Expand Down

12 changes: 6 additions & 6 deletions
tests/unit/test_airflow.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@ def test_byo_training_config_all_args(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=["output", "tensorflow-training-{}/source/sourcedir.tar.gz".format(TIME_STAMP)]
 ),
Expand DownExpand Up@@ -468,7 +468,7 @@ def test_amazon_alg_training_config_all_args(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -610,7 +610,7 @@ def test_framework_tuning_config(retrieve_image_uri, sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -1020,7 +1020,7 @@ def test_amazon_alg_model_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -1185,7 +1185,7 @@ def test_transform_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -1436,7 +1436,7 @@ def test_deploy_amazon_alg_model_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand Down

12 changes: 0 additions & 12 deletions
tests/unit/test_fw_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -411,18 +411,6 @@ def test_framework_version_from_tag_other():
 assert version is None


def test_parse_s3_url():
 bucket, key_prefix = fw_utils.parse_s3_url("s3://bucket/code_location")
 assert "bucket" == bucket
 assert "code_location" == key_prefix


def test_parse_s3_url_fail():
 with pytest.raises(ValueError) as error:
 fw_utils.parse_s3_url("t3://code_location")
 assert "Expecting 's3' scheme" in str(error)


def test_model_code_key_prefix_with_all_values_present():
 key_prefix = fw_utils.model_code_key_prefix("prefix", "model_name", "image_uri")
 assert key_prefix == "prefix/model_name"
Expand Down

22 changes: 17 additions & 5 deletions
tests/unit/test_s3.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
import pytest
from mock import Mock

from sagemaker.s3 import S3Uploader, S3Downloader
from sagemaker import s3

BUCKET_NAME = "mybucket"
REGION = "us-west-2"
Expand All@@ -42,7 +42,7 @@ def sagemaker_session():

def test_upload(sagemaker_session, caplog):
 desired_s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Uploader.upload(
s3.S3Uploader.upload(
 local_path="/path/to/app.jar",
 desired_s3_uri=desired_s3_uri,
 sagemaker_session=sagemaker_session,
Expand All@@ -57,7 +57,7 @@ def test_upload(sagemaker_session, caplog):

def test_upload_with_kms_key(sagemaker_session):
 desired_s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Uploader.upload(
s3.S3Uploader.upload(
 local_path="/path/to/app.jar",
 desired_s3_uri=desired_s3_uri,
 kms_key=KMS_KEY,
Expand All@@ -73,7 +73,7 @@ def test_upload_with_kms_key(sagemaker_session):

def test_download(sagemaker_session):
 s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Downloader.download(
s3.S3Downloader.download(
 s3_uri=s3_uri, local_path="/path/for/download/", sagemaker_session=sagemaker_session
 )
 sagemaker_session.download_data.assert_called_with(
Expand All@@ -86,7 +86,7 @@ def test_download(sagemaker_session):

def test_download_with_kms_key(sagemaker_session):
 s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Downloader.download(
s3.S3Downloader.download(
 s3_uri=s3_uri,
 local_path="/path/for/download/",
 kms_key=KMS_KEY,
Expand All@@ -98,3 +98,15 @@ def test_download_with_kms_key(sagemaker_session):
 key_prefix=os.path.join(CURRENT_JOB_NAME, SOURCE_NAME),
 extra_args={"SSECustomerKey": KMS_KEY},
 )


def test_parse_s3_url():
 bucket, key_prefix = s3.parse_s3_url("s3://bucket/code_location")
 assert "bucket" == bucket
 assert "code_location" == key_prefix


def test_parse_s3_url_fail():
 with pytest.raises(ValueError) as error:
 s3.parse_s3_url("t3://code_location")
 assert "Expecting 's3' scheme" in str(error)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url#1772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

laurenyu
merged 3 commits into

from

Jul 30, 2020
 Merged


breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url
#1772
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
515d284

breaking: deprecate fw_utils.parse_s3_url in favor of s3.parse_s3_url


laurenyu Jul 29, 2020
929e639

Merge branch 'zwei' into deprecate-fw-utils-parse-s3-url


laurenyu Jul 30, 2020
11b3bc7

Merge branch 'zwei' into deprecate-fw-utils-parse-s3-url


laurenyu Jul 30, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 1 addition & 2 deletions
src/sagemaker/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,10 @@
from sagemaker.debugger import DebuggerHookConfig
from sagemaker.debugger import TensorBoardOutputConfig # noqa: F401 # pylint: disable=unused-import
from sagemaker.debugger import get_rule_container_image_uri
from sagemaker.s3 import S3Uploader
from sagemaker.s3 import S3Uploader, parse_s3_url

from sagemaker.fw_utils import (
 tar_and_upload_dir,
 parse_s3_url,
 UploadedCode,
 validate_source_dir,
 _region_supports_debugger,
Expand Down

15 changes: 0 additions & 15 deletions
src/sagemaker/fw_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
from collections import namedtuple

import sagemaker.utils
from sagemaker import s3

logger = logging.getLogger("sagemaker")

Expand DownExpand Up@@ -264,20 +263,6 @@ def framework_version_from_tag(image_tag):
 return None if tag_match is None else tag_match.group(1)


def parse_s3_url(url):
 """Calls the method with the same name in the s3 module.

 :func:~sagemaker.s3.parse_s3_url

 Args:
 url: A URL, expected with an s3 scheme.

 Returns: The return value of s3.parse_s3_url, which is a tuple containing:
 str: S3 bucket name str: S3 key
 """
 return s3.parse_s3_url(url)


def model_code_key_prefix(code_location_key_prefix, model_name, image):
 """Returns the s3 key prefix for uploading code during model deployment
 The location returned is a potential concatenation of 2 parts
Expand Down

7 changes: 3 additions & 4 deletions
src/sagemaker/model.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,7 @@
import os

import sagemaker
from sagemaker import fw_utils, image_uris, local, session, utils, git_utils
from sagemaker.fw_utils import UploadedCode
from sagemaker import fw_utils, image_uris, local, s3, session, utils, git_utils
from sagemaker.transformer import Transformer

LOGGER = logging.getLogger("sagemaker")
Expand DownExpand Up@@ -715,7 +714,7 @@ def __init__(
 self.git_config = git_config
 self.container_log_level = container_log_level
 if code_location:
 self.bucket, self.key_prefix = fw_utils.parse_s3_url(code_location)
 self.bucket, self.key_prefix = s3.parse_s3_url(code_location)
 else:
 self.bucket, self.key_prefix = None, None
 if self.git_config:
Expand DownExpand Up@@ -788,7 +787,7 @@ def _upload_code(self, key_prefix, repack=False):
 )

 self.repacked_model_data = repacked_model_data
 self.uploaded_code = UploadedCode(
 self.uploaded_code = fw_utils.UploadedCode(
 s3_prefix=self.repacked_model_data, script_name=os.path.basename(self.entry_point)
 )

Expand Down

6 changes: 3 additions & 3 deletions
src/sagemaker/workflow/airflow.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
import re

import sagemaker
from sagemaker import fw_utils, job, utils, session, vpc_utils
from sagemaker import fw_utils, job, utils, s3, session, vpc_utils
from sagemaker.amazon import amazon_estimator
from sagemaker.tensorflow import TensorFlow

Expand All@@ -33,10 +33,10 @@ def prepare_framework(estimator, s3_operations):
 `source_dir` ).
 """
 if estimator.code_location is not None:
 bucket, key = fw_utils.parse_s3_url(estimator.code_location)
 bucket, key = s3.parse_s3_url(estimator.code_location)
 key = os.path.join(key, estimator._current_job_name, "source", "sourcedir.tar.gz")
 elif estimator.uploaded_code is not None:
 bucket, key = fw_utils.parse_s3_url(estimator.uploaded_code.s3_prefix)
 bucket, key = s3.parse_s3_url(estimator.uploaded_code.s3_prefix)
 else:
 bucket = estimator.sagemaker_session._default_bucket
 key = os.path.join(estimator._current_job_name, "source", "sourcedir.tar.gz")
Expand Down

12 changes: 6 additions & 6 deletions
tests/unit/test_airflow.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@ def test_byo_training_config_all_args(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=["output", "tensorflow-training-{}/source/sourcedir.tar.gz".format(TIME_STAMP)]
 ),
Expand DownExpand Up@@ -468,7 +468,7 @@ def test_amazon_alg_training_config_all_args(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -610,7 +610,7 @@ def test_framework_tuning_config(retrieve_image_uri, sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -1020,7 +1020,7 @@ def test_amazon_alg_model_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -1185,7 +1185,7 @@ def test_transform_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand DownExpand Up@@ -1436,7 +1436,7 @@ def test_deploy_amazon_alg_model_config(sagemaker_session):
@patch("os.path.isfile", MagicMock(return_value=True))
@patch("sagemaker.estimator.tar_and_upload_dir", MagicMock())
@patch(
 "sagemaker.fw_utils.parse_s3_url",
 "sagemaker.s3.parse_s3_url",
 MagicMock(
 return_value=[
 "output",
Expand Down

12 changes: 0 additions & 12 deletions
tests/unit/test_fw_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -411,18 +411,6 @@ def test_framework_version_from_tag_other():
 assert version is None


def test_parse_s3_url():
 bucket, key_prefix = fw_utils.parse_s3_url("s3://bucket/code_location")
 assert "bucket" == bucket
 assert "code_location" == key_prefix


def test_parse_s3_url_fail():
 with pytest.raises(ValueError) as error:
 fw_utils.parse_s3_url("t3://code_location")
 assert "Expecting 's3' scheme" in str(error)


def test_model_code_key_prefix_with_all_values_present():
 key_prefix = fw_utils.model_code_key_prefix("prefix", "model_name", "image_uri")
 assert key_prefix == "prefix/model_name"
Expand Down

22 changes: 17 additions & 5 deletions
tests/unit/test_s3.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
import pytest
from mock import Mock

from sagemaker.s3 import S3Uploader, S3Downloader
from sagemaker import s3

BUCKET_NAME = "mybucket"
REGION = "us-west-2"
Expand All@@ -42,7 +42,7 @@ def sagemaker_session():

def test_upload(sagemaker_session, caplog):
 desired_s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Uploader.upload(
s3.S3Uploader.upload(
 local_path="/path/to/app.jar",
 desired_s3_uri=desired_s3_uri,
 sagemaker_session=sagemaker_session,
Expand All@@ -57,7 +57,7 @@ def test_upload(sagemaker_session, caplog):

def test_upload_with_kms_key(sagemaker_session):
 desired_s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Uploader.upload(
s3.S3Uploader.upload(
 local_path="/path/to/app.jar",
 desired_s3_uri=desired_s3_uri,
 kms_key=KMS_KEY,
Expand All@@ -73,7 +73,7 @@ def test_upload_with_kms_key(sagemaker_session):

def test_download(sagemaker_session):
 s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Downloader.download(
s3.S3Downloader.download(
 s3_uri=s3_uri, local_path="/path/for/download/", sagemaker_session=sagemaker_session
 )
 sagemaker_session.download_data.assert_called_with(
Expand All@@ -86,7 +86,7 @@ def test_download(sagemaker_session):

def test_download_with_kms_key(sagemaker_session):
 s3_uri = os.path.join("s3://", BUCKET_NAME, CURRENT_JOB_NAME, SOURCE_NAME)
 S3Downloader.download(
s3.S3Downloader.download(
 s3_uri=s3_uri,
 local_path="/path/for/download/",
 kms_key=KMS_KEY,
Expand All@@ -98,3 +98,15 @@ def test_download_with_kms_key(sagemaker_session):
 key_prefix=os.path.join(CURRENT_JOB_NAME, SOURCE_NAME),
 extra_args={"SSECustomerKey": KMS_KEY},
 )


def test_parse_s3_url():
 bucket, key_prefix = s3.parse_s3_url("s3://bucket/code_location")
 assert "bucket" == bucket
 assert "code_location" == key_prefix


def test_parse_s3_url_fail():
 with pytest.raises(ValueError) as error:
 s3.parse_s3_url("t3://code_location")
 assert "Expecting 's3' scheme" in str(error)