change: add sagemaker_session parameter to DataCaptureConfig#1313

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 2 commits into from
Feb 25, 2020
Merged

change: add sagemaker_session parameter to DataCaptureConfig #1313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8f7614
change: add sagemaker_session parameter to DataCaptureConfig
laurenyu Feb 20, 2020
52b28c0
Merge branch 'master' into data-capture-config-session
laurenyu Feb 25, 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
12 changes: 10 additions & 2 deletions src/sagemaker/model_monitor/data_capture_config.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ def __init__(
capture_options=None,
csv_content_types=None,
json_content_types=None,
sagemaker_session=None,
):
"""Initialize a DataCaptureConfig object for capturing data from Amazon SageMaker Endpoints.

Expand All@@ -56,14 +57,21 @@ def __init__(
which data to capture between request and response.
csv_content_types ([str]): Optional. Default=["text/csv"].
json_content_types([str]): Optional. Default=["application/json"].

sagemaker_session (sagemaker.session.Session): A SageMaker Session
object, used for SageMaker interactions (default: None). If not
specified, one is created using the default AWS configuration
chain.
"""
self.enable_capture = enable_capture
self.sampling_percentage = sampling_percentage
self.destination_s3_uri = destination_s3_uri
if self.destination_s3_uri is None:
sagemaker_session = sagemaker_session or Session()
self.destination_s3_uri = os.path.join(
"s3://", Session().default_bucket(), _MODEL_MONITOR_S3_PATH, _DATA_CAPTURE_S3_PATH
"s3://",
sagemaker_session.default_bucket(),
_MODEL_MONITOR_S3_PATH,
_DATA_CAPTURE_S3_PATH,
)

self.kms_key_id = kms_key_id
Expand Down
12 changes: 10 additions & 2 deletions src/sagemaker/predictor.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,14 +192,22 @@ def enable_data_capture(self):
to enable data capture. For a more customized experience, refer to
update_data_capture_config, instead.
"""
self.update_data_capture_config(data_capture_config=DataCaptureConfig(enable_capture=True))
self.update_data_capture_config(
data_capture_config=DataCaptureConfig(
enable_capture=True, sagemaker_session=self.sagemaker_session
)
)

def disable_data_capture(self):
"""Updates the DataCaptureConfig for the Predictor's associated Amazon SageMaker Endpoint
to disable data capture. For a more customized experience, refer to
update_data_capture_config, instead.
"""
self.update_data_capture_config(data_capture_config=DataCaptureConfig(enable_capture=False))
self.update_data_capture_config(
data_capture_config=DataCaptureConfig(
enable_capture=False, sagemaker_session=self.sagemaker_session
)
)

def update_data_capture_config(self, data_capture_config):
"""Updates the DataCaptureConfig for the Predictor's associated Amazon SageMaker Endpoint
Expand Down
2 changes: 2 additions & 0 deletions tests/integ/test_data_capture_config.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@ def test_disabling_data_capture_on_endpoint_shows_correct_data_capture_status(
capture_options=CUSTOM_CAPTURE_OPTIONS,
csv_content_types=CUSTOM_CSV_CONTENT_TYPES,
json_content_types=CUSTOM_JSON_CONTENT_TYPES,
sagemaker_session=sagemaker_session,
),
)

Expand DownExpand Up@@ -224,6 +225,7 @@ def test_updating_data_capture_on_endpoint_shows_correct_data_capture_status(
capture_options=CUSTOM_CAPTURE_OPTIONS,
csv_content_types=CUSTOM_CSV_CONTENT_TYPES,
json_content_types=CUSTOM_JSON_CONTENT_TYPES,
sagemaker_session=sagemaker_session,
)
)

Expand Down
2 changes: 1 addition & 1 deletion tests/integ/test_model_monitor.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,7 @@ def predictor(sagemaker_session, tf_full_version):
INSTANCE_COUNT,
INSTANCE_TYPE,
endpoint_name=endpoint_name,
data_capture_config=DataCaptureConfig(True),
data_capture_config=DataCaptureConfig(True, sagemaker_session=sagemaker_session),
)
yield predictor

Expand Down
13 changes: 9 additions & 4 deletions tests/unit/sagemaker/monitor/test_data_capture_config.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,12 +12,14 @@
# language governing permissions and limitations under the License.
from __future__ import absolute_import

from mock import Mock

from sagemaker.model_monitor import DataCaptureConfig

DEFAULT_ENABLE_CAPTURE = True
DEFAULT_SAMPLING_PERCENTAGE = 20
DEFAULT_BUCKET_NAME = "default-bucket"
DEFAULT_DESTINATION_S3_URI = "s3://" + DEFAULT_BUCKET_NAME + "/model-monitor/data-capture"
DEFAULT_DESTINATION_S3_URI = "s3://{}/model-monitor/data-capture".format(DEFAULT_BUCKET_NAME)
DEFAULT_KMS_KEY_ID = None
DEFAULT_CAPTURE_MODES = ["REQUEST", "RESPONSE"]
DEFAULT_CSV_CONTENT_TYPES = ["text/csv"]
Expand All@@ -33,7 +35,7 @@
NON_DEFAULT_JSON_CONTENT_TYPES = ["custom/json-format"]


