Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
103 changes: 100 additions & 3 deletions src/sagemaker/workflow/pipeline.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,7 +344,10 @@ def start(
A `_PipelineExecution` instance, if successful.
"""
if selective_execution_config is not None:
if selective_execution_config.source_pipeline_execution_arn is None:
if (
selective_execution_config.source_pipeline_execution_arn is None
and selective_execution_config.reference_latest_execution
):
selective_execution_config.source_pipeline_execution_arn = (
self._get_latest_execution_arn()
)
Expand DownExpand Up@@ -425,8 +428,8 @@ def list_executions(
sort_by (str): The field by which to sort results(CreationTime/PipelineExecutionArn).
sort_order (str): The sort order for results (Ascending/Descending).
max_results (int): The maximum number of pipeline executions to return in the response.
next_token (str): If the result of the previous ListPipelineExecutions request was
truncated, the response includes a NextToken. To retrieve the next set of pipeline
next_token (str): If the result of the previous `ListPipelineExecutions` request was
truncated, the response includes a `NextToken`. To retrieve the next set of pipeline
executions, use the token in the next request.

Returns:
Expand DownExpand Up@@ -463,6 +466,76 @@ def _get_latest_execution_arn(self):
return response["PipelineExecutionSummaries"][0]["PipelineExecutionArn"]
return None

def build_parameters_from_execution(
self,
pipeline_execution_arn: str,
parameter_value_overrides: Dict[str, Union[str, bool, int, float]] = None,
) -> Dict[str, Union[str, bool, int, float]]:
"""Gets the parameters from an execution, update with optional parameter value overrides.

Args:
pipeline_execution_arn (str): The arn of the reference pipeline execution.
parameter_value_overrides (Dict[str, Union[str, bool, int, float]]): Parameter dict
to be updated with the parameters from the referenced execution.

Returns:
A parameter dict built from an execution and provided parameter value overrides.
"""
execution_parameters = self._get_parameters_for_execution(pipeline_execution_arn)
if parameter_value_overrides is not None:
self._validate_parameter_overrides(
pipeline_execution_arn, execution_parameters, parameter_value_overrides
)
execution_parameters.update(parameter_value_overrides)
return execution_parameters

def _get_parameters_for_execution(self, pipeline_execution_arn: str) -> Dict[str, str]:
"""Gets all the parameters from an execution.

Args:
pipeline_execution_arn (str): The arn of the pipeline execution.

Returns:
A parameter dict from the execution.
"""
pipeline_execution = _PipelineExecution(
arn=pipeline_execution_arn,
sagemaker_session=self.sagemaker_session,
)

response = pipeline_execution.list_parameters()
parameter_list = response["PipelineParameters"]
while response.get("NextToken") is not None:
response = pipeline_execution.list_parameters(next_token=response["NextToken"])
parameter_list.extend(response["PipelineParameters"])

return {parameter["Name"]: parameter["Value"] for parameter in parameter_list}

@staticmethod
def _validate_parameter_overrides(
pipeline_execution_arn: str,
execution_parameters: Dict[str, str],
parameter_overrides: Dict[str, Union[str, bool, int, float]],
):
"""Validates the parameter overrides are present in the execution parameters.

Args:
pipeline_execution_arn (str): The arn of the pipeline execution.
execution_parameters (Dict[str, str]): A parameter dict from the execution.
parameter_overrides (Dict[str, Union[str, bool, int, float]]): Parameter dict to be
updated in the parameters from the referenced execution.

Raises:
ValueError: If any parameters in parameter overrides is not present in the
execution parameters.
"""
invalid_parameters = set(parameter_overrides) - set(execution_parameters)
if invalid_parameters:
raise ValueError(
f"The following parameter overrides provided: {str(invalid_parameters)} "
+ f"are not present in the pipeline execution: {pipeline_execution_arn}"
)


def format_start_parameters(parameters: Dict[str, Any]) -> List[Dict[str, Any]]:
"""Formats start parameter overrides as a list of dicts.
Expand DownExpand Up@@ -652,6 +725,30 @@ def list_steps(self):
)
return response["PipelineExecutionSteps"]

def list_parameters(self, max_results: int = None, next_token: str = None):
"""Gets a list of parameters for a pipeline execution.

Args:
max_results (int): The maximum number of parameters to return in the response.
next_token (str): If the result of the previous `ListPipelineParametersForExecution`
request was truncated, the response includes a `NextToken`. To retrieve the next
set of parameters, use the token in the next request.

Returns:
Information about the parameters of the pipeline execution. This function is also
a wrapper for `list_pipeline_parameters_for_execution
<https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/sagemaker.html#SageMaker.Client.list_pipeline_parameters_for_execution>`_.
"""
kwargs = dict(PipelineExecutionArn=self.arn)
update_args(
kwargs,
MaxResults=max_results,
NextToken=next_token,
)
return self.sagemaker_session.sagemaker_client.list_pipeline_parameters_for_execution(
**kwargs
)

def wait(self, delay=30, max_attempts=60):
"""Waits for a pipeline execution.

Expand Down
10 changes: 9 additions & 1 deletion src/sagemaker/workflow/selective_execution_config.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,12 @@ class SelectiveExecutionConfig:
another SageMaker pipeline run.
"""

def __init__(self, selected_steps: List[str], source_pipeline_execution_arn: str = None):
def __init__(
self,
selected_steps: List[str],
source_pipeline_execution_arn: str = None,
reference_latest_execution: bool = True,
):
"""Create a `SelectiveExecutionConfig`.

Args:
Expand All@@ -32,9 +37,12 @@ def __init__(self, selected_steps: List[str], source_pipeline_execution_arn: str
`Succeeded`.
selected_steps (List[str]): A list of pipeline steps to run. All step(s) in all
path(s) between two selected steps should be included.
reference_latest_execution (bool): Whether to reference the latest execution if
`source_pipeline_execution_arn` is not provided.
"""
self.source_pipeline_execution_arn = source_pipeline_execution_arn
self.selected_steps = selected_steps
self.reference_latest_execution = reference_latest_execution

def _build_selected_steps_from_list(self) -> RequestType:
"""Get the request structure for the list of selected steps."""
Expand Down
122 changes: 121 additions & 1 deletion tests/unit/sagemaker/workflow/test_pipeline.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@

import pytest

from mock import Mock, patch
from mock import Mock, call, patch

from sagemaker import s3
from sagemaker.session_settings import SessionSettings
Expand DownExpand Up@@ -492,8 +492,10 @@ def test_pipeline_start_selective_execution(sagemaker_session_mock):
"SourcePipelineExecutionArn": "foo-arn",
},
)
sagemaker_session_mock.reset_mock()

# Case 2: Start selective execution without SourcePipelineExecutionArn
# References latest execution by default.
sagemaker_session_mock.sagemaker_client.list_pipeline_executions.return_value = {
"PipelineExecutionSummaries": [
{
Expand DownExpand Up@@ -523,6 +525,27 @@ def test_pipeline_start_selective_execution(sagemaker_session_mock):
"SourcePipelineExecutionArn": "my:latest:execution:arn",
},
)
sagemaker_session_mock.reset_mock()

# Case 3: Start selective execution without SourcePipelineExecutionArn
# Opts not to reference latest execution.
selective_execution_config = SelectiveExecutionConfig(
selected_steps=["step-1", "step-2", "step-3"],
reference_latest_execution=False,
)
pipeline.start(selective_execution_config=selective_execution_config)
sagemaker_session_mock.sagemaker_client.list_pipeline_executions.assert_not_called()
sagemaker_session_mock.sagemaker_client.start_pipeline_execution.assert_called_with(
PipelineName="MyPipeline",
SelectiveExecutionConfig={
"SelectedSteps": [
{"StepName": "step-1"},
{"StepName": "step-2"},
{"StepName": "step-3"},
],
},
)
sagemaker_session_mock.reset_mock()


def test_pipeline_basic():
Expand DownExpand Up@@ -718,13 +741,99 @@ def test_pipeline_list_executions(sagemaker_session_mock):
assert executions["NextToken"] == "token"


def test_pipeline_build_parameters_from_execution(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
parameter_value_overrides = {"TestParameterName": "NewParameterValue"}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}]
}
parameters = pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn,
parameter_value_overrides=parameter_value_overrides,
)
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn=reference_execution_arn
)
)
assert len(parameters) == 1
assert parameters["TestParameterName"] == "NewParameterValue"


def test_pipeline_build_parameters_from_execution_with_invalid_overrides(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
invalid_parameter_value_overrides = {"InvalidParameterName": "Value"}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}]
}
with pytest.raises(ValueError) as error:
pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn,
parameter_value_overrides=invalid_parameter_value_overrides,
)
assert (
f"The following parameter overrides provided: {str(set(invalid_parameter_value_overrides.keys()))} "
+ f"are not present in the pipeline execution: {reference_execution_arn}"
in str(error)
)
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn=reference_execution_arn
)
)


def test_pipeline_build_parameters_from_execution_with_paginated_result(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
next_token = "token"
first_page_response = {
"PipelineParameters": [{"Name": "TestParameterName1", "Value": "TestParameterValue1"}],
"NextToken": next_token,
}
second_page_response = {
"PipelineParameters": [{"Name": "TestParameterName2", "Value": "TestParameterValue2"}],
}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.side_effect = [
first_page_response,
second_page_response,
]
parameters = pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn
)
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.assert_has_calls(
[
call(PipelineExecutionArn=reference_execution_arn),
call(PipelineExecutionArn=reference_execution_arn, NextToken=next_token),
]
)
assert len(parameters) == 2
assert parameters["TestParameterName1"] == "TestParameterValue1"
assert parameters["TestParameterName2"] == "TestParameterValue2"


def test_pipeline_execution_basics(sagemaker_session_mock):
sagemaker_session_mock.sagemaker_client.start_pipeline_execution.return_value = {
"PipelineExecutionArn": "my:arn"
}
sagemaker_session_mock.sagemaker_client.list_pipeline_execution_steps.return_value = {
"PipelineExecutionSteps": [Mock()]
}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}],
"NextToken": "token",
}
pipeline = Pipeline(
name="MyPipeline",
parameters=[ParameterString("alpha", "beta"), ParameterString("gamma", "delta")],
Expand All@@ -745,6 +854,17 @@ def test_pipeline_execution_basics(sagemaker_session_mock):
PipelineExecutionArn="my:arn"
)
assert len(steps) == 1
list_parameters_response = execution.list_parameters()
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn="my:arn"
)
)
parameter_list = list_parameters_response["PipelineParameters"]
assert len(parameter_list) == 1
assert parameter_list[0]["Name"] == "TestParameterName"
assert parameter_list[0]["Value"] == "TestParameterValue"
assert list_parameters_response["NextToken"] == "token"


