Fix: checking stopped status when waiting for logs#185

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
andremoeller merged 3 commits into from
May 20, 2018
Merged

Fix: checking stopped status when waiting for logs #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
396650c
Fix: checking stopped status when waiting for logs
sshekh May 15, 2018
cdd164e
Updated changelog and added comments
May 19, 2018
54fd325
Merge branch 'master' into patch-1
andremoeller May 20, 2018
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
1 change: 1 addition & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ CHANGELOG
* bug-fix: tensorflow-serving-api: SageMaker does not conflict with tensorflow-serving-api module version
* feature: Local Mode: add support for local training data using file://
* feature: Updated TensorFlow Serving api protobuf files
* bug-fix: No longer poll for logs from stopped training jobs

1.2.4
=====
Expand Down
6 changes: 3 additions & 3 deletions src/sagemaker/session.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -404,7 +404,7 @@ def _check_job_status(self, job, desc):
"""
status = desc['TrainingJobStatus']

if status != 'Completed':
if status != 'Completed' and status != 'Stopped':
reason = desc.get('FailureReason', '(No reason provided)')
raise ValueError('Error training {}: {} Reason: {}'.format(job, status, reason))

Expand DownExpand Up@@ -590,7 +590,7 @@ def logs_for_job(self, job_name, wait=False, poll=10): # noqa: C901 - suppress
client = self.boto_session.client('logs', config=config)
log_group = '/aws/sagemaker/TrainingJobs'

job_already_completed = True if status == 'Completed' or status == 'Failed' else False
job_already_completed = True if status == 'Completed' or status == 'Failed' or status == 'Stopped' else False

state = LogState.TAILING if wait and not job_already_completed else LogState.COMPLETE
dot = False
Expand DownExpand Up@@ -662,7 +662,7 @@ def logs_for_job(self, job_name, wait=False, poll=10): # noqa: C901 - suppress

status = description['TrainingJobStatus']

if status == 'Completed' or status == 'Failed':
if status == 'Completed' or status == 'Failed' or status == 'Stopped':
state = LogState.JOB_COMPLETE

if wait:
Expand Down
30 changes: 30 additions & 0 deletions tests/unit/test_session.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -185,6 +185,10 @@ def test_s3_input_all_arguments():
{'TrainingStartTime': datetime.datetime(2018, 2, 17, 7, 15, 0, 103000)})
COMPLETED_DESCRIBE_JOB_RESULT.update(
{'TrainingEndTime': datetime.datetime(2018, 2, 17, 7, 19, 34, 953000)})

STOPPED_DESCRIBE_JOB_RESULT = dict(COMPLETED_DESCRIBE_JOB_RESULT)
STOPPED_DESCRIBE_JOB_RESULT.update({'TrainingJobStatus': 'Stopped'})

IN_PROGRESS_DESCRIBE_JOB_RESULT = dict(DEFAULT_EXPECTED_TRAIN_JOB_ARGS)
IN_PROGRESS_DESCRIBE_JOB_RESULT.update({'TrainingJobStatus': 'InProgress'})

Expand DownExpand Up@@ -270,6 +274,16 @@ def sagemaker_session_complete():
return ims


@pytest.fixture()
def sagemaker_session_stopped():
boto_mock = Mock(name='boto_session')
boto_mock.client('logs').describe_log_streams.return_value = DEFAULT_LOG_STREAMS
boto_mock.client('logs').get_log_events.side_effect = DEFAULT_LOG_EVENTS
ims = sagemaker.Session(boto_session=boto_mock, sagemaker_client=Mock())
ims.sagemaker_client.describe_training_job.return_value = STOPPED_DESCRIBE_JOB_RESULT
return ims


@pytest.fixture()
def sagemaker_session_ready_lifecycle():
boto_mock = Mock(name='boto_session')
Expand DownExpand Up@@ -302,6 +316,14 @@ def test_logs_for_job_no_wait(cw, sagemaker_session_complete):
cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_no_wait_stopped_job(cw, sagemaker_session_stopped):
ims = sagemaker_session_stopped
ims.logs_for_job(JOB_NAME)
ims.sagemaker_client.describe_training_job.assert_called_once_with(TrainingJobName=JOB_NAME)
cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_wait_on_completed(cw, sagemaker_session_complete):
ims = sagemaker_session_complete
Expand All@@ -310,6 +332,14 @@ def test_logs_for_job_wait_on_completed(cw, sagemaker_session_complete):
cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_wait_on_stopped(cw, sagemaker_session_stopped):
ims = sagemaker_session_stopped
ims.logs_for_job(JOB_NAME, wait=True, poll=0)
assert ims.sagemaker_client.describe_training_job.call_args_list == [call(TrainingJobName=JOB_NAME,)]
cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_no_wait_on_running(cw, sagemaker_session_ready_lifecycle):
ims = sagemaker_session_ready_lifecycle
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
Fix: checking stopped status when waiting for logs#185

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

andremoeller
merged 3 commits into

from

May 20, 2018
 Merged


Fix: checking stopped status when waiting for logs
#185
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
396650c

Fix: checking stopped status when waiting for logs


sshekh May 15, 2018
cdd164e

Updated changelog and added comments

May 19, 2018
54fd325

Merge branch 'master' into patch-1


andremoeller May 20, 2018

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


1 change: 1 addition & 0 deletions
CHANGELOG.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ CHANGELOG
* bug-fix: tensorflow-serving-api: SageMaker does not conflict with tensorflow-serving-api module version
* feature: Local Mode: add support for local training data using file://
* feature: Updated TensorFlow Serving api protobuf files
* bug-fix: No longer poll for logs from stopped training jobs

1.2.4
=====
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -404,7 +404,7 @@ def _check_job_status(self, job, desc):
 """
 status = desc['TrainingJobStatus']

 if status != 'Completed':
 if status != 'Completed' and status != 'Stopped':
 reason = desc.get('FailureReason', '(No reason provided)')
 raise ValueError('Error training {}: {} Reason: {}'.format(job, status, reason))