def test_to_request_dict_returns_correct_params_when_non_defaults_provided():
def test_init_when_non_defaults_provided():
data_capture_config = DataCaptureConfig(
enable_capture=NON_DEFAULT_ENABLE_CAPTURE,
sampling_percentage=NON_DEFAULT_SAMPLING_PERCENTAGE,
Expand All@@ -51,9 +53,12 @@ def test_to_request_dict_returns_correct_params_when_non_defaults_provided():
assert data_capture_config.json_content_types == NON_DEFAULT_JSON_CONTENT_TYPES


def test_to_request_dict_returns_correct_default_params_when_optionals_not_provided():
def test_init_when_optionals_not_provided():
sagemaker_session = Mock()
sagemaker_session.default_bucket.return_value = DEFAULT_BUCKET_NAME

data_capture_config = DataCaptureConfig(
enable_capture=DEFAULT_ENABLE_CAPTURE, destination_s3_uri=DEFAULT_DESTINATION_S3_URI
enable_capture=DEFAULT_ENABLE_CAPTURE, sagemaker_session=sagemaker_session
)

assert data_capture_config.enable_capture == DEFAULT_ENABLE_CAPTURE
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: add sagemaker_session parameter to DataCaptureConfig#1313

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

from

Feb 25, 2020
 Merged


change: add sagemaker_session parameter to DataCaptureConfig
#1313
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c8f7614

change: add sagemaker_session parameter to DataCaptureConfig


laurenyu Feb 20, 2020
52b28c0

Merge branch 'master' into data-capture-config-session


laurenyu Feb 25, 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


12 changes: 10 additions & 2 deletions
src/sagemaker/model_monitor/data_capture_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ def __init__(
 capture_options=None,
 csv_content_types=None,
 json_content_types=None,
 sagemaker_session=None,
 ):
 """Initialize a DataCaptureConfig object for capturing data from Amazon SageMaker Endpoints.

Expand All@@ -56,14 +57,21 @@ def __init__(
 which data to capture between request and response.
 csv_content_types ([str]): Optional. Default=["text/csv"].
 json_content_types([str]): Optional. Default=["application/json"].

 sagemaker_session (sagemaker.session.Session): A SageMaker Session
 object, used for SageMaker interactions (default: None). If not
 specified, one is created using the default AWS configuration
 chain.
 """
 self.enable_capture = enable_capture
 self.sampling_percentage = sampling_percentage
 self.destination_s3_uri = destination_s3_uri
 if self.destination_s3_uri is None:
 sagemaker_session = sagemaker_session or Session()
 self.destination_s3_uri = os.path.join(
 "s3://", Session().default_bucket(), _MODEL_MONITOR_S3_PATH, _DATA_CAPTURE_S3_PATH
 "s3://",
 sagemaker_session.default_bucket(),
 _MODEL_MONITOR_S3_PATH,
 _DATA_CAPTURE_S3_PATH,
 )

 self.kms_key_id = kms_key_id
Expand Down

12 changes: 10 additions & 2 deletions
src/sagemaker/predictor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,14 +192,22 @@ def enable_data_capture(self):
 to enable data capture. For a more customized experience, refer to
 update_data_capture_config, instead.
 """
 self.update_data_capture_config(data_capture_config=DataCaptureConfig(enable_capture=True))
 self.update_data_capture_config(
 data_capture_config=DataCaptureConfig(
 enable_capture=True, sagemaker_session=self.sagemaker_session
 )
 )

 def disable_data_capture(self):
 """Updates the DataCaptureConfig for the Predictor's associated Amazon SageMaker Endpoint
 to disable data capture. For a more customized experience, refer to
 update_data_capture_config, instead.
 """
 self.update_data_capture_config(data_capture_config=DataCaptureConfig(enable_capture=False))
 self.update_data_capture_config(
 data_capture_config=DataCaptureConfig(
 enable_capture=False, sagemaker_session=self.sagemaker_session
 )
 )

 def update_data_capture_config(self, data_capture_config):
 """Updates the DataCaptureConfig for the Predictor's associated Amazon SageMaker Endpoint
Expand Down

2 changes: 2 additions & 0 deletions
tests/integ/test_data_capture_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@ def test_disabling_data_capture_on_endpoint_shows_correct_data_capture_status(
 capture_options=CUSTOM_CAPTURE_OPTIONS,
 csv_content_types=CUSTOM_CSV_CONTENT_TYPES,
 json_content_types=CUSTOM_JSON_CONTENT_TYPES,
 sagemaker_session=sagemaker_session,
 ),
 )

Expand DownExpand Up@@ -224,6 +225,7 @@ def test_updating_data_capture_on_endpoint_shows_correct_data_capture_status(
 capture_options=CUSTOM_CAPTURE_OPTIONS,
 csv_content_types=CUSTOM_CSV_CONTENT_TYPES,
 json_content_types=CUSTOM_JSON_CONTENT_TYPES,
 sagemaker_session=sagemaker_session,
 )
 )

Expand Down

2 changes: 1 addition & 1 deletion
tests/integ/test_model_monitor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,7 @@ def predictor(sagemaker_session, tf_full_version):
 INSTANCE_COUNT,
 INSTANCE_TYPE,
 endpoint_name=endpoint_name,
 data_capture_config=DataCaptureConfig(True),
 data_capture_config=DataCaptureConfig(True, sagemaker_session=sagemaker_session),
 )
 yield predictor

Expand Down

13 changes: 9 additions & 4 deletions
tests/unit/sagemaker/monitor/test_data_capture_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,12 +12,14 @@
# language governing permissions and limitations under the License.
from __future__ import absolute_import

from mock import Mock

from sagemaker.model_monitor import DataCaptureConfig

DEFAULT_ENABLE_CAPTURE = True
DEFAULT_SAMPLING_PERCENTAGE = 20
DEFAULT_BUCKET_NAME = "default-bucket"
DEFAULT_DESTINATION_S3_URI = "s3://" + DEFAULT_BUCKET_NAME + "/model-monitor/data-capture"
DEFAULT_DESTINATION_S3_URI = "s3://{}/model-monitor/data-capture".format(DEFAULT_BUCKET_NAME)
DEFAULT_KMS_KEY_ID = None
DEFAULT_CAPTURE_MODES = ["REQUEST", "RESPONSE"]
DEFAULT_CSV_CONTENT_TYPES = ["text/csv"]
Expand All@@ -33,7 +35,7 @@
NON_DEFAULT_JSON_CONTENT_TYPES = ["custom/json-format"]