def _generate_large_pipeline_steps(input_data: object):
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
103 changes: 100 additions & 3 deletions src/sagemaker/workflow/pipeline.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,7 +344,10 @@ def start(
A `_PipelineExecution` instance, if successful.
"""
if selective_execution_config is not None:
if selective_execution_config.source_pipeline_execution_arn is None:
if (
selective_execution_config.source_pipeline_execution_arn is None
and selective_execution_config.reference_latest_execution
):
selective_execution_config.source_pipeline_execution_arn = (
self._get_latest_execution_arn()
)
Expand DownExpand Up@@ -425,8 +428,8 @@ def list_executions(
sort_by (str): The field by which to sort results(CreationTime/PipelineExecutionArn).
sort_order (str): The sort order for results (Ascending/Descending).
max_results (int): The maximum number of pipeline executions to return in the response.
next_token (str): If the result of the previous ListPipelineExecutions request was
truncated, the response includes a NextToken. To retrieve the next set of pipeline
next_token (str): If the result of the previous `ListPipelineExecutions` request was
truncated, the response includes a `NextToken`. To retrieve the next set of pipeline
executions, use the token in the next request.

Returns:
Expand DownExpand Up@@ -463,6 +466,76 @@ def _get_latest_execution_arn(self):
return response["PipelineExecutionSummaries"][0]["PipelineExecutionArn"]
return None

def build_parameters_from_execution(
self,
pipeline_execution_arn: str,
parameter_value_overrides: Dict[str, Union[str, bool, int, float]] = None,
) -> Dict[str, Union[str, bool, int, float]]:
"""Gets the parameters from an execution, update with optional parameter value overrides.

Args:
pipeline_execution_arn (str): The arn of the reference pipeline execution.
parameter_value_overrides (Dict[str, Union[str, bool, int, float]]): Parameter dict
to be updated with the parameters from the referenced execution.

Returns:
A parameter dict built from an execution and provided parameter value overrides.
"""
execution_parameters = self._get_parameters_for_execution(pipeline_execution_arn)
if parameter_value_overrides is not None:
self._validate_parameter_overrides(
pipeline_execution_arn, execution_parameters, parameter_value_overrides
)
execution_parameters.update(parameter_value_overrides)
return execution_parameters

def _get_parameters_for_execution(self, pipeline_execution_arn: str) -> Dict[str, str]:
"""Gets all the parameters from an execution.

Args:
pipeline_execution_arn (str): The arn of the pipeline execution.

Returns:
A parameter dict from the execution.
"""
pipeline_execution = _PipelineExecution(
arn=pipeline_execution_arn,
sagemaker_session=self.sagemaker_session,
)

response = pipeline_execution.list_parameters()
parameter_list = response["PipelineParameters"]
while response.get("NextToken") is not None:
response = pipeline_execution.list_parameters(next_token=response["NextToken"])
parameter_list.extend(response["PipelineParameters"])

return {parameter["Name"]: parameter["Value"] for parameter in parameter_list}

@staticmethod
def _validate_parameter_overrides(
pipeline_execution_arn: str,
execution_parameters: Dict[str, str],
parameter_overrides: Dict[str, Union[str, bool, int, float]],
):
"""Validates the parameter overrides are present in the execution parameters.

Args:
pipeline_execution_arn (str): The arn of the pipeline execution.
execution_parameters (Dict[str, str]): A parameter dict from the execution.
parameter_overrides (Dict[str, Union[str, bool, int, float]]): Parameter dict to be
updated in the parameters from the referenced execution.

Raises:
ValueError: If any parameters in parameter overrides is not present in the
execution parameters.
"""
invalid_parameters = set(parameter_overrides) - set(execution_parameters)
if invalid_parameters:
raise ValueError(
f"The following parameter overrides provided: {str(invalid_parameters)} "
+ f"are not present in the pipeline execution: {pipeline_execution_arn}"
)


def format_start_parameters(parameters: Dict[str, Any]) -> List[Dict[str, Any]]:
"""Formats start parameter overrides as a list of dicts.
Expand DownExpand Up@@ -652,6 +725,30 @@ def list_steps(self):
)
return response["PipelineExecutionSteps"]

def list_parameters(self, max_results: int = None, next_token: str = None):
"""Gets a list of parameters for a pipeline execution.

Args:
max_results (int): The maximum number of parameters to return in the response.
next_token (str): If the result of the previous `ListPipelineParametersForExecution`
request was truncated, the response includes a `NextToken`. To retrieve the next
set of parameters, use the token in the next request.

Returns:
Information about the parameters of the pipeline execution. This function is also
a wrapper for `list_pipeline_parameters_for_execution
<https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/sagemaker.html#SageMaker.Client.list_pipeline_parameters_for_execution>`_.
"""
kwargs = dict(PipelineExecutionArn=self.arn)
update_args(
kwargs,
MaxResults=max_results,
NextToken=next_token,
)
return self.sagemaker_session.sagemaker_client.list_pipeline_parameters_for_execution(
**kwargs
)

def wait(self, delay=30, max_attempts=60):
"""Waits for a pipeline execution.

Expand Down
10 changes: 9 additions & 1 deletion src/sagemaker/workflow/selective_execution_config.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,12 @@ class SelectiveExecutionConfig:
another SageMaker pipeline run.
"""

def __init__(self, selected_steps: List[str], source_pipeline_execution_arn: str = None):
def __init__(
self,
selected_steps: List[str],
source_pipeline_execution_arn: str = None,
reference_latest_execution: bool = True,
):
"""Create a `SelectiveExecutionConfig`.

Args:
Expand All@@ -32,9 +37,12 @@ def __init__(self, selected_steps: List[str], source_pipeline_execution_arn: str
`Succeeded`.
selected_steps (List[str]): A list of pipeline steps to run. All step(s) in all
path(s) between two selected steps should be included.
reference_latest_execution (bool): Whether to reference the latest execution if
`source_pipeline_execution_arn` is not provided.
"""
self.source_pipeline_execution_arn = source_pipeline_execution_arn
self.selected_steps = selected_steps
self.reference_latest_execution = reference_latest_execution

def _build_selected_steps_from_list(self) -> RequestType:
"""Get the request structure for the list of selected steps."""
Expand Down
122 changes: 121 additions & 1 deletion tests/unit/sagemaker/workflow/test_pipeline.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@

import pytest

from mock import Mock, patch
from mock import Mock, call, patch

from sagemaker import s3
from sagemaker.session_settings import SessionSettings
Expand DownExpand Up@@ -492,8 +492,10 @@ def test_pipeline_start_selective_execution(sagemaker_session_mock):
"SourcePipelineExecutionArn": "foo-arn",
},
)
sagemaker_session_mock.reset_mock()

# Case 2: Start selective execution without SourcePipelineExecutionArn
# References latest execution by default.
sagemaker_session_mock.sagemaker_client.list_pipeline_executions.return_value = {
"PipelineExecutionSummaries": [
{
Expand DownExpand Up@@ -523,6 +525,27 @@ def test_pipeline_start_selective_execution(sagemaker_session_mock):
"SourcePipelineExecutionArn": "my:latest:execution:arn",
},
)
sagemaker_session_mock.reset_mock()

# Case 3: Start selective execution without SourcePipelineExecutionArn
# Opts not to reference latest execution.
selective_execution_config = SelectiveExecutionConfig(
selected_steps=["step-1", "step-2", "step-3"],
reference_latest_execution=False,
)
pipeline.start(selective_execution_config=selective_execution_config)
sagemaker_session_mock.sagemaker_client.list_pipeline_executions.assert_not_called()
sagemaker_session_mock.sagemaker_client.start_pipeline_execution.assert_called_with(
PipelineName="MyPipeline",
SelectiveExecutionConfig={
"SelectedSteps": [
{"StepName": "step-1"},
{"StepName": "step-2"},
{"StepName": "step-3"},
],
},
)
sagemaker_session_mock.reset_mock()


def test_pipeline_basic():
Expand DownExpand Up@@ -718,13 +741,99 @@ def test_pipeline_list_executions(sagemaker_session_mock):
assert executions["NextToken"] == "token"


def test_pipeline_build_parameters_from_execution(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
parameter_value_overrides = {"TestParameterName": "NewParameterValue"}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}]
}
parameters = pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn,
parameter_value_overrides=parameter_value_overrides,
)
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn=reference_execution_arn
)
)
assert len(parameters) == 1
assert parameters["TestParameterName"] == "NewParameterValue"


def test_pipeline_build_parameters_from_execution_with_invalid_overrides(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
invalid_parameter_value_overrides = {"InvalidParameterName": "Value"}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}]
}
with pytest.raises(ValueError) as error:
pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn,
parameter_value_overrides=invalid_parameter_value_overrides,
)
assert (
f"The following parameter overrides provided: {str(set(invalid_parameter_value_overrides.keys()))} "
+ f"are not present in the pipeline execution: {reference_execution_arn}"
in str(error)
)
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn=reference_execution_arn
)
)


def test_pipeline_build_parameters_from_execution_with_paginated_result(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
next_token = "token"
first_page_response = {
"PipelineParameters": [{"Name": "TestParameterName1", "Value": "TestParameterValue1"}],
"NextToken": next_token,
}
second_page_response = {
"PipelineParameters": [{"Name": "TestParameterName2", "Value": "TestParameterValue2"}],
}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.side_effect = [
first_page_response,
second_page_response,
]
parameters = pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn
)
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.assert_has_calls(
[
call(PipelineExecutionArn=reference_execution_arn),
call(PipelineExecutionArn=reference_execution_arn, NextToken=next_token),
]
)
assert len(parameters) == 2
assert parameters["TestParameterName1"] == "TestParameterValue1"
assert parameters["TestParameterName2"] == "TestParameterValue2"


def test_pipeline_execution_basics(sagemaker_session_mock):
sagemaker_session_mock.sagemaker_client.start_pipeline_execution.return_value = {
"PipelineExecutionArn": "my:arn"
}
sagemaker_session_mock.sagemaker_client.list_pipeline_execution_steps.return_value = {
"PipelineExecutionSteps": [Mock()]
}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}],
"NextToken": "token",
}
pipeline = Pipeline(
name="MyPipeline",
parameters=[ParameterString("alpha", "beta"), ParameterString("gamma", "delta")],
Expand All@@ -745,6 +854,17 @@ def test_pipeline_execution_basics(sagemaker_session_mock):
PipelineExecutionArn="my:arn"
)
assert len(steps) == 1
list_parameters_response = execution.list_parameters()
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn="my:arn"
)
)
parameter_list = list_parameters_response["PipelineParameters"]
assert len(parameter_list) == 1
assert parameter_list[0]["Name"] == "TestParameterName"
assert parameter_list[0]["Value"] == "TestParameterValue"
assert list_parameters_response["NextToken"] == "token"