Expand DownExpand Up@@ -590,7 +590,7 @@ def logs_for_job(self, job_name, wait=False, poll=10): # noqa: C901 - suppress
 client = self.boto_session.client('logs', config=config)
 log_group = '/aws/sagemaker/TrainingJobs'

 job_already_completed = True if status == 'Completed' or status == 'Failed' else False
 job_already_completed = True if status == 'Completed' or status == 'Failed' or status == 'Stopped' else False

 state = LogState.TAILING if wait and not job_already_completed else LogState.COMPLETE
 dot = False
Expand DownExpand Up@@ -662,7 +662,7 @@ def logs_for_job(self, job_name, wait=False, poll=10): # noqa: C901 - suppress

 status = description['TrainingJobStatus']

 if status == 'Completed' or status == 'Failed':
 if status == 'Completed' or status == 'Failed' or status == 'Stopped':
 state = LogState.JOB_COMPLETE

 if wait:
Expand Down

30 changes: 30 additions & 0 deletions
tests/unit/test_session.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -185,6 +185,10 @@ def test_s3_input_all_arguments():
 {'TrainingStartTime': datetime.datetime(2018, 2, 17, 7, 15, 0, 103000)})
COMPLETED_DESCRIBE_JOB_RESULT.update(
 {'TrainingEndTime': datetime.datetime(2018, 2, 17, 7, 19, 34, 953000)})

STOPPED_DESCRIBE_JOB_RESULT = dict(COMPLETED_DESCRIBE_JOB_RESULT)
STOPPED_DESCRIBE_JOB_RESULT.update({'TrainingJobStatus': 'Stopped'})

IN_PROGRESS_DESCRIBE_JOB_RESULT = dict(DEFAULT_EXPECTED_TRAIN_JOB_ARGS)
IN_PROGRESS_DESCRIBE_JOB_RESULT.update({'TrainingJobStatus': 'InProgress'})

Expand DownExpand Up@@ -270,6 +274,16 @@ def sagemaker_session_complete():
 return ims


@pytest.fixture()
def sagemaker_session_stopped():
 boto_mock = Mock(name='boto_session')
 boto_mock.client('logs').describe_log_streams.return_value = DEFAULT_LOG_STREAMS
 boto_mock.client('logs').get_log_events.side_effect = DEFAULT_LOG_EVENTS
 ims = sagemaker.Session(boto_session=boto_mock, sagemaker_client=Mock())
 ims.sagemaker_client.describe_training_job.return_value = STOPPED_DESCRIBE_JOB_RESULT
 return ims


@pytest.fixture()
def sagemaker_session_ready_lifecycle():
 boto_mock = Mock(name='boto_session')
Expand DownExpand Up@@ -302,6 +316,14 @@ def test_logs_for_job_no_wait(cw, sagemaker_session_complete):
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_no_wait_stopped_job(cw, sagemaker_session_stopped):
 ims = sagemaker_session_stopped
 ims.logs_for_job(JOB_NAME)
 ims.sagemaker_client.describe_training_job.assert_called_once_with(TrainingJobName=JOB_NAME)
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_wait_on_completed(cw, sagemaker_session_complete):
 ims = sagemaker_session_complete
Expand All@@ -310,6 +332,14 @@ def test_logs_for_job_wait_on_completed(cw, sagemaker_session_complete):
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_wait_on_stopped(cw, sagemaker_session_stopped):
 ims = sagemaker_session_stopped
 ims.logs_for_job(JOB_NAME, wait=True, poll=0)
 assert ims.sagemaker_client.describe_training_job.call_args_list == [call(TrainingJobName=JOB_NAME,)]
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_no_wait_on_running(cw, sagemaker_session_ready_lifecycle):
 ims = sagemaker_session_ready_lifecycle
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
Fix: checking stopped status when waiting for logs#185

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