def test_to_request_dict_returns_correct_params_when_non_defaults_provided():
def test_init_when_non_defaults_provided():
 data_capture_config = DataCaptureConfig(
 enable_capture=NON_DEFAULT_ENABLE_CAPTURE,
 sampling_percentage=NON_DEFAULT_SAMPLING_PERCENTAGE,
Expand All@@ -51,9 +53,12 @@ def test_to_request_dict_returns_correct_params_when_non_defaults_provided():
 assert data_capture_config.json_content_types == NON_DEFAULT_JSON_CONTENT_TYPES


def test_to_request_dict_returns_correct_default_params_when_optionals_not_provided():
def test_init_when_optionals_not_provided():
 sagemaker_session = Mock()
 sagemaker_session.default_bucket.return_value = DEFAULT_BUCKET_NAME

 data_capture_config = DataCaptureConfig(
 enable_capture=DEFAULT_ENABLE_CAPTURE, destination_s3_uri=DEFAULT_DESTINATION_S3_URI
 enable_capture=DEFAULT_ENABLE_CAPTURE, sagemaker_session=sagemaker_session
 )

 assert data_capture_config.enable_capture == DEFAULT_ENABLE_CAPTURE
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: add sagemaker_session parameter to DataCaptureConfig#1313

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

from

Feb 25, 2020
 Merged


change: add sagemaker_session parameter to DataCaptureConfig
#1313
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c8f7614

change: add sagemaker_session parameter to DataCaptureConfig


laurenyu Feb 20, 2020
52b28c0

Merge branch 'master' into data-capture-config-session


laurenyu Feb 25, 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


12 changes: 10 additions & 2 deletions
src/sagemaker/model_monitor/data_capture_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ def __init__(
 capture_options=None,
 csv_content_types=None,
 json_content_types=None,
 sagemaker_session=None,
 ):
 """Initialize a DataCaptureConfig object for capturing data from Amazon SageMaker Endpoints.

Expand All@@ -56,14 +57,21 @@ def __init__(
 which data to capture between request and response.
 csv_content_types ([str]): Optional. Default=["text/csv"].
 json_content_types([str]): Optional. Default=["application/json"].

 sagemaker_session (sagemaker.session.Session): A SageMaker Session
 object, used for SageMaker interactions (default: None). If not
 specified, one is created using the default AWS configuration
 chain.
 """
 self.enable_capture = enable_capture
 self.sampling_percentage = sampling_percentage
 self.destination_s3_uri = destination_s3_uri
 if self.destination_s3_uri is None:
 sagemaker_session = sagemaker_session or Session()
 self.destination_s3_uri = os.path.join(
 "s3://", Session().default_bucket(), _MODEL_MONITOR_S3_PATH, _DATA_CAPTURE_S3_PATH
 "s3://",
 sagemaker_session.default_bucket(),
 _MODEL_MONITOR_S3_PATH,
 _DATA_CAPTURE_S3_PATH,
 )

 self.kms_key_id = kms_key_id
Expand Down

12 changes: 10 additions & 2 deletions
src/sagemaker/predictor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,14 +192,22 @@ def enable_data_capture(self):
 to enable data capture. For a more customized experience, refer to
 update_data_capture_config, instead.
 """
 self.update_data_capture_config(data_capture_config=DataCaptureConfig(enable_capture=True))
 self.update_data_capture_config(
 data_capture_config=DataCaptureConfig(
 enable_capture=True, sagemaker_session=self.sagemaker_session
 )
 )

 def disable_data_capture(self):
 """Updates the DataCaptureConfig for the Predictor's associated Amazon SageMaker Endpoint
 to disable data capture. For a more customized experience, refer to
 update_data_capture_config, instead.
 """
 self.update_data_capture_config(data_capture_config=DataCaptureConfig(enable_capture=False))
 self.update_data_capture_config(
 data_capture_config=DataCaptureConfig(
 enable_capture=False, sagemaker_session=self.sagemaker_session
 )
 )

 def update_data_capture_config(self, data_capture_config):
 """Updates the DataCaptureConfig for the Predictor's associated Amazon SageMaker Endpoint
Expand Down

2 changes: 2 additions & 0 deletions
tests/integ/test_data_capture_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@ def test_disabling_data_capture_on_endpoint_shows_correct_data_capture_status(
 capture_options=CUSTOM_CAPTURE_OPTIONS,
 csv_content_types=CUSTOM_CSV_CONTENT_TYPES,
 json_content_types=CUSTOM_JSON_CONTENT_TYPES,
 sagemaker_session=sagemaker_session,
 ),
 )

Expand DownExpand Up@@ -224,6 +225,7 @@ def test_updating_data_capture_on_endpoint_shows_correct_data_capture_status(
 capture_options=CUSTOM_CAPTURE_OPTIONS,
 csv_content_types=CUSTOM_CSV_CONTENT_TYPES,
 json_content_types=CUSTOM_JSON_CONTENT_TYPES,
 sagemaker_session=sagemaker_session,
 )
 )

Expand Down

2 changes: 1 addition & 1 deletion
tests/integ/test_model_monitor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,7 @@ def predictor(sagemaker_session, tf_full_version):
 INSTANCE_COUNT,
 INSTANCE_TYPE,
 endpoint_name=endpoint_name,
 data_capture_config=DataCaptureConfig(True),
 data_capture_config=DataCaptureConfig(True, sagemaker_session=sagemaker_session),
 )
 yield predictor

Expand Down

13 changes: 9 additions & 4 deletions
tests/unit/sagemaker/monitor/test_data_capture_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,12 +12,14 @@
# language governing permissions and limitations under the License.
from __future__ import absolute_import

from mock import Mock

from sagemaker.model_monitor import DataCaptureConfig

DEFAULT_ENABLE_CAPTURE = True
DEFAULT_SAMPLING_PERCENTAGE = 20
DEFAULT_BUCKET_NAME = "default-bucket"
DEFAULT_DESTINATION_S3_URI = "s3://" + DEFAULT_BUCKET_NAME + "/model-monitor/data-capture"
DEFAULT_DESTINATION_S3_URI = "s3://{}/model-monitor/data-capture".format(DEFAULT_BUCKET_NAME)
DEFAULT_KMS_KEY_ID = None
DEFAULT_CAPTURE_MODES = ["REQUEST", "RESPONSE"]
DEFAULT_CSV_CONTENT_TYPES = ["text/csv"]
Expand All@@ -33,7 +35,7 @@
NON_DEFAULT_JSON_CONTENT_TYPES = ["custom/json-format"]