def _generate_large_pipeline_steps(input_data: object):
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
103 changes: 100 additions & 3 deletions src/sagemaker/workflow/pipeline.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,7 +344,10 @@ def start(
A `_PipelineExecution` instance, if successful.
"""
if selective_execution_config is not None:
if selective_execution_config.source_pipeline_execution_arn is None:
if (
selective_execution_config.source_pipeline_execution_arn is None
and selective_execution_config.reference_latest_execution
):
selective_execution_config.source_pipeline_execution_arn = (
self._get_latest_execution_arn()
)
Expand DownExpand Up@@ -425,8 +428,8 @@ def list_executions(
sort_by (str): The field by which to sort results(CreationTime/PipelineExecutionArn).
sort_order (str): The sort order for results (Ascending/Descending).
max_results (int): The maximum number of pipeline executions to return in the response.
next_token (str): If the result of the previous ListPipelineExecutions request was
truncated, the response includes a NextToken. To retrieve the next set of pipeline
next_token (str): If the result of the previous `ListPipelineExecutions` request was
truncated, the response includes a `NextToken`. To retrieve the next set of pipeline
executions, use the token in the next request.

Returns:
Expand DownExpand Up@@ -463,6 +466,76 @@ def _get_latest_execution_arn(self):
return response["PipelineExecutionSummaries"][0]["PipelineExecutionArn"]
return None

def build_parameters_from_execution(
self,
pipeline_execution_arn: str,
parameter_value_overrides: Dict[str, Union[str, bool, int, float]] = None,
) -> Dict[str, Union[str, bool, int, float]]:
"""Gets the parameters from an execution, update with optional parameter value overrides.

Args:
pipeline_execution_arn (str): The arn of the reference pipeline execution.
parameter_value_overrides (Dict[str, Union[str, bool, int, float]]): Parameter dict
to be updated with the parameters from the referenced execution.

Returns:
A parameter dict built from an execution and provided parameter value overrides.
"""
execution_parameters = self._get_parameters_for_execution(pipeline_execution_arn)
if parameter_value_overrides is not None:
self._validate_parameter_overrides(
pipeline_execution_arn, execution_parameters, parameter_value_overrides
)
execution_parameters.update(parameter_value_overrides)
return execution_parameters

def _get_parameters_for_execution(self, pipeline_execution_arn: str) -> Dict[str, str]:
"""Gets all the parameters from an execution.

Args:
pipeline_execution_arn (str): The arn of the pipeline execution.

Returns:
A parameter dict from the execution.
"""
pipeline_execution = _PipelineExecution(
arn=pipeline_execution_arn,
sagemaker_session=self.sagemaker_session,
)

response = pipeline_execution.list_parameters()
parameter_list = response["PipelineParameters"]
while response.get("NextToken") is not None:
response = pipeline_execution.list_parameters(next_token=response["NextToken"])
parameter_list.extend(response["PipelineParameters"])

return {parameter["Name"]: parameter["Value"] for parameter in parameter_list}

@staticmethod
def _validate_parameter_overrides(
pipeline_execution_arn: str,
execution_parameters: Dict[str, str],
parameter_overrides: Dict[str, Union[str, bool, int, float]],
):
"""Validates the parameter overrides are present in the execution parameters.

Args:
pipeline_execution_arn (str): The arn of the pipeline execution.
execution_parameters (Dict[str, str]): A parameter dict from the execution.
parameter_overrides (Dict[str, Union[str, bool, int, float]]): Parameter dict to be
updated in the parameters from the referenced execution.

Raises:
ValueError: If any parameters in parameter overrides is not present in the
execution parameters.
"""
invalid_parameters = set(parameter_overrides) - set(execution_parameters)
if invalid_parameters:
raise ValueError(
f"The following parameter overrides provided: {str(invalid_parameters)} "
+ f"are not present in the pipeline execution: {pipeline_execution_arn}"
)


def format_start_parameters(parameters: Dict[str, Any]) -> List[Dict[str, Any]]:
"""Formats start parameter overrides as a list of dicts.
Expand DownExpand Up@@ -652,6 +725,30 @@ def list_steps(self):
)
return response["PipelineExecutionSteps"]

def list_parameters(self, max_results: int = None, next_token: str = None):
"""Gets a list of parameters for a pipeline execution.

Args:
max_results (int): The maximum number of parameters to return in the response.
next_token (str): If the result of the previous `ListPipelineParametersForExecution`
request was truncated, the response includes a `NextToken`. To retrieve the next
set of parameters, use the token in the next request.

Returns:
Information about the parameters of the pipeline execution. This function is also
a wrapper for `list_pipeline_parameters_for_execution
<https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/sagemaker.html#SageMaker.Client.list_pipeline_parameters_for_execution>`_.
"""
kwargs = dict(PipelineExecutionArn=self.arn)
update_args(
kwargs,
MaxResults=max_results,
NextToken=next_token,
)
return self.sagemaker_session.sagemaker_client.list_pipeline_parameters_for_execution(
**kwargs
)

def wait(self, delay=30, max_attempts=60):
"""Waits for a pipeline execution.

Expand Down
10 changes: 9 additions & 1 deletion src/sagemaker/workflow/selective_execution_config.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,12 @@ class SelectiveExecutionConfig:
another SageMaker pipeline run.
"""

def __init__(self, selected_steps: List[str], source_pipeline_execution_arn: str = None):
def __init__(
self,
selected_steps: List[str],
source_pipeline_execution_arn: str = None,
reference_latest_execution: bool = True,
):
"""Create a `SelectiveExecutionConfig`.

Args:
Expand All@@ -32,9 +37,12 @@ def __init__(self, selected_steps: List[str], source_pipeline_execution_arn: str
`Succeeded`.
selected_steps (List[str]): A list of pipeline steps to run. All step(s) in all
path(s) between two selected steps should be included.
reference_latest_execution (bool): Whether to reference the latest execution if
`source_pipeline_execution_arn` is not provided.
"""
self.source_pipeline_execution_arn = source_pipeline_execution_arn
self.selected_steps = selected_steps
self.reference_latest_execution = reference_latest_execution

def _build_selected_steps_from_list(self) -> RequestType:
"""Get the request structure for the list of selected steps."""
Expand Down
122 changes: 121 additions & 1 deletion tests/unit/sagemaker/workflow/test_pipeline.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@

import pytest

from mock import Mock, patch
from mock import Mock, call, patch

from sagemaker import s3
from sagemaker.session_settings import SessionSettings
Expand DownExpand Up@@ -492,8 +492,10 @@ def test_pipeline_start_selective_execution(sagemaker_session_mock):
"SourcePipelineExecutionArn": "foo-arn",
},
)
sagemaker_session_mock.reset_mock()

# Case 2: Start selective execution without SourcePipelineExecutionArn
# References latest execution by default.
sagemaker_session_mock.sagemaker_client.list_pipeline_executions.return_value = {
"PipelineExecutionSummaries": [
{
Expand DownExpand Up@@ -523,6 +525,27 @@ def test_pipeline_start_selective_execution(sagemaker_session_mock):
"SourcePipelineExecutionArn": "my:latest:execution:arn",
},
)
sagemaker_session_mock.reset_mock()

# Case 3: Start selective execution without SourcePipelineExecutionArn
# Opts not to reference latest execution.
selective_execution_config = SelectiveExecutionConfig(
selected_steps=["step-1", "step-2", "step-3"],
reference_latest_execution=False,
)
pipeline.start(selective_execution_config=selective_execution_config)
sagemaker_session_mock.sagemaker_client.list_pipeline_executions.assert_not_called()
sagemaker_session_mock.sagemaker_client.start_pipeline_execution.assert_called_with(
PipelineName="MyPipeline",
SelectiveExecutionConfig={
"SelectedSteps": [
{"StepName": "step-1"},
{"StepName": "step-2"},
{"StepName": "step-3"},
],
},
)
sagemaker_session_mock.reset_mock()


def test_pipeline_basic():
Expand DownExpand Up@@ -718,13 +741,99 @@ def test_pipeline_list_executions(sagemaker_session_mock):
assert executions["NextToken"] == "token"


def test_pipeline_build_parameters_from_execution(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
parameter_value_overrides = {"TestParameterName": "NewParameterValue"}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}]
}
parameters = pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn,
parameter_value_overrides=parameter_value_overrides,
)
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn=reference_execution_arn
)
)
assert len(parameters) == 1
assert parameters["TestParameterName"] == "NewParameterValue"


def test_pipeline_build_parameters_from_execution_with_invalid_overrides(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
invalid_parameter_value_overrides = {"InvalidParameterName": "Value"}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}]
}
with pytest.raises(ValueError) as error:
pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn,
parameter_value_overrides=invalid_parameter_value_overrides,
)
assert (
f"The following parameter overrides provided: {str(set(invalid_parameter_value_overrides.keys()))} "
+ f"are not present in the pipeline execution: {reference_execution_arn}"
in str(error)
)
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn=reference_execution_arn
)
)


def test_pipeline_build_parameters_from_execution_with_paginated_result(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
next_token = "token"
first_page_response = {
"PipelineParameters": [{"Name": "TestParameterName1", "Value": "TestParameterValue1"}],
"NextToken": next_token,
}
second_page_response = {
"PipelineParameters": [{"Name": "TestParameterName2", "Value": "TestParameterValue2"}],
}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.side_effect = [
first_page_response,
second_page_response,
]
parameters = pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn
)
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.assert_has_calls(
[
call(PipelineExecutionArn=reference_execution_arn),
call(PipelineExecutionArn=reference_execution_arn, NextToken=next_token),
]
)
assert len(parameters) == 2
assert parameters["TestParameterName1"] == "TestParameterValue1"
assert parameters["TestParameterName2"] == "TestParameterValue2"


def test_pipeline_execution_basics(sagemaker_session_mock):
sagemaker_session_mock.sagemaker_client.start_pipeline_execution.return_value = {
"PipelineExecutionArn": "my:arn"
}
sagemaker_session_mock.sagemaker_client.list_pipeline_execution_steps.return_value = {
"PipelineExecutionSteps": [Mock()]
}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}],
"NextToken": "token",
}
pipeline = Pipeline(
name="MyPipeline",
parameters=[ParameterString("alpha", "beta"), ParameterString("gamma", "delta")],
Expand All@@ -745,6 +854,17 @@ def test_pipeline_execution_basics(sagemaker_session_mock):
PipelineExecutionArn="my:arn"
)
assert len(steps) == 1
list_parameters_response = execution.list_parameters()
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn="my:arn"
)
)
parameter_list = list_parameters_response["PipelineParameters"]
assert len(parameter_list) == 1
assert parameter_list[0]["Name"] == "TestParameterName"
assert parameter_list[0]["Value"] == "TestParameterValue"
assert list_parameters_response["NextToken"] == "token"


