change: use image_uris.retrieve() for ModelMonitor default image#1765

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 4 commits into from
Jul 29, 2020
Merged

change: use image_uris.retrieve() for ModelMonitor default image #1765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
021937b
change: use image_uris.retrieve() for ModelMonitor default image
Jul 28, 2020
6b0b83f
using the generic template for model monitor image retrieve
Jul 28, 2020
7d72166
Merge branch 'zwei' into model-monitoring
chuyang-deng Jul 29, 2020
954c956
Merge branch 'zwei' into model-monitoring
laurenyu Jul 29, 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
30 changes: 30 additions & 0 deletions src/sagemaker/image_uri_config/model-monitor.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
{
"scope": ["monitoring"],
"versions": {
"": {
"registries": {
"eu-north-1": "895015795356",

@laurenyulaurenyuJul 29, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpicky nitpick: alphabetize the regions

"me-south-1": "607024016150",
"ap-south-1": "126357580389",
"us-east-2": "777275614652",
"eu-west-1": "468650794304",
"eu-central-1": "048819808253",
"sa-east-1": "539772159869",
"ap-east-1": "001633400207",
"us-east-1": "156813124566",
"ap-northeast-2": "709848358524",
"eu-west-2": "749857270468",
"eu-west-3": "680080141114",
"ap-northeast-1": "574779866223",
"us-west-2": "159807026194",
"us-west-1": "890145073186",
"ap-southeast-1": "245545462676",
"ap-southeast-2": "563025443158",
"ca-central-1": "536280801234",
"cn-north-1": "453000072557",
"cn-northwest-1": "453252182341"
},
"repository": "sagemaker-model-monitor-analyzer"
}
}
}
9 changes: 6 additions & 3 deletions src/sagemaker/image_uris.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@

logger = logging.getLogger(__name__)

ECR_URI_TEMPLATE = "{registry}.dkr.{hostname}/{repository}:{tag}"
ECR_URI_TEMPLATE = "{registry}.dkr.{hostname}/{repository}"