def test_to_request_dict_returns_correct_params_when_non_defaults_provided():
def test_init_when_non_defaults_provided():
 data_capture_config = DataCaptureConfig(
 enable_capture=NON_DEFAULT_ENABLE_CAPTURE,
 sampling_percentage=NON_DEFAULT_SAMPLING_PERCENTAGE,
Expand All@@ -51,9 +53,12 @@ def test_to_request_dict_returns_correct_params_when_non_defaults_provided():
 assert data_capture_config.json_content_types == NON_DEFAULT_JSON_CONTENT_TYPES


def test_to_request_dict_returns_correct_default_params_when_optionals_not_provided():
def test_init_when_optionals_not_provided():
 sagemaker_session = Mock()
 sagemaker_session.default_bucket.return_value = DEFAULT_BUCKET_NAME

 data_capture_config = DataCaptureConfig(
 enable_capture=DEFAULT_ENABLE_CAPTURE, destination_s3_uri=DEFAULT_DESTINATION_S3_URI
 enable_capture=DEFAULT_ENABLE_CAPTURE, sagemaker_session=sagemaker_session
 )

 assert data_capture_config.enable_capture == DEFAULT_ENABLE_CAPTURE
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: add sagemaker_session parameter to DataCaptureConfig#1313

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

from

Feb 25, 2020
 Merged


change: add sagemaker_session parameter to DataCaptureConfig
#1313
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c8f7614

change: add sagemaker_session parameter to DataCaptureConfig


laurenyu Feb 20, 2020
52b28c0

Merge branch 'master' into data-capture-config-session


laurenyu Feb 25, 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


12 changes: 10 additions & 2 deletions
src/sagemaker/model_monitor/data_capture_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ def __init__(
 capture_options=None,
 csv_content_types=None,
 json_content_types=None,
 sagemaker_session=None,
 ):
 """Initialize a DataCaptureConfig object for capturing data from Amazon SageMaker Endpoints.

Expand All@@ -56,14 +57,21 @@ def __init__(
 which data to capture between request and response.
 csv_content_types ([str]): Optional. Default=["text/csv"].
 json_content_types([str]): Optional. Default=["application/json"].

 sagemaker_session (sagemaker.session.Session): A SageMaker Session
 object, used for SageMaker interactions (default: None). If not
 specified, one is created using the default AWS configuration
 chain.
 """
 self.enable_capture = enable_capture
 self.sampling_percentage = sampling_percentage
 self.destination_s3_uri = destination_s3_uri
 if self.destination_s3_uri is None:
 sagemaker_session = sagemaker_session or Session()
 self.destination_s3_uri = os.path.join(
 "s3://", Session().default_bucket(), _MODEL_MONITOR_S3_PATH, _DATA_CAPTURE_S3_PATH
 "s3://",
 sagemaker_session.default_bucket(),
 _MODEL_MONITOR_S3_PATH,
 _DATA_CAPTURE_S3_PATH,
 )

 self.kms_key_id = kms_key_id
Expand Down

12 changes: 10 additions & 2 deletions
src/sagemaker/predictor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,14 +192,22 @@ def enable_data_capture(self):
 to enable data capture. For a more customized experience, refer to
 update_data_capture_config, instead.
 """
 self.update_data_capture_config(data_capture_config=DataCaptureConfig(enable_capture=True))
 self.update_data_capture_config(
 data_capture_config=DataCaptureConfig(
 enable_capture=True, sagemaker_session=self.sagemaker_session
 )
 )

 def disable_data_capture(self):
 """Updates the DataCaptureConfig for the Predictor's associated Amazon SageMaker Endpoint
 to disable data capture. For a more customized experience, refer to
 update_data_capture_config, instead.
 """
 self.update_data_capture_config(data_capture_config=DataCaptureConfig(enable_capture=False))
 self.update_data_capture_config(
 data_capture_config=DataCaptureConfig(
 enable_capture=False, sagemaker_session=self.sagemaker_session
 )
 )

 def update_data_capture_config(self, data_capture_config):
 """Updates the DataCaptureConfig for the Predictor's associated Amazon SageMaker Endpoint
Expand Down

2 changes: 2 additions & 0 deletions
tests/integ/test_data_capture_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@ def test_disabling_data_capture_on_endpoint_shows_correct_data_capture_status(
 capture_options=CUSTOM_CAPTURE_OPTIONS,
 csv_content_types=CUSTOM_CSV_CONTENT_TYPES,
 json_content_types=CUSTOM_JSON_CONTENT_TYPES,
 sagemaker_session=sagemaker_session,
 ),
 )

Expand DownExpand Up@@ -224,6 +225,7 @@ def test_updating_data_capture_on_endpoint_shows_correct_data_capture_status(
 capture_options=CUSTOM_CAPTURE_OPTIONS,
 csv_content_types=CUSTOM_CSV_CONTENT_TYPES,
 json_content_types=CUSTOM_JSON_CONTENT_TYPES,
 sagemaker_session=sagemaker_session,
 )
 )

Expand Down

2 changes: 1 addition & 1 deletion
tests/integ/test_model_monitor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,7 @@ def predictor(sagemaker_session, tf_full_version):
 INSTANCE_COUNT,
 INSTANCE_TYPE,
 endpoint_name=endpoint_name,
 data_capture_config=DataCaptureConfig(True),
 data_capture_config=DataCaptureConfig(True, sagemaker_session=sagemaker_session),
 )
 yield predictor

Expand Down

13 changes: 9 additions & 4 deletions
tests/unit/sagemaker/monitor/test_data_capture_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,12 +12,14 @@
# language governing permissions and limitations under the License.
from __future__ import absolute_import

from mock import Mock

from sagemaker.model_monitor import DataCaptureConfig

DEFAULT_ENABLE_CAPTURE = True
DEFAULT_SAMPLING_PERCENTAGE = 20
DEFAULT_BUCKET_NAME = "default-bucket"
DEFAULT_DESTINATION_S3_URI = "s3://" + DEFAULT_BUCKET_NAME + "/model-monitor/data-capture"
DEFAULT_DESTINATION_S3_URI = "s3://{}/model-monitor/data-capture".format(DEFAULT_BUCKET_NAME)
DEFAULT_KMS_KEY_ID = None
DEFAULT_CAPTURE_MODES = ["REQUEST", "RESPONSE"]
DEFAULT_CSV_CONTENT_TYPES = ["text/csv"]
Expand All@@ -33,7 +35,7 @@
NON_DEFAULT_JSON_CONTENT_TYPES = ["custom/json-format"]