def _generate_large_pipeline_steps(input_data: object):
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
103 changes: 100 additions & 3 deletions src/sagemaker/workflow/pipeline.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,7 +344,10 @@ def start(
A `_PipelineExecution` instance, if successful.
"""
if selective_execution_config is not None:
if selective_execution_config.source_pipeline_execution_arn is None:
if (
selective_execution_config.source_pipeline_execution_arn is None
and selective_execution_config.reference_latest_execution
):
selective_execution_config.source_pipeline_execution_arn = (
self._get_latest_execution_arn()
)
Expand DownExpand Up@@ -425,8 +428,8 @@ def list_executions(
sort_by (str): The field by which to sort results(CreationTime/PipelineExecutionArn).
sort_order (str): The sort order for results (Ascending/Descending).
max_results (int): The maximum number of pipeline executions to return in the response.
next_token (str): If the result of the previous ListPipelineExecutions request was
truncated, the response includes a NextToken. To retrieve the next set of pipeline
next_token (str): If the result of the previous `ListPipelineExecutions` request was
truncated, the response includes a `NextToken`. To retrieve the next set of pipeline
executions, use the token in the next request.

Returns:
Expand DownExpand Up@@ -463,6 +466,76 @@ def _get_latest_execution_arn(self):
return response["PipelineExecutionSummaries"][0]["PipelineExecutionArn"]
return None

def build_parameters_from_execution(
self,
pipeline_execution_arn: str,
parameter_value_overrides: Dict[str, Union[str, bool, int, float]] = None,
) -> Dict[str, Union[str, bool, int, float]]:
"""Gets the parameters from an execution, update with optional parameter value overrides.

Args:
pipeline_execution_arn (str): The arn of the reference pipeline execution.
parameter_value_overrides (Dict[str, Union[str, bool, int, float]]): Parameter dict
to be updated with the parameters from the referenced execution.

Returns:
A parameter dict built from an execution and provided parameter value overrides.
"""
execution_parameters = self._get_parameters_for_execution(pipeline_execution_arn)
if parameter_value_overrides is not None:
self._validate_parameter_overrides(
pipeline_execution_arn, execution_parameters, parameter_value_overrides
)
execution_parameters.update(parameter_value_overrides)
return execution_parameters

def _get_parameters_for_execution(self, pipeline_execution_arn: str) -> Dict[str, str]:
"""Gets all the parameters from an execution.

Args:
pipeline_execution_arn (str): The arn of the pipeline execution.

Returns:
A parameter dict from the execution.
"""
pipeline_execution = _PipelineExecution(
arn=pipeline_execution_arn,
sagemaker_session=self.sagemaker_session,
)

response = pipeline_execution.list_parameters()
parameter_list = response["PipelineParameters"]
while response.get("NextToken") is not None:
response = pipeline_execution.list_parameters(next_token=response["NextToken"])
parameter_list.extend(response["PipelineParameters"])

return {parameter["Name"]: parameter["Value"] for parameter in parameter_list}

@staticmethod
def _validate_parameter_overrides(
pipeline_execution_arn: str,
execution_parameters: Dict[str, str],
parameter_overrides: Dict[str, Union[str, bool, int, float]],
):
"""Validates the parameter overrides are present in the execution parameters.

Args:
pipeline_execution_arn (str): The arn of the pipeline execution.
execution_parameters (Dict[str, str]): A parameter dict from the execution.
parameter_overrides (Dict[str, Union[str, bool, int, float]]): Parameter dict to be
updated in the parameters from the referenced execution.

Raises:
ValueError: If any parameters in parameter overrides is not present in the
execution parameters.
"""
invalid_parameters = set(parameter_overrides) - set(execution_parameters)
if invalid_parameters:
raise ValueError(
f"The following parameter overrides provided: {str(invalid_parameters)} "
+ f"are not present in the pipeline execution: {pipeline_execution_arn}"
)


def format_start_parameters(parameters: Dict[str, Any]) -> List[Dict[str, Any]]:
"""Formats start parameter overrides as a list of dicts.
Expand DownExpand Up@@ -652,6 +725,30 @@ def list_steps(self):
)
return response["PipelineExecutionSteps"]

def list_parameters(self, max_results: int = None, next_token: str = None):
"""Gets a list of parameters for a pipeline execution.

Args:
max_results (int): The maximum number of parameters to return in the response.
next_token (str): If the result of the previous `ListPipelineParametersForExecution`
request was truncated, the response includes a `NextToken`. To retrieve the next
set of parameters, use the token in the next request.

Returns:
Information about the parameters of the pipeline execution. This function is also
a wrapper for `list_pipeline_parameters_for_execution
<https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/sagemaker.html#SageMaker.Client.list_pipeline_parameters_for_execution>`_.
"""
kwargs = dict(PipelineExecutionArn=self.arn)
update_args(
kwargs,
MaxResults=max_results,
NextToken=next_token,
)
return self.sagemaker_session.sagemaker_client.list_pipeline_parameters_for_execution(
**kwargs
)

def wait(self, delay=30, max_attempts=60):
"""Waits for a pipeline execution.

Expand Down
10 changes: 9 additions & 1 deletion src/sagemaker/workflow/selective_execution_config.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,12 @@ class SelectiveExecutionConfig:
another SageMaker pipeline run.
"""

def __init__(self, selected_steps: List[str], source_pipeline_execution_arn: str = None):
def __init__(
self,
selected_steps: List[str],
source_pipeline_execution_arn: str = None,
reference_latest_execution: bool = True,
):
"""Create a `SelectiveExecutionConfig`.

Args:
Expand All@@ -32,9 +37,12 @@ def __init__(self, selected_steps: List[str], source_pipeline_execution_arn: str
`Succeeded`.
selected_steps (List[str]): A list of pipeline steps to run. All step(s) in all
path(s) between two selected steps should be included.
reference_latest_execution (bool): Whether to reference the latest execution if
`source_pipeline_execution_arn` is not provided.
"""
self.source_pipeline_execution_arn = source_pipeline_execution_arn
self.selected_steps = selected_steps
self.reference_latest_execution = reference_latest_execution

def _build_selected_steps_from_list(self) -> RequestType:
"""Get the request structure for the list of selected steps."""
Expand Down
122 changes: 121 additions & 1 deletion tests/unit/sagemaker/workflow/test_pipeline.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@

import pytest

from mock import Mock, patch
from mock import Mock, call, patch

from sagemaker import s3
from sagemaker.session_settings import SessionSettings
Expand DownExpand Up@@ -492,8 +492,10 @@ def test_pipeline_start_selective_execution(sagemaker_session_mock):
"SourcePipelineExecutionArn": "foo-arn",
},
)
sagemaker_session_mock.reset_mock()

# Case 2: Start selective execution without SourcePipelineExecutionArn
# References latest execution by default.
sagemaker_session_mock.sagemaker_client.list_pipeline_executions.return_value = {
"PipelineExecutionSummaries": [
{
Expand DownExpand Up@@ -523,6 +525,27 @@ def test_pipeline_start_selective_execution(sagemaker_session_mock):
"SourcePipelineExecutionArn": "my:latest:execution:arn",
},
)
sagemaker_session_mock.reset_mock()

# Case 3: Start selective execution without SourcePipelineExecutionArn
# Opts not to reference latest execution.
selective_execution_config = SelectiveExecutionConfig(
selected_steps=["step-1", "step-2", "step-3"],
reference_latest_execution=False,
)
pipeline.start(selective_execution_config=selective_execution_config)
sagemaker_session_mock.sagemaker_client.list_pipeline_executions.assert_not_called()
sagemaker_session_mock.sagemaker_client.start_pipeline_execution.assert_called_with(
PipelineName="MyPipeline",
SelectiveExecutionConfig={
"SelectedSteps": [
{"StepName": "step-1"},
{"StepName": "step-2"},
{"StepName": "step-3"},
],
},
)
sagemaker_session_mock.reset_mock()


def test_pipeline_basic():
Expand DownExpand Up@@ -718,13 +741,99 @@ def test_pipeline_list_executions(sagemaker_session_mock):
assert executions["NextToken"] == "token"


def test_pipeline_build_parameters_from_execution(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
parameter_value_overrides = {"TestParameterName": "NewParameterValue"}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}]
}
parameters = pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn,
parameter_value_overrides=parameter_value_overrides,
)
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn=reference_execution_arn
)
)
assert len(parameters) == 1
assert parameters["TestParameterName"] == "NewParameterValue"


def test_pipeline_build_parameters_from_execution_with_invalid_overrides(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
invalid_parameter_value_overrides = {"InvalidParameterName": "Value"}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}]
}
with pytest.raises(ValueError) as error:
pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn,
parameter_value_overrides=invalid_parameter_value_overrides,
)
assert (
f"The following parameter overrides provided: {str(set(invalid_parameter_value_overrides.keys()))} "
+ f"are not present in the pipeline execution: {reference_execution_arn}"
in str(error)
)
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn=reference_execution_arn
)
)


def test_pipeline_build_parameters_from_execution_with_paginated_result(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
next_token = "token"
first_page_response = {
"PipelineParameters": [{"Name": "TestParameterName1", "Value": "TestParameterValue1"}],
"NextToken": next_token,
}
second_page_response = {
"PipelineParameters": [{"Name": "TestParameterName2", "Value": "TestParameterValue2"}],
}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.side_effect = [
first_page_response,
second_page_response,
]
parameters = pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn
)
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.assert_has_calls(
[
call(PipelineExecutionArn=reference_execution_arn),
call(PipelineExecutionArn=reference_execution_arn, NextToken=next_token),
]
)
assert len(parameters) == 2
assert parameters["TestParameterName1"] == "TestParameterValue1"
assert parameters["TestParameterName2"] == "TestParameterValue2"


def test_pipeline_execution_basics(sagemaker_session_mock):
sagemaker_session_mock.sagemaker_client.start_pipeline_execution.return_value = {
"PipelineExecutionArn": "my:arn"
}
sagemaker_session_mock.sagemaker_client.list_pipeline_execution_steps.return_value = {
"PipelineExecutionSteps": [Mock()]
}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}],
"NextToken": "token",
}
pipeline = Pipeline(
name="MyPipeline",
parameters=[ParameterString("alpha", "beta"), ParameterString("gamma", "delta")],
Expand All@@ -745,6 +854,17 @@ def test_pipeline_execution_basics(sagemaker_session_mock):
PipelineExecutionArn="my:arn"
)
assert len(steps) == 1
list_parameters_response = execution.list_parameters()
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn="my:arn"
)
)
parameter_list = list_parameters_response["PipelineParameters"]
assert len(parameter_list) == 1
assert parameter_list[0]["Name"] == "TestParameterName"
assert parameter_list[0]["Value"] == "TestParameterValue"
assert list_parameters_response["NextToken"] == "token"


