Skip to content

Commit 733cd3f

Browse files
authored
Merge branch 'main' into master
2 parents 41f2db2 + f97fb20 commit 733cd3f

11 files changed

+129
-73
lines changed

README.rst

+6-6
Original file line numberDiff line numberDiff line change
@@ -157,16 +157,16 @@ Using this SDK you can create steps, chain them together to create a workflow,
157157
create that workflow in AWS Step Functions, and execute the workflow in the
158158
AWS cloud.
159159

160-
.. image:: https://github.com/aws/aws-step-functions-data-science-sdk-python/raw/master/doc/images/create.png
161-
:scale: 50 %
162-
:alt: Create a workflow in AWS Step Functions
160+
.. image:: doc/images/create.png
161+
:width: 600
162+
:alt: Create a workflow in AWS Step Functions
163163

164164
Once you have created your workflow in AWS Step Functions, you can execute that
165165
workflow in Step Functions, in the AWS cloud.
166166

167-
.. image:: https://github.com/aws/aws-step-functions-data-science-sdk-python/raw/master/doc/images/execute.png
168-
:scale: 50 %
169-
:alt: Start a workflow in AWS Step Functions
167+
.. image:: doc/images/execute.png
168+
:width: 600
169+
:alt: Start a workflow in AWS Step Functions
170170

171171
Step Functions creates workflows out of steps called `States <https://docs.aws.amazon.com/step-functions/latest/dg/concepts-states.html>`__,
172172
and expresses that workflow in the `Amazon States Language <https://docs.aws.amazon.com/step-functions/latest/dg/concepts-amazon-states-language.html>`__.

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.0-rc1
1+
2.0.0

buildspec_integ.yaml

-9
This file was deleted.

buildspec_release.yaml

-27
This file was deleted.

buildspec_unit.yaml

-12
This file was deleted.

src/stepfunctions/steps/compute.py