def test_to_request_dict_returns_correct_params_when_non_defaults_provided():
def test_init_when_non_defaults_provided():
 data_capture_config = DataCaptureConfig(
 enable_capture=NON_DEFAULT_ENABLE_CAPTURE,
 sampling_percentage=NON_DEFAULT_SAMPLING_PERCENTAGE,
Expand All@@ -51,9 +53,12 @@ def test_to_request_dict_returns_correct_params_when_non_defaults_provided():
 assert data_capture_config.json_content_types == NON_DEFAULT_JSON_CONTENT_TYPES


def test_to_request_dict_returns_correct_default_params_when_optionals_not_provided():
def test_init_when_optionals_not_provided():
 sagemaker_session = Mock()
 sagemaker_session.default_bucket.return_value = DEFAULT_BUCKET_NAME

 data_capture_config = DataCaptureConfig(
 enable_capture=DEFAULT_ENABLE_CAPTURE, destination_s3_uri=DEFAULT_DESTINATION_S3_URI
 enable_capture=DEFAULT_ENABLE_CAPTURE, sagemaker_session=sagemaker_session
 )

 assert data_capture_config.enable_capture == DEFAULT_ENABLE_CAPTURE
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: add sagemaker_session parameter to DataCaptureConfig#1313

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

from

Feb 25, 2020
 Merged


change: add sagemaker_session parameter to DataCaptureConfig
#1313
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c8f7614

change: add sagemaker_session parameter to DataCaptureConfig


laurenyu Feb 20, 2020
52b28c0

Merge branch 'master' into data-capture-config-session


laurenyu Feb 25, 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


12 changes: 10 additions & 2 deletions
src/sagemaker/model_monitor/data_capture_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ def __init__(
 capture_options=None,
 csv_content_types=None,
 json_content_types=None,
 sagemaker_session=None,
 ):
 """Initialize a DataCaptureConfig object for capturing data from Amazon SageMaker Endpoints.

Expand All@@ -56,14 +57,21 @@ def __init__(
 which data to capture between request and response.
 csv_content_types ([str]): Optional. Default=["text/csv"].
 json_content_types([str]): Optional. Default=["application/json"].

 sagemaker_session (sagemaker.session.Session): A SageMaker Session
 object, used for SageMaker interactions (default: None). If not
 specified, one is created using the default AWS configuration
 chain.
 """
 self.enable_capture = enable_capture
 self.sampling_percentage = sampling_percentage
 self.destination_s3_uri = destination_s3_uri
 if self.destination_s3_uri is None:
 sagemaker_session = sagemaker_session or Session()
 self.destination_s3_uri = os.path.join(
 "s3://", Session().default_bucket(), _MODEL_MONITOR_S3_PATH, _DATA_CAPTURE_S3_PATH
 "s3://",
 sagemaker_session.default_bucket(),
 _MODEL_MONITOR_S3_PATH,
 _DATA_CAPTURE_S3_PATH,
 )

 self.kms_key_id = kms_key_id
Expand Down

12 changes: 10 additions & 2 deletions
src/sagemaker/predictor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,14 +192,22 @@ def enable_data_capture(self):
 to enable data capture. For a more customized experience, refer to
 update_data_capture_config, instead.
 """
 self.update_data_capture_config(data_capture_config=DataCaptureConfig(enable_capture=True))
 self.update_data_capture_config(
 data_capture_config=DataCaptureConfig(
 enable_capture=True, sagemaker_session=self.sagemaker_session
 )
 )

 def disable_data_capture(self):
 """Updates the DataCaptureConfig for the Predictor's associated Amazon SageMaker Endpoint
 to disable data capture. For a more customized experience, refer to
 update_data_capture_config, instead.
 """
 self.update_data_capture_config(data_capture_config=DataCaptureConfig(enable_capture=False))
 self.update_data_capture_config(
 data_capture_config=DataCaptureConfig(
 enable_capture=False, sagemaker_session=self.sagemaker_session
 )
 )

 def update_data_capture_config(self, data_capture_config):
 """Updates the DataCaptureConfig for the Predictor's associated Amazon SageMaker Endpoint
Expand Down

2 changes: 2 additions & 0 deletions
tests/integ/test_data_capture_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@ def test_disabling_data_capture_on_endpoint_shows_correct_data_capture_status(
 capture_options=CUSTOM_CAPTURE_OPTIONS,
 csv_content_types=CUSTOM_CSV_CONTENT_TYPES,
 json_content_types=CUSTOM_JSON_CONTENT_TYPES,
 sagemaker_session=sagemaker_session,
 ),
 )

Expand DownExpand Up@@ -224,6 +225,7 @@ def test_updating_data_capture_on_endpoint_shows_correct_data_capture_status(
 capture_options=CUSTOM_CAPTURE_OPTIONS,
 csv_content_types=CUSTOM_CSV_CONTENT_TYPES,
 json_content_types=CUSTOM_JSON_CONTENT_TYPES,
 sagemaker_session=sagemaker_session,
 )
 )

Expand Down

2 changes: 1 addition & 1 deletion
tests/integ/test_model_monitor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,7 @@ def predictor(sagemaker_session, tf_full_version):
 INSTANCE_COUNT,
 INSTANCE_TYPE,
 endpoint_name=endpoint_name,
 data_capture_config=DataCaptureConfig(True),
 data_capture_config=DataCaptureConfig(True, sagemaker_session=sagemaker_session),
 )
 yield predictor

Expand Down

13 changes: 9 additions & 4 deletions
tests/unit/sagemaker/monitor/test_data_capture_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,12 +12,14 @@
# language governing permissions and limitations under the License.
from __future__ import absolute_import

from mock import Mock

from sagemaker.model_monitor import DataCaptureConfig

DEFAULT_ENABLE_CAPTURE = True
DEFAULT_SAMPLING_PERCENTAGE = 20
DEFAULT_BUCKET_NAME = "default-bucket"
DEFAULT_DESTINATION_S3_URI = "s3://" + DEFAULT_BUCKET_NAME + "/model-monitor/data-capture"
DEFAULT_DESTINATION_S3_URI = "s3://{}/model-monitor/data-capture".format(DEFAULT_BUCKET_NAME)
DEFAULT_KMS_KEY_ID = None
DEFAULT_CAPTURE_MODES = ["REQUEST", "RESPONSE"]
DEFAULT_CSV_CONTENT_TYPES = ["text/csv"]
Expand All@@ -33,7 +35,7 @@
NON_DEFAULT_JSON_CONTENT_TYPES = ["custom/json-format"]


