change: remove primitive_or_expr() from conditions #3212

aoguo64 · 2022-07-05T20:16:01Z

Issue #, if available:

Description of changes:
Remove redundant primitive_or_expr() which is used in to_request() in some Pipeline conditions. This behavior is redundant since PropertyReferences or other PipelineVariables are interpolated when creating pipeline definition, early interpolation results in plain request dict (PipelineVariables are converted into dictionary) returned by ConditionStep.to_request(), which lose PipelineVariable information. Preserving PipelineVariable information is required by Pipeline local mode.

Testing done:
Updated related unit test cases and ran locally

Merge Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your pull request.

General

I have read the CONTRIBUTING doc
I certify that the changes I am introducing will be backward compatible, and I have discussed concerns about this, if any, with the Python SDK team
I used the commit message format described in CONTRIBUTING
I have passed the region in to all S3 and STS clients that I've initialized as part of this change.
I have updated any necessary documentation, including READMEs and API docs (if appropriate)

Tests

I have added tests that prove my fix is effective or that my feature works (if appropriate)
I have added unit and/or integration tests as appropriate to ensure backward compatibility of the changes
I have checked that my tests are not configured for a specific region or account (if appropriate)
I have used unique_name_from_base to create resource names in integ tests (if appropriate)

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

sagemaker-bot · 2022-07-05T20:21:28Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-unit-tests
Commit ID: 2dbbc90
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-05T20:30:32Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-unit-tests
Commit ID: 25a6a7c
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-05T21:02:42Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-local-mode-tests
Commit ID: 2dbbc90
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-05T21:07:35Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-unit-tests
Commit ID: 8598b98
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-05T21:12:49Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-local-mode-tests
Commit ID: 25a6a7c
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-05T21:20:49Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-slow-tests
Commit ID: 2dbbc90
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-05T21:21:52Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-notebook-tests
Commit ID: 2dbbc90
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-05T21:22:27Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-slow-tests
Commit ID: 25a6a7c
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-05T21:33:52Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-notebook-tests
Commit ID: 25a6a7c
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-05T21:37:31Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-unit-tests
Commit ID: 405567e
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

codecov-commenter · 2022-07-05T21:39:18Z

Codecov Report

Merging #3212 (a771db9) into master (46c68a9) will decrease coverage by 0.09%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #3212      +/-   ##
==========================================
- Coverage   88.79%   88.70%   -0.10%     
==========================================
  Files         202      202              
  Lines       17833    17827       -6     
==========================================
- Hits        15835    15813      -22     
- Misses       1998     2014      +16