+8
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ def __init__(self, state_id, wait_for_callback=False, **kwargs):
2828
state_id (str): State name whose length **must be** less than or equal to 128 unicode characters. State names **must be** unique within the scope of the whole state machine.
2929
wait_for_callback(bool, optional): Boolean value set to `True` if the Task state should wait for callback to resume the operation. (default: False)
3030
timeout_seconds (int, optional): Positive integer specifying timeout for the state in seconds. If the state runs longer than the specified timeout, then the interpreter fails the state with a `States.Timeout` Error Name. (default: 60)
31+
timeout_seconds_path (str, optional): Path specifying the state's timeout value in seconds from the state input. When resolved, the path must select a field whose value is a positive integer.
3132
heartbeat_seconds (int, optional): Positive integer specifying heartbeat timeout for the state in seconds. This value should be lower than the one specified for `timeout_seconds`. If more time than the specified heartbeat elapses between heartbeats from the task, then the interpreter fails the state with a `States.Timeout` Error Name.
33+
heartbeat_seconds_path (str, optional): Path specifying the state's heartbeat value in seconds from the state input. When resolved, the path must select a field whose value is a positive integer.
3234
comment (str, optional): Human-readable comment or description. (default: None)
3335
input_path (str, optional): Path applied to the state’s raw input to select some or all of it; that selection is used by the state. (default: '$')
3436
parameters (dict, optional): The value of this field becomes the effective input for the state.
@@ -56,7 +58,9 @@ def __init__(self, state_id, wait_for_completion=True, **kwargs):
5658
state_id (str): State name whose length **must be** less than or equal to 128 unicode characters. State names **must be** unique within the scope of the whole state machine.
5759
wait_for_completion(bool, optional): Boolean value set to `True` if the Task state should wait for the glue job to complete before proceeding to the next step in the workflow. Set to `False` if the Task state should submit the glue job and proceed to the next step. (default: True)
5860
timeout_seconds (int, optional): Positive integer specifying timeout for the state in seconds. If the state runs longer than the specified timeout, then the interpreter fails the state with a `States.Timeout` Error Name. (default: 60)
61+
timeout_seconds_path (str, optional): Path specifying the state's timeout value in seconds from the state input. When resolved, the path must select a field whose value is a positive integer.
5962
heartbeat_seconds (int, optional): Positive integer specifying heartbeat timeout for the state in seconds. This value should be lower than the one specified for `timeout_seconds`. If more time than the specified heartbeat elapses between heartbeats from the task, then the interpreter fails the state with a `States.Timeout` Error Name.
63+
heartbeat_seconds_path (str, optional): Path specifying the state's heartbeat value in seconds from the state input. When resolved, the path must select a field whose value is a positive integer.
6064
comment (str, optional): Human-readable comment or description. (default: None)
6165
input_path (str, optional): Path applied to the state’s raw input to select some or all of it; that selection is used by the state. (default: '$')
6266
parameters (dict, optional): The value of this field becomes the effective input for the state.
@@ -84,7 +88,9 @@ def __init__(self, state_id, wait_for_completion=True, **kwargs):
8488
state_id (str): State name whose length **must be** less than or equal to 128 unicode characters. State names **must be** unique within the scope of the whole state machine.
8589
wait_for_completion(bool, optional): Boolean value set to `True` if the Task state should wait for the batch job to complete before proceeding to the next step in the workflow. Set to `False` if the Task state should submit the batch job and proceed to the next step. (default: True)
8690
timeout_seconds (int, optional): Positive integer specifying timeout for the state in seconds. If the state runs longer than the specified timeout, then the interpreter fails the state with a `States.Timeout` Error Name. (default: 60)
91+
timeout_seconds_path (str, optional): Path specifying the state's timeout value in seconds from the state input. When resolved, the path must select a field whose value is a positive integer.
8792
heartbeat_seconds (int, optional): Positive integer specifying heartbeat timeout for the state in seconds. This value should be lower than the one specified for `timeout_seconds`. If more time than the specified heartbeat elapses between heartbeats from the task, then the interpreter fails the state with a `States.Timeout` Error Name.
93+
heartbeat_seconds_path (str, optional): Path specifying the state's heartbeat value in seconds from the state input. When resolved, the path must select a field whose value is a positive integer.
8894
comment (str, optional): Human-readable comment or description. (default: None)
8995
input_path (str, optional): Path applied to the state’s raw input to select some or all of it; that selection is used by the state. (default: '$')
9096
parameters (dict, optional): The value of this field becomes the effective input for the state.
@@ -112,7 +118,9 @@ def __init__(self, state_id, wait_for_completion=True, **kwargs):
112118
state_id (str): State name whose length **must be** less than or equal to 128 unicode characters. State names **must be** unique within the scope of the whole state machine.
113119
wait_for_completion(bool, optional): Boolean value set to `True` if the Task state should wait for the ecs job to complete before proceeding to the next step in the workflow. Set to `False` if the Task state should submit the ecs job and proceed to the next step. (default: True)
114120
timeout_seconds (int, optional): Positive integer specifying timeout for the state in seconds. If the state runs longer than the specified timeout, then the interpreter fails the state with a `States.Timeout` Error Name. (default: 60)
121+
timeout_seconds_path (str, optional): Path specifying the state's timeout value in seconds from the state input. When resolved, the path must select a field whose value is a positive integer.
115122
heartbeat_seconds (int, optional): Positive integer specifying heartbeat timeout for the state in seconds. This value should be lower than the one specified for `timeout_seconds`. If more time than the specified heartbeat elapses between heartbeats from the task, then the interpreter fails the state with a `States.Timeout` Error Name.
123+
heartbeat_seconds_path (str, optional): Path specifying the state's heartbeat value in seconds from the state input. When resolved, the path must select a field whose value is a positive integer.
116124
comment (str, optional): Human-readable comment or description. (default: None)
117125
input_path (str, optional): Path applied to the state’s raw input to select some or all of it; that selection is used by the state. (default: '$')
118126
parameters (dict, optional): The value of this field becomes the effective input for the state.

src/stepfunctions/steps/fields.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,12 @@ class Field(Enum):
5454
MaxConcurrency = 'max_concurrency'
5555

5656
# Task state fields
57-
Resource = 'resource'
58-
TimeoutSeconds = 'timeout_seconds'
59-
HeartbeatSeconds = 'heartbeat_seconds'
57+
Resource = 'resource'
58+
TimeoutSeconds = 'timeout_seconds'
59+
TimeoutSecondsPath = 'timeout_seconds_path'
60+
HeartbeatSeconds = 'heartbeat_seconds'
61+
HeartbeatSecondsPath = 'heartbeat_seconds_path'
62+
6063

6164
# Retry and catch fields
6265
ErrorEquals = 'error_equals'

0 commit comments

Comments
 (0)