andremoeller
merged 3 commits into

from

May 20, 2018
 Merged


Fix: checking stopped status when waiting for logs
#185
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
396650c

Fix: checking stopped status when waiting for logs


sshekh May 15, 2018
cdd164e

Updated changelog and added comments

May 19, 2018
54fd325

Merge branch 'master' into patch-1


andremoeller May 20, 2018

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


1 change: 1 addition & 0 deletions
CHANGELOG.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ CHANGELOG
* bug-fix: tensorflow-serving-api: SageMaker does not conflict with tensorflow-serving-api module version
* feature: Local Mode: add support for local training data using file://
* feature: Updated TensorFlow Serving api protobuf files
* bug-fix: No longer poll for logs from stopped training jobs

1.2.4
=====
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -404,7 +404,7 @@ def _check_job_status(self, job, desc):
 """
 status = desc['TrainingJobStatus']

 if status != 'Completed':
 if status != 'Completed' and status != 'Stopped':
 reason = desc.get('FailureReason', '(No reason provided)')
 raise ValueError('Error training {}: {} Reason: {}'.format(job, status, reason))

Expand DownExpand Up@@ -590,7 +590,7 @@ def logs_for_job(self, job_name, wait=False, poll=10): # noqa: C901 - suppress
 client = self.boto_session.client('logs', config=config)
 log_group = '/aws/sagemaker/TrainingJobs'

 job_already_completed = True if status == 'Completed' or status == 'Failed' else False
 job_already_completed = True if status == 'Completed' or status == 'Failed' or status == 'Stopped' else False

 state = LogState.TAILING if wait and not job_already_completed else LogState.COMPLETE
 dot = False
Expand DownExpand Up@@ -662,7 +662,7 @@ def logs_for_job(self, job_name, wait=False, poll=10): # noqa: C901 - suppress

 status = description['TrainingJobStatus']

 if status == 'Completed' or status == 'Failed':
 if status == 'Completed' or status == 'Failed' or status == 'Stopped':
 state = LogState.JOB_COMPLETE

 if wait:
Expand Down

30 changes: 30 additions & 0 deletions
tests/unit/test_session.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -185,6 +185,10 @@ def test_s3_input_all_arguments():
 {'TrainingStartTime': datetime.datetime(2018, 2, 17, 7, 15, 0, 103000)})
COMPLETED_DESCRIBE_JOB_RESULT.update(
 {'TrainingEndTime': datetime.datetime(2018, 2, 17, 7, 19, 34, 953000)})

STOPPED_DESCRIBE_JOB_RESULT = dict(COMPLETED_DESCRIBE_JOB_RESULT)
STOPPED_DESCRIBE_JOB_RESULT.update({'TrainingJobStatus': 'Stopped'})

IN_PROGRESS_DESCRIBE_JOB_RESULT = dict(DEFAULT_EXPECTED_TRAIN_JOB_ARGS)
IN_PROGRESS_DESCRIBE_JOB_RESULT.update({'TrainingJobStatus': 'InProgress'})

Expand DownExpand Up@@ -270,6 +274,16 @@ def sagemaker_session_complete():
 return ims


@pytest.fixture()
def sagemaker_session_stopped():
 boto_mock = Mock(name='boto_session')
 boto_mock.client('logs').describe_log_streams.return_value = DEFAULT_LOG_STREAMS
 boto_mock.client('logs').get_log_events.side_effect = DEFAULT_LOG_EVENTS
 ims = sagemaker.Session(boto_session=boto_mock, sagemaker_client=Mock())
 ims.sagemaker_client.describe_training_job.return_value = STOPPED_DESCRIBE_JOB_RESULT
 return ims


@pytest.fixture()
def sagemaker_session_ready_lifecycle():
 boto_mock = Mock(name='boto_session')
Expand DownExpand Up@@ -302,6 +316,14 @@ def test_logs_for_job_no_wait(cw, sagemaker_session_complete):
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_no_wait_stopped_job(cw, sagemaker_session_stopped):
 ims = sagemaker_session_stopped
 ims.logs_for_job(JOB_NAME)
 ims.sagemaker_client.describe_training_job.assert_called_once_with(TrainingJobName=JOB_NAME)
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_wait_on_completed(cw, sagemaker_session_complete):
 ims = sagemaker_session_complete
Expand All@@ -310,6 +332,14 @@ def test_logs_for_job_wait_on_completed(cw, sagemaker_session_complete):
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_wait_on_stopped(cw, sagemaker_session_stopped):
 ims = sagemaker_session_stopped
 ims.logs_for_job(JOB_NAME, wait=True, poll=0)
 assert ims.sagemaker_client.describe_training_job.call_args_list == [call(TrainingJobName=JOB_NAME,)]
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_no_wait_on_running(cw, sagemaker_session_ready_lifecycle):
 ims = sagemaker_session_ready_lifecycle
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
Fix: checking stopped status when waiting for logs#185

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

andremoeller
merged 3 commits into

from

May 20, 2018
 Merged


Fix: checking stopped status when waiting for logs
#185
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
396650c

Fix: checking stopped status when waiting for logs


sshekh May 15, 2018
cdd164e

Updated changelog and added comments

May 19, 2018
54fd325

Merge branch 'master' into patch-1


andremoeller May 20, 2018

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


1 change: 1 addition & 0 deletions
CHANGELOG.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ CHANGELOG
* bug-fix: tensorflow-serving-api: SageMaker does not conflict with tensorflow-serving-api module version
* feature: Local Mode: add support for local training data using file://
* feature: Updated TensorFlow Serving api protobuf files
* bug-fix: No longer poll for logs from stopped training jobs

1.2.4
=====
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -404,7 +404,7 @@ def _check_job_status(self, job, desc):
 """
 status = desc['TrainingJobStatus']

 if status != 'Completed':
 if status != 'Completed' and status != 'Stopped':
 reason = desc.get('FailureReason', '(No reason provided)')
 raise ValueError('Error training {}: {} Reason: {}'.format(job, status, reason))