def _generate_large_pipeline_steps(input_data: object):
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
103 changes: 100 additions & 3 deletions src/sagemaker/workflow/pipeline.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,7 +344,10 @@ def start(
A `_PipelineExecution` instance, if successful.
"""
if selective_execution_config is not None:
if selective_execution_config.source_pipeline_execution_arn is None:
if (
selective_execution_config.source_pipeline_execution_arn is None
and selective_execution_config.reference_latest_execution
):
selective_execution_config.source_pipeline_execution_arn = (
self._get_latest_execution_arn()
)
Expand DownExpand Up@@ -425,8 +428,8 @@ def list_executions(
sort_by (str): The field by which to sort results(CreationTime/PipelineExecutionArn).
sort_order (str): The sort order for results (Ascending/Descending).
max_results (int): The maximum number of pipeline executions to return in the response.
next_token (str): If the result of the previous ListPipelineExecutions request was
truncated, the response includes a NextToken. To retrieve the next set of pipeline
next_token (str): If the result of the previous `ListPipelineExecutions` request was
truncated, the response includes a `NextToken`. To retrieve the next set of pipeline
executions, use the token in the next request.

Returns:
Expand DownExpand Up@@ -463,6 +466,76 @@ def _get_latest_execution_arn(self):
return response["PipelineExecutionSummaries"][0]["PipelineExecutionArn"]
return None

def build_parameters_from_execution(
self,
pipeline_execution_arn: str,
parameter_value_overrides: Dict[str, Union[str, bool, int, float]] = None,
) -> Dict[str, Union[str, bool, int, float]]:
"""Gets the parameters from an execution, update with optional parameter value overrides.

Args:
pipeline_execution_arn (str): The arn of the reference pipeline execution.
parameter_value_overrides (Dict[str, Union[str, bool, int, float]]): Parameter dict
to be updated with the parameters from the referenced execution.

Returns:
A parameter dict built from an execution and provided parameter value overrides.
"""
execution_parameters = self._get_parameters_for_execution(pipeline_execution_arn)
if parameter_value_overrides is not None:
self._validate_parameter_overrides(
pipeline_execution_arn, execution_parameters, parameter_value_overrides
)
execution_parameters.update(parameter_value_overrides)
return execution_parameters

def _get_parameters_for_execution(self, pipeline_execution_arn: str) -> Dict[str, str]:
"""Gets all the parameters from an execution.

Args:
pipeline_execution_arn (str): The arn of the pipeline execution.

Returns:
A parameter dict from the execution.
"""
pipeline_execution = _PipelineExecution(
arn=pipeline_execution_arn,
sagemaker_session=self.sagemaker_session,
)

response = pipeline_execution.list_parameters()
parameter_list = response["PipelineParameters"]
while response.get("NextToken") is not None:
response = pipeline_execution.list_parameters(next_token=response["NextToken"])
parameter_list.extend(response["PipelineParameters"])

return {parameter["Name"]: parameter["Value"] for parameter in parameter_list}

@staticmethod
def _validate_parameter_overrides(
pipeline_execution_arn: str,
execution_parameters: Dict[str, str],
parameter_overrides: Dict[str, Union[str, bool, int, float]],
):
"""Validates the parameter overrides are present in the execution parameters.

Args:
pipeline_execution_arn (str): The arn of the pipeline execution.
execution_parameters (Dict[str, str]): A parameter dict from the execution.
parameter_overrides (Dict[str, Union[str, bool, int, float]]): Parameter dict to be
updated in the parameters from the referenced execution.

Raises:
ValueError: If any parameters in parameter overrides is not present in the
execution parameters.
"""
invalid_parameters = set(parameter_overrides) - set(execution_parameters)
if invalid_parameters:
raise ValueError(
f"The following parameter overrides provided: {str(invalid_parameters)} "
+ f"are not present in the pipeline execution: {pipeline_execution_arn}"
)


def format_start_parameters(parameters: Dict[str, Any]) -> List[Dict[str, Any]]:
"""Formats start parameter overrides as a list of dicts.
Expand DownExpand Up@@ -652,6 +725,30 @@ def list_steps(self):
)
return response["PipelineExecutionSteps"]

def list_parameters(self, max_results: int = None, next_token: str = None):
"""Gets a list of parameters for a pipeline execution.

Args:
max_results (int): The maximum number of parameters to return in the response.
next_token (str): If the result of the previous `ListPipelineParametersForExecution`
request was truncated, the response includes a `NextToken`. To retrieve the next
set of parameters, use the token in the next request.

Returns:
Information about the parameters of the pipeline execution. This function is also
a wrapper for `list_pipeline_parameters_for_execution
<https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/sagemaker.html#SageMaker.Client.list_pipeline_parameters_for_execution>`_.
"""
kwargs = dict(PipelineExecutionArn=self.arn)
update_args(
kwargs,
MaxResults=max_results,
NextToken=next_token,
)
return self.sagemaker_session.sagemaker_client.list_pipeline_parameters_for_execution(
**kwargs
)

def wait(self, delay=30, max_attempts=60):
"""Waits for a pipeline execution.

Expand Down
10 changes: 9 additions & 1 deletion src/sagemaker/workflow/selective_execution_config.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,12 @@ class SelectiveExecutionConfig:
another SageMaker pipeline run.
"""

def __init__(self, selected_steps: List[str], source_pipeline_execution_arn: str = None):
def __init__(
self,
selected_steps: List[str],
source_pipeline_execution_arn: str = None,
reference_latest_execution: bool = True,
):
"""Create a `SelectiveExecutionConfig`.

Args:
Expand All@@ -32,9 +37,12 @@ def __init__(self, selected_steps: List[str], source_pipeline_execution_arn: str
`Succeeded`.
selected_steps (List[str]): A list of pipeline steps to run. All step(s) in all
path(s) between two selected steps should be included.
reference_latest_execution (bool): Whether to reference the latest execution if
`source_pipeline_execution_arn` is not provided.
"""
self.source_pipeline_execution_arn = source_pipeline_execution_arn
self.selected_steps = selected_steps
self.reference_latest_execution = reference_latest_execution

def _build_selected_steps_from_list(self) -> RequestType:
"""Get the request structure for the list of selected steps."""
Expand Down
122 changes: 121 additions & 1 deletion tests/unit/sagemaker/workflow/test_pipeline.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@

import pytest

from mock import Mock, patch
from mock import Mock, call, patch

from sagemaker import s3
from sagemaker.session_settings import SessionSettings
Expand DownExpand Up@@ -492,8 +492,10 @@ def test_pipeline_start_selective_execution(sagemaker_session_mock):
"SourcePipelineExecutionArn": "foo-arn",
},
)
sagemaker_session_mock.reset_mock()

# Case 2: Start selective execution without SourcePipelineExecutionArn
# References latest execution by default.
sagemaker_session_mock.sagemaker_client.list_pipeline_executions.return_value = {
"PipelineExecutionSummaries": [
{
Expand DownExpand Up@@ -523,6 +525,27 @@ def test_pipeline_start_selective_execution(sagemaker_session_mock):
"SourcePipelineExecutionArn": "my:latest:execution:arn",
},
)
sagemaker_session_mock.reset_mock()

# Case 3: Start selective execution without SourcePipelineExecutionArn
# Opts not to reference latest execution.
selective_execution_config = SelectiveExecutionConfig(
selected_steps=["step-1", "step-2", "step-3"],
reference_latest_execution=False,
)
pipeline.start(selective_execution_config=selective_execution_config)
sagemaker_session_mock.sagemaker_client.list_pipeline_executions.assert_not_called()
sagemaker_session_mock.sagemaker_client.start_pipeline_execution.assert_called_with(
PipelineName="MyPipeline",
SelectiveExecutionConfig={
"SelectedSteps": [
{"StepName": "step-1"},
{"StepName": "step-2"},
{"StepName": "step-3"},
],
},
)
sagemaker_session_mock.reset_mock()


def test_pipeline_basic():
Expand DownExpand Up@@ -718,13 +741,99 @@ def test_pipeline_list_executions(sagemaker_session_mock):
assert executions["NextToken"] == "token"


def test_pipeline_build_parameters_from_execution(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
parameter_value_overrides = {"TestParameterName": "NewParameterValue"}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}]
}
parameters = pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn,
parameter_value_overrides=parameter_value_overrides,
)
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn=reference_execution_arn
)
)
assert len(parameters) == 1
assert parameters["TestParameterName"] == "NewParameterValue"


def test_pipeline_build_parameters_from_execution_with_invalid_overrides(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
invalid_parameter_value_overrides = {"InvalidParameterName": "Value"}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}]
}
with pytest.raises(ValueError) as error:
pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn,
parameter_value_overrides=invalid_parameter_value_overrides,
)
assert (
f"The following parameter overrides provided: {str(set(invalid_parameter_value_overrides.keys()))} "
+ f"are not present in the pipeline execution: {reference_execution_arn}"
in str(error)
)
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn=reference_execution_arn
)
)


def test_pipeline_build_parameters_from_execution_with_paginated_result(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
next_token = "token"
first_page_response = {
"PipelineParameters": [{"Name": "TestParameterName1", "Value": "TestParameterValue1"}],
"NextToken": next_token,
}
second_page_response = {
"PipelineParameters": [{"Name": "TestParameterName2", "Value": "TestParameterValue2"}],
}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.side_effect = [
first_page_response,
second_page_response,
]
parameters = pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn
)
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.assert_has_calls(
[
call(PipelineExecutionArn=reference_execution_arn),
call(PipelineExecutionArn=reference_execution_arn, NextToken=next_token),
]
)
assert len(parameters) == 2
assert parameters["TestParameterName1"] == "TestParameterValue1"
assert parameters["TestParameterName2"] == "TestParameterValue2"


def test_pipeline_execution_basics(sagemaker_session_mock):
sagemaker_session_mock.sagemaker_client.start_pipeline_execution.return_value = {
"PipelineExecutionArn": "my:arn"
}
sagemaker_session_mock.sagemaker_client.list_pipeline_execution_steps.return_value = {
"PipelineExecutionSteps": [Mock()]
}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}],
"NextToken": "token",
}
pipeline = Pipeline(
name="MyPipeline",
parameters=[ParameterString("alpha", "beta"), ParameterString("gamma", "delta")],
Expand All@@ -745,6 +854,17 @@ def test_pipeline_execution_basics(sagemaker_session_mock):
PipelineExecutionArn="my:arn"
)
assert len(steps) == 1
list_parameters_response = execution.list_parameters()
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn="my:arn"
)
)
parameter_list = list_parameters_response["PipelineParameters"]
assert len(parameter_list) == 1
assert parameter_list[0]["Name"] == "TestParameterName"
assert parameter_list[0]["Value"] == "TestParameterValue"
assert list_parameters_response["NextToken"] == "token"