def test_to_request_dict_returns_correct_params_when_non_defaults_provided():
def test_init_when_non_defaults_provided():
 data_capture_config = DataCaptureConfig(
 enable_capture=NON_DEFAULT_ENABLE_CAPTURE,
 sampling_percentage=NON_DEFAULT_SAMPLING_PERCENTAGE,
Expand All@@ -51,9 +53,12 @@ def test_to_request_dict_returns_correct_params_when_non_defaults_provided():
 assert data_capture_config.json_content_types == NON_DEFAULT_JSON_CONTENT_TYPES


def test_to_request_dict_returns_correct_default_params_when_optionals_not_provided():
def test_init_when_optionals_not_provided():
 sagemaker_session = Mock()
 sagemaker_session.default_bucket.return_value = DEFAULT_BUCKET_NAME

 data_capture_config = DataCaptureConfig(
 enable_capture=DEFAULT_ENABLE_CAPTURE, destination_s3_uri=DEFAULT_DESTINATION_S3_URI
 enable_capture=DEFAULT_ENABLE_CAPTURE, sagemaker_session=sagemaker_session
 )

 assert data_capture_config.enable_capture == DEFAULT_ENABLE_CAPTURE
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: add sagemaker_session parameter to DataCaptureConfig#1313

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

from

Feb 25, 2020
 Merged


change: add sagemaker_session parameter to DataCaptureConfig
#1313
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c8f7614

change: add sagemaker_session parameter to DataCaptureConfig


laurenyu Feb 20, 2020
52b28c0

Merge branch 'master' into data-capture-config-session


laurenyu Feb 25, 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


12 changes: 10 additions & 2 deletions
src/sagemaker/model_monitor/data_capture_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ def __init__(
 capture_options=None,
 csv_content_types=None,
 json_content_types=None,
 sagemaker_session=None,
 ):
 """Initialize a DataCaptureConfig object for capturing data from Amazon SageMaker Endpoints.

Expand All@@ -56,14 +57,21 @@ def __init__(
 which data to capture between request and response.
 csv_content_types ([str]): Optional. Default=["text/csv"].
 json_content_types([str]): Optional. Default=["application/json"].

 sagemaker_session (sagemaker.session.Session): A SageMaker Session
 object, used for SageMaker interactions (default: None). If not
 specified, one is created using the default AWS configuration
 chain.
 """
 self.enable_capture = enable_capture
 self.sampling_percentage = sampling_percentage
 self.destination_s3_uri = destination_s3_uri
 if self.destination_s3_uri is None:
 sagemaker_session = sagemaker_session or Session()
 self.destination_s3_uri = os.path.join(
 "s3://", Session().default_bucket(), _MODEL_MONITOR_S3_PATH, _DATA_CAPTURE_S3_PATH
 "s3://",
 sagemaker_session.default_bucket(),
 _MODEL_MONITOR_S3_PATH,
 _DATA_CAPTURE_S3_PATH,
 )

 self.kms_key_id = kms_key_id
Expand Down

12 changes: 10 additions & 2 deletions
src/sagemaker/predictor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,14 +192,22 @@ def enable_data_capture(self):
 to enable data capture. For a more customized experience, refer to
 update_data_capture_config, instead.
 """
 self.update_data_capture_config(data_capture_config=DataCaptureConfig(enable_capture=True))
 self.update_data_capture_config(
 data_capture_config=DataCaptureConfig(
 enable_capture=True, sagemaker_session=self.sagemaker_session
 )
 )

 def disable_data_capture(self):
 """Updates the DataCaptureConfig for the Predictor's associated Amazon SageMaker Endpoint
 to disable data capture. For a more customized experience, refer to
 update_data_capture_config, instead.
 """
 self.update_data_capture_config(data_capture_config=DataCaptureConfig(enable_capture=False))
 self.update_data_capture_config(
 data_capture_config=DataCaptureConfig(
 enable_capture=False, sagemaker_session=self.sagemaker_session
 )
 )

 def update_data_capture_config(self, data_capture_config):
 """Updates the DataCaptureConfig for the Predictor's associated Amazon SageMaker Endpoint
Expand Down

2 changes: 2 additions & 0 deletions
tests/integ/test_data_capture_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@ def test_disabling_data_capture_on_endpoint_shows_correct_data_capture_status(
 capture_options=CUSTOM_CAPTURE_OPTIONS,
 csv_content_types=CUSTOM_CSV_CONTENT_TYPES,
 json_content_types=CUSTOM_JSON_CONTENT_TYPES,
 sagemaker_session=sagemaker_session,
 ),
 )

Expand DownExpand Up@@ -224,6 +225,7 @@ def test_updating_data_capture_on_endpoint_shows_correct_data_capture_status(
 capture_options=CUSTOM_CAPTURE_OPTIONS,
 csv_content_types=CUSTOM_CSV_CONTENT_TYPES,
 json_content_types=CUSTOM_JSON_CONTENT_TYPES,
 sagemaker_session=sagemaker_session,
 )
 )

Expand Down

2 changes: 1 addition & 1 deletion
tests/integ/test_model_monitor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,7 @@ def predictor(sagemaker_session, tf_full_version):
 INSTANCE_COUNT,
 INSTANCE_TYPE,
 endpoint_name=endpoint_name,
 data_capture_config=DataCaptureConfig(True),
 data_capture_config=DataCaptureConfig(True, sagemaker_session=sagemaker_session),
 )
 yield predictor

Expand Down

13 changes: 9 additions & 4 deletions
tests/unit/sagemaker/monitor/test_data_capture_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,12 +12,14 @@
# language governing permissions and limitations under the License.
from __future__ import absolute_import

from mock import Mock

from sagemaker.model_monitor import DataCaptureConfig

DEFAULT_ENABLE_CAPTURE = True
DEFAULT_SAMPLING_PERCENTAGE = 20
DEFAULT_BUCKET_NAME = "default-bucket"
DEFAULT_DESTINATION_S3_URI = "s3://" + DEFAULT_BUCKET_NAME + "/model-monitor/data-capture"
DEFAULT_DESTINATION_S3_URI = "s3://{}/model-monitor/data-capture".format(DEFAULT_BUCKET_NAME)
DEFAULT_KMS_KEY_ID = None
DEFAULT_CAPTURE_MODES = ["REQUEST", "RESPONSE"]
DEFAULT_CSV_CONTENT_TYPES = ["text/csv"]
Expand All@@ -33,7 +35,7 @@
NON_DEFAULT_JSON_CONTENT_TYPES = ["custom/json-format"]