Expand DownExpand Up@@ -590,7 +590,7 @@ def logs_for_job(self, job_name, wait=False, poll=10): # noqa: C901 - suppress
 client = self.boto_session.client('logs', config=config)
 log_group = '/aws/sagemaker/TrainingJobs'

 job_already_completed = True if status == 'Completed' or status == 'Failed' else False
 job_already_completed = True if status == 'Completed' or status == 'Failed' or status == 'Stopped' else False

 state = LogState.TAILING if wait and not job_already_completed else LogState.COMPLETE
 dot = False
Expand DownExpand Up@@ -662,7 +662,7 @@ def logs_for_job(self, job_name, wait=False, poll=10): # noqa: C901 - suppress

 status = description['TrainingJobStatus']

 if status == 'Completed' or status == 'Failed':
 if status == 'Completed' or status == 'Failed' or status == 'Stopped':
 state = LogState.JOB_COMPLETE

 if wait:
Expand Down

30 changes: 30 additions & 0 deletions
tests/unit/test_session.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -185,6 +185,10 @@ def test_s3_input_all_arguments():
 {'TrainingStartTime': datetime.datetime(2018, 2, 17, 7, 15, 0, 103000)})
COMPLETED_DESCRIBE_JOB_RESULT.update(
 {'TrainingEndTime': datetime.datetime(2018, 2, 17, 7, 19, 34, 953000)})

STOPPED_DESCRIBE_JOB_RESULT = dict(COMPLETED_DESCRIBE_JOB_RESULT)
STOPPED_DESCRIBE_JOB_RESULT.update({'TrainingJobStatus': 'Stopped'})

IN_PROGRESS_DESCRIBE_JOB_RESULT = dict(DEFAULT_EXPECTED_TRAIN_JOB_ARGS)
IN_PROGRESS_DESCRIBE_JOB_RESULT.update({'TrainingJobStatus': 'InProgress'})

Expand DownExpand Up@@ -270,6 +274,16 @@ def sagemaker_session_complete():
 return ims


@pytest.fixture()
def sagemaker_session_stopped():
 boto_mock = Mock(name='boto_session')
 boto_mock.client('logs').describe_log_streams.return_value = DEFAULT_LOG_STREAMS
 boto_mock.client('logs').get_log_events.side_effect = DEFAULT_LOG_EVENTS
 ims = sagemaker.Session(boto_session=boto_mock, sagemaker_client=Mock())
 ims.sagemaker_client.describe_training_job.return_value = STOPPED_DESCRIBE_JOB_RESULT
 return ims


@pytest.fixture()
def sagemaker_session_ready_lifecycle():
 boto_mock = Mock(name='boto_session')
Expand DownExpand Up@@ -302,6 +316,14 @@ def test_logs_for_job_no_wait(cw, sagemaker_session_complete):
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_no_wait_stopped_job(cw, sagemaker_session_stopped):
 ims = sagemaker_session_stopped
 ims.logs_for_job(JOB_NAME)
 ims.sagemaker_client.describe_training_job.assert_called_once_with(TrainingJobName=JOB_NAME)
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_wait_on_completed(cw, sagemaker_session_complete):
 ims = sagemaker_session_complete
Expand All@@ -310,6 +332,14 @@ def test_logs_for_job_wait_on_completed(cw, sagemaker_session_complete):
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_wait_on_stopped(cw, sagemaker_session_stopped):
 ims = sagemaker_session_stopped
 ims.logs_for_job(JOB_NAME, wait=True, poll=0)
 assert ims.sagemaker_client.describe_training_job.call_args_list == [call(TrainingJobName=JOB_NAME,)]
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_no_wait_on_running(cw, sagemaker_session_ready_lifecycle):
 ims = sagemaker_session_ready_lifecycle
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
Fix: checking stopped status when waiting for logs#185

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

andremoeller
merged 3 commits into