def retrieve(
Expand DownExpand Up@@ -69,14 +69,17 @@ def retrieve(
registry = _registry_from_region(region, version_config["registries"])
hostname = utils._botocore_resolver().construct_endpoint("ecr", region)["hostname"]

repo = version_config["repository"]

processor = _processor(
instance_type, config.get("processors") or version_config.get("processors")
)
tag = _format_tag(version_config.get("tag_prefix", version), processor, py_version)

repo = version_config["repository"]
if tag:
repo += ":{}".format(tag)

return ECR_URI_TEMPLATE.format(registry=registry, hostname=hostname, repository=repo, tag=tag)
return ECR_URI_TEMPLATE.format(registry=registry, hostname=hostname, repository=repo)


def _config_for_framework_and_scope(framework, image_scope, accelerator_type=None):
Expand Down
36 changes: 7 additions & 29 deletions src/sagemaker/model_monitor/model_monitoring.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,38 +26,16 @@
from six.moves.urllib.parse import urlparse
from botocore.exceptions import ClientError

from sagemaker import image_uris
from sagemaker.exceptions import UnexpectedStatusException
from sagemaker.model_monitor.monitoring_files import Constraints, ConstraintViolations, Statistics
from sagemaker.network import NetworkConfig
from sagemaker.processing import Processor, ProcessingInput, ProcessingJob, ProcessingOutput
from sagemaker.s3 import S3Uploader
from sagemaker.session import Session
from sagemaker.utils import name_from_base, retries, get_ecr_image_uri_prefix

_DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS = "{}/sagemaker-model-monitor-analyzer"

_DEFAULT_MONITOR_IMAGE_REGION_ACCOUNT_MAPPING = {
"eu-north-1": "895015795356",
"me-south-1": "607024016150",
"ap-south-1": "126357580389",
"us-east-2": "777275614652",
"eu-west-1": "468650794304",
"eu-central-1": "048819808253",
"sa-east-1": "539772159869",
"ap-east-1": "001633400207",
"us-east-1": "156813124566",
"ap-northeast-2": "709848358524",
"eu-west-2": "749857270468",
"eu-west-3": "680080141114",
"ap-northeast-1": "574779866223",
"us-west-2": "159807026194",
"us-west-1": "890145073186",
"ap-southeast-1": "245545462676",
"ap-southeast-2": "563025443158",
"ca-central-1": "536280801234",
"cn-north-1": "453000072557",
"cn-northwest-1": "453252182341",
}
from sagemaker.utils import name_from_base, retries

DEFAULT_REPOSITORY_NAME = "sagemaker-model-monitor-analyzer"

STATISTICS_JSON_DEFAULT_FILE_NAME = "statistics.json"
CONSTRAINTS_JSON_DEFAULT_FILE_NAME = "constraints.json"
Expand DownExpand Up@@ -89,6 +67,8 @@

_LOGGER = logging.getLogger(__name__)

framework_name = "model-monitor"


class ModelMonitor(object):
"""Sets up Amazon SageMaker Monitoring Schedules and baseline suggestions. Use this class when
Expand DownExpand Up@@ -1787,9 +1767,7 @@ def _get_default_image_uri(region):
Returns:
str: The Default Model Monitoring image uri based on the region.
"""
return _DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS.format(
get_ecr_image_uri_prefix(_DEFAULT_MONITOR_IMAGE_REGION_ACCOUNT_MAPPING[region], region)
)
return image_uris.retrieve(framework=framework_name, region=region)


class BaseliningJob(ProcessingJob):
Expand Down
7 changes: 2 additions & 5 deletions src/sagemaker/predictor.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
from sagemaker.utils import name_from_base

from sagemaker.model_monitor.model_monitoring import (
_DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS,
DEFAULT_REPOSITORY_NAME,
ModelMonitor,
DefaultModelMonitor,
)
Expand DownExpand Up@@ -357,10 +357,7 @@ def list_monitors(self):
image_uri = schedule["MonitoringScheduleConfig"]["MonitoringJobDefinition"][
"MonitoringAppSpecification"
]["ImageUri"]
index_after_placeholders = _DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS.rfind("{}")
if image_uri.endswith(
_DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS[index_after_placeholders + len("{}") :]
):
if image_uri.endswith(DEFAULT_REPOSITORY_NAME):
monitors.append(
DefaultModelMonitor.attach(
monitor_schedule_name=schedule_name,
Expand Down
6 changes: 6 additions & 0 deletions tests/unit/sagemaker/image_uris/expected_uris.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
}
DOMAIN = "amazonaws.com"
IMAGE_URI_FORMAT = "{}.dkr.ecr.{}.{}/{}:{}"
MONITOR_URI_FORMAT = "{}.dkr.ecr.{}.{}/sagemaker-model-monitor-analyzer"
REGION = "us-west-2"


Expand All@@ -34,3 +35,8 @@ def framework_uri(repo, fw_version, account, py_version=None, processor="cpu", r
def algo_uri(algo, account, region, version=1):
domain = ALTERNATE_DOMAINS.get(region, DOMAIN)
return IMAGE_URI_FORMAT.format(account, region, domain, algo, version)


def monitor_uri(account, region=REGION):
domain = ALTERNATE_DOMAINS.get(region, DOMAIN)
return MONITOR_URI_FORMAT.format(account, region, domain)
48 changes: 48 additions & 0 deletions tests/unit/sagemaker/image_uris/test_model_monitor.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
# Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You
# may not use this file except in compliance with the License. A copy of
# the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "license" file accompanying this file. This file is
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
from __future__ import absolute_import

from sagemaker import image_uris
from tests.unit.sagemaker.image_uris import expected_uris, regions

ACCOUNTS = {
"eu-north-1": "895015795356",
"me-south-1": "607024016150",
"ap-south-1": "126357580389",
"us-east-2": "777275614652",
"eu-west-1": "468650794304",
"eu-central-1": "048819808253",
"sa-east-1": "539772159869",
"ap-east-1": "001633400207",
"us-east-1": "156813124566",
"ap-northeast-2": "709848358524",
"eu-west-2": "749857270468",
"eu-west-3": "680080141114",
"ap-northeast-1": "574779866223",
"us-west-2": "159807026194",
"us-west-1": "890145073186",
"ap-southeast-1": "245545462676",
"ap-southeast-2": "563025443158",
"ca-central-1": "536280801234",
"cn-north-1": "453000072557",
"cn-northwest-1": "453252182341",
}


def test_model_monitor():
for region in regions.regions():
if region in ACCOUNTS.keys():
uri = image_uris.retrieve("model-monitor", region=region)

expected = expected_uris.monitor_uri(ACCOUNTS[region], region)
assert expected == uri
2 changes: 2 additions & 0 deletions tests/unit/sagemaker/monitor/test_model_monitoring.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,7 @@


CUSTOM_IMAGE_URI = "012345678901.dkr.ecr.us-west-2.amazonaws.com/my-custom-image-uri"
DEFAULT_IMAGE_URI = "159807026194.dkr.ecr.us-west-2.amazonaws.com/sagemaker-model-monitor-analyzer"

INTER_CONTAINER_ENCRYPTION_EXCEPTION_MSG = (
"EnableInterContainerTrafficEncryption is not supported in Model Monitor. Please ensure that "
Expand DownExpand Up@@ -126,6 +127,7 @@ def test_default_model_monitor_suggest_baseline(sagemaker_session):
assert my_default_monitor.sagemaker_session == sagemaker_session
assert my_default_monitor.tags == TAGS
assert my_default_monitor.network_config == NETWORK_CONFIG
assert my_default_monitor.image_uri == DEFAULT_IMAGE_URI

assert BASE_JOB_NAME in my_default_monitor.latest_baselining_job_name
assert my_default_monitor.latest_baselining_job_name != BASE_JOB_NAME
Expand Down
, '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
change: use image_uris.retrieve() for ModelMonitor default image#1765

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 4 commits into

from

Jul 29, 2020
 Merged


change: use image_uris.retrieve() for ModelMonitor default image
#1765
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
021937b

change: use image_uris.retrieve() for ModelMonitor default image

Jul 28, 2020
6b0b83f

using the generic template for model monitor image retrieve

Jul 28, 2020
7d72166

Merge branch 'zwei' into model-monitoring


chuyang-deng Jul 29, 2020
954c956

Merge branch 'zwei' into model-monitoring


laurenyu Jul 29, 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


30 changes: 30 additions & 0 deletions
src/sagemaker/image_uri_config/model-monitor.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
{
 "scope": ["monitoring"],
 "versions": {
 "": {
 "registries": {
 "eu-north-1": "895015795356",
@laurenyulaurenyuJul 29, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpicky nitpick: alphabetize the regions
 "me-south-1": "607024016150",
 "ap-south-1": "126357580389",
 "us-east-2": "777275614652",
 "eu-west-1": "468650794304",
 "eu-central-1": "048819808253",
 "sa-east-1": "539772159869",
 "ap-east-1": "001633400207",
 "us-east-1": "156813124566",
 "ap-northeast-2": "709848358524",
 "eu-west-2": "749857270468",
 "eu-west-3": "680080141114",
 "ap-northeast-1": "574779866223",
 "us-west-2": "159807026194",
 "us-west-1": "890145073186",
 "ap-southeast-1": "245545462676",
 "ap-southeast-2": "563025443158",
 "ca-central-1": "536280801234",
 "cn-north-1": "453000072557",
 "cn-northwest-1": "453252182341"
 },
 "repository": "sagemaker-model-monitor-analyzer"
 }
 }
}

9 changes: 6 additions & 3 deletions
src/sagemaker/image_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@

logger = logging.getLogger(__name__)

ECR_URI_TEMPLATE = "{registry}.dkr.{hostname}/{repository}:{tag}"
ECR_URI_TEMPLATE = "{registry}.dkr.{hostname}/{repository}"


def retrieve(
Expand DownExpand Up@@ -69,14 +69,17 @@ def retrieve(
 registry = _registry_from_region(region, version_config["registries"])
 hostname = utils._botocore_resolver().construct_endpoint("ecr", region)["hostname"]

 repo = version_config["repository"]

 processor = _processor(
 instance_type, config.get("processors") or version_config.get("processors")
 )
 tag = _format_tag(version_config.get("tag_prefix", version), processor, py_version)

 repo = version_config["repository"]
 if tag:
 repo += ":{}".format(tag)

 return ECR_URI_TEMPLATE.format(registry=registry, hostname=hostname, repository=repo, tag=tag)
 return ECR_URI_TEMPLATE.format(registry=registry, hostname=hostname, repository=repo)


def _config_for_framework_and_scope(framework, image_scope, accelerator_type=None):
Expand Down

36 changes: 7 additions & 29 deletions
src/sagemaker/model_monitor/model_monitoring.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,38 +26,16 @@
from six.moves.urllib.parse import urlparse
from botocore.exceptions import ClientError

from sagemaker import image_uris
from sagemaker.exceptions import UnexpectedStatusException
from sagemaker.model_monitor.monitoring_files import Constraints, ConstraintViolations, Statistics
from sagemaker.network import NetworkConfig
from sagemaker.processing import Processor, ProcessingInput, ProcessingJob, ProcessingOutput
from sagemaker.s3 import S3Uploader
from sagemaker.session import Session
from sagemaker.utils import name_from_base, retries, get_ecr_image_uri_prefix

_DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS = "{}/sagemaker-model-monitor-analyzer"

_DEFAULT_MONITOR_IMAGE_REGION_ACCOUNT_MAPPING = {
 "eu-north-1": "895015795356",
 "me-south-1": "607024016150",
 "ap-south-1": "126357580389",
 "us-east-2": "777275614652",
 "eu-west-1": "468650794304",
 "eu-central-1": "048819808253",
 "sa-east-1": "539772159869",
 "ap-east-1": "001633400207",
 "us-east-1": "156813124566",
 "ap-northeast-2": "709848358524",
 "eu-west-2": "749857270468",
 "eu-west-3": "680080141114",
 "ap-northeast-1": "574779866223",
 "us-west-2": "159807026194",
 "us-west-1": "890145073186",
 "ap-southeast-1": "245545462676",
 "ap-southeast-2": "563025443158",
 "ca-central-1": "536280801234",
 "cn-north-1": "453000072557",
 "cn-northwest-1": "453252182341",
}
from sagemaker.utils import name_from_base, retries

DEFAULT_REPOSITORY_NAME = "sagemaker-model-monitor-analyzer"

STATISTICS_JSON_DEFAULT_FILE_NAME = "statistics.json"
CONSTRAINTS_JSON_DEFAULT_FILE_NAME = "constraints.json"
Expand DownExpand Up@@ -89,6 +67,8 @@

_LOGGER = logging.getLogger(__name__)

framework_name = "model-monitor"


class ModelMonitor(object):
 """Sets up Amazon SageMaker Monitoring Schedules and baseline suggestions. Use this class when
Expand DownExpand Up@@ -1787,9 +1767,7 @@ def _get_default_image_uri(region):
 Returns:
 str: The Default Model Monitoring image uri based on the region.
 """
 return _DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS.format(
 get_ecr_image_uri_prefix(_DEFAULT_MONITOR_IMAGE_REGION_ACCOUNT_MAPPING[region], region)
 )
 return image_uris.retrieve(framework=framework_name, region=region)


class BaseliningJob(ProcessingJob):
Expand Down

7 changes: 2 additions & 5 deletions
src/sagemaker/predictor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
from sagemaker.utils import name_from_base

from sagemaker.model_monitor.model_monitoring import (
_DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS,
DEFAULT_REPOSITORY_NAME,
 ModelMonitor,
 DefaultModelMonitor,
)
Expand DownExpand Up@@ -357,10 +357,7 @@ def list_monitors(self):
 image_uri = schedule["MonitoringScheduleConfig"]["MonitoringJobDefinition"][
 "MonitoringAppSpecification"
 ]["ImageUri"]
 index_after_placeholders = _DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS.rfind("{}")
 if image_uri.endswith(
 _DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS[index_after_placeholders + len("{}") :]
 ):
 if image_uri.endswith(DEFAULT_REPOSITORY_NAME):
 monitors.append(
 DefaultModelMonitor.attach(
 monitor_schedule_name=schedule_name,
Expand Down

6 changes: 6 additions & 0 deletions
tests/unit/sagemaker/image_uris/expected_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
}
DOMAIN = "amazonaws.com"
IMAGE_URI_FORMAT = "{}.dkr.ecr.{}.{}/{}:{}"
MONITOR_URI_FORMAT = "{}.dkr.ecr.{}.{}/sagemaker-model-monitor-analyzer"
REGION = "us-west-2"


Expand All@@ -34,3 +35,8 @@ def framework_uri(repo, fw_version, account, py_version=None, processor="cpu", r
def algo_uri(algo, account, region, version=1):
 domain = ALTERNATE_DOMAINS.get(region, DOMAIN)
 return IMAGE_URI_FORMAT.format(account, region, domain, algo, version)


def monitor_uri(account, region=REGION):
 domain = ALTERNATE_DOMAINS.get(region, DOMAIN)
 return MONITOR_URI_FORMAT.format(account, region, domain)

48 changes: 48 additions & 0 deletions
tests/unit/sagemaker/image_uris/test_model_monitor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
# Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You
# may not use this file except in compliance with the License. A copy of
# the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "license" file accompanying this file. This file is
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
from __future__ import absolute_import

from sagemaker import image_uris
from tests.unit.sagemaker.image_uris import expected_uris, regions

ACCOUNTS = {
 "eu-north-1": "895015795356",
 "me-south-1": "607024016150",
 "ap-south-1": "126357580389",
 "us-east-2": "777275614652",
 "eu-west-1": "468650794304",
 "eu-central-1": "048819808253",
 "sa-east-1": "539772159869",
 "ap-east-1": "001633400207",
 "us-east-1": "156813124566",
 "ap-northeast-2": "709848358524",
 "eu-west-2": "749857270468",
 "eu-west-3": "680080141114",
 "ap-northeast-1": "574779866223",
 "us-west-2": "159807026194",
 "us-west-1": "890145073186",
 "ap-southeast-1": "245545462676",
 "ap-southeast-2": "563025443158",
 "ca-central-1": "536280801234",
 "cn-north-1": "453000072557",
 "cn-northwest-1": "453252182341",
}


def test_model_monitor():
 for region in regions.regions():
 if region in ACCOUNTS.keys():
 uri = image_uris.retrieve("model-monitor", region=region)

 expected = expected_uris.monitor_uri(ACCOUNTS[region], region)
 assert expected == uri

2 changes: 2 additions & 0 deletions
tests/unit/sagemaker/monitor/test_model_monitoring.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,7 @@


CUSTOM_IMAGE_URI = "012345678901.dkr.ecr.us-west-2.amazonaws.com/my-custom-image-uri"
DEFAULT_IMAGE_URI = "159807026194.dkr.ecr.us-west-2.amazonaws.com/sagemaker-model-monitor-analyzer"

INTER_CONTAINER_ENCRYPTION_EXCEPTION_MSG = (
 "EnableInterContainerTrafficEncryption is not supported in Model Monitor. Please ensure that "
Expand DownExpand Up@@ -126,6 +127,7 @@ def test_default_model_monitor_suggest_baseline(sagemaker_session):
 assert my_default_monitor.sagemaker_session == sagemaker_session
 assert my_default_monitor.tags == TAGS
 assert my_default_monitor.network_config == NETWORK_CONFIG
 assert my_default_monitor.image_uri == DEFAULT_IMAGE_URI

 assert BASE_JOB_NAME in my_default_monitor.latest_baselining_job_name
 assert my_default_monitor.latest_baselining_job_name != BASE_JOB_NAME
Expand Down

, '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
change: use image_uris.retrieve() for ModelMonitor default image#1765

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 4 commits into

from

Jul 29, 2020
 Merged


change: use image_uris.retrieve() for ModelMonitor default image
#1765
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
021937b

change: use image_uris.retrieve() for ModelMonitor default image

Jul 28, 2020
6b0b83f

using the generic template for model monitor image retrieve

Jul 28, 2020
7d72166

Merge branch 'zwei' into model-monitoring


chuyang-deng Jul 29, 2020
954c956

Merge branch 'zwei' into model-monitoring


laurenyu Jul 29, 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


30 changes: 30 additions & 0 deletions
src/sagemaker/image_uri_config/model-monitor.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
{
 "scope": ["monitoring"],
 "versions": {
 "": {
 "registries": {
 "eu-north-1": "895015795356",
@laurenyulaurenyuJul 29, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpicky nitpick: alphabetize the regions
 "me-south-1": "607024016150",
 "ap-south-1": "126357580389",
 "us-east-2": "777275614652",
 "eu-west-1": "468650794304",
 "eu-central-1": "048819808253",
 "sa-east-1": "539772159869",
 "ap-east-1": "001633400207",
 "us-east-1": "156813124566",
 "ap-northeast-2": "709848358524",
 "eu-west-2": "749857270468",
 "eu-west-3": "680080141114",
 "ap-northeast-1": "574779866223",
 "us-west-2": "159807026194",
 "us-west-1": "890145073186",
 "ap-southeast-1": "245545462676",
 "ap-southeast-2": "563025443158",
 "ca-central-1": "536280801234",
 "cn-north-1": "453000072557",
 "cn-northwest-1": "453252182341"
 },
 "repository": "sagemaker-model-monitor-analyzer"
 }
 }
}

9 changes: 6 additions & 3 deletions
src/sagemaker/image_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@

logger = logging.getLogger(__name__)

ECR_URI_TEMPLATE = "{registry}.dkr.{hostname}/{repository}:{tag}"
ECR_URI_TEMPLATE = "{registry}.dkr.{hostname}/{repository}"


def retrieve(
Expand DownExpand Up@@ -69,14 +69,17 @@ def retrieve(
 registry = _registry_from_region(region, version_config["registries"])
 hostname = utils._botocore_resolver().construct_endpoint("ecr", region)["hostname"]

 repo = version_config["repository"]

 processor = _processor(
 instance_type, config.get("processors") or version_config.get("processors")
 )
 tag = _format_tag(version_config.get("tag_prefix", version), processor, py_version)

 repo = version_config["repository"]
 if tag:
 repo += ":{}".format(tag)

 return ECR_URI_TEMPLATE.format(registry=registry, hostname=hostname, repository=repo, tag=tag)
 return ECR_URI_TEMPLATE.format(registry=registry, hostname=hostname, repository=repo)


def _config_for_framework_and_scope(framework, image_scope, accelerator_type=None):
Expand Down

36 changes: 7 additions & 29 deletions
src/sagemaker/model_monitor/model_monitoring.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,38 +26,16 @@
from six.moves.urllib.parse import urlparse
from botocore.exceptions import ClientError

from sagemaker import image_uris
from sagemaker.exceptions import UnexpectedStatusException
from sagemaker.model_monitor.monitoring_files import Constraints, ConstraintViolations, Statistics
from sagemaker.network import NetworkConfig
from sagemaker.processing import Processor, ProcessingInput, ProcessingJob, ProcessingOutput
from sagemaker.s3 import S3Uploader
from sagemaker.session import Session
from sagemaker.utils import name_from_base, retries, get_ecr_image_uri_prefix

_DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS = "{}/sagemaker-model-monitor-analyzer"

_DEFAULT_MONITOR_IMAGE_REGION_ACCOUNT_MAPPING = {
 "eu-north-1": "895015795356",
 "me-south-1": "607024016150",
 "ap-south-1": "126357580389",
 "us-east-2": "777275614652",
 "eu-west-1": "468650794304",
 "eu-central-1": "048819808253",
 "sa-east-1": "539772159869",
 "ap-east-1": "001633400207",
 "us-east-1": "156813124566",
 "ap-northeast-2": "709848358524",
 "eu-west-2": "749857270468",
 "eu-west-3": "680080141114",
 "ap-northeast-1": "574779866223",
 "us-west-2": "159807026194",
 "us-west-1": "890145073186",
 "ap-southeast-1": "245545462676",
 "ap-southeast-2": "563025443158",
 "ca-central-1": "536280801234",
 "cn-north-1": "453000072557",
 "cn-northwest-1": "453252182341",
}
from sagemaker.utils import name_from_base, retries

DEFAULT_REPOSITORY_NAME = "sagemaker-model-monitor-analyzer"

STATISTICS_JSON_DEFAULT_FILE_NAME = "statistics.json"
CONSTRAINTS_JSON_DEFAULT_FILE_NAME = "constraints.json"
Expand DownExpand Up@@ -89,6 +67,8 @@

_LOGGER = logging.getLogger(__name__)

framework_name = "model-monitor"


class ModelMonitor(object):
 """Sets up Amazon SageMaker Monitoring Schedules and baseline suggestions. Use this class when
Expand DownExpand Up@@ -1787,9 +1767,7 @@ def _get_default_image_uri(region):
 Returns:
 str: The Default Model Monitoring image uri based on the region.
 """
 return _DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS.format(
 get_ecr_image_uri_prefix(_DEFAULT_MONITOR_IMAGE_REGION_ACCOUNT_MAPPING[region], region)
 )
 return image_uris.retrieve(framework=framework_name, region=region)


class BaseliningJob(ProcessingJob):
Expand Down

7 changes: 2 additions & 5 deletions
src/sagemaker/predictor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
from sagemaker.utils import name_from_base

from sagemaker.model_monitor.model_monitoring import (
_DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS,
DEFAULT_REPOSITORY_NAME,
 ModelMonitor,
 DefaultModelMonitor,
)
Expand DownExpand Up@@ -357,10 +357,7 @@ def list_monitors(self):
 image_uri = schedule["MonitoringScheduleConfig"]["MonitoringJobDefinition"][
 "MonitoringAppSpecification"
 ]["ImageUri"]
 index_after_placeholders = _DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS.rfind("{}")
 if image_uri.endswith(
 _DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS[index_after_placeholders + len("{}") :]
 ):
 if image_uri.endswith(DEFAULT_REPOSITORY_NAME):
 monitors.append(
 DefaultModelMonitor.attach(
 monitor_schedule_name=schedule_name,
Expand Down

6 changes: 6 additions & 0 deletions
tests/unit/sagemaker/image_uris/expected_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
}
DOMAIN = "amazonaws.com"
IMAGE_URI_FORMAT = "{}.dkr.ecr.{}.{}/{}:{}"
MONITOR_URI_FORMAT = "{}.dkr.ecr.{}.{}/sagemaker-model-monitor-analyzer"
REGION = "us-west-2"


Expand All@@ -34,3 +35,8 @@ def framework_uri(repo, fw_version, account, py_version=None, processor="cpu", r
def algo_uri(algo, account, region, version=1):
 domain = ALTERNATE_DOMAINS.get(region, DOMAIN)
 return IMAGE_URI_FORMAT.format(account, region, domain, algo, version)


def monitor_uri(account, region=REGION):
 domain = ALTERNATE_DOMAINS.get(region, DOMAIN)
 return MONITOR_URI_FORMAT.format(account, region, domain)

48 changes: 48 additions & 0 deletions
tests/unit/sagemaker/image_uris/test_model_monitor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
# Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You
# may not use this file except in compliance with the License. A copy of
# the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "license" file accompanying this file. This file is
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
from __future__ import absolute_import

from sagemaker import image_uris
from tests.unit.sagemaker.image_uris import expected_uris, regions

ACCOUNTS = {
 "eu-north-1": "895015795356",
 "me-south-1": "607024016150",
 "ap-south-1": "126357580389",
 "us-east-2": "777275614652",
 "eu-west-1": "468650794304",
 "eu-central-1": "048819808253",
 "sa-east-1": "539772159869",
 "ap-east-1": "001633400207",
 "us-east-1": "156813124566",
 "ap-northeast-2": "709848358524",
 "eu-west-2": "749857270468",
 "eu-west-3": "680080141114",
 "ap-northeast-1": "574779866223",
 "us-west-2": "159807026194",
 "us-west-1": "890145073186",
 "ap-southeast-1": "245545462676",
 "ap-southeast-2": "563025443158",
 "ca-central-1": "536280801234",
 "cn-north-1": "453000072557",
 "cn-northwest-1": "453252182341",
}


def test_model_monitor():
 for region in regions.regions():
 if region in ACCOUNTS.keys():
 uri = image_uris.retrieve("model-monitor", region=region)

 expected = expected_uris.monitor_uri(ACCOUNTS[region], region)
 assert expected == uri

2 changes: 2 additions & 0 deletions
tests/unit/sagemaker/monitor/test_model_monitoring.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,7 @@


CUSTOM_IMAGE_URI = "012345678901.dkr.ecr.us-west-2.amazonaws.com/my-custom-image-uri"
DEFAULT_IMAGE_URI = "159807026194.dkr.ecr.us-west-2.amazonaws.com/sagemaker-model-monitor-analyzer"

INTER_CONTAINER_ENCRYPTION_EXCEPTION_MSG = (
 "EnableInterContainerTrafficEncryption is not supported in Model Monitor. Please ensure that "
Expand DownExpand Up@@ -126,6 +127,7 @@ def test_default_model_monitor_suggest_baseline(sagemaker_session):
 assert my_default_monitor.sagemaker_session == sagemaker_session
 assert my_default_monitor.tags == TAGS
 assert my_default_monitor.network_config == NETWORK_CONFIG
 assert my_default_monitor.image_uri == DEFAULT_IMAGE_URI

 assert BASE_JOB_NAME in my_default_monitor.latest_baselining_job_name
 assert my_default_monitor.latest_baselining_job_name != BASE_JOB_NAME
Expand Down

, '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
change: use image_uris.retrieve() for ModelMonitor default image#1765

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 4 commits into

from

Jul 29, 2020
 Merged


change: use image_uris.retrieve() for ModelMonitor default image
#1765
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
021937b

change: use image_uris.retrieve() for ModelMonitor default image

Jul 28, 2020
6b0b83f

using the generic template for model monitor image retrieve

Jul 28, 2020
7d72166

Merge branch 'zwei' into model-monitoring


chuyang-deng Jul 29, 2020
954c956

Merge branch 'zwei' into model-monitoring


laurenyu Jul 29, 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


30 changes: 30 additions & 0 deletions
src/sagemaker/image_uri_config/model-monitor.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
{
 "scope": ["monitoring"],
 "versions": {
 "": {
 "registries": {
 "eu-north-1": "895015795356",
@laurenyulaurenyuJul 29, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpicky nitpick: alphabetize the regions
 "me-south-1": "607024016150",
 "ap-south-1": "126357580389",
 "us-east-2": "777275614652",
 "eu-west-1": "468650794304",
 "eu-central-1": "048819808253",
 "sa-east-1": "539772159869",
 "ap-east-1": "001633400207",
 "us-east-1": "156813124566",
 "ap-northeast-2": "709848358524",
 "eu-west-2": "749857270468",
 "eu-west-3": "680080141114",
 "ap-northeast-1": "574779866223",
 "us-west-2": "159807026194",
 "us-west-1": "890145073186",
 "ap-southeast-1": "245545462676",
 "ap-southeast-2": "563025443158",
 "ca-central-1": "536280801234",
 "cn-north-1": "453000072557",
 "cn-northwest-1": "453252182341"
 },
 "repository": "sagemaker-model-monitor-analyzer"
 }
 }
}

9 changes: 6 additions & 3 deletions
src/sagemaker/image_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@

logger = logging.getLogger(__name__)

ECR_URI_TEMPLATE = "{registry}.dkr.{hostname}/{repository}:{tag}"
ECR_URI_TEMPLATE = "{registry}.dkr.{hostname}/{repository}"


def retrieve(
Expand DownExpand Up@@ -69,14 +69,17 @@ def retrieve(
 registry = _registry_from_region(region, version_config["registries"])
 hostname = utils._botocore_resolver().construct_endpoint("ecr", region)["hostname"]

 repo = version_config["repository"]

 processor = _processor(
 instance_type, config.get("processors") or version_config.get("processors")
 )
 tag = _format_tag(version_config.get("tag_prefix", version), processor, py_version)

 repo = version_config["repository"]
 if tag:
 repo += ":{}".format(tag)

 return ECR_URI_TEMPLATE.format(registry=registry, hostname=hostname, repository=repo, tag=tag)
 return ECR_URI_TEMPLATE.format(registry=registry, hostname=hostname, repository=repo)


def _config_for_framework_and_scope(framework, image_scope, accelerator_type=None):
Expand Down

36 changes: 7 additions & 29 deletions
src/sagemaker/model_monitor/model_monitoring.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,38 +26,16 @@
from six.moves.urllib.parse import urlparse
from botocore.exceptions import ClientError

from sagemaker import image_uris
from sagemaker.exceptions import UnexpectedStatusException
from sagemaker.model_monitor.monitoring_files import Constraints, ConstraintViolations, Statistics
from sagemaker.network import NetworkConfig
from sagemaker.processing import Processor, ProcessingInput, ProcessingJob, ProcessingOutput
from sagemaker.s3 import S3Uploader
from sagemaker.session import Session
from sagemaker.utils import name_from_base, retries, get_ecr_image_uri_prefix

_DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS = "{}/sagemaker-model-monitor-analyzer"

_DEFAULT_MONITOR_IMAGE_REGION_ACCOUNT_MAPPING = {
 "eu-north-1": "895015795356",
 "me-south-1": "607024016150",
 "ap-south-1": "126357580389",
 "us-east-2": "777275614652",
 "eu-west-1": "468650794304",
 "eu-central-1": "048819808253",
 "sa-east-1": "539772159869",
 "ap-east-1": "001633400207",
 "us-east-1": "156813124566",
 "ap-northeast-2": "709848358524",
 "eu-west-2": "749857270468",
 "eu-west-3": "680080141114",
 "ap-northeast-1": "574779866223",
 "us-west-2": "159807026194",
 "us-west-1": "890145073186",
 "ap-southeast-1": "245545462676",
 "ap-southeast-2": "563025443158",
 "ca-central-1": "536280801234",
 "cn-north-1": "453000072557",
 "cn-northwest-1": "453252182341",
}
from sagemaker.utils import name_from_base, retries

DEFAULT_REPOSITORY_NAME = "sagemaker-model-monitor-analyzer"

STATISTICS_JSON_DEFAULT_FILE_NAME = "statistics.json"
CONSTRAINTS_JSON_DEFAULT_FILE_NAME = "constraints.json"
Expand DownExpand Up@@ -89,6 +67,8 @@

_LOGGER = logging.getLogger(__name__)

framework_name = "model-monitor"


class ModelMonitor(object):
 """Sets up Amazon SageMaker Monitoring Schedules and baseline suggestions. Use this class when
Expand DownExpand Up@@ -1787,9 +1767,7 @@ def _get_default_image_uri(region):
 Returns:
 str: The Default Model Monitoring image uri based on the region.
 """
 return _DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS.format(
 get_ecr_image_uri_prefix(_DEFAULT_MONITOR_IMAGE_REGION_ACCOUNT_MAPPING[region], region)
 )
 return image_uris.retrieve(framework=framework_name, region=region)


class BaseliningJob(ProcessingJob):
Expand Down

7 changes: 2 additions & 5 deletions
src/sagemaker/predictor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
from sagemaker.utils import name_from_base

from sagemaker.model_monitor.model_monitoring import (
_DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS,
DEFAULT_REPOSITORY_NAME,
 ModelMonitor,
 DefaultModelMonitor,
)
Expand DownExpand Up@@ -357,10 +357,7 @@ def list_monitors(self):
 image_uri = schedule["MonitoringScheduleConfig"]["MonitoringJobDefinition"][
 "MonitoringAppSpecification"
 ]["ImageUri"]
 index_after_placeholders = _DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS.rfind("{}")
 if image_uri.endswith(
 _DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS[index_after_placeholders + len("{}") :]
 ):
 if image_uri.endswith(DEFAULT_REPOSITORY_NAME):
 monitors.append(
 DefaultModelMonitor.attach(
 monitor_schedule_name=schedule_name,
Expand Down

6 changes: 6 additions & 0 deletions
tests/unit/sagemaker/image_uris/expected_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
}
DOMAIN = "amazonaws.com"
IMAGE_URI_FORMAT = "{}.dkr.ecr.{}.{}/{}:{}"
MONITOR_URI_FORMAT = "{}.dkr.ecr.{}.{}/sagemaker-model-monitor-analyzer"
REGION = "us-west-2"


Expand All@@ -34,3 +35,8 @@ def framework_uri(repo, fw_version, account, py_version=None, processor="cpu", r
def algo_uri(algo, account, region, version=1):
 domain = ALTERNATE_DOMAINS.get(region, DOMAIN)
 return IMAGE_URI_FORMAT.format(account, region, domain, algo, version)


def monitor_uri(account, region=REGION):
 domain = ALTERNATE_DOMAINS.get(region, DOMAIN)
 return MONITOR_URI_FORMAT.format(account, region, domain)

48 changes: 48 additions & 0 deletions
tests/unit/sagemaker/image_uris/test_model_monitor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
# Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You
# may not use this file except in compliance with the License. A copy of
# the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "license" file accompanying this file. This file is
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
from __future__ import absolute_import

from sagemaker import image_uris
from tests.unit.sagemaker.image_uris import expected_uris, regions

ACCOUNTS = {
 "eu-north-1": "895015795356",
 "me-south-1": "607024016150",
 "ap-south-1": "126357580389",
 "us-east-2": "777275614652",
 "eu-west-1": "468650794304",
 "eu-central-1": "048819808253",
 "sa-east-1": "539772159869",
 "ap-east-1": "001633400207",
 "us-east-1": "156813124566",
 "ap-northeast-2": "709848358524",
 "eu-west-2": "749857270468",
 "eu-west-3": "680080141114",
 "ap-northeast-1": "574779866223",
 "us-west-2": "159807026194",
 "us-west-1": "890145073186",
 "ap-southeast-1": "245545462676",
 "ap-southeast-2": "563025443158",
 "ca-central-1": "536280801234",
 "cn-north-1": "453000072557",
 "cn-northwest-1": "453252182341",
}


def test_model_monitor():
 for region in regions.regions():
 if region in ACCOUNTS.keys():
 uri = image_uris.retrieve("model-monitor", region=region)

 expected = expected_uris.monitor_uri(ACCOUNTS[region], region)
 assert expected == uri

2 changes: 2 additions & 0 deletions
tests/unit/sagemaker/monitor/test_model_monitoring.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,7 @@


CUSTOM_IMAGE_URI = "012345678901.dkr.ecr.us-west-2.amazonaws.com/my-custom-image-uri"
DEFAULT_IMAGE_URI = "159807026194.dkr.ecr.us-west-2.amazonaws.com/sagemaker-model-monitor-analyzer"

INTER_CONTAINER_ENCRYPTION_EXCEPTION_MSG = (
 "EnableInterContainerTrafficEncryption is not supported in Model Monitor. Please ensure that "
Expand DownExpand Up@@ -126,6 +127,7 @@ def test_default_model_monitor_suggest_baseline(sagemaker_session):
 assert my_default_monitor.sagemaker_session == sagemaker_session
 assert my_default_monitor.tags == TAGS
 assert my_default_monitor.network_config == NETWORK_CONFIG
 assert my_default_monitor.image_uri == DEFAULT_IMAGE_URI

 assert BASE_JOB_NAME in my_default_monitor.latest_baselining_job_name
 assert my_default_monitor.latest_baselining_job_name != BASE_JOB_NAME
Expand Down

, '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
change: use image_uris.retrieve() for ModelMonitor default image#1765

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 4 commits into

from

Jul 29, 2020
 Merged


change: use image_uris.retrieve() for ModelMonitor default image
#1765
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
021937b

change: use image_uris.retrieve() for ModelMonitor default image

Jul 28, 2020
6b0b83f

using the generic template for model monitor image retrieve

Jul 28, 2020
7d72166

Merge branch 'zwei' into model-monitoring


chuyang-deng Jul 29, 2020
954c956

Merge branch 'zwei' into model-monitoring


laurenyu Jul 29, 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


30 changes: 30 additions & 0 deletions
src/sagemaker/image_uri_config/model-monitor.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
{
 "scope": ["monitoring"],
 "versions": {
 "": {
 "registries": {
 "eu-north-1": "895015795356",
@laurenyulaurenyuJul 29, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpicky nitpick: alphabetize the regions
 "me-south-1": "607024016150",
 "ap-south-1": "126357580389",
 "us-east-2": "777275614652",
 "eu-west-1": "468650794304",
 "eu-central-1": "048819808253",
 "sa-east-1": "539772159869",
 "ap-east-1": "001633400207",
 "us-east-1": "156813124566",
 "ap-northeast-2": "709848358524",
 "eu-west-2": "749857270468",
 "eu-west-3": "680080141114",
 "ap-northeast-1": "574779866223",
 "us-west-2": "159807026194",
 "us-west-1": "890145073186",
 "ap-southeast-1": "245545462676",
 "ap-southeast-2": "563025443158",
 "ca-central-1": "536280801234",
 "cn-north-1": "453000072557",
 "cn-northwest-1": "453252182341"
 },
 "repository": "sagemaker-model-monitor-analyzer"
 }
 }
}

9 changes: 6 additions & 3 deletions
src/sagemaker/image_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@

logger = logging.getLogger(__name__)

ECR_URI_TEMPLATE = "{registry}.dkr.{hostname}/{repository}:{tag}"
ECR_URI_TEMPLATE = "{registry}.dkr.{hostname}/{repository}"


def retrieve(
Expand DownExpand Up@@ -69,14 +69,17 @@ def retrieve(
 registry = _registry_from_region(region, version_config["registries"])
 hostname = utils._botocore_resolver().construct_endpoint("ecr", region)["hostname"]

 repo = version_config["repository"]

 processor = _processor(
 instance_type, config.get("processors") or version_config.get("processors")
 )
 tag = _format_tag(version_config.get("tag_prefix", version), processor, py_version)

 repo = version_config["repository"]
 if tag:
 repo += ":{}".format(tag)

 return ECR_URI_TEMPLATE.format(registry=registry, hostname=hostname, repository=repo, tag=tag)
 return ECR_URI_TEMPLATE.format(registry=registry, hostname=hostname, repository=repo)


def _config_for_framework_and_scope(framework, image_scope, accelerator_type=None):
Expand Down

36 changes: 7 additions & 29 deletions
src/sagemaker/model_monitor/model_monitoring.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,38 +26,16 @@
from six.moves.urllib.parse import urlparse
from botocore.exceptions import ClientError

from sagemaker import image_uris
from sagemaker.exceptions import UnexpectedStatusException
from sagemaker.model_monitor.monitoring_files import Constraints, ConstraintViolations, Statistics
from sagemaker.network import NetworkConfig
from sagemaker.processing import Processor, ProcessingInput, ProcessingJob, ProcessingOutput
from sagemaker.s3 import S3Uploader
from sagemaker.session import Session
from sagemaker.utils import name_from_base, retries, get_ecr_image_uri_prefix

_DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS = "{}/sagemaker-model-monitor-analyzer"

_DEFAULT_MONITOR_IMAGE_REGION_ACCOUNT_MAPPING = {
 "eu-north-1": "895015795356",
 "me-south-1": "607024016150",
 "ap-south-1": "126357580389",
 "us-east-2": "777275614652",
 "eu-west-1": "468650794304",
 "eu-central-1": "048819808253",
 "sa-east-1": "539772159869",
 "ap-east-1": "001633400207",
 "us-east-1": "156813124566",
 "ap-northeast-2": "709848358524",
 "eu-west-2": "749857270468",
 "eu-west-3": "680080141114",
 "ap-northeast-1": "574779866223",
 "us-west-2": "159807026194",
 "us-west-1": "890145073186",
 "ap-southeast-1": "245545462676",
 "ap-southeast-2": "563025443158",
 "ca-central-1": "536280801234",
 "cn-north-1": "453000072557",
 "cn-northwest-1": "453252182341",
}
from sagemaker.utils import name_from_base, retries

DEFAULT_REPOSITORY_NAME = "sagemaker-model-monitor-analyzer"

STATISTICS_JSON_DEFAULT_FILE_NAME = "statistics.json"
CONSTRAINTS_JSON_DEFAULT_FILE_NAME = "constraints.json"
Expand DownExpand Up@@ -89,6 +67,8 @@

_LOGGER = logging.getLogger(__name__)

framework_name = "model-monitor"


class ModelMonitor(object):
 """Sets up Amazon SageMaker Monitoring Schedules and baseline suggestions. Use this class when
Expand DownExpand Up@@ -1787,9 +1767,7 @@ def _get_default_image_uri(region):
 Returns:
 str: The Default Model Monitoring image uri based on the region.
 """
 return _DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS.format(
 get_ecr_image_uri_prefix(_DEFAULT_MONITOR_IMAGE_REGION_ACCOUNT_MAPPING[region], region)
 )
 return image_uris.retrieve(framework=framework_name, region=region)


class BaseliningJob(ProcessingJob):
Expand Down

7 changes: 2 additions & 5 deletions
src/sagemaker/predictor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
from sagemaker.utils import name_from_base

from sagemaker.model_monitor.model_monitoring import (
_DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS,
DEFAULT_REPOSITORY_NAME,
 ModelMonitor,
 DefaultModelMonitor,
)
Expand DownExpand Up@@ -357,10 +357,7 @@ def list_monitors(self):
 image_uri = schedule["MonitoringScheduleConfig"]["MonitoringJobDefinition"][
 "MonitoringAppSpecification"
 ]["ImageUri"]
 index_after_placeholders = _DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS.rfind("{}")
 if image_uri.endswith(
 _DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS[index_after_placeholders + len("{}") :]
 ):
 if image_uri.endswith(DEFAULT_REPOSITORY_NAME):
 monitors.append(
 DefaultModelMonitor.attach(
 monitor_schedule_name=schedule_name,
Expand Down

6 changes: 6 additions & 0 deletions
tests/unit/sagemaker/image_uris/expected_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
}
DOMAIN = "amazonaws.com"
IMAGE_URI_FORMAT = "{}.dkr.ecr.{}.{}/{}:{}"
MONITOR_URI_FORMAT = "{}.dkr.ecr.{}.{}/sagemaker-model-monitor-analyzer"
REGION = "us-west-2"


Expand All@@ -34,3 +35,8 @@ def framework_uri(repo, fw_version, account, py_version=None, processor="cpu", r
def algo_uri(algo, account, region, version=1):
 domain = ALTERNATE_DOMAINS.get(region, DOMAIN)
 return IMAGE_URI_FORMAT.format(account, region, domain, algo, version)


def monitor_uri(account, region=REGION):
 domain = ALTERNATE_DOMAINS.get(region, DOMAIN)
 return MONITOR_URI_FORMAT.format(account, region, domain)

48 changes: 48 additions & 0 deletions
tests/unit/sagemaker/image_uris/test_model_monitor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
# Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You
# may not use this file except in compliance with the License. A copy of
# the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "license" file accompanying this file. This file is
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
from __future__ import absolute_import

from sagemaker import image_uris
from tests.unit.sagemaker.image_uris import expected_uris, regions

ACCOUNTS = {
 "eu-north-1": "895015795356",
 "me-south-1": "607024016150",
 "ap-south-1": "126357580389",
 "us-east-2": "777275614652",
 "eu-west-1": "468650794304",
 "eu-central-1": "048819808253",
 "sa-east-1": "539772159869",
 "ap-east-1": "001633400207",
 "us-east-1": "156813124566",
 "ap-northeast-2": "709848358524",
 "eu-west-2": "749857270468",
 "eu-west-3": "680080141114",
 "ap-northeast-1": "574779866223",
 "us-west-2": "159807026194",
 "us-west-1": "890145073186",
 "ap-southeast-1": "245545462676",
 "ap-southeast-2": "563025443158",
 "ca-central-1": "536280801234",
 "cn-north-1": "453000072557",
 "cn-northwest-1": "453252182341",
}


def test_model_monitor():
 for region in regions.regions():
 if region in ACCOUNTS.keys():
 uri = image_uris.retrieve("model-monitor", region=region)

 expected = expected_uris.monitor_uri(ACCOUNTS[region], region)
 assert expected == uri

2 changes: 2 additions & 0 deletions
tests/unit/sagemaker/monitor/test_model_monitoring.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,7 @@


CUSTOM_IMAGE_URI = "012345678901.dkr.ecr.us-west-2.amazonaws.com/my-custom-image-uri"
DEFAULT_IMAGE_URI = "159807026194.dkr.ecr.us-west-2.amazonaws.com/sagemaker-model-monitor-analyzer"

INTER_CONTAINER_ENCRYPTION_EXCEPTION_MSG = (
 "EnableInterContainerTrafficEncryption is not supported in Model Monitor. Please ensure that "
Expand DownExpand Up@@ -126,6 +127,7 @@ def test_default_model_monitor_suggest_baseline(sagemaker_session):
 assert my_default_monitor.sagemaker_session == sagemaker_session
 assert my_default_monitor.tags == TAGS
 assert my_default_monitor.network_config == NETWORK_CONFIG
 assert my_default_monitor.image_uri == DEFAULT_IMAGE_URI

 assert BASE_JOB_NAME in my_default_monitor.latest_baselining_job_name
 assert my_default_monitor.latest_baselining_job_name != BASE_JOB_NAME
Expand Down

, '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
change: use image_uris.retrieve() for ModelMonitor default image#1765

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 4 commits into

from

Jul 29, 2020
 Merged


change: use image_uris.retrieve() for ModelMonitor default image
#1765
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
021937b

change: use image_uris.retrieve() for ModelMonitor default image

Jul 28, 2020
6b0b83f

using the generic template for model monitor image retrieve

Jul 28, 2020
7d72166

Merge branch 'zwei' into model-monitoring


chuyang-deng Jul 29, 2020
954c956

Merge branch 'zwei' into model-monitoring


laurenyu Jul 29, 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


30 changes: 30 additions & 0 deletions
src/sagemaker/image_uri_config/model-monitor.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
{
 "scope": ["monitoring"],
 "versions": {
 "": {
 "registries": {
 "eu-north-1": "895015795356",
@laurenyulaurenyuJul 29, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpicky nitpick: alphabetize the regions
 "me-south-1": "607024016150",
 "ap-south-1": "126357580389",
 "us-east-2": "777275614652",
 "eu-west-1": "468650794304",
 "eu-central-1": "048819808253",
 "sa-east-1": "539772159869",
 "ap-east-1": "001633400207",
 "us-east-1": "156813124566",
 "ap-northeast-2": "709848358524",
 "eu-west-2": "749857270468",
 "eu-west-3": "680080141114",
 "ap-northeast-1": "574779866223",
 "us-west-2": "159807026194",
 "us-west-1": "890145073186",
 "ap-southeast-1": "245545462676",
 "ap-southeast-2": "563025443158",
 "ca-central-1": "536280801234",
 "cn-north-1": "453000072557",
 "cn-northwest-1": "453252182341"
 },
 "repository": "sagemaker-model-monitor-analyzer"
 }
 }
}

9 changes: 6 additions & 3 deletions
src/sagemaker/image_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@

logger = logging.getLogger(__name__)

ECR_URI_TEMPLATE = "{registry}.dkr.{hostname}/{repository}:{tag}"
ECR_URI_TEMPLATE = "{registry}.dkr.{hostname}/{repository}"


def retrieve(
Expand DownExpand Up@@ -69,14 +69,17 @@ def retrieve(
 registry = _registry_from_region(region, version_config["registries"])
 hostname = utils._botocore_resolver().construct_endpoint("ecr", region)["hostname"]

 repo = version_config["repository"]

 processor = _processor(
 instance_type, config.get("processors") or version_config.get("processors")
 )
 tag = _format_tag(version_config.get("tag_prefix", version), processor, py_version)

 repo = version_config["repository"]
 if tag:
 repo += ":{}".format(tag)

 return ECR_URI_TEMPLATE.format(registry=registry, hostname=hostname, repository=repo, tag=tag)
 return ECR_URI_TEMPLATE.format(registry=registry, hostname=hostname, repository=repo)


def _config_for_framework_and_scope(framework, image_scope, accelerator_type=None):
Expand Down

36 changes: 7 additions & 29 deletions
src/sagemaker/model_monitor/model_monitoring.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,38 +26,16 @@
from six.moves.urllib.parse import urlparse
from botocore.exceptions import ClientError

from sagemaker import image_uris
from sagemaker.exceptions import UnexpectedStatusException
from sagemaker.model_monitor.monitoring_files import Constraints, ConstraintViolations, Statistics
from sagemaker.network import NetworkConfig
from sagemaker.processing import Processor, ProcessingInput, ProcessingJob, ProcessingOutput
from sagemaker.s3 import S3Uploader
from sagemaker.session import Session
from sagemaker.utils import name_from_base, retries, get_ecr_image_uri_prefix

_DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS = "{}/sagemaker-model-monitor-analyzer"

_DEFAULT_MONITOR_IMAGE_REGION_ACCOUNT_MAPPING = {
 "eu-north-1": "895015795356",
 "me-south-1": "607024016150",
 "ap-south-1": "126357580389",
 "us-east-2": "777275614652",
 "eu-west-1": "468650794304",
 "eu-central-1": "048819808253",
 "sa-east-1": "539772159869",
 "ap-east-1": "001633400207",
 "us-east-1": "156813124566",
 "ap-northeast-2": "709848358524",
 "eu-west-2": "749857270468",
 "eu-west-3": "680080141114",
 "ap-northeast-1": "574779866223",
 "us-west-2": "159807026194",
 "us-west-1": "890145073186",
 "ap-southeast-1": "245545462676",
 "ap-southeast-2": "563025443158",
 "ca-central-1": "536280801234",
 "cn-north-1": "453000072557",
 "cn-northwest-1": "453252182341",
}
from sagemaker.utils import name_from_base, retries

DEFAULT_REPOSITORY_NAME = "sagemaker-model-monitor-analyzer"

STATISTICS_JSON_DEFAULT_FILE_NAME = "statistics.json"
CONSTRAINTS_JSON_DEFAULT_FILE_NAME = "constraints.json"
Expand DownExpand Up@@ -89,6 +67,8 @@

_LOGGER = logging.getLogger(__name__)

framework_name = "model-monitor"


class ModelMonitor(object):
 """Sets up Amazon SageMaker Monitoring Schedules and baseline suggestions. Use this class when
Expand DownExpand Up@@ -1787,9 +1767,7 @@ def _get_default_image_uri(region):
 Returns:
 str: The Default Model Monitoring image uri based on the region.
 """
 return _DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS.format(
 get_ecr_image_uri_prefix(_DEFAULT_MONITOR_IMAGE_REGION_ACCOUNT_MAPPING[region], region)
 )
 return image_uris.retrieve(framework=framework_name, region=region)


class BaseliningJob(ProcessingJob):
Expand Down

7 changes: 2 additions & 5 deletions
src/sagemaker/predictor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
from sagemaker.utils import name_from_base

from sagemaker.model_monitor.model_monitoring import (
_DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS,
DEFAULT_REPOSITORY_NAME,
 ModelMonitor,
 DefaultModelMonitor,
)
Expand DownExpand Up@@ -357,10 +357,7 @@ def list_monitors(self):
 image_uri = schedule["MonitoringScheduleConfig"]["MonitoringJobDefinition"][
 "MonitoringAppSpecification"
 ]["ImageUri"]
 index_after_placeholders = _DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS.rfind("{}")
 if image_uri.endswith(
 _DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS[index_after_placeholders + len("{}") :]
 ):
 if image_uri.endswith(DEFAULT_REPOSITORY_NAME):
 monitors.append(
 DefaultModelMonitor.attach(
 monitor_schedule_name=schedule_name,
Expand Down

6 changes: 6 additions & 0 deletions
tests/unit/sagemaker/image_uris/expected_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
}
DOMAIN = "amazonaws.com"
IMAGE_URI_FORMAT = "{}.dkr.ecr.{}.{}/{}:{}"
MONITOR_URI_FORMAT = "{}.dkr.ecr.{}.{}/sagemaker-model-monitor-analyzer"
REGION = "us-west-2"


Expand All@@ -34,3 +35,8 @@ def framework_uri(repo, fw_version, account, py_version=None, processor="cpu", r
def algo_uri(algo, account, region, version=1):
 domain = ALTERNATE_DOMAINS.get(region, DOMAIN)
 return IMAGE_URI_FORMAT.format(account, region, domain, algo, version)


def monitor_uri(account, region=REGION):
 domain = ALTERNATE_DOMAINS.get(region, DOMAIN)
 return MONITOR_URI_FORMAT.format(account, region, domain)

48 changes: 48 additions & 0 deletions
tests/unit/sagemaker/image_uris/test_model_monitor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
# Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You
# may not use this file except in compliance with the License. A copy of
# the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "license" file accompanying this file. This file is
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
from __future__ import absolute_import

from sagemaker import image_uris
from tests.unit.sagemaker.image_uris import expected_uris, regions

ACCOUNTS = {
 "eu-north-1": "895015795356",
 "me-south-1": "607024016150",
 "ap-south-1": "126357580389",
 "us-east-2": "777275614652",
 "eu-west-1": "468650794304",
 "eu-central-1": "048819808253",
 "sa-east-1": "539772159869",
 "ap-east-1": "001633400207",
 "us-east-1": "156813124566",
 "ap-northeast-2": "709848358524",
 "eu-west-2": "749857270468",
 "eu-west-3": "680080141114",
 "ap-northeast-1": "574779866223",
 "us-west-2": "159807026194",
 "us-west-1": "890145073186",
 "ap-southeast-1": "245545462676",
 "ap-southeast-2": "563025443158",
 "ca-central-1": "536280801234",
 "cn-north-1": "453000072557",
 "cn-northwest-1": "453252182341",
}


def test_model_monitor():
 for region in regions.regions():
 if region in ACCOUNTS.keys():
 uri = image_uris.retrieve("model-monitor", region=region)

 expected = expected_uris.monitor_uri(ACCOUNTS[region], region)
 assert expected == uri

2 changes: 2 additions & 0 deletions
tests/unit/sagemaker/monitor/test_model_monitoring.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,7 @@


CUSTOM_IMAGE_URI = "012345678901.dkr.ecr.us-west-2.amazonaws.com/my-custom-image-uri"
DEFAULT_IMAGE_URI = "159807026194.dkr.ecr.us-west-2.amazonaws.com/sagemaker-model-monitor-analyzer"

INTER_CONTAINER_ENCRYPTION_EXCEPTION_MSG = (
 "EnableInterContainerTrafficEncryption is not supported in Model Monitor. Please ensure that "
Expand DownExpand Up@@ -126,6 +127,7 @@ def test_default_model_monitor_suggest_baseline(sagemaker_session):
 assert my_default_monitor.sagemaker_session == sagemaker_session
 assert my_default_monitor.tags == TAGS
 assert my_default_monitor.network_config == NETWORK_CONFIG
 assert my_default_monitor.image_uri == DEFAULT_IMAGE_URI

 assert BASE_JOB_NAME in my_default_monitor.latest_baselining_job_name
 assert my_default_monitor.latest_baselining_job_name != BASE_JOB_NAME
Expand Down

, '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
change: use image_uris.retrieve() for ModelMonitor default image#1765

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 4 commits into

from

Jul 29, 2020
 Merged


change: use image_uris.retrieve() for ModelMonitor default image
#1765
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
021937b

change: use image_uris.retrieve() for ModelMonitor default image

Jul 28, 2020
6b0b83f

using the generic template for model monitor image retrieve

Jul 28, 2020
7d72166

Merge branch 'zwei' into model-monitoring


chuyang-deng Jul 29, 2020
954c956

Merge branch 'zwei' into model-monitoring


laurenyu Jul 29, 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


30 changes: 30 additions & 0 deletions
src/sagemaker/image_uri_config/model-monitor.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
{
 "scope": ["monitoring"],
 "versions": {
 "": {
 "registries": {
 "eu-north-1": "895015795356",
@laurenyulaurenyuJul 29, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpicky nitpick: alphabetize the regions
 "me-south-1": "607024016150",
 "ap-south-1": "126357580389",
 "us-east-2": "777275614652",
 "eu-west-1": "468650794304",
 "eu-central-1": "048819808253",
 "sa-east-1": "539772159869",
 "ap-east-1": "001633400207",
 "us-east-1": "156813124566",
 "ap-northeast-2": "709848358524",
 "eu-west-2": "749857270468",
 "eu-west-3": "680080141114",
 "ap-northeast-1": "574779866223",
 "us-west-2": "159807026194",
 "us-west-1": "890145073186",
 "ap-southeast-1": "245545462676",
 "ap-southeast-2": "563025443158",
 "ca-central-1": "536280801234",
 "cn-north-1": "453000072557",
 "cn-northwest-1": "453252182341"
 },
 "repository": "sagemaker-model-monitor-analyzer"
 }
 }
}

9 changes: 6 additions & 3 deletions
src/sagemaker/image_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@

logger = logging.getLogger(__name__)

ECR_URI_TEMPLATE = "{registry}.dkr.{hostname}/{repository}:{tag}"
ECR_URI_TEMPLATE = "{registry}.dkr.{hostname}/{repository}"


def retrieve(
Expand DownExpand Up@@ -69,14 +69,17 @@ def retrieve(
 registry = _registry_from_region(region, version_config["registries"])
 hostname = utils._botocore_resolver().construct_endpoint("ecr", region)["hostname"]

 repo = version_config["repository"]

 processor = _processor(
 instance_type, config.get("processors") or version_config.get("processors")
 )
 tag = _format_tag(version_config.get("tag_prefix", version), processor, py_version)

 repo = version_config["repository"]
 if tag:
 repo += ":{}".format(tag)

 return ECR_URI_TEMPLATE.format(registry=registry, hostname=hostname, repository=repo, tag=tag)
 return ECR_URI_TEMPLATE.format(registry=registry, hostname=hostname, repository=repo)


def _config_for_framework_and_scope(framework, image_scope, accelerator_type=None):
Expand Down

36 changes: 7 additions & 29 deletions
src/sagemaker/model_monitor/model_monitoring.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,38 +26,16 @@
from six.moves.urllib.parse import urlparse
from botocore.exceptions import ClientError

from sagemaker import image_uris
from sagemaker.exceptions import UnexpectedStatusException
from sagemaker.model_monitor.monitoring_files import Constraints, ConstraintViolations, Statistics
from sagemaker.network import NetworkConfig
from sagemaker.processing import Processor, ProcessingInput, ProcessingJob, ProcessingOutput
from sagemaker.s3 import S3Uploader
from sagemaker.session import Session
from sagemaker.utils import name_from_base, retries, get_ecr_image_uri_prefix

_DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS = "{}/sagemaker-model-monitor-analyzer"

_DEFAULT_MONITOR_IMAGE_REGION_ACCOUNT_MAPPING = {
 "eu-north-1": "895015795356",
 "me-south-1": "607024016150",
 "ap-south-1": "126357580389",
 "us-east-2": "777275614652",
 "eu-west-1": "468650794304",
 "eu-central-1": "048819808253",
 "sa-east-1": "539772159869",
 "ap-east-1": "001633400207",
 "us-east-1": "156813124566",
 "ap-northeast-2": "709848358524",
 "eu-west-2": "749857270468",
 "eu-west-3": "680080141114",
 "ap-northeast-1": "574779866223",
 "us-west-2": "159807026194",
 "us-west-1": "890145073186",
 "ap-southeast-1": "245545462676",
 "ap-southeast-2": "563025443158",
 "ca-central-1": "536280801234",
 "cn-north-1": "453000072557",
 "cn-northwest-1": "453252182341",
}
from sagemaker.utils import name_from_base, retries

DEFAULT_REPOSITORY_NAME = "sagemaker-model-monitor-analyzer"

STATISTICS_JSON_DEFAULT_FILE_NAME = "statistics.json"
CONSTRAINTS_JSON_DEFAULT_FILE_NAME = "constraints.json"
Expand DownExpand Up@@ -89,6 +67,8 @@

_LOGGER = logging.getLogger(__name__)

framework_name = "model-monitor"


class ModelMonitor(object):
 """Sets up Amazon SageMaker Monitoring Schedules and baseline suggestions. Use this class when
Expand DownExpand Up@@ -1787,9 +1767,7 @@ def _get_default_image_uri(region):
 Returns:
 str: The Default Model Monitoring image uri based on the region.
 """
 return _DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS.format(
 get_ecr_image_uri_prefix(_DEFAULT_MONITOR_IMAGE_REGION_ACCOUNT_MAPPING[region], region)
 )
 return image_uris.retrieve(framework=framework_name, region=region)


class BaseliningJob(ProcessingJob):
Expand Down

7 changes: 2 additions & 5 deletions
src/sagemaker/predictor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
from sagemaker.utils import name_from_base

from sagemaker.model_monitor.model_monitoring import (
_DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS,
DEFAULT_REPOSITORY_NAME,
 ModelMonitor,
 DefaultModelMonitor,
)
Expand DownExpand Up@@ -357,10 +357,7 @@ def list_monitors(self):
 image_uri = schedule["MonitoringScheduleConfig"]["MonitoringJobDefinition"][
 "MonitoringAppSpecification"
 ]["ImageUri"]
 index_after_placeholders = _DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS.rfind("{}")
 if image_uri.endswith(
 _DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS[index_after_placeholders + len("{}") :]
 ):
 if image_uri.endswith(DEFAULT_REPOSITORY_NAME):
 monitors.append(
 DefaultModelMonitor.attach(
 monitor_schedule_name=schedule_name,
Expand Down

6 changes: 6 additions & 0 deletions
tests/unit/sagemaker/image_uris/expected_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
}
DOMAIN = "amazonaws.com"
IMAGE_URI_FORMAT = "{}.dkr.ecr.{}.{}/{}:{}"
MONITOR_URI_FORMAT = "{}.dkr.ecr.{}.{}/sagemaker-model-monitor-analyzer"
REGION = "us-west-2"


Expand All@@ -34,3 +35,8 @@ def framework_uri(repo, fw_version, account, py_version=None, processor="cpu", r
def algo_uri(algo, account, region, version=1):
 domain = ALTERNATE_DOMAINS.get(region, DOMAIN)
 return IMAGE_URI_FORMAT.format(account, region, domain, algo, version)


def monitor_uri(account, region=REGION):
 domain = ALTERNATE_DOMAINS.get(region, DOMAIN)
 return MONITOR_URI_FORMAT.format(account, region, domain)

48 changes: 48 additions & 0 deletions
tests/unit/sagemaker/image_uris/test_model_monitor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
# Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You
# may not use this file except in compliance with the License. A copy of
# the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "license" file accompanying this file. This file is
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
from __future__ import absolute_import

from sagemaker import image_uris
from tests.unit.sagemaker.image_uris import expected_uris, regions

ACCOUNTS = {
 "eu-north-1": "895015795356",
 "me-south-1": "607024016150",
 "ap-south-1": "126357580389",
 "us-east-2": "777275614652",
 "eu-west-1": "468650794304",
 "eu-central-1": "048819808253",
 "sa-east-1": "539772159869",
 "ap-east-1": "001633400207",
 "us-east-1": "156813124566",
 "ap-northeast-2": "709848358524",
 "eu-west-2": "749857270468",
 "eu-west-3": "680080141114",
 "ap-northeast-1": "574779866223",
 "us-west-2": "159807026194",
 "us-west-1": "890145073186",
 "ap-southeast-1": "245545462676",
 "ap-southeast-2": "563025443158",
 "ca-central-1": "536280801234",
 "cn-north-1": "453000072557",
 "cn-northwest-1": "453252182341",
}


def test_model_monitor():
 for region in regions.regions():
 if region in ACCOUNTS.keys():
 uri = image_uris.retrieve("model-monitor", region=region)

 expected = expected_uris.monitor_uri(ACCOUNTS[region], region)
 assert expected == uri

2 changes: 2 additions & 0 deletions
tests/unit/sagemaker/monitor/test_model_monitoring.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,7 @@


CUSTOM_IMAGE_URI = "012345678901.dkr.ecr.us-west-2.amazonaws.com/my-custom-image-uri"
DEFAULT_IMAGE_URI = "159807026194.dkr.ecr.us-west-2.amazonaws.com/sagemaker-model-monitor-analyzer"

INTER_CONTAINER_ENCRYPTION_EXCEPTION_MSG = (
 "EnableInterContainerTrafficEncryption is not supported in Model Monitor. Please ensure that "
Expand DownExpand Up@@ -126,6 +127,7 @@ def test_default_model_monitor_suggest_baseline(sagemaker_session):
 assert my_default_monitor.sagemaker_session == sagemaker_session
 assert my_default_monitor.tags == TAGS
 assert my_default_monitor.network_config == NETWORK_CONFIG
 assert my_default_monitor.image_uri == DEFAULT_IMAGE_URI

 assert BASE_JOB_NAME in my_default_monitor.latest_baselining_job_name
 assert my_default_monitor.latest_baselining_job_name != BASE_JOB_NAME
Expand Down

, '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
change: use image_uris.retrieve() for ModelMonitor default image#1765

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 4 commits into

from

Jul 29, 2020
 Merged


change: use image_uris.retrieve() for ModelMonitor default image
#1765
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
021937b

change: use image_uris.retrieve() for ModelMonitor default image

Jul 28, 2020
6b0b83f

using the generic template for model monitor image retrieve

Jul 28, 2020
7d72166

Merge branch 'zwei' into model-monitoring


chuyang-deng Jul 29, 2020
954c956

Merge branch 'zwei' into model-monitoring


laurenyu Jul 29, 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


30 changes: 30 additions & 0 deletions
src/sagemaker/image_uri_config/model-monitor.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
{
 "scope": ["monitoring"],
 "versions": {
 "": {
 "registries": {
 "eu-north-1": "895015795356",
@laurenyulaurenyuJul 29, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpicky nitpick: alphabetize the regions
 "me-south-1": "607024016150",
 "ap-south-1": "126357580389",
 "us-east-2": "777275614652",
 "eu-west-1": "468650794304",
 "eu-central-1": "048819808253",
 "sa-east-1": "539772159869",
 "ap-east-1": "001633400207",
 "us-east-1": "156813124566",
 "ap-northeast-2": "709848358524",
 "eu-west-2": "749857270468",
 "eu-west-3": "680080141114",
 "ap-northeast-1": "574779866223",
 "us-west-2": "159807026194",
 "us-west-1": "890145073186",
 "ap-southeast-1": "245545462676",
 "ap-southeast-2": "563025443158",
 "ca-central-1": "536280801234",
 "cn-north-1": "453000072557",
 "cn-northwest-1": "453252182341"
 },
 "repository": "sagemaker-model-monitor-analyzer"
 }
 }
}

9 changes: 6 additions & 3 deletions
src/sagemaker/image_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@

logger = logging.getLogger(__name__)

ECR_URI_TEMPLATE = "{registry}.dkr.{hostname}/{repository}:{tag}"
ECR_URI_TEMPLATE = "{registry}.dkr.{hostname}/{repository}"


def retrieve(
Expand DownExpand Up@@ -69,14 +69,17 @@ def retrieve(
 registry = _registry_from_region(region, version_config["registries"])
 hostname = utils._botocore_resolver().construct_endpoint("ecr", region)["hostname"]

 repo = version_config["repository"]

 processor = _processor(
 instance_type, config.get("processors") or version_config.get("processors")
 )
 tag = _format_tag(version_config.get("tag_prefix", version), processor, py_version)

 repo = version_config["repository"]
 if tag:
 repo += ":{}".format(tag)

 return ECR_URI_TEMPLATE.format(registry=registry, hostname=hostname, repository=repo, tag=tag)
 return ECR_URI_TEMPLATE.format(registry=registry, hostname=hostname, repository=repo)


def _config_for_framework_and_scope(framework, image_scope, accelerator_type=None):
Expand Down

36 changes: 7 additions & 29 deletions
src/sagemaker/model_monitor/model_monitoring.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,38 +26,16 @@
from six.moves.urllib.parse import urlparse
from botocore.exceptions import ClientError

from sagemaker import image_uris
from sagemaker.exceptions import UnexpectedStatusException
from sagemaker.model_monitor.monitoring_files import Constraints, ConstraintViolations, Statistics
from sagemaker.network import NetworkConfig
from sagemaker.processing import Processor, ProcessingInput, ProcessingJob, ProcessingOutput
from sagemaker.s3 import S3Uploader
from sagemaker.session import Session
from sagemaker.utils import name_from_base, retries, get_ecr_image_uri_prefix

_DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS = "{}/sagemaker-model-monitor-analyzer"

_DEFAULT_MONITOR_IMAGE_REGION_ACCOUNT_MAPPING = {
 "eu-north-1": "895015795356",
 "me-south-1": "607024016150",
 "ap-south-1": "126357580389",
 "us-east-2": "777275614652",
 "eu-west-1": "468650794304",
 "eu-central-1": "048819808253",
 "sa-east-1": "539772159869",
 "ap-east-1": "001633400207",
 "us-east-1": "156813124566",
 "ap-northeast-2": "709848358524",
 "eu-west-2": "749857270468",
 "eu-west-3": "680080141114",
 "ap-northeast-1": "574779866223",
 "us-west-2": "159807026194",
 "us-west-1": "890145073186",
 "ap-southeast-1": "245545462676",
 "ap-southeast-2": "563025443158",
 "ca-central-1": "536280801234",
 "cn-north-1": "453000072557",
 "cn-northwest-1": "453252182341",
}
from sagemaker.utils import name_from_base, retries

DEFAULT_REPOSITORY_NAME = "sagemaker-model-monitor-analyzer"

STATISTICS_JSON_DEFAULT_FILE_NAME = "statistics.json"
CONSTRAINTS_JSON_DEFAULT_FILE_NAME = "constraints.json"
Expand DownExpand Up@@ -89,6 +67,8 @@

_LOGGER = logging.getLogger(__name__)

framework_name = "model-monitor"


class ModelMonitor(object):
 """Sets up Amazon SageMaker Monitoring Schedules and baseline suggestions. Use this class when
Expand DownExpand Up@@ -1787,9 +1767,7 @@ def _get_default_image_uri(region):
 Returns:
 str: The Default Model Monitoring image uri based on the region.
 """
 return _DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS.format(
 get_ecr_image_uri_prefix(_DEFAULT_MONITOR_IMAGE_REGION_ACCOUNT_MAPPING[region], region)
 )
 return image_uris.retrieve(framework=framework_name, region=region)


class BaseliningJob(ProcessingJob):
Expand Down

7 changes: 2 additions & 5 deletions
src/sagemaker/predictor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
from sagemaker.utils import name_from_base

from sagemaker.model_monitor.model_monitoring import (
_DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS,
DEFAULT_REPOSITORY_NAME,
 ModelMonitor,
 DefaultModelMonitor,
)
Expand DownExpand Up@@ -357,10 +357,7 @@ def list_monitors(self):
 image_uri = schedule["MonitoringScheduleConfig"]["MonitoringJobDefinition"][
 "MonitoringAppSpecification"
 ]["ImageUri"]
 index_after_placeholders = _DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS.rfind("{}")
 if image_uri.endswith(
 _DEFAULT_MONITOR_IMAGE_URI_WITH_PLACEHOLDERS[index_after_placeholders + len("{}") :]
 ):
 if image_uri.endswith(DEFAULT_REPOSITORY_NAME):
 monitors.append(
 DefaultModelMonitor.attach(
 monitor_schedule_name=schedule_name,
Expand Down

6 changes: 6 additions & 0 deletions
tests/unit/sagemaker/image_uris/expected_uris.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
}
DOMAIN = "amazonaws.com"
IMAGE_URI_FORMAT = "{}.dkr.ecr.{}.{}/{}:{}"
MONITOR_URI_FORMAT = "{}.dkr.ecr.{}.{}/sagemaker-model-monitor-analyzer"
REGION = "us-west-2"


Expand All@@ -34,3 +35,8 @@ def framework_uri(repo, fw_version, account, py_version=None, processor="cpu", r
def algo_uri(algo, account, region, version=1):
 domain = ALTERNATE_DOMAINS.get(region, DOMAIN)
 return IMAGE_URI_FORMAT.format(account, region, domain, algo, version)


def monitor_uri(account, region=REGION):
 domain = ALTERNATE_DOMAINS.get(region, DOMAIN)
 return MONITOR_URI_FORMAT.format(account, region, domain)

48 changes: 48 additions & 0 deletions
tests/unit/sagemaker/image_uris/test_model_monitor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
# Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You
# may not use this file except in compliance with the License. A copy of
# the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "license" file accompanying this file. This file is
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
from __future__ import absolute_import

from sagemaker import image_uris
from tests.unit.sagemaker.image_uris import expected_uris, regions

ACCOUNTS = {
 "eu-north-1": "895015795356",
 "me-south-1": "607024016150",
 "ap-south-1": "126357580389",
 "us-east-2": "777275614652",
 "eu-west-1": "468650794304",
 "eu-central-1": "048819808253",
 "sa-east-1": "539772159869",
 "ap-east-1": "001633400207",
 "us-east-1": "156813124566",
 "ap-northeast-2": "709848358524",
 "eu-west-2": "749857270468",
 "eu-west-3": "680080141114",
 "ap-northeast-1": "574779866223",
 "us-west-2": "159807026194",
 "us-west-1": "890145073186",
 "ap-southeast-1": "245545462676",
 "ap-southeast-2": "563025443158",
 "ca-central-1": "536280801234",
 "cn-north-1": "453000072557",
 "cn-northwest-1": "453252182341",
}


def test_model_monitor():
 for region in regions.regions():
 if region in ACCOUNTS.keys():
 uri = image_uris.retrieve("model-monitor", region=region)

 expected = expected_uris.monitor_uri(ACCOUNTS[region], region)
 assert expected == uri

2 changes: 2 additions & 0 deletions
tests/unit/sagemaker/monitor/test_model_monitoring.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,7 @@


CUSTOM_IMAGE_URI = "012345678901.dkr.ecr.us-west-2.amazonaws.com/my-custom-image-uri"
DEFAULT_IMAGE_URI = "159807026194.dkr.ecr.us-west-2.amazonaws.com/sagemaker-model-monitor-analyzer"

INTER_CONTAINER_ENCRYPTION_EXCEPTION_MSG = (
 "EnableInterContainerTrafficEncryption is not supported in Model Monitor. Please ensure that "
Expand DownExpand Up@@ -126,6 +127,7 @@ def test_default_model_monitor_suggest_baseline(sagemaker_session):
 assert my_default_monitor.sagemaker_session == sagemaker_session
 assert my_default_monitor.tags == TAGS
 assert my_default_monitor.network_config == NETWORK_CONFIG
 assert my_default_monitor.image_uri == DEFAULT_IMAGE_URI

 assert BASE_JOB_NAME in my_default_monitor.latest_baselining_job_name
 assert my_default_monitor.latest_baselining_job_name != BASE_JOB_NAME
Expand Down