def _generate_large_pipeline_steps(input_data: object):
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
103 changes: 100 additions & 3 deletions src/sagemaker/workflow/pipeline.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,7 +344,10 @@ def start(
A `_PipelineExecution` instance, if successful.
"""
if selective_execution_config is not None:
if selective_execution_config.source_pipeline_execution_arn is None:
if (
selective_execution_config.source_pipeline_execution_arn is None
and selective_execution_config.reference_latest_execution
):
selective_execution_config.source_pipeline_execution_arn = (
self._get_latest_execution_arn()
)
Expand DownExpand Up@@ -425,8 +428,8 @@ def list_executions(
sort_by (str): The field by which to sort results(CreationTime/PipelineExecutionArn).
sort_order (str): The sort order for results (Ascending/Descending).
max_results (int): The maximum number of pipeline executions to return in the response.
next_token (str): If the result of the previous ListPipelineExecutions request was
truncated, the response includes a NextToken. To retrieve the next set of pipeline
next_token (str): If the result of the previous `ListPipelineExecutions` request was
truncated, the response includes a `NextToken`. To retrieve the next set of pipeline
executions, use the token in the next request.

Returns:
Expand DownExpand Up@@ -463,6 +466,76 @@ def _get_latest_execution_arn(self):
return response["PipelineExecutionSummaries"][0]["PipelineExecutionArn"]
return None

def build_parameters_from_execution(
self,
pipeline_execution_arn: str,
parameter_value_overrides: Dict[str, Union[str, bool, int, float]] = None,
) -> Dict[str, Union[str, bool, int, float]]:
"""Gets the parameters from an execution, update with optional parameter value overrides.

Args:
pipeline_execution_arn (str): The arn of the reference pipeline execution.
parameter_value_overrides (Dict[str, Union[str, bool, int, float]]): Parameter dict
to be updated with the parameters from the referenced execution.

Returns:
A parameter dict built from an execution and provided parameter value overrides.
"""
execution_parameters = self._get_parameters_for_execution(pipeline_execution_arn)
if parameter_value_overrides is not None:
self._validate_parameter_overrides(
pipeline_execution_arn, execution_parameters, parameter_value_overrides
)
execution_parameters.update(parameter_value_overrides)
return execution_parameters

def _get_parameters_for_execution(self, pipeline_execution_arn: str) -> Dict[str, str]:
"""Gets all the parameters from an execution.

Args:
pipeline_execution_arn (str): The arn of the pipeline execution.

Returns:
A parameter dict from the execution.
"""
pipeline_execution = _PipelineExecution(
arn=pipeline_execution_arn,
sagemaker_session=self.sagemaker_session,
)

response = pipeline_execution.list_parameters()
parameter_list = response["PipelineParameters"]
while response.get("NextToken") is not None:
response = pipeline_execution.list_parameters(next_token=response["NextToken"])
parameter_list.extend(response["PipelineParameters"])

return {parameter["Name"]: parameter["Value"] for parameter in parameter_list}

@staticmethod
def _validate_parameter_overrides(
pipeline_execution_arn: str,
execution_parameters: Dict[str, str],
parameter_overrides: Dict[str, Union[str, bool, int, float]],
):
"""Validates the parameter overrides are present in the execution parameters.

Args:
pipeline_execution_arn (str): The arn of the pipeline execution.
execution_parameters (Dict[str, str]): A parameter dict from the execution.
parameter_overrides (Dict[str, Union[str, bool, int, float]]): Parameter dict to be
updated in the parameters from the referenced execution.

Raises:
ValueError: If any parameters in parameter overrides is not present in the
execution parameters.
"""
invalid_parameters = set(parameter_overrides) - set(execution_parameters)
if invalid_parameters:
raise ValueError(
f"The following parameter overrides provided: {str(invalid_parameters)} "
+ f"are not present in the pipeline execution: {pipeline_execution_arn}"
)


def format_start_parameters(parameters: Dict[str, Any]) -> List[Dict[str, Any]]:
"""Formats start parameter overrides as a list of dicts.
Expand DownExpand Up@@ -652,6 +725,30 @@ def list_steps(self):
)
return response["PipelineExecutionSteps"]

def list_parameters(self, max_results: int = None, next_token: str = None):
"""Gets a list of parameters for a pipeline execution.

Args:
max_results (int): The maximum number of parameters to return in the response.
next_token (str): If the result of the previous `ListPipelineParametersForExecution`
request was truncated, the response includes a `NextToken`. To retrieve the next
set of parameters, use the token in the next request.

Returns:
Information about the parameters of the pipeline execution. This function is also
a wrapper for `list_pipeline_parameters_for_execution
<https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/sagemaker.html#SageMaker.Client.list_pipeline_parameters_for_execution>`_.
"""
kwargs = dict(PipelineExecutionArn=self.arn)
update_args(
kwargs,
MaxResults=max_results,
NextToken=next_token,
)
return self.sagemaker_session.sagemaker_client.list_pipeline_parameters_for_execution(
**kwargs
)

def wait(self, delay=30, max_attempts=60):
"""Waits for a pipeline execution.

Expand Down
10 changes: 9 additions & 1 deletion src/sagemaker/workflow/selective_execution_config.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,12 @@ class SelectiveExecutionConfig:
another SageMaker pipeline run.
"""

def __init__(self, selected_steps: List[str], source_pipeline_execution_arn: str = None):
def __init__(
self,
selected_steps: List[str],
source_pipeline_execution_arn: str = None,
reference_latest_execution: bool = True,
):
"""Create a `SelectiveExecutionConfig`.

Args:
Expand All@@ -32,9 +37,12 @@ def __init__(self, selected_steps: List[str], source_pipeline_execution_arn: str
`Succeeded`.
selected_steps (List[str]): A list of pipeline steps to run. All step(s) in all
path(s) between two selected steps should be included.
reference_latest_execution (bool): Whether to reference the latest execution if
`source_pipeline_execution_arn` is not provided.
"""
self.source_pipeline_execution_arn = source_pipeline_execution_arn
self.selected_steps = selected_steps
self.reference_latest_execution = reference_latest_execution

def _build_selected_steps_from_list(self) -> RequestType:
"""Get the request structure for the list of selected steps."""
Expand Down
122 changes: 121 additions & 1 deletion tests/unit/sagemaker/workflow/test_pipeline.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@

import pytest

from mock import Mock, patch
from mock import Mock, call, patch

from sagemaker import s3
from sagemaker.session_settings import SessionSettings
Expand DownExpand Up@@ -492,8 +492,10 @@ def test_pipeline_start_selective_execution(sagemaker_session_mock):
"SourcePipelineExecutionArn": "foo-arn",
},
)
sagemaker_session_mock.reset_mock()

# Case 2: Start selective execution without SourcePipelineExecutionArn
# References latest execution by default.
sagemaker_session_mock.sagemaker_client.list_pipeline_executions.return_value = {
"PipelineExecutionSummaries": [
{
Expand DownExpand Up@@ -523,6 +525,27 @@ def test_pipeline_start_selective_execution(sagemaker_session_mock):
"SourcePipelineExecutionArn": "my:latest:execution:arn",
},
)
sagemaker_session_mock.reset_mock()

# Case 3: Start selective execution without SourcePipelineExecutionArn
# Opts not to reference latest execution.
selective_execution_config = SelectiveExecutionConfig(
selected_steps=["step-1", "step-2", "step-3"],
reference_latest_execution=False,
)
pipeline.start(selective_execution_config=selective_execution_config)
sagemaker_session_mock.sagemaker_client.list_pipeline_executions.assert_not_called()
sagemaker_session_mock.sagemaker_client.start_pipeline_execution.assert_called_with(
PipelineName="MyPipeline",
SelectiveExecutionConfig={
"SelectedSteps": [
{"StepName": "step-1"},
{"StepName": "step-2"},
{"StepName": "step-3"},
],
},
)
sagemaker_session_mock.reset_mock()


def test_pipeline_basic():
Expand DownExpand Up@@ -718,13 +741,99 @@ def test_pipeline_list_executions(sagemaker_session_mock):
assert executions["NextToken"] == "token"


def test_pipeline_build_parameters_from_execution(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
parameter_value_overrides = {"TestParameterName": "NewParameterValue"}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}]
}
parameters = pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn,
parameter_value_overrides=parameter_value_overrides,
)
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn=reference_execution_arn
)
)
assert len(parameters) == 1
assert parameters["TestParameterName"] == "NewParameterValue"


def test_pipeline_build_parameters_from_execution_with_invalid_overrides(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
invalid_parameter_value_overrides = {"InvalidParameterName": "Value"}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}]
}
with pytest.raises(ValueError) as error:
pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn,
parameter_value_overrides=invalid_parameter_value_overrides,
)
assert (
f"The following parameter overrides provided: {str(set(invalid_parameter_value_overrides.keys()))} "
+ f"are not present in the pipeline execution: {reference_execution_arn}"
in str(error)
)
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn=reference_execution_arn
)
)


def test_pipeline_build_parameters_from_execution_with_paginated_result(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
next_token = "token"
first_page_response = {
"PipelineParameters": [{"Name": "TestParameterName1", "Value": "TestParameterValue1"}],
"NextToken": next_token,
}
second_page_response = {
"PipelineParameters": [{"Name": "TestParameterName2", "Value": "TestParameterValue2"}],
}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.side_effect = [
first_page_response,
second_page_response,
]
parameters = pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn
)
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.assert_has_calls(
[
call(PipelineExecutionArn=reference_execution_arn),
call(PipelineExecutionArn=reference_execution_arn, NextToken=next_token),
]
)
assert len(parameters) == 2
assert parameters["TestParameterName1"] == "TestParameterValue1"
assert parameters["TestParameterName2"] == "TestParameterValue2"


def test_pipeline_execution_basics(sagemaker_session_mock):
sagemaker_session_mock.sagemaker_client.start_pipeline_execution.return_value = {
"PipelineExecutionArn": "my:arn"
}
sagemaker_session_mock.sagemaker_client.list_pipeline_execution_steps.return_value = {
"PipelineExecutionSteps": [Mock()]
}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}],
"NextToken": "token",
}
pipeline = Pipeline(
name="MyPipeline",
parameters=[ParameterString("alpha", "beta"), ParameterString("gamma", "delta")],
Expand All@@ -745,6 +854,17 @@ def test_pipeline_execution_basics(sagemaker_session_mock):
PipelineExecutionArn="my:arn"
)
assert len(steps) == 1
list_parameters_response = execution.list_parameters()
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn="my:arn"
)
)
parameter_list = list_parameters_response["PipelineParameters"]
assert len(parameter_list) == 1
assert parameter_list[0]["Name"] == "TestParameterName"
assert parameter_list[0]["Value"] == "TestParameterValue"
assert list_parameters_response["NextToken"] == "token"