from

May 20, 2018
 Merged


Fix: checking stopped status when waiting for logs
#185
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
396650c

Fix: checking stopped status when waiting for logs


sshekh May 15, 2018
cdd164e

Updated changelog and added comments

May 19, 2018
54fd325

Merge branch 'master' into patch-1


andremoeller May 20, 2018

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


1 change: 1 addition & 0 deletions
CHANGELOG.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ CHANGELOG
* bug-fix: tensorflow-serving-api: SageMaker does not conflict with tensorflow-serving-api module version
* feature: Local Mode: add support for local training data using file://
* feature: Updated TensorFlow Serving api protobuf files
* bug-fix: No longer poll for logs from stopped training jobs

1.2.4
=====
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -404,7 +404,7 @@ def _check_job_status(self, job, desc):
 """
 status = desc['TrainingJobStatus']

 if status != 'Completed':
 if status != 'Completed' and status != 'Stopped':
 reason = desc.get('FailureReason', '(No reason provided)')
 raise ValueError('Error training {}: {} Reason: {}'.format(job, status, reason))

Expand DownExpand Up@@ -590,7 +590,7 @@ def logs_for_job(self, job_name, wait=False, poll=10): # noqa: C901 - suppress
 client = self.boto_session.client('logs', config=config)
 log_group = '/aws/sagemaker/TrainingJobs'

 job_already_completed = True if status == 'Completed' or status == 'Failed' else False
 job_already_completed = True if status == 'Completed' or status == 'Failed' or status == 'Stopped' else False

 state = LogState.TAILING if wait and not job_already_completed else LogState.COMPLETE
 dot = False
Expand DownExpand Up@@ -662,7 +662,7 @@ def logs_for_job(self, job_name, wait=False, poll=10): # noqa: C901 - suppress

 status = description['TrainingJobStatus']

 if status == 'Completed' or status == 'Failed':
 if status == 'Completed' or status == 'Failed' or status == 'Stopped':
 state = LogState.JOB_COMPLETE

 if wait:
Expand Down

30 changes: 30 additions & 0 deletions
tests/unit/test_session.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -185,6 +185,10 @@ def test_s3_input_all_arguments():
 {'TrainingStartTime': datetime.datetime(2018, 2, 17, 7, 15, 0, 103000)})
COMPLETED_DESCRIBE_JOB_RESULT.update(
 {'TrainingEndTime': datetime.datetime(2018, 2, 17, 7, 19, 34, 953000)})

STOPPED_DESCRIBE_JOB_RESULT = dict(COMPLETED_DESCRIBE_JOB_RESULT)
STOPPED_DESCRIBE_JOB_RESULT.update({'TrainingJobStatus': 'Stopped'})

IN_PROGRESS_DESCRIBE_JOB_RESULT = dict(DEFAULT_EXPECTED_TRAIN_JOB_ARGS)
IN_PROGRESS_DESCRIBE_JOB_RESULT.update({'TrainingJobStatus': 'InProgress'})

Expand DownExpand Up@@ -270,6 +274,16 @@ def sagemaker_session_complete():
 return ims


@pytest.fixture()
def sagemaker_session_stopped():
 boto_mock = Mock(name='boto_session')
 boto_mock.client('logs').describe_log_streams.return_value = DEFAULT_LOG_STREAMS
 boto_mock.client('logs').get_log_events.side_effect = DEFAULT_LOG_EVENTS
 ims = sagemaker.Session(boto_session=boto_mock, sagemaker_client=Mock())
 ims.sagemaker_client.describe_training_job.return_value = STOPPED_DESCRIBE_JOB_RESULT
 return ims


@pytest.fixture()
def sagemaker_session_ready_lifecycle():
 boto_mock = Mock(name='boto_session')
Expand DownExpand Up@@ -302,6 +316,14 @@ def test_logs_for_job_no_wait(cw, sagemaker_session_complete):
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_no_wait_stopped_job(cw, sagemaker_session_stopped):
 ims = sagemaker_session_stopped
 ims.logs_for_job(JOB_NAME)
 ims.sagemaker_client.describe_training_job.assert_called_once_with(TrainingJobName=JOB_NAME)
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_wait_on_completed(cw, sagemaker_session_complete):
 ims = sagemaker_session_complete
Expand All@@ -310,6 +332,14 @@ def test_logs_for_job_wait_on_completed(cw, sagemaker_session_complete):
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_wait_on_stopped(cw, sagemaker_session_stopped):
 ims = sagemaker_session_stopped
 ims.logs_for_job(JOB_NAME, wait=True, poll=0)
 assert ims.sagemaker_client.describe_training_job.call_args_list == [call(TrainingJobName=JOB_NAME,)]
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_no_wait_on_running(cw, sagemaker_session_ready_lifecycle):
 ims = sagemaker_session_ready_lifecycle
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
Fix: checking stopped status when waiting for logs#185

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

andremoeller
merged 3 commits into

from

May 20, 2018
 Merged


Fix: checking stopped status when waiting for logs
#185
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
396650c

Fix: checking stopped status when waiting for logs


sshekh May 15, 2018
cdd164e

Updated changelog and added comments

May 19, 2018
54fd325

Merge branch 'master' into patch-1


andremoeller May 20, 2018

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


1 change: 1 addition & 0 deletions
CHANGELOG.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ CHANGELOG
* bug-fix: tensorflow-serving-api: SageMaker does not conflict with tensorflow-serving-api module version
* feature: Local Mode: add support for local training data using file://
* feature: Updated TensorFlow Serving api protobuf files
* bug-fix: No longer poll for logs from stopped training jobs

1.2.4
=====
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -404,7 +404,7 @@ def _check_job_status(self, job, desc):
 """
 status = desc['TrainingJobStatus']

 if status != 'Completed':
 if status != 'Completed' and status != 'Stopped':
 reason = desc.get('FailureReason', '(No reason provided)')
 raise ValueError('Error training {}: {} Reason: {}'.format(job, status, reason))