Impacted Files	Coverage Δ
src/sagemaker/workflow/condition_step.py	`93.33% <100.00%> (-0.22%)`	⬇️
src/sagemaker/workflow/conditions.py	`80.64% <100.00%> (-17.32%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 46c68a9...a771db9. Read the comment docs.

sagemaker-bot · 2022-07-05T21:51:56Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-local-mode-tests
Commit ID: 8598b98
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-05T21:55:35Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-pr
Commit ID: 405567e
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-05T21:57:58Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-local-mode-tests
Commit ID: 405567e
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-05T22:10:36Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-notebook-tests
Commit ID: 8598b98
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-05T22:17:29Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-notebook-tests
Commit ID: 405567e
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-05T22:18:36Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-slow-tests
Commit ID: 405567e
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-05T22:20:08Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-slow-tests
Commit ID: 8598b98
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-06T00:16:07Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-pr
Commit ID: 405567e
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-06T01:08:40Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-pr
Commit ID: 405567e
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-06T05:11:25Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-unit-tests
Commit ID: 7dd245e
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-06T05:51:31Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-pr
Commit ID: 7dd245e
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-06T05:53:22Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-local-mode-tests
Commit ID: 7dd245e
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-06T06:12:20Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-notebook-tests
Commit ID: 7dd245e
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-06T06:21:19Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-unit-tests
Commit ID: 12ad8f4
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-06T06:21:22Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-slow-tests
Commit ID: 7dd245e
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-06T06:31:22Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-pr
Commit ID: 12ad8f4
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-06T06:39:53Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-local-mode-tests
Commit ID: 12ad8f4
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-06T07:04:04Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-notebook-tests
Commit ID: 12ad8f4
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-06T08:48:12Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-slow-tests
Commit ID: 12ad8f4
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-06T16:26:43Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-slow-tests
Commit ID: 12ad8f4
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-06T18:21:16Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-slow-tests
Commit ID: 12ad8f4
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-06T20:46:31Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-slow-tests
Commit ID: a771db9
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-06T21:07:02Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-unit-tests
Commit ID: a771db9
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-06T21:18:47Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-pr
Commit ID: a771db9
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-06T21:35:59Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-local-mode-tests
Commit ID: a771db9
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2022-07-06T21:44:29Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-notebook-tests
Commit ID: a771db9
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

nmadan · 2022-07-06T21:45:28Z

src/sagemaker/workflow/condition_step.py


 from sagemaker.deprecations import deprecated_class
 from sagemaker.workflow.conditions import Condition
 from sagemaker.workflow.step_collections import StepCollection
+from sagemaker.workflow.functions import JsonGet as NewJsonGet


nit: rename NewJsonGet to JsonGetV2

sagemaker-bot · 2022-07-06T22:20:41Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-slow-tests
Commit ID: a771db9
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

Co-authored-by: Ao Guo <[email protected]>

aoguo64 force-pushed the master branch from 2dbbc90 to 25a6a7c Compare July 5, 2022 20:26

aoguo64 force-pushed the master branch from 25a6a7c to 8598b98 Compare July 5, 2022 21:02

aoguo64 force-pushed the master branch from 8598b98 to 405567e Compare July 5, 2022 21:10

nmadan approved these changes Jul 5, 2022

View reviewed changes

jerrypeng7773 approved these changes Jul 5, 2022

View reviewed changes

staubhp approved these changes Jul 6, 2022

View reviewed changes

aoguo64 force-pushed the master branch from 405567e to 7dd245e Compare July 6, 2022 05:05

remove primitive_or_expr() from conditions

12ad8f4

aoguo64 force-pushed the master branch from 7dd245e to 12ad8f4 Compare July 6, 2022 05:54

Merge branch 'master' into master

a771db9

staubhp approved these changes Jul 6, 2022

View reviewed changes

nmadan reviewed Jul 6, 2022

View reviewed changes

nmadan approved these changes Jul 6, 2022

View reviewed changes

shreyapandit approved these changes Jul 12, 2022

View reviewed changes

mufaddal-rohawala approved these changes Jul 12, 2022

View reviewed changes

navinsoni changed the title ~~remove primitive_or_expr() from conditions~~ change: remove primitive_or_expr() from conditions Jul 12, 2022

navinsoni merged commit bd8ea40 into aws:master Jul 12, 2022

JoseJuan98 pushed a commit to JoseJuan98/sagemaker-python-sdk that referenced this pull request Mar 4, 2023

change: remove primitive_or_expr() from conditions (aws#3212)

31c5d65

Co-authored-by: Ao Guo <[email protected]>

change: remove primitive_or_expr() from conditions #3212

change: remove primitive_or_expr() from conditions #3212

Uh oh!

Conversation

aoguo64 commented Jul 5, 2022

Merge Checklist

General

Tests

Uh oh!

sagemaker-bot commented Jul 5, 2022

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Jul 5, 2022

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Jul 5, 2022

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Jul 5, 2022

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Jul 5, 2022

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Jul 5, 2022

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Jul 5, 2022

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Jul 5, 2022

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Jul 5, 2022

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Jul 5, 2022

AWS CodeBuild CI Report

Uh oh!

codecov-commenter commented Jul 5, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

sagemaker-bot commented Jul 5, 2022

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Jul 5, 2022

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Jul 5, 2022

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Jul 5, 2022

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Jul 5, 2022

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Jul 5, 2022

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Jul 5, 2022

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Jul 6, 2022

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Jul 6, 2022

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Jul 6, 2022

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Jul 6, 2022

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Jul 6, 2022

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Jul 6, 2022

codecov-commenter commented Jul 5, 2022 •

edited

Loading