def _generate_large_pipeline_steps(input_data: object):
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
103 changes: 100 additions & 3 deletions src/sagemaker/workflow/pipeline.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,7 +344,10 @@ def start(
A `_PipelineExecution` instance, if successful.
"""
if selective_execution_config is not None:
if selective_execution_config.source_pipeline_execution_arn is None:
if (
selective_execution_config.source_pipeline_execution_arn is None
and selective_execution_config.reference_latest_execution
):
selective_execution_config.source_pipeline_execution_arn = (
self._get_latest_execution_arn()
)
Expand DownExpand Up@@ -425,8 +428,8 @@ def list_executions(
sort_by (str): The field by which to sort results(CreationTime/PipelineExecutionArn).
sort_order (str): The sort order for results (Ascending/Descending).
max_results (int): The maximum number of pipeline executions to return in the response.
next_token (str): If the result of the previous ListPipelineExecutions request was
truncated, the response includes a NextToken. To retrieve the next set of pipeline
next_token (str): If the result of the previous `ListPipelineExecutions` request was
truncated, the response includes a `NextToken`. To retrieve the next set of pipeline
executions, use the token in the next request.

Returns:
Expand DownExpand Up@@ -463,6 +466,76 @@ def _get_latest_execution_arn(self):
return response["PipelineExecutionSummaries"][0]["PipelineExecutionArn"]
return None

def build_parameters_from_execution(
self,
pipeline_execution_arn: str,
parameter_value_overrides: Dict[str, Union[str, bool, int, float]] = None,
) -> Dict[str, Union[str, bool, int, float]]:
"""Gets the parameters from an execution, update with optional parameter value overrides.

Args:
pipeline_execution_arn (str): The arn of the reference pipeline execution.
parameter_value_overrides (Dict[str, Union[str, bool, int, float]]): Parameter dict
to be updated with the parameters from the referenced execution.

Returns:
A parameter dict built from an execution and provided parameter value overrides.
"""
execution_parameters = self._get_parameters_for_execution(pipeline_execution_arn)
if parameter_value_overrides is not None:
self._validate_parameter_overrides(
pipeline_execution_arn, execution_parameters, parameter_value_overrides
)
execution_parameters.update(parameter_value_overrides)
return execution_parameters

def _get_parameters_for_execution(self, pipeline_execution_arn: str) -> Dict[str, str]:
"""Gets all the parameters from an execution.

Args:
pipeline_execution_arn (str): The arn of the pipeline execution.

Returns:
A parameter dict from the execution.
"""
pipeline_execution = _PipelineExecution(
arn=pipeline_execution_arn,
sagemaker_session=self.sagemaker_session,
)

response = pipeline_execution.list_parameters()
parameter_list = response["PipelineParameters"]
while response.get("NextToken") is not None:
response = pipeline_execution.list_parameters(next_token=response["NextToken"])
parameter_list.extend(response["PipelineParameters"])

return {parameter["Name"]: parameter["Value"] for parameter in parameter_list}

@staticmethod
def _validate_parameter_overrides(
pipeline_execution_arn: str,
execution_parameters: Dict[str, str],
parameter_overrides: Dict[str, Union[str, bool, int, float]],
):
"""Validates the parameter overrides are present in the execution parameters.

Args:
pipeline_execution_arn (str): The arn of the pipeline execution.
execution_parameters (Dict[str, str]): A parameter dict from the execution.
parameter_overrides (Dict[str, Union[str, bool, int, float]]): Parameter dict to be
updated in the parameters from the referenced execution.

Raises:
ValueError: If any parameters in parameter overrides is not present in the
execution parameters.
"""
invalid_parameters = set(parameter_overrides) - set(execution_parameters)
if invalid_parameters:
raise ValueError(
f"The following parameter overrides provided: {str(invalid_parameters)} "
+ f"are not present in the pipeline execution: {pipeline_execution_arn}"
)


def format_start_parameters(parameters: Dict[str, Any]) -> List[Dict[str, Any]]:
"""Formats start parameter overrides as a list of dicts.
Expand DownExpand Up@@ -652,6 +725,30 @@ def list_steps(self):
)
return response["PipelineExecutionSteps"]

def list_parameters(self, max_results: int = None, next_token: str = None):
"""Gets a list of parameters for a pipeline execution.

Args:
max_results (int): The maximum number of parameters to return in the response.
next_token (str): If the result of the previous `ListPipelineParametersForExecution`
request was truncated, the response includes a `NextToken`. To retrieve the next
set of parameters, use the token in the next request.

Returns:
Information about the parameters of the pipeline execution. This function is also
a wrapper for `list_pipeline_parameters_for_execution
<https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/sagemaker.html#SageMaker.Client.list_pipeline_parameters_for_execution>`_.
"""
kwargs = dict(PipelineExecutionArn=self.arn)
update_args(
kwargs,
MaxResults=max_results,
NextToken=next_token,
)
return self.sagemaker_session.sagemaker_client.list_pipeline_parameters_for_execution(
**kwargs
)

def wait(self, delay=30, max_attempts=60):
"""Waits for a pipeline execution.

Expand Down
10 changes: 9 additions & 1 deletion src/sagemaker/workflow/selective_execution_config.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,12 @@ class SelectiveExecutionConfig:
another SageMaker pipeline run.
"""

def __init__(self, selected_steps: List[str], source_pipeline_execution_arn: str = None):
def __init__(
self,
selected_steps: List[str],
source_pipeline_execution_arn: str = None,
reference_latest_execution: bool = True,
):
"""Create a `SelectiveExecutionConfig`.

Args:
Expand All@@ -32,9 +37,12 @@ def __init__(self, selected_steps: List[str], source_pipeline_execution_arn: str
`Succeeded`.
selected_steps (List[str]): A list of pipeline steps to run. All step(s) in all
path(s) between two selected steps should be included.
reference_latest_execution (bool): Whether to reference the latest execution if
`source_pipeline_execution_arn` is not provided.
"""
self.source_pipeline_execution_arn = source_pipeline_execution_arn
self.selected_steps = selected_steps
self.reference_latest_execution = reference_latest_execution

def _build_selected_steps_from_list(self) -> RequestType:
"""Get the request structure for the list of selected steps."""
Expand Down
122 changes: 121 additions & 1 deletion tests/unit/sagemaker/workflow/test_pipeline.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@

import pytest

from mock import Mock, patch
from mock import Mock, call, patch

from sagemaker import s3
from sagemaker.session_settings import SessionSettings
Expand DownExpand Up@@ -492,8 +492,10 @@ def test_pipeline_start_selective_execution(sagemaker_session_mock):
"SourcePipelineExecutionArn": "foo-arn",
},
)
sagemaker_session_mock.reset_mock()

# Case 2: Start selective execution without SourcePipelineExecutionArn
# References latest execution by default.
sagemaker_session_mock.sagemaker_client.list_pipeline_executions.return_value = {
"PipelineExecutionSummaries": [
{
Expand DownExpand Up@@ -523,6 +525,27 @@ def test_pipeline_start_selective_execution(sagemaker_session_mock):
"SourcePipelineExecutionArn": "my:latest:execution:arn",
},
)
sagemaker_session_mock.reset_mock()

# Case 3: Start selective execution without SourcePipelineExecutionArn
# Opts not to reference latest execution.
selective_execution_config = SelectiveExecutionConfig(
selected_steps=["step-1", "step-2", "step-3"],
reference_latest_execution=False,
)
pipeline.start(selective_execution_config=selective_execution_config)
sagemaker_session_mock.sagemaker_client.list_pipeline_executions.assert_not_called()
sagemaker_session_mock.sagemaker_client.start_pipeline_execution.assert_called_with(
PipelineName="MyPipeline",
SelectiveExecutionConfig={
"SelectedSteps": [
{"StepName": "step-1"},
{"StepName": "step-2"},
{"StepName": "step-3"},
],
},
)
sagemaker_session_mock.reset_mock()


def test_pipeline_basic():
Expand DownExpand Up@@ -718,13 +741,99 @@ def test_pipeline_list_executions(sagemaker_session_mock):
assert executions["NextToken"] == "token"


def test_pipeline_build_parameters_from_execution(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
parameter_value_overrides = {"TestParameterName": "NewParameterValue"}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}]
}
parameters = pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn,
parameter_value_overrides=parameter_value_overrides,
)
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn=reference_execution_arn
)
)
assert len(parameters) == 1
assert parameters["TestParameterName"] == "NewParameterValue"


def test_pipeline_build_parameters_from_execution_with_invalid_overrides(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
invalid_parameter_value_overrides = {"InvalidParameterName": "Value"}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}]
}
with pytest.raises(ValueError) as error:
pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn,
parameter_value_overrides=invalid_parameter_value_overrides,
)
assert (
f"The following parameter overrides provided: {str(set(invalid_parameter_value_overrides.keys()))} "
+ f"are not present in the pipeline execution: {reference_execution_arn}"
in str(error)
)
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn=reference_execution_arn
)
)


def test_pipeline_build_parameters_from_execution_with_paginated_result(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
next_token = "token"
first_page_response = {
"PipelineParameters": [{"Name": "TestParameterName1", "Value": "TestParameterValue1"}],
"NextToken": next_token,
}
second_page_response = {
"PipelineParameters": [{"Name": "TestParameterName2", "Value": "TestParameterValue2"}],
}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.side_effect = [
first_page_response,
second_page_response,
]
parameters = pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn
)
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.assert_has_calls(
[
call(PipelineExecutionArn=reference_execution_arn),
call(PipelineExecutionArn=reference_execution_arn, NextToken=next_token),
]
)
assert len(parameters) == 2
assert parameters["TestParameterName1"] == "TestParameterValue1"
assert parameters["TestParameterName2"] == "TestParameterValue2"


def test_pipeline_execution_basics(sagemaker_session_mock):
sagemaker_session_mock.sagemaker_client.start_pipeline_execution.return_value = {
"PipelineExecutionArn": "my:arn"
}
sagemaker_session_mock.sagemaker_client.list_pipeline_execution_steps.return_value = {
"PipelineExecutionSteps": [Mock()]
}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}],
"NextToken": "token",
}
pipeline = Pipeline(
name="MyPipeline",
parameters=[ParameterString("alpha", "beta"), ParameterString("gamma", "delta")],
Expand All@@ -745,6 +854,17 @@ def test_pipeline_execution_basics(sagemaker_session_mock):
PipelineExecutionArn="my:arn"
)
assert len(steps) == 1
list_parameters_response = execution.list_parameters()
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn="my:arn"
)
)
parameter_list = list_parameters_response["PipelineParameters"]
assert len(parameter_list) == 1
assert parameter_list[0]["Name"] == "TestParameterName"
assert parameter_list[0]["Value"] == "TestParameterValue"
assert list_parameters_response["NextToken"] == "token"