Expand DownExpand Up@@ -590,7 +590,7 @@ def logs_for_job(self, job_name, wait=False, poll=10): # noqa: C901 - suppress
 client = self.boto_session.client('logs', config=config)
 log_group = '/aws/sagemaker/TrainingJobs'

 job_already_completed = True if status == 'Completed' or status == 'Failed' else False
 job_already_completed = True if status == 'Completed' or status == 'Failed' or status == 'Stopped' else False

 state = LogState.TAILING if wait and not job_already_completed else LogState.COMPLETE
 dot = False
Expand DownExpand Up@@ -662,7 +662,7 @@ def logs_for_job(self, job_name, wait=False, poll=10): # noqa: C901 - suppress

 status = description['TrainingJobStatus']

 if status == 'Completed' or status == 'Failed':
 if status == 'Completed' or status == 'Failed' or status == 'Stopped':
 state = LogState.JOB_COMPLETE

 if wait:
Expand Down

30 changes: 30 additions & 0 deletions
tests/unit/test_session.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -185,6 +185,10 @@ def test_s3_input_all_arguments():
 {'TrainingStartTime': datetime.datetime(2018, 2, 17, 7, 15, 0, 103000)})
COMPLETED_DESCRIBE_JOB_RESULT.update(
 {'TrainingEndTime': datetime.datetime(2018, 2, 17, 7, 19, 34, 953000)})

STOPPED_DESCRIBE_JOB_RESULT = dict(COMPLETED_DESCRIBE_JOB_RESULT)
STOPPED_DESCRIBE_JOB_RESULT.update({'TrainingJobStatus': 'Stopped'})

IN_PROGRESS_DESCRIBE_JOB_RESULT = dict(DEFAULT_EXPECTED_TRAIN_JOB_ARGS)
IN_PROGRESS_DESCRIBE_JOB_RESULT.update({'TrainingJobStatus': 'InProgress'})

Expand DownExpand Up@@ -270,6 +274,16 @@ def sagemaker_session_complete():
 return ims


@pytest.fixture()
def sagemaker_session_stopped():
 boto_mock = Mock(name='boto_session')
 boto_mock.client('logs').describe_log_streams.return_value = DEFAULT_LOG_STREAMS
 boto_mock.client('logs').get_log_events.side_effect = DEFAULT_LOG_EVENTS
 ims = sagemaker.Session(boto_session=boto_mock, sagemaker_client=Mock())
 ims.sagemaker_client.describe_training_job.return_value = STOPPED_DESCRIBE_JOB_RESULT
 return ims


@pytest.fixture()
def sagemaker_session_ready_lifecycle():
 boto_mock = Mock(name='boto_session')
Expand DownExpand Up@@ -302,6 +316,14 @@ def test_logs_for_job_no_wait(cw, sagemaker_session_complete):
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_no_wait_stopped_job(cw, sagemaker_session_stopped):
 ims = sagemaker_session_stopped
 ims.logs_for_job(JOB_NAME)
 ims.sagemaker_client.describe_training_job.assert_called_once_with(TrainingJobName=JOB_NAME)
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_wait_on_completed(cw, sagemaker_session_complete):
 ims = sagemaker_session_complete
Expand All@@ -310,6 +332,14 @@ def test_logs_for_job_wait_on_completed(cw, sagemaker_session_complete):
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_wait_on_stopped(cw, sagemaker_session_stopped):
 ims = sagemaker_session_stopped
 ims.logs_for_job(JOB_NAME, wait=True, poll=0)
 assert ims.sagemaker_client.describe_training_job.call_args_list == [call(TrainingJobName=JOB_NAME,)]
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_no_wait_on_running(cw, sagemaker_session_ready_lifecycle):
 ims = sagemaker_session_ready_lifecycle
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
Fix: checking stopped status when waiting for logs#185

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

andremoeller
merged 3 commits into

from