def test_to_request_dict_returns_correct_params_when_non_defaults_provided():
def test_init_when_non_defaults_provided():
 data_capture_config = DataCaptureConfig(
 enable_capture=NON_DEFAULT_ENABLE_CAPTURE,
 sampling_percentage=NON_DEFAULT_SAMPLING_PERCENTAGE,
Expand All@@ -51,9 +53,12 @@ def test_to_request_dict_returns_correct_params_when_non_defaults_provided():
 assert data_capture_config.json_content_types == NON_DEFAULT_JSON_CONTENT_TYPES


def test_to_request_dict_returns_correct_default_params_when_optionals_not_provided():
def test_init_when_optionals_not_provided():
 sagemaker_session = Mock()
 sagemaker_session.default_bucket.return_value = DEFAULT_BUCKET_NAME

 data_capture_config = DataCaptureConfig(
 enable_capture=DEFAULT_ENABLE_CAPTURE, destination_s3_uri=DEFAULT_DESTINATION_S3_URI
 enable_capture=DEFAULT_ENABLE_CAPTURE, sagemaker_session=sagemaker_session
 )

 assert data_capture_config.enable_capture == DEFAULT_ENABLE_CAPTURE
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: add sagemaker_session parameter to DataCaptureConfig#1313

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

from

Feb 25, 2020
 Merged


change: add sagemaker_session parameter to DataCaptureConfig
#1313
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c8f7614

change: add sagemaker_session parameter to DataCaptureConfig


laurenyu Feb 20, 2020
52b28c0

Merge branch 'master' into data-capture-config-session


laurenyu Feb 25, 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


12 changes: 10 additions & 2 deletions
src/sagemaker/model_monitor/data_capture_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ def __init__(
 capture_options=None,
 csv_content_types=None,
 json_content_types=None,
 sagemaker_session=None,
 ):
 """Initialize a DataCaptureConfig object for capturing data from Amazon SageMaker Endpoints.

Expand All@@ -56,14 +57,21 @@ def __init__(
 which data to capture between request and response.
 csv_content_types ([str]): Optional. Default=["text/csv"].
 json_content_types([str]): Optional. Default=["application/json"].

 sagemaker_session (sagemaker.session.Session): A SageMaker Session
 object, used for SageMaker interactions (default: None). If not
 specified, one is created using the default AWS configuration
 chain.
 """
 self.enable_capture = enable_capture
 self.sampling_percentage = sampling_percentage
 self.destination_s3_uri = destination_s3_uri
 if self.destination_s3_uri is None:
 sagemaker_session = sagemaker_session or Session()
 self.destination_s3_uri = os.path.join(
 "s3://", Session().default_bucket(), _MODEL_MONITOR_S3_PATH, _DATA_CAPTURE_S3_PATH
 "s3://",
 sagemaker_session.default_bucket(),
 _MODEL_MONITOR_S3_PATH,
 _DATA_CAPTURE_S3_PATH,
 )

 self.kms_key_id = kms_key_id
Expand Down

12 changes: 10 additions & 2 deletions
src/sagemaker/predictor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,14 +192,22 @@ def enable_data_capture(self):
 to enable data capture. For a more customized experience, refer to
 update_data_capture_config, instead.
 """
 self.update_data_capture_config(data_capture_config=DataCaptureConfig(enable_capture=True))
 self.update_data_capture_config(
 data_capture_config=DataCaptureConfig(
 enable_capture=True, sagemaker_session=self.sagemaker_session
 )
 )

 def disable_data_capture(self):
 """Updates the DataCaptureConfig for the Predictor's associated Amazon SageMaker Endpoint
 to disable data capture. For a more customized experience, refer to
 update_data_capture_config, instead.
 """
 self.update_data_capture_config(data_capture_config=DataCaptureConfig(enable_capture=False))
 self.update_data_capture_config(
 data_capture_config=DataCaptureConfig(
 enable_capture=False, sagemaker_session=self.sagemaker_session
 )
 )

 def update_data_capture_config(self, data_capture_config):
 """Updates the DataCaptureConfig for the Predictor's associated Amazon SageMaker Endpoint
Expand Down

2 changes: 2 additions & 0 deletions
tests/integ/test_data_capture_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@ def test_disabling_data_capture_on_endpoint_shows_correct_data_capture_status(
 capture_options=CUSTOM_CAPTURE_OPTIONS,
 csv_content_types=CUSTOM_CSV_CONTENT_TYPES,
 json_content_types=CUSTOM_JSON_CONTENT_TYPES,
 sagemaker_session=sagemaker_session,
 ),
 )

Expand DownExpand Up@@ -224,6 +225,7 @@ def test_updating_data_capture_on_endpoint_shows_correct_data_capture_status(
 capture_options=CUSTOM_CAPTURE_OPTIONS,
 csv_content_types=CUSTOM_CSV_CONTENT_TYPES,
 json_content_types=CUSTOM_JSON_CONTENT_TYPES,
 sagemaker_session=sagemaker_session,
 )
 )

Expand Down

2 changes: 1 addition & 1 deletion
tests/integ/test_model_monitor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,7 @@ def predictor(sagemaker_session, tf_full_version):
 INSTANCE_COUNT,
 INSTANCE_TYPE,
 endpoint_name=endpoint_name,
 data_capture_config=DataCaptureConfig(True),
 data_capture_config=DataCaptureConfig(True, sagemaker_session=sagemaker_session),
 )
 yield predictor

Expand Down

13 changes: 9 additions & 4 deletions
tests/unit/sagemaker/monitor/test_data_capture_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,12 +12,14 @@
# language governing permissions and limitations under the License.
from __future__ import absolute_import

from mock import Mock

from sagemaker.model_monitor import DataCaptureConfig

DEFAULT_ENABLE_CAPTURE = True
DEFAULT_SAMPLING_PERCENTAGE = 20
DEFAULT_BUCKET_NAME = "default-bucket"
DEFAULT_DESTINATION_S3_URI = "s3://" + DEFAULT_BUCKET_NAME + "/model-monitor/data-capture"
DEFAULT_DESTINATION_S3_URI = "s3://{}/model-monitor/data-capture".format(DEFAULT_BUCKET_NAME)
DEFAULT_KMS_KEY_ID = None
DEFAULT_CAPTURE_MODES = ["REQUEST", "RESPONSE"]
DEFAULT_CSV_CONTENT_TYPES = ["text/csv"]
Expand All@@ -33,7 +35,7 @@
NON_DEFAULT_JSON_CONTENT_TYPES = ["custom/json-format"]