def _generate_large_pipeline_steps(input_data: object):
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
103 changes: 100 additions & 3 deletions src/sagemaker/workflow/pipeline.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,7 +344,10 @@ def start(
A `_PipelineExecution` instance, if successful.
"""
if selective_execution_config is not None:
if selective_execution_config.source_pipeline_execution_arn is None:
if (
selective_execution_config.source_pipeline_execution_arn is None
and selective_execution_config.reference_latest_execution
):
selective_execution_config.source_pipeline_execution_arn = (
self._get_latest_execution_arn()
)
Expand DownExpand Up@@ -425,8 +428,8 @@ def list_executions(
sort_by (str): The field by which to sort results(CreationTime/PipelineExecutionArn).
sort_order (str): The sort order for results (Ascending/Descending).
max_results (int): The maximum number of pipeline executions to return in the response.
next_token (str): If the result of the previous ListPipelineExecutions request was
truncated, the response includes a NextToken. To retrieve the next set of pipeline
next_token (str): If the result of the previous `ListPipelineExecutions` request was
truncated, the response includes a `NextToken`. To retrieve the next set of pipeline
executions, use the token in the next request.

Returns:
Expand DownExpand Up@@ -463,6 +466,76 @@ def _get_latest_execution_arn(self):
return response["PipelineExecutionSummaries"][0]["PipelineExecutionArn"]
return None

def build_parameters_from_execution(
self,
pipeline_execution_arn: str,
parameter_value_overrides: Dict[str, Union[str, bool, int, float]] = None,
) -> Dict[str, Union[str, bool, int, float]]:
"""Gets the parameters from an execution, update with optional parameter value overrides.

Args:
pipeline_execution_arn (str): The arn of the reference pipeline execution.
parameter_value_overrides (Dict[str, Union[str, bool, int, float]]): Parameter dict
to be updated with the parameters from the referenced execution.

Returns:
A parameter dict built from an execution and provided parameter value overrides.
"""
execution_parameters = self._get_parameters_for_execution(pipeline_execution_arn)
if parameter_value_overrides is not None:
self._validate_parameter_overrides(
pipeline_execution_arn, execution_parameters, parameter_value_overrides
)
execution_parameters.update(parameter_value_overrides)
return execution_parameters

def _get_parameters_for_execution(self, pipeline_execution_arn: str) -> Dict[str, str]:
"""Gets all the parameters from an execution.

Args:
pipeline_execution_arn (str): The arn of the pipeline execution.

Returns:
A parameter dict from the execution.
"""
pipeline_execution = _PipelineExecution(
arn=pipeline_execution_arn,
sagemaker_session=self.sagemaker_session,
)

response = pipeline_execution.list_parameters()
parameter_list = response["PipelineParameters"]
while response.get("NextToken") is not None:
response = pipeline_execution.list_parameters(next_token=response["NextToken"])
parameter_list.extend(response["PipelineParameters"])

return {parameter["Name"]: parameter["Value"] for parameter in parameter_list}

@staticmethod
def _validate_parameter_overrides(
pipeline_execution_arn: str,
execution_parameters: Dict[str, str],
parameter_overrides: Dict[str, Union[str, bool, int, float]],
):
"""Validates the parameter overrides are present in the execution parameters.

Args:
pipeline_execution_arn (str): The arn of the pipeline execution.
execution_parameters (Dict[str, str]): A parameter dict from the execution.
parameter_overrides (Dict[str, Union[str, bool, int, float]]): Parameter dict to be
updated in the parameters from the referenced execution.

Raises:
ValueError: If any parameters in parameter overrides is not present in the
execution parameters.
"""
invalid_parameters = set(parameter_overrides) - set(execution_parameters)
if invalid_parameters:
raise ValueError(
f"The following parameter overrides provided: {str(invalid_parameters)} "
+ f"are not present in the pipeline execution: {pipeline_execution_arn}"
)


def format_start_parameters(parameters: Dict[str, Any]) -> List[Dict[str, Any]]:
"""Formats start parameter overrides as a list of dicts.
Expand DownExpand Up@@ -652,6 +725,30 @@ def list_steps(self):
)
return response["PipelineExecutionSteps"]

def list_parameters(self, max_results: int = None, next_token: str = None):
"""Gets a list of parameters for a pipeline execution.

Args:
max_results (int): The maximum number of parameters to return in the response.
next_token (str): If the result of the previous `ListPipelineParametersForExecution`
request was truncated, the response includes a `NextToken`. To retrieve the next
set of parameters, use the token in the next request.

Returns:
Information about the parameters of the pipeline execution. This function is also
a wrapper for `list_pipeline_parameters_for_execution
<https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/sagemaker.html#SageMaker.Client.list_pipeline_parameters_for_execution>`_.
"""
kwargs = dict(PipelineExecutionArn=self.arn)
update_args(
kwargs,
MaxResults=max_results,
NextToken=next_token,
)
return self.sagemaker_session.sagemaker_client.list_pipeline_parameters_for_execution(
**kwargs
)

def wait(self, delay=30, max_attempts=60):
"""Waits for a pipeline execution.

Expand Down
10 changes: 9 additions & 1 deletion src/sagemaker/workflow/selective_execution_config.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,12 @@ class SelectiveExecutionConfig:
another SageMaker pipeline run.
"""

def __init__(self, selected_steps: List[str], source_pipeline_execution_arn: str = None):
def __init__(
self,
selected_steps: List[str],
source_pipeline_execution_arn: str = None,
reference_latest_execution: bool = True,
):
"""Create a `SelectiveExecutionConfig`.

Args:
Expand All@@ -32,9 +37,12 @@ def __init__(self, selected_steps: List[str], source_pipeline_execution_arn: str
`Succeeded`.
selected_steps (List[str]): A list of pipeline steps to run. All step(s) in all
path(s) between two selected steps should be included.
reference_latest_execution (bool): Whether to reference the latest execution if
`source_pipeline_execution_arn` is not provided.
"""
self.source_pipeline_execution_arn = source_pipeline_execution_arn
self.selected_steps = selected_steps
self.reference_latest_execution = reference_latest_execution

def _build_selected_steps_from_list(self) -> RequestType:
"""Get the request structure for the list of selected steps."""
Expand Down
122 changes: 121 additions & 1 deletion tests/unit/sagemaker/workflow/test_pipeline.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@

import pytest

from mock import Mock, patch
from mock import Mock, call, patch

from sagemaker import s3
from sagemaker.session_settings import SessionSettings
Expand DownExpand Up@@ -492,8 +492,10 @@ def test_pipeline_start_selective_execution(sagemaker_session_mock):
"SourcePipelineExecutionArn": "foo-arn",
},
)
sagemaker_session_mock.reset_mock()

# Case 2: Start selective execution without SourcePipelineExecutionArn
# References latest execution by default.
sagemaker_session_mock.sagemaker_client.list_pipeline_executions.return_value = {
"PipelineExecutionSummaries": [
{
Expand DownExpand Up@@ -523,6 +525,27 @@ def test_pipeline_start_selective_execution(sagemaker_session_mock):
"SourcePipelineExecutionArn": "my:latest:execution:arn",
},
)
sagemaker_session_mock.reset_mock()

# Case 3: Start selective execution without SourcePipelineExecutionArn
# Opts not to reference latest execution.
selective_execution_config = SelectiveExecutionConfig(
selected_steps=["step-1", "step-2", "step-3"],
reference_latest_execution=False,
)
pipeline.start(selective_execution_config=selective_execution_config)
sagemaker_session_mock.sagemaker_client.list_pipeline_executions.assert_not_called()
sagemaker_session_mock.sagemaker_client.start_pipeline_execution.assert_called_with(
PipelineName="MyPipeline",
SelectiveExecutionConfig={
"SelectedSteps": [
{"StepName": "step-1"},
{"StepName": "step-2"},
{"StepName": "step-3"},
],
},
)
sagemaker_session_mock.reset_mock()


def test_pipeline_basic():
Expand DownExpand Up@@ -718,13 +741,99 @@ def test_pipeline_list_executions(sagemaker_session_mock):
assert executions["NextToken"] == "token"


def test_pipeline_build_parameters_from_execution(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
parameter_value_overrides = {"TestParameterName": "NewParameterValue"}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}]
}
parameters = pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn,
parameter_value_overrides=parameter_value_overrides,
)
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn=reference_execution_arn
)
)
assert len(parameters) == 1
assert parameters["TestParameterName"] == "NewParameterValue"


def test_pipeline_build_parameters_from_execution_with_invalid_overrides(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
invalid_parameter_value_overrides = {"InvalidParameterName": "Value"}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}]
}
with pytest.raises(ValueError) as error:
pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn,
parameter_value_overrides=invalid_parameter_value_overrides,
)
assert (
f"The following parameter overrides provided: {str(set(invalid_parameter_value_overrides.keys()))} "
+ f"are not present in the pipeline execution: {reference_execution_arn}"
in str(error)
)
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn=reference_execution_arn
)
)


def test_pipeline_build_parameters_from_execution_with_paginated_result(sagemaker_session_mock):
pipeline = Pipeline(
name="MyPipeline",
sagemaker_session=sagemaker_session_mock,
)
reference_execution_arn = "reference_execution_arn"
next_token = "token"
first_page_response = {
"PipelineParameters": [{"Name": "TestParameterName1", "Value": "TestParameterValue1"}],
"NextToken": next_token,
}
second_page_response = {
"PipelineParameters": [{"Name": "TestParameterName2", "Value": "TestParameterValue2"}],
}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.side_effect = [
first_page_response,
second_page_response,
]
parameters = pipeline.build_parameters_from_execution(
pipeline_execution_arn=reference_execution_arn
)
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.assert_has_calls(
[
call(PipelineExecutionArn=reference_execution_arn),
call(PipelineExecutionArn=reference_execution_arn, NextToken=next_token),
]
)
assert len(parameters) == 2
assert parameters["TestParameterName1"] == "TestParameterValue1"
assert parameters["TestParameterName2"] == "TestParameterValue2"


def test_pipeline_execution_basics(sagemaker_session_mock):
sagemaker_session_mock.sagemaker_client.start_pipeline_execution.return_value = {
"PipelineExecutionArn": "my:arn"
}
sagemaker_session_mock.sagemaker_client.list_pipeline_execution_steps.return_value = {
"PipelineExecutionSteps": [Mock()]
}
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.return_value = {
"PipelineParameters": [{"Name": "TestParameterName", "Value": "TestParameterValue"}],
"NextToken": "token",
}
pipeline = Pipeline(
name="MyPipeline",
parameters=[ParameterString("alpha", "beta"), ParameterString("gamma", "delta")],
Expand All@@ -745,6 +854,17 @@ def test_pipeline_execution_basics(sagemaker_session_mock):
PipelineExecutionArn="my:arn"
)
assert len(steps) == 1
list_parameters_response = execution.list_parameters()
assert (
sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with(
PipelineExecutionArn="my:arn"
)
)
parameter_list = list_parameters_response["PipelineParameters"]
assert len(parameter_list) == 1
assert parameter_list[0]["Name"] == "TestParameterName"
assert parameter_list[0]["Value"] == "TestParameterValue"
assert list_parameters_response["NextToken"] == "token"


def _generate_large_pipeline_steps(input_data: object):
Expand Down