May 20, 2018
 Merged


Fix: checking stopped status when waiting for logs
#185
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
396650c

Fix: checking stopped status when waiting for logs


sshekh May 15, 2018
cdd164e

Updated changelog and added comments

May 19, 2018
54fd325

Merge branch 'master' into patch-1


andremoeller May 20, 2018

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


1 change: 1 addition & 0 deletions
CHANGELOG.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ CHANGELOG
* bug-fix: tensorflow-serving-api: SageMaker does not conflict with tensorflow-serving-api module version
* feature: Local Mode: add support for local training data using file://
* feature: Updated TensorFlow Serving api protobuf files
* bug-fix: No longer poll for logs from stopped training jobs

1.2.4
=====
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -404,7 +404,7 @@ def _check_job_status(self, job, desc):
 """
 status = desc['TrainingJobStatus']

 if status != 'Completed':
 if status != 'Completed' and status != 'Stopped':
 reason = desc.get('FailureReason', '(No reason provided)')
 raise ValueError('Error training {}: {} Reason: {}'.format(job, status, reason))

Expand DownExpand Up@@ -590,7 +590,7 @@ def logs_for_job(self, job_name, wait=False, poll=10): # noqa: C901 - suppress
 client = self.boto_session.client('logs', config=config)
 log_group = '/aws/sagemaker/TrainingJobs'

 job_already_completed = True if status == 'Completed' or status == 'Failed' else False
 job_already_completed = True if status == 'Completed' or status == 'Failed' or status == 'Stopped' else False

 state = LogState.TAILING if wait and not job_already_completed else LogState.COMPLETE
 dot = False
Expand DownExpand Up@@ -662,7 +662,7 @@ def logs_for_job(self, job_name, wait=False, poll=10): # noqa: C901 - suppress

 status = description['TrainingJobStatus']

 if status == 'Completed' or status == 'Failed':
 if status == 'Completed' or status == 'Failed' or status == 'Stopped':
 state = LogState.JOB_COMPLETE

 if wait:
Expand Down

30 changes: 30 additions & 0 deletions
tests/unit/test_session.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -185,6 +185,10 @@ def test_s3_input_all_arguments():
 {'TrainingStartTime': datetime.datetime(2018, 2, 17, 7, 15, 0, 103000)})
COMPLETED_DESCRIBE_JOB_RESULT.update(
 {'TrainingEndTime': datetime.datetime(2018, 2, 17, 7, 19, 34, 953000)})

STOPPED_DESCRIBE_JOB_RESULT = dict(COMPLETED_DESCRIBE_JOB_RESULT)
STOPPED_DESCRIBE_JOB_RESULT.update({'TrainingJobStatus': 'Stopped'})

IN_PROGRESS_DESCRIBE_JOB_RESULT = dict(DEFAULT_EXPECTED_TRAIN_JOB_ARGS)
IN_PROGRESS_DESCRIBE_JOB_RESULT.update({'TrainingJobStatus': 'InProgress'})

Expand DownExpand Up@@ -270,6 +274,16 @@ def sagemaker_session_complete():
 return ims


@pytest.fixture()
def sagemaker_session_stopped():
 boto_mock = Mock(name='boto_session')
 boto_mock.client('logs').describe_log_streams.return_value = DEFAULT_LOG_STREAMS
 boto_mock.client('logs').get_log_events.side_effect = DEFAULT_LOG_EVENTS
 ims = sagemaker.Session(boto_session=boto_mock, sagemaker_client=Mock())
 ims.sagemaker_client.describe_training_job.return_value = STOPPED_DESCRIBE_JOB_RESULT
 return ims


@pytest.fixture()
def sagemaker_session_ready_lifecycle():
 boto_mock = Mock(name='boto_session')
Expand DownExpand Up@@ -302,6 +316,14 @@ def test_logs_for_job_no_wait(cw, sagemaker_session_complete):
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_no_wait_stopped_job(cw, sagemaker_session_stopped):
 ims = sagemaker_session_stopped
 ims.logs_for_job(JOB_NAME)
 ims.sagemaker_client.describe_training_job.assert_called_once_with(TrainingJobName=JOB_NAME)
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_wait_on_completed(cw, sagemaker_session_complete):
 ims = sagemaker_session_complete
Expand All@@ -310,6 +332,14 @@ def test_logs_for_job_wait_on_completed(cw, sagemaker_session_complete):
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_wait_on_stopped(cw, sagemaker_session_stopped):
 ims = sagemaker_session_stopped
 ims.logs_for_job(JOB_NAME, wait=True, poll=0)
 assert ims.sagemaker_client.describe_training_job.call_args_list == [call(TrainingJobName=JOB_NAME,)]
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_no_wait_on_running(cw, sagemaker_session_ready_lifecycle):
 ims = sagemaker_session_ready_lifecycle
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
Fix: checking stopped status when waiting for logs#185

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

andremoeller
merged 3 commits into

from

May 20, 2018
 Merged


Fix: checking stopped status when waiting for logs
#185
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
396650c

Fix: checking stopped status when waiting for logs


sshekh May 15, 2018
cdd164e

Updated changelog and added comments

May 19, 2018
54fd325

Merge branch 'master' into patch-1


andremoeller May 20, 2018

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


1 change: 1 addition & 0 deletions
CHANGELOG.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ CHANGELOG
* bug-fix: tensorflow-serving-api: SageMaker does not conflict with tensorflow-serving-api module version
* feature: Local Mode: add support for local training data using file://
* feature: Updated TensorFlow Serving api protobuf files
* bug-fix: No longer poll for logs from stopped training jobs

1.2.4
=====
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -404,7 +404,7 @@ def _check_job_status(self, job, desc):
 """
 status = desc['TrainingJobStatus']

 if status != 'Completed':
 if status != 'Completed' and status != 'Stopped':
 reason = desc.get('FailureReason', '(No reason provided)')
 raise ValueError('Error training {}: {} Reason: {}'.format(job, status, reason))