def test_to_request_dict_returns_correct_params_when_non_defaults_provided():
def test_init_when_non_defaults_provided():
 data_capture_config = DataCaptureConfig(
 enable_capture=NON_DEFAULT_ENABLE_CAPTURE,
 sampling_percentage=NON_DEFAULT_SAMPLING_PERCENTAGE,
Expand All@@ -51,9 +53,12 @@ def test_to_request_dict_returns_correct_params_when_non_defaults_provided():
 assert data_capture_config.json_content_types == NON_DEFAULT_JSON_CONTENT_TYPES


def test_to_request_dict_returns_correct_default_params_when_optionals_not_provided():
def test_init_when_optionals_not_provided():
 sagemaker_session = Mock()
 sagemaker_session.default_bucket.return_value = DEFAULT_BUCKET_NAME

 data_capture_config = DataCaptureConfig(
 enable_capture=DEFAULT_ENABLE_CAPTURE, destination_s3_uri=DEFAULT_DESTINATION_S3_URI
 enable_capture=DEFAULT_ENABLE_CAPTURE, sagemaker_session=sagemaker_session
 )

 assert data_capture_config.enable_capture == DEFAULT_ENABLE_CAPTURE
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: add sagemaker_session parameter to DataCaptureConfig#1313

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

from

Feb 25, 2020
 Merged


change: add sagemaker_session parameter to DataCaptureConfig
#1313
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c8f7614

change: add sagemaker_session parameter to DataCaptureConfig


laurenyu Feb 20, 2020
52b28c0

Merge branch 'master' into data-capture-config-session


laurenyu Feb 25, 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


12 changes: 10 additions & 2 deletions
src/sagemaker/model_monitor/data_capture_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ def __init__(
 capture_options=None,
 csv_content_types=None,
 json_content_types=None,
 sagemaker_session=None,
 ):
 """Initialize a DataCaptureConfig object for capturing data from Amazon SageMaker Endpoints.

Expand All@@ -56,14 +57,21 @@ def __init__(
 which data to capture between request and response.
 csv_content_types ([str]): Optional. Default=["text/csv"].
 json_content_types([str]): Optional. Default=["application/json"].

 sagemaker_session (sagemaker.session.Session): A SageMaker Session
 object, used for SageMaker interactions (default: None). If not
 specified, one is created using the default AWS configuration
 chain.
 """
 self.enable_capture = enable_capture
 self.sampling_percentage = sampling_percentage
 self.destination_s3_uri = destination_s3_uri
 if self.destination_s3_uri is None:
 sagemaker_session = sagemaker_session or Session()
 self.destination_s3_uri = os.path.join(
 "s3://", Session().default_bucket(), _MODEL_MONITOR_S3_PATH, _DATA_CAPTURE_S3_PATH
 "s3://",
 sagemaker_session.default_bucket(),
 _MODEL_MONITOR_S3_PATH,
 _DATA_CAPTURE_S3_PATH,
 )

 self.kms_key_id = kms_key_id
Expand Down

12 changes: 10 additions & 2 deletions
src/sagemaker/predictor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,14 +192,22 @@ def enable_data_capture(self):
 to enable data capture. For a more customized experience, refer to
 update_data_capture_config, instead.
 """
 self.update_data_capture_config(data_capture_config=DataCaptureConfig(enable_capture=True))
 self.update_data_capture_config(
 data_capture_config=DataCaptureConfig(
 enable_capture=True, sagemaker_session=self.sagemaker_session
 )
 )

 def disable_data_capture(self):
 """Updates the DataCaptureConfig for the Predictor's associated Amazon SageMaker Endpoint
 to disable data capture. For a more customized experience, refer to
 update_data_capture_config, instead.
 """
 self.update_data_capture_config(data_capture_config=DataCaptureConfig(enable_capture=False))
 self.update_data_capture_config(
 data_capture_config=DataCaptureConfig(
 enable_capture=False, sagemaker_session=self.sagemaker_session
 )
 )

 def update_data_capture_config(self, data_capture_config):
 """Updates the DataCaptureConfig for the Predictor's associated Amazon SageMaker Endpoint
Expand Down

2 changes: 2 additions & 0 deletions
tests/integ/test_data_capture_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@ def test_disabling_data_capture_on_endpoint_shows_correct_data_capture_status(
 capture_options=CUSTOM_CAPTURE_OPTIONS,
 csv_content_types=CUSTOM_CSV_CONTENT_TYPES,
 json_content_types=CUSTOM_JSON_CONTENT_TYPES,
 sagemaker_session=sagemaker_session,
 ),
 )

Expand DownExpand Up@@ -224,6 +225,7 @@ def test_updating_data_capture_on_endpoint_shows_correct_data_capture_status(
 capture_options=CUSTOM_CAPTURE_OPTIONS,
 csv_content_types=CUSTOM_CSV_CONTENT_TYPES,
 json_content_types=CUSTOM_JSON_CONTENT_TYPES,
 sagemaker_session=sagemaker_session,
 )
 )

Expand Down

2 changes: 1 addition & 1 deletion
tests/integ/test_model_monitor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,7 @@ def predictor(sagemaker_session, tf_full_version):
 INSTANCE_COUNT,
 INSTANCE_TYPE,
 endpoint_name=endpoint_name,
 data_capture_config=DataCaptureConfig(True),
 data_capture_config=DataCaptureConfig(True, sagemaker_session=sagemaker_session),
 )
 yield predictor

Expand Down

13 changes: 9 additions & 4 deletions
tests/unit/sagemaker/monitor/test_data_capture_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,12 +12,14 @@
# language governing permissions and limitations under the License.
from __future__ import absolute_import

from mock import Mock

from sagemaker.model_monitor import DataCaptureConfig

DEFAULT_ENABLE_CAPTURE = True
DEFAULT_SAMPLING_PERCENTAGE = 20
DEFAULT_BUCKET_NAME = "default-bucket"
DEFAULT_DESTINATION_S3_URI = "s3://" + DEFAULT_BUCKET_NAME + "/model-monitor/data-capture"
DEFAULT_DESTINATION_S3_URI = "s3://{}/model-monitor/data-capture".format(DEFAULT_BUCKET_NAME)
DEFAULT_KMS_KEY_ID = None
DEFAULT_CAPTURE_MODES = ["REQUEST", "RESPONSE"]
DEFAULT_CSV_CONTENT_TYPES = ["text/csv"]
Expand All@@ -33,7 +35,7 @@
NON_DEFAULT_JSON_CONTENT_TYPES = ["custom/json-format"]


def test_to_request_dict_returns_correct_params_when_non_defaults_provided():
def test_init_when_non_defaults_provided():
 data_capture_config = DataCaptureConfig(
 enable_capture=NON_DEFAULT_ENABLE_CAPTURE,
 sampling_percentage=NON_DEFAULT_SAMPLING_PERCENTAGE,
Expand All@@ -51,9 +53,12 @@ def test_to_request_dict_returns_correct_params_when_non_defaults_provided():
 assert data_capture_config.json_content_types == NON_DEFAULT_JSON_CONTENT_TYPES


def test_to_request_dict_returns_correct_default_params_when_optionals_not_provided():
def test_init_when_optionals_not_provided():
 sagemaker_session = Mock()
 sagemaker_session.default_bucket.return_value = DEFAULT_BUCKET_NAME

 data_capture_config = DataCaptureConfig(
 enable_capture=DEFAULT_ENABLE_CAPTURE, destination_s3_uri=DEFAULT_DESTINATION_S3_URI
 enable_capture=DEFAULT_ENABLE_CAPTURE, sagemaker_session=sagemaker_session
 )

 assert data_capture_config.enable_capture == DEFAULT_ENABLE_CAPTURE
Expand Down