Expand DownExpand Up@@ -590,7 +590,7 @@ def logs_for_job(self, job_name, wait=False, poll=10): # noqa: C901 - suppress
 client = self.boto_session.client('logs', config=config)
 log_group = '/aws/sagemaker/TrainingJobs'

 job_already_completed = True if status == 'Completed' or status == 'Failed' else False
 job_already_completed = True if status == 'Completed' or status == 'Failed' or status == 'Stopped' else False

 state = LogState.TAILING if wait and not job_already_completed else LogState.COMPLETE
 dot = False
Expand DownExpand Up@@ -662,7 +662,7 @@ def logs_for_job(self, job_name, wait=False, poll=10): # noqa: C901 - suppress

 status = description['TrainingJobStatus']

 if status == 'Completed' or status == 'Failed':
 if status == 'Completed' or status == 'Failed' or status == 'Stopped':
 state = LogState.JOB_COMPLETE

 if wait:
Expand Down

30 changes: 30 additions & 0 deletions
tests/unit/test_session.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -185,6 +185,10 @@ def test_s3_input_all_arguments():
 {'TrainingStartTime': datetime.datetime(2018, 2, 17, 7, 15, 0, 103000)})
COMPLETED_DESCRIBE_JOB_RESULT.update(
 {'TrainingEndTime': datetime.datetime(2018, 2, 17, 7, 19, 34, 953000)})

STOPPED_DESCRIBE_JOB_RESULT = dict(COMPLETED_DESCRIBE_JOB_RESULT)
STOPPED_DESCRIBE_JOB_RESULT.update({'TrainingJobStatus': 'Stopped'})

IN_PROGRESS_DESCRIBE_JOB_RESULT = dict(DEFAULT_EXPECTED_TRAIN_JOB_ARGS)
IN_PROGRESS_DESCRIBE_JOB_RESULT.update({'TrainingJobStatus': 'InProgress'})

Expand DownExpand Up@@ -270,6 +274,16 @@ def sagemaker_session_complete():
 return ims


@pytest.fixture()
def sagemaker_session_stopped():
 boto_mock = Mock(name='boto_session')
 boto_mock.client('logs').describe_log_streams.return_value = DEFAULT_LOG_STREAMS
 boto_mock.client('logs').get_log_events.side_effect = DEFAULT_LOG_EVENTS
 ims = sagemaker.Session(boto_session=boto_mock, sagemaker_client=Mock())
 ims.sagemaker_client.describe_training_job.return_value = STOPPED_DESCRIBE_JOB_RESULT
 return ims


@pytest.fixture()
def sagemaker_session_ready_lifecycle():
 boto_mock = Mock(name='boto_session')
Expand DownExpand Up@@ -302,6 +316,14 @@ def test_logs_for_job_no_wait(cw, sagemaker_session_complete):
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_no_wait_stopped_job(cw, sagemaker_session_stopped):
 ims = sagemaker_session_stopped
 ims.logs_for_job(JOB_NAME)
 ims.sagemaker_client.describe_training_job.assert_called_once_with(TrainingJobName=JOB_NAME)
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_wait_on_completed(cw, sagemaker_session_complete):
 ims = sagemaker_session_complete
Expand All@@ -310,6 +332,14 @@ def test_logs_for_job_wait_on_completed(cw, sagemaker_session_complete):
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_wait_on_stopped(cw, sagemaker_session_stopped):
 ims = sagemaker_session_stopped
 ims.logs_for_job(JOB_NAME, wait=True, poll=0)
 assert ims.sagemaker_client.describe_training_job.call_args_list == [call(TrainingJobName=JOB_NAME,)]
 cw().assert_called_with(0, 'hi there #1')


@patch('sagemaker.logs.ColorWrap')
def test_logs_for_job_no_wait_on_running(cw, sagemaker_session_ready_lifecycle):
 ims = sagemaker_session_ready_lifecycle
Expand Down