From 4aa6c7cf161e3c355c739b51b9fa0850f2b64b08 Mon Sep 17 00:00:00 2001 From: Molly He Date: Tue, 25 Feb 2025 16:24:20 -0800 Subject: [PATCH 01/35] Test py312 ci support --- .github/workflows/codebuild-ci-health.yml | 2 +- .github/workflows/codebuild-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codebuild-ci-health.yml b/.github/workflows/codebuild-ci-health.yml index 7ecefd310f..69f982f638 100644 --- a/.github/workflows/codebuild-ci-health.yml +++ b/.github/workflows/codebuild-ci-health.yml @@ -26,7 +26,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["py38", "py39", "py310", "py311"] + python-version: ["py38", "py39", "py310", "py311","py312"] steps: - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index 8c6bd6b337..f9fcffbd48 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -63,7 +63,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["py38","py39","py310","py311"] + python-version: ["py38","py39","py310","py311","py312"] steps: - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 From 280424dbdbd84a2ba1d416c1c85991dcb61260d1 Mon Sep 17 00:00:00 2001 From: Molly He Date: Wed, 26 Feb 2025 17:08:03 -0800 Subject: [PATCH 02/35] Test py312 ci support --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index b16c0d2f0b..963dd9dda5 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ [tox] isolated_build = true -envlist = black-format,flake8,pylint,docstyle,sphinx,doc8,twine,py38,py39,py310,py311 +envlist = black-format,flake8,pylint,docstyle,sphinx,doc8,twine,py38,py39,py310,py311,py312 skip_missing_interpreters = False @@ -90,7 +90,7 @@ commands = pytest {posargs} deps = .[test] depends = - {py38,py39,py310,p311}: clean + {py38,py39,py310,py311,py312}: clean [testenv:runcoverage] description = run unit tests with coverage From 1374184c990fa59330dcda19eabf59cb24b69593 Mon Sep 17 00:00:00 2001 From: Molly He Date: Tue, 17 Dec 2024 17:12:24 -0800 Subject: [PATCH 03/35] first commit --- .gitconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .gitconfig diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000000..e7f2a61985 --- /dev/null +++ b/.gitconfig @@ -0,0 +1,11 @@ +[secrets] + patterns = [aA]pollo|[bB]razil|[cC]oral|[oO]din + patterns = tt.amazon.com|issues.amazon.com|cr.amazon.com|sim.amazon.com + patterns = ic.gov|sgov.gov + patterns = us-iso|aws-iso + providers = git secrets --aws-provider + patterns = [A-Z0-9]{20} + patterns = (\"|')?(AWS|aws|Aws)?_?(SECRET|secret|Secret)?_?(ACCESS|access|Access)?_?(KEY|key|Key)(\"|')?\\s*(:|=>|=)\\s*(\"|')?[A-Za-z0-9/\\+=]{40}(\"|')? + patterns = (\"|')?(AWS|aws|Aws)?_?(ACCOUNT|account|Account)_?(ID|id|Id)?(\"|')?\\s*(:|=>|=)\\s*(\"|')?[0-9]{4}\\-?[0-9]{4}\\-?[0-9]{4}(\"|')? + patterns = (ironman|IronMan|Ironman)* + patterns = iron man|Iron Man|Iron man From 49de84423bc257ddaacc22664d39f4f8be17142a Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 2 Jan 2025 13:22:34 -0800 Subject: [PATCH 04/35] test to point to personal stack --- src/sagemaker/telemetry/telemetry_logging.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/sagemaker/telemetry/telemetry_logging.py b/src/sagemaker/telemetry/telemetry_logging.py index b0ecedee4c..a55ea6216b 100644 --- a/src/sagemaker/telemetry/telemetry_logging.py +++ b/src/sagemaker/telemetry/telemetry_logging.py @@ -230,9 +230,17 @@ def _construct_url( ) -> str: """Construct the URL for the telemetry request""" + # base_url = ( + # f"https://sm-pysdk-t-{region}.s3.{region}.amazonaws.com/telemetry?" + # f"x-accountId={accountId}" + # f"&x-status={status}" + # f"&x-feature={feature}" + # ) + + # Change telemetry emitter to point to Molly's personal stack base_url = ( - f"https://sm-pysdk-t-{region}.s3.{region}.amazonaws.com/telemetry?" - f"x-accountId={accountId}" + f"https://sm-pysdk-t-personal-mollyhe-pia.s3.us-west-2.amazonaws.com/telemetry?" + f"x-accountId=879381237580" f"&x-status={status}" f"&x-feature={feature}" ) From 696cb47d2ee48db11962e7ae752b6d46ca754a91 Mon Sep 17 00:00:00 2001 From: Molly He Date: Wed, 26 Feb 2025 17:17:14 -0800 Subject: [PATCH 05/35] changed tox.ini --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 0122a6bf3c..664697b39b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,6 +29,7 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ] dependencies = [ "attrs>=23.1.0,<24", From 5d35bd054f589870726328d5bb8760a911681914 Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 27 Feb 2025 11:10:27 -0800 Subject: [PATCH 06/35] Revert "changed tox.ini" This reverts commit 696cb47d2ee48db11962e7ae752b6d46ca754a91. --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 664697b39b..0122a6bf3c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,6 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", ] dependencies = [ "attrs>=23.1.0,<24", From 2ab95fbdd4866a6d9eeea727e5fa9710fb8f997e Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 27 Feb 2025 11:12:42 -0800 Subject: [PATCH 07/35] Revert "Revert "changed tox.ini"" This reverts commit 5d35bd054f589870726328d5bb8760a911681914. --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 0122a6bf3c..664697b39b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,6 +29,7 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ] dependencies = [ "attrs>=23.1.0,<24", From dc2fcd5e31d080a90fc1c84377bc4ee1153aa1ed Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 27 Feb 2025 11:14:43 -0800 Subject: [PATCH 08/35] Revert "Revert "Revert "changed tox.ini""" This reverts commit 2ab95fbdd4866a6d9eeea727e5fa9710fb8f997e. --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 664697b39b..0122a6bf3c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,6 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", ] dependencies = [ "attrs>=23.1.0,<24", From f143ca7a4c68fce0999ad6a71151fa1dfabf70c1 Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 27 Feb 2025 11:14:58 -0800 Subject: [PATCH 09/35] Revert "Revert "changed tox.ini"" This reverts commit 5d35bd054f589870726328d5bb8760a911681914. --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 0122a6bf3c..664697b39b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,6 +29,7 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ] dependencies = [ "attrs>=23.1.0,<24", From 31d74781b418c67e5b21429cc4159696b30015b8 Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 27 Feb 2025 11:15:01 -0800 Subject: [PATCH 10/35] Revert "changed tox.ini" This reverts commit 696cb47d2ee48db11962e7ae752b6d46ca754a91. --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 664697b39b..0122a6bf3c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,6 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", ] dependencies = [ "attrs>=23.1.0,<24", From f78febe2319b845344d55622d71efab6587da7df Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 27 Feb 2025 11:15:04 -0800 Subject: [PATCH 11/35] Revert "test to point to personal stack" This reverts commit 49de84423bc257ddaacc22664d39f4f8be17142a. --- src/sagemaker/telemetry/telemetry_logging.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/sagemaker/telemetry/telemetry_logging.py b/src/sagemaker/telemetry/telemetry_logging.py index a55ea6216b..b0ecedee4c 100644 --- a/src/sagemaker/telemetry/telemetry_logging.py +++ b/src/sagemaker/telemetry/telemetry_logging.py @@ -230,17 +230,9 @@ def _construct_url( ) -> str: """Construct the URL for the telemetry request""" - # base_url = ( - # f"https://sm-pysdk-t-{region}.s3.{region}.amazonaws.com/telemetry?" - # f"x-accountId={accountId}" - # f"&x-status={status}" - # f"&x-feature={feature}" - # ) - - # Change telemetry emitter to point to Molly's personal stack base_url = ( - f"https://sm-pysdk-t-personal-mollyhe-pia.s3.us-west-2.amazonaws.com/telemetry?" - f"x-accountId=879381237580" + f"https://sm-pysdk-t-{region}.s3.{region}.amazonaws.com/telemetry?" + f"x-accountId={accountId}" f"&x-status={status}" f"&x-feature={feature}" ) From 766955021b848c3bd3e1ac6dfe8b472d784f72be Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 27 Feb 2025 11:15:06 -0800 Subject: [PATCH 12/35] Revert "first commit" This reverts commit 1374184c990fa59330dcda19eabf59cb24b69593. --- .gitconfig | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 .gitconfig diff --git a/.gitconfig b/.gitconfig deleted file mode 100644 index e7f2a61985..0000000000 --- a/.gitconfig +++ /dev/null @@ -1,11 +0,0 @@ -[secrets] - patterns = [aA]pollo|[bB]razil|[cC]oral|[oO]din - patterns = tt.amazon.com|issues.amazon.com|cr.amazon.com|sim.amazon.com - patterns = ic.gov|sgov.gov - patterns = us-iso|aws-iso - providers = git secrets --aws-provider - patterns = [A-Z0-9]{20} - patterns = (\"|')?(AWS|aws|Aws)?_?(SECRET|secret|Secret)?_?(ACCESS|access|Access)?_?(KEY|key|Key)(\"|')?\\s*(:|=>|=)\\s*(\"|')?[A-Za-z0-9/\\+=]{40}(\"|')? - patterns = (\"|')?(AWS|aws|Aws)?_?(ACCOUNT|account|Account)_?(ID|id|Id)?(\"|')?\\s*(:|=>|=)\\s*(\"|')?[0-9]{4}\\-?[0-9]{4}\\-?[0-9]{4}(\"|')? - patterns = (ironman|IronMan|Ironman)* - patterns = iron man|Iron Man|Iron man From 598447f10ce83f3213e3b8f52e932c51ff78560a Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 27 Feb 2025 11:22:06 -0800 Subject: [PATCH 13/35] add pyproject.toml --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 0122a6bf3c..664697b39b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,6 +29,7 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ] dependencies = [ "attrs>=23.1.0,<24", From c915fed17f291930aca845b8788f070d2ce71b21 Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 27 Feb 2025 11:33:56 -0800 Subject: [PATCH 14/35] add py312 to ci --- .github/workflows/codebuild-ci-health.yml | 2 +- .github/workflows/codebuild-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codebuild-ci-health.yml b/.github/workflows/codebuild-ci-health.yml index 7ecefd310f..69f982f638 100644 --- a/.github/workflows/codebuild-ci-health.yml +++ b/.github/workflows/codebuild-ci-health.yml @@ -26,7 +26,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["py38", "py39", "py310", "py311"] + python-version: ["py38", "py39", "py310", "py311","py312"] steps: - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index 8c6bd6b337..f9fcffbd48 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -63,7 +63,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["py38","py39","py310","py311"] + python-version: ["py38","py39","py310","py311","py312"] steps: - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 From 332389c66888faa9deb3fdc2013f1418aaaf677a Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 27 Feb 2025 11:48:39 -0800 Subject: [PATCH 15/35] bump numpy version --- pyproject.toml | 2 +- requirements/extras/test_requirements.txt | 2 +- src/sagemaker/serve/utils/conda_in_process.yml | 2 +- tests/data/serve_resources/mlflow/pytorch/requirements.txt | 2 +- tests/data/serve_resources/mlflow/xgboost/requirements.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 664697b39b..c6875a8e70 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -40,7 +40,7 @@ dependencies = [ "google-pasta", "importlib-metadata>=1.4.0,<7.0", "jsonschema", - "numpy>=1.9.0,<2.0", + "numpy>=1.26.4,<2.0", "omegaconf>=2.2,<=2.3", "packaging>=20.0", "pandas", diff --git a/requirements/extras/test_requirements.txt b/requirements/extras/test_requirements.txt index fe31300c22..e1ef35a108 100644 --- a/requirements/extras/test_requirements.txt +++ b/requirements/extras/test_requirements.txt @@ -1,5 +1,5 @@ tox==3.24.5 -numpy>=1.24.0 +numpy>=1.26.4 build[virtualenv]==1.2.1 flake8==4.0.1 pytest==6.2.5 diff --git a/src/sagemaker/serve/utils/conda_in_process.yml b/src/sagemaker/serve/utils/conda_in_process.yml index 61badaa52f..36df518e24 100644 --- a/src/sagemaker/serve/utils/conda_in_process.yml +++ b/src/sagemaker/serve/utils/conda_in_process.yml @@ -12,7 +12,7 @@ dependencies: - boto3>=1.34.142,<2.0 - cloudpickle==2.2.1 - google-pasta - - numpy>=1.9.0,<2.0 + - numpy>=1.26.4,<2.0 - protobuf>=3.12,<5.0 - smdebug_rulesconfig==1.0.1 - importlib-metadata>=1.4.0,<7.0 diff --git a/tests/data/serve_resources/mlflow/pytorch/requirements.txt b/tests/data/serve_resources/mlflow/pytorch/requirements.txt index 0446ed5053..0c07bf38fd 100644 --- a/tests/data/serve_resources/mlflow/pytorch/requirements.txt +++ b/tests/data/serve_resources/mlflow/pytorch/requirements.txt @@ -5,7 +5,7 @@ cloudpickle==2.2.1 defusedxml==0.7.1 dill==0.3.8 gmpy2==2.1.2 -numpy==1.24.4 +numpy==1.26.4 opt-einsum==3.3.0 packaging==21.3 pandas==2.2.1 diff --git a/tests/data/serve_resources/mlflow/xgboost/requirements.txt b/tests/data/serve_resources/mlflow/xgboost/requirements.txt index 1130dcaec5..e296c4aaed 100644 --- a/tests/data/serve_resources/mlflow/xgboost/requirements.txt +++ b/tests/data/serve_resources/mlflow/xgboost/requirements.txt @@ -1,6 +1,6 @@ mlflow==2.13.2 lz4==4.3.2 -numpy==1.24.4 +numpy==1.26.4 pandas==2.0.3 psutil==5.9.8 scikit-learn==1.3.2 From 041c739a038247e65b64db9916245e2be5afe3db Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 27 Feb 2025 12:37:29 -0800 Subject: [PATCH 16/35] numpy version change --- pyproject.toml | 2 +- src/sagemaker/serve/utils/conda_in_process.yml | 2 +- tests/unit/sagemaker/jumpstart/constants.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c6875a8e70..a5ab22d3e5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -40,7 +40,7 @@ dependencies = [ "google-pasta", "importlib-metadata>=1.4.0,<7.0", "jsonschema", - "numpy>=1.26.4,<2.0", + "numpy>=1.26.4,<3.0", "omegaconf>=2.2,<=2.3", "packaging>=20.0", "pandas", diff --git a/src/sagemaker/serve/utils/conda_in_process.yml b/src/sagemaker/serve/utils/conda_in_process.yml index 36df518e24..92a490fcd5 100644 --- a/src/sagemaker/serve/utils/conda_in_process.yml +++ b/src/sagemaker/serve/utils/conda_in_process.yml @@ -12,7 +12,7 @@ dependencies: - boto3>=1.34.142,<2.0 - cloudpickle==2.2.1 - google-pasta - - numpy>=1.26.4,<2.0 + - numpy>=1.26.4,<3.0 - protobuf>=3.12,<5.0 - smdebug_rulesconfig==1.0.1 - importlib-metadata>=1.4.0,<7.0 diff --git a/tests/unit/sagemaker/jumpstart/constants.py b/tests/unit/sagemaker/jumpstart/constants.py index 59f38bd189..2d1bc55c03 100644 --- a/tests/unit/sagemaker/jumpstart/constants.py +++ b/tests/unit/sagemaker/jumpstart/constants.py @@ -14360,7 +14360,7 @@ "jmespath==1.0.1", "jsonschema==4.17.3", "multiprocess==0.70.14", - "numpy==1.24.3", + "numpy==1.26.4", "oscrypto==1.3.0", "packaging==23.1", "pandas==2.0.2", From 88fbe0cbb6f6e69dcc92ac392ee16070f8eff05f Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 27 Feb 2025 13:28:55 -0800 Subject: [PATCH 17/35] add py312 --- src/sagemaker/fw_utils.py | 12 ++++++------ src/sagemaker/processing.py | 2 +- src/sagemaker/serve/model_format/mlflow/constants.py | 2 ++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/sagemaker/fw_utils.py b/src/sagemaker/fw_utils.py index 0e4e582261..edd9c65f85 100644 --- a/src/sagemaker/fw_utils.py +++ b/src/sagemaker/fw_utils.py @@ -689,7 +689,7 @@ def validate_smdistributed( framework_name (str): A string representing the name of framework selected. framework_version (str): A string representing the framework version selected. py_version (str): A string representing the python version selected. - Ex: `py38, py39, py310, py311` + Ex: `py38, py39, py310, py311, py312` distribution (dict): A dictionary with information to enable distributed training. (Defaults to None if distributed training is not enabled.) For example: @@ -762,7 +762,7 @@ def _validate_smdataparallel_args( framework_name (str): A string representing the name of framework selected. Ex: `tensorflow` framework_version (str): A string representing the framework version selected. Ex: `2.3.1` py_version (str): A string representing the python version selected. - Ex: `py38, py39, py310, py311` + Ex: `py38, py39, py310, py311, py312` distribution (dict): A dictionary with information to enable distributed training. (Defaults to None if distributed training is not enabled.) Ex: @@ -846,7 +846,7 @@ def validate_distribution( framework_name (str): A string representing the name of framework selected. framework_version (str): A string representing the framework version selected. py_version (str): A string representing the python version selected. - Ex: `py38, py39, py310, py311` + Ex: `py38, py39, py310, py311, py312` image_uri (str): A string representing a Docker image URI. kwargs(dict): Additional kwargs passed to this function @@ -1010,7 +1010,7 @@ def validate_torch_distributed_distribution( } framework_version (str): A string representing the framework version selected. py_version (str): A string representing the python version selected. - Ex: `py38, py39, py310, py311` + Ex: `py38, py39, py310, py311, py312` image_uri (str): A string representing a Docker image URI. entry_point (str or PipelineVariable): The absolute or relative path to the local Python source file that should be executed as the entry point to @@ -1162,7 +1162,7 @@ def validate_version_or_image_args(framework_version, py_version, image_uri): Args: framework_version (str): The version of the framework. py_version (str): A string representing the python version selected. - Ex: `py38, py39, py310, py311` + Ex: `py38, py39, py310, py311, py312` image_uri (str): The URI of the image. Raises: @@ -1194,7 +1194,7 @@ def create_image_uri( instance_type (str): SageMaker instance type. Used to determine device type (cpu/gpu/family-specific optimized). framework_version (str): The version of the framework. - py_version (str): Optional. Python version Ex: `py38, py39, py310, py311`. + py_version (str): Optional. Python version Ex: `py38, py39, py310, py311, py312`. If not specified, image uri will not include a python component. account (str): AWS account that contains the image. (default: '520713654638') diff --git a/src/sagemaker/processing.py b/src/sagemaker/processing.py index d8674f269d..9fca394d44 100644 --- a/src/sagemaker/processing.py +++ b/src/sagemaker/processing.py @@ -1465,7 +1465,7 @@ def __init__( instance_type (str or PipelineVariable): The type of EC2 instance to use for processing, for example, 'ml.c4.xlarge'. py_version (str): Python version you want to use for executing your - model training code. Ex `py38, py39, py310, py311`. Value + model training code. Ex `py38, py39, py310, py311, py312`. Value is ignored when ``image_uri`` is provided. image_uri (str or PipelineVariable): The URI of the Docker image to use for the processing jobs (default: None). diff --git a/src/sagemaker/serve/model_format/mlflow/constants.py b/src/sagemaker/serve/model_format/mlflow/constants.py index ff7553ea5f..ef09c8d90c 100644 --- a/src/sagemaker/serve/model_format/mlflow/constants.py +++ b/src/sagemaker/serve/model_format/mlflow/constants.py @@ -19,6 +19,8 @@ "py39": "1.13.1", "py310": "2.2.0", "py311": "2.3.0", + "py312": "2.5.0", + } MODEL_PACKAGE_ARN_REGEX = ( r"^arn:aws:sagemaker:[a-z0-9\-]+:[0-9]{12}:model-package\/(.*?)(?:/(\d+))?$" From 5c20eee4293a65c468077cb55be8b85f6810c90f Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 27 Feb 2025 13:38:59 -0800 Subject: [PATCH 18/35] upgrade pip version --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 963dd9dda5..d6f6405ba5 100644 --- a/tox.ini +++ b/tox.ini @@ -67,7 +67,7 @@ markers = [testenv] setenv = PYTHONHASHSEED=42 -pip_version = pip==21.3 +pip_version = pip==24.3 passenv = AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY @@ -132,7 +132,7 @@ commands = twine check dist/*.tar.gz [testenv:sphinx] -pip_version = pip==21.3 +pip_version = pip==24.3 changedir = doc # pip install requirements.txt is separate as RTD does it in separate steps # having the requirements.txt installed in deps above results in Double Requirement exception From 3feadc5061f32103796f2eb2d92f9355512e1600 Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 27 Feb 2025 16:32:55 -0800 Subject: [PATCH 19/35] add setuptools wheel to tox.ini --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index d6f6405ba5..af95b9b364 100644 --- a/tox.ini +++ b/tox.ini @@ -86,6 +86,7 @@ commands = pip install 'torch==2.0.1+cpu' -f 'https://download.pytorch.org/whl/torch_stable.html' pip install 'torchvision==0.15.2+cpu' -f 'https://download.pytorch.org/whl/torch_stable.html' pip install 'dill>=0.3.8' + pip install --upgrade pip setuptools wheel pytest {posargs} deps = .[test] From a27527d8b5771fdf66f456cbeb714085c7639e7f Mon Sep 17 00:00:00 2001 From: Molly He Date: Fri, 28 Feb 2025 14:47:07 -0800 Subject: [PATCH 20/35] add pyyaml version constraint, remove py312 from docstring because there is no py312 image yet --- src/sagemaker/fw_utils.py | 12 ++++++------ src/sagemaker/processing.py | 2 +- src/sagemaker/serve/model_format/mlflow/constants.py | 2 -- tox.ini | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/sagemaker/fw_utils.py b/src/sagemaker/fw_utils.py index edd9c65f85..0e4e582261 100644 --- a/src/sagemaker/fw_utils.py +++ b/src/sagemaker/fw_utils.py @@ -689,7 +689,7 @@ def validate_smdistributed( framework_name (str): A string representing the name of framework selected. framework_version (str): A string representing the framework version selected. py_version (str): A string representing the python version selected. - Ex: `py38, py39, py310, py311, py312` + Ex: `py38, py39, py310, py311` distribution (dict): A dictionary with information to enable distributed training. (Defaults to None if distributed training is not enabled.) For example: @@ -762,7 +762,7 @@ def _validate_smdataparallel_args( framework_name (str): A string representing the name of framework selected. Ex: `tensorflow` framework_version (str): A string representing the framework version selected. Ex: `2.3.1` py_version (str): A string representing the python version selected. - Ex: `py38, py39, py310, py311, py312` + Ex: `py38, py39, py310, py311` distribution (dict): A dictionary with information to enable distributed training. (Defaults to None if distributed training is not enabled.) Ex: @@ -846,7 +846,7 @@ def validate_distribution( framework_name (str): A string representing the name of framework selected. framework_version (str): A string representing the framework version selected. py_version (str): A string representing the python version selected. - Ex: `py38, py39, py310, py311, py312` + Ex: `py38, py39, py310, py311` image_uri (str): A string representing a Docker image URI. kwargs(dict): Additional kwargs passed to this function @@ -1010,7 +1010,7 @@ def validate_torch_distributed_distribution( } framework_version (str): A string representing the framework version selected. py_version (str): A string representing the python version selected. - Ex: `py38, py39, py310, py311, py312` + Ex: `py38, py39, py310, py311` image_uri (str): A string representing a Docker image URI. entry_point (str or PipelineVariable): The absolute or relative path to the local Python source file that should be executed as the entry point to @@ -1162,7 +1162,7 @@ def validate_version_or_image_args(framework_version, py_version, image_uri): Args: framework_version (str): The version of the framework. py_version (str): A string representing the python version selected. - Ex: `py38, py39, py310, py311, py312` + Ex: `py38, py39, py310, py311` image_uri (str): The URI of the image. Raises: @@ -1194,7 +1194,7 @@ def create_image_uri( instance_type (str): SageMaker instance type. Used to determine device type (cpu/gpu/family-specific optimized). framework_version (str): The version of the framework. - py_version (str): Optional. Python version Ex: `py38, py39, py310, py311, py312`. + py_version (str): Optional. Python version Ex: `py38, py39, py310, py311`. If not specified, image uri will not include a python component. account (str): AWS account that contains the image. (default: '520713654638') diff --git a/src/sagemaker/processing.py b/src/sagemaker/processing.py index 9fca394d44..d8674f269d 100644 --- a/src/sagemaker/processing.py +++ b/src/sagemaker/processing.py @@ -1465,7 +1465,7 @@ def __init__( instance_type (str or PipelineVariable): The type of EC2 instance to use for processing, for example, 'ml.c4.xlarge'. py_version (str): Python version you want to use for executing your - model training code. Ex `py38, py39, py310, py311, py312`. Value + model training code. Ex `py38, py39, py310, py311`. Value is ignored when ``image_uri`` is provided. image_uri (str or PipelineVariable): The URI of the Docker image to use for the processing jobs (default: None). diff --git a/src/sagemaker/serve/model_format/mlflow/constants.py b/src/sagemaker/serve/model_format/mlflow/constants.py index ef09c8d90c..ff7553ea5f 100644 --- a/src/sagemaker/serve/model_format/mlflow/constants.py +++ b/src/sagemaker/serve/model_format/mlflow/constants.py @@ -19,8 +19,6 @@ "py39": "1.13.1", "py310": "2.2.0", "py311": "2.3.0", - "py312": "2.5.0", - } MODEL_PACKAGE_ARN_REGEX = ( r"^arn:aws:sagemaker:[a-z0-9\-]+:[0-9]{12}:model-package\/(.*?)(?:/(\d+))?$" diff --git a/tox.ini b/tox.ini index af95b9b364..8e7e2d8611 100644 --- a/tox.ini +++ b/tox.ini @@ -86,7 +86,7 @@ commands = pip install 'torch==2.0.1+cpu' -f 'https://download.pytorch.org/whl/torch_stable.html' pip install 'torchvision==0.15.2+cpu' -f 'https://download.pytorch.org/whl/torch_stable.html' pip install 'dill>=0.3.8' - pip install --upgrade pip setuptools wheel + pip install "pyyaml>=6.0.1" pytest {posargs} deps = .[test] From 340ab3be95910b54233a59631785bf5a9c02d16f Mon Sep 17 00:00:00 2001 From: Molly He Date: Fri, 28 Feb 2025 14:58:05 -0800 Subject: [PATCH 21/35] update pyyaml version constraint --- pyproject.toml | 2 +- src/sagemaker/serve/utils/conda_in_process.yml | 2 +- tox.ini | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a5ab22d3e5..adf4e5c9a0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,7 +48,7 @@ dependencies = [ "platformdirs", "protobuf>=3.12,<6.0", "psutil", - "PyYAML~=6.0", + "PyYAML>=6.0.1", "requests", "sagemaker-core>=1.0.17,<2.0.0", "schema", diff --git a/src/sagemaker/serve/utils/conda_in_process.yml b/src/sagemaker/serve/utils/conda_in_process.yml index 92a490fcd5..e291487778 100644 --- a/src/sagemaker/serve/utils/conda_in_process.yml +++ b/src/sagemaker/serve/utils/conda_in_process.yml @@ -82,7 +82,7 @@ dependencies: - python-dateutil>=2.8.2 - pytz>=2023.3 - pytz-deprecation-shim>=0.1.0.post0 - - pyyaml>=5.4.1 + - pyyaml>=6.0.1 - regex>=2023.3.23 - requests>=2.28.2 - rich>=13.3.4 diff --git a/tox.ini b/tox.ini index 8e7e2d8611..d6f6405ba5 100644 --- a/tox.ini +++ b/tox.ini @@ -86,7 +86,6 @@ commands = pip install 'torch==2.0.1+cpu' -f 'https://download.pytorch.org/whl/torch_stable.html' pip install 'torchvision==0.15.2+cpu' -f 'https://download.pytorch.org/whl/torch_stable.html' pip install 'dill>=0.3.8' - pip install "pyyaml>=6.0.1" pytest {posargs} deps = .[test] From 5bfbb5595ea6a85484b8bc190b62d5ce2baf9c7a Mon Sep 17 00:00:00 2001 From: Molly He Date: Fri, 28 Feb 2025 15:11:05 -0800 Subject: [PATCH 22/35] update pyyaml version constraint --- requirements/extras/local_requirements.txt | 2 +- requirements/extras/test_requirements.txt | 2 +- src/sagemaker/serve/utils/conda_in_process.yml | 2 +- src/sagemaker/serve/utils/in_process_requirements.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/extras/local_requirements.txt b/requirements/extras/local_requirements.txt index 68b9a1bcb3..ea57b82e9a 100644 --- a/requirements/extras/local_requirements.txt +++ b/requirements/extras/local_requirements.txt @@ -1,3 +1,3 @@ urllib3>=1.26.8,<3.0.0 docker>=5.0.2,<8.0.0 -PyYAML>=5.4.1,<7 +PyYAML>=6.0.1,<7 diff --git a/requirements/extras/test_requirements.txt b/requirements/extras/test_requirements.txt index e1ef35a108..872d33c04c 100644 --- a/requirements/extras/test_requirements.txt +++ b/requirements/extras/test_requirements.txt @@ -26,7 +26,7 @@ pandas==1.4.4 scikit-learn==1.3.0 cloudpickle==2.2.1 jsonpickle<4.0.0 -PyYAML==6.0 +PyYAML>=6.0.1 # TODO find workaround xgboost>=1.6.2,<=1.7.6 pillow>=10.0.1,<=11 diff --git a/src/sagemaker/serve/utils/conda_in_process.yml b/src/sagemaker/serve/utils/conda_in_process.yml index e291487778..0f6f9212ab 100644 --- a/src/sagemaker/serve/utils/conda_in_process.yml +++ b/src/sagemaker/serve/utils/conda_in_process.yml @@ -20,7 +20,7 @@ dependencies: - pandas - pathos - schema - - PyYAML~=6.0 + - PyYAML>=6.0.1 - jsonschema - platformdirs - tblib>=1.7.0,<4 diff --git a/src/sagemaker/serve/utils/in_process_requirements.txt b/src/sagemaker/serve/utils/in_process_requirements.txt index e356e1720d..c3569cd132 100644 --- a/src/sagemaker/serve/utils/in_process_requirements.txt +++ b/src/sagemaker/serve/utils/in_process_requirements.txt @@ -50,7 +50,7 @@ pyrsistent>=0.19.3 python-dateutil>=2.8.2 pytz>=2023.3 pytz-deprecation-shim>=0.1.0.post0 -pyyaml>=5.4.1 +pyyaml>=6.0.1 regex>=2023.3.23 requests>=2.28.2 rich>=13.3.4 From 5084e6f0df0418a49caf6a2de9f72b441adbc169 Mon Sep 17 00:00:00 2001 From: Molly He Date: Fri, 28 Feb 2025 15:32:24 -0800 Subject: [PATCH 23/35] deprecate py38 --- pyproject.toml | 3 +-- tox.ini | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index adf4e5c9a0..c4f9003e26 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ name = "sagemaker" dynamic = ["version", "optional-dependencies"] description = "Open source library for training and deploying models on Amazon SageMaker." readme = "README.rst" -requires-python = ">=3.8" +requires-python = ">=3.9" authors = [ { name = "Amazon Web Services" }, ] @@ -25,7 +25,6 @@ classifiers = [ "License :: OSI Approved :: Apache Software License", "Natural Language :: English", "Programming Language :: Python", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", diff --git a/tox.ini b/tox.ini index d6f6405ba5..eea75eab2a 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ [tox] isolated_build = true -envlist = black-format,flake8,pylint,docstyle,sphinx,doc8,twine,py38,py39,py310,py311,py312 +envlist = black-format,flake8,pylint,docstyle,sphinx,doc8,twine,py39,py310,py311,py312 skip_missing_interpreters = False @@ -90,7 +90,7 @@ commands = pytest {posargs} deps = .[test] depends = - {py38,py39,py310,py311,py312}: clean + {py39,py310,py311,py312}: clean [testenv:runcoverage] description = run unit tests with coverage From f679f2c13da0bda242b28955c9baf8184375bcbb Mon Sep 17 00:00:00 2001 From: Molly He Date: Fri, 28 Feb 2025 15:59:33 -0800 Subject: [PATCH 24/35] bump scipy --- pyproject.toml | 2 +- requirements/extras/scipy_requirements.txt | 2 +- requirements/extras/test_requirements.txt | 2 +- src/sagemaker/serve/utils/conda_in_process.yml | 2 +- tests/data/pipeline/model_step/pytorch_mnist/requirements.txt | 2 +- tests/data/remote_function/requirements.txt | 2 +- tests/data/workflow/requirements.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c4f9003e26..16b8f85c33 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,7 +39,7 @@ dependencies = [ "google-pasta", "importlib-metadata>=1.4.0,<7.0", "jsonschema", - "numpy>=1.26.4,<3.0", + "numpy>=1.26.0,<2.0", "omegaconf>=2.2,<=2.3", "packaging>=20.0", "pandas", diff --git a/requirements/extras/scipy_requirements.txt b/requirements/extras/scipy_requirements.txt index 0e99587e6e..44ce1d9331 100644 --- a/requirements/extras/scipy_requirements.txt +++ b/requirements/extras/scipy_requirements.txt @@ -1 +1 @@ -scipy==1.10.1 +scipy==1.11.3 diff --git a/requirements/extras/test_requirements.txt b/requirements/extras/test_requirements.txt index 872d33c04c..21088a3c40 100644 --- a/requirements/extras/test_requirements.txt +++ b/requirements/extras/test_requirements.txt @@ -1,5 +1,5 @@ tox==3.24.5 -numpy>=1.26.4 +numpy>=1.26.0,<2.0 build[virtualenv]==1.2.1 flake8==4.0.1 pytest==6.2.5 diff --git a/src/sagemaker/serve/utils/conda_in_process.yml b/src/sagemaker/serve/utils/conda_in_process.yml index 0f6f9212ab..b6266a9cf0 100644 --- a/src/sagemaker/serve/utils/conda_in_process.yml +++ b/src/sagemaker/serve/utils/conda_in_process.yml @@ -12,7 +12,7 @@ dependencies: - boto3>=1.34.142,<2.0 - cloudpickle==2.2.1 - google-pasta - - numpy>=1.26.4,<3.0 + - numpy>=1.26.0,<2.0 - protobuf>=3.12,<5.0 - smdebug_rulesconfig==1.0.1 - importlib-metadata>=1.4.0,<7.0 diff --git a/tests/data/pipeline/model_step/pytorch_mnist/requirements.txt b/tests/data/pipeline/model_step/pytorch_mnist/requirements.txt index 56d09228be..c25fca7e9f 100644 --- a/tests/data/pipeline/model_step/pytorch_mnist/requirements.txt +++ b/tests/data/pipeline/model_step/pytorch_mnist/requirements.txt @@ -1 +1 @@ -scipy>=1.8.1 +scipy>=1.11.3 diff --git a/tests/data/remote_function/requirements.txt b/tests/data/remote_function/requirements.txt index 0e99587e6e..44ce1d9331 100644 --- a/tests/data/remote_function/requirements.txt +++ b/tests/data/remote_function/requirements.txt @@ -1 +1 @@ -scipy==1.10.1 +scipy==1.11.3 diff --git a/tests/data/workflow/requirements.txt b/tests/data/workflow/requirements.txt index 0e99587e6e..44ce1d9331 100644 --- a/tests/data/workflow/requirements.txt +++ b/tests/data/workflow/requirements.txt @@ -1 +1 @@ -scipy==1.10.1 +scipy==1.11.3 From 66557601aaf1f34d82e310e9904c78baa1895074 Mon Sep 17 00:00:00 2001 From: Molly He Date: Fri, 28 Feb 2025 16:27:08 -0800 Subject: [PATCH 25/35] bump tensorflow and tensorboard --- requirements/extras/test_requirements.txt | 4 ++-- tests/data/serve_resources/mlflow/xgboost/requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/extras/test_requirements.txt b/requirements/extras/test_requirements.txt index 21088a3c40..3b5dcd2d5d 100644 --- a/requirements/extras/test_requirements.txt +++ b/requirements/extras/test_requirements.txt @@ -32,7 +32,7 @@ xgboost>=1.6.2,<=1.7.6 pillow>=10.0.1,<=11 opentelemetry-proto==1.27.0 protobuf==4.25.5 -tensorboard>=2.9.0,<=2.15.2 +tensorboard>=2.16.2,<=2.18.0 transformers==4.46.1 sentencepiece==0.1.99 # https://github.com/triton-inference-server/server/issues/6246 @@ -42,7 +42,7 @@ onnx==1.17.0 nbformat>=5.9,<6 accelerate>=0.24.1,<=0.27.0 schema==0.7.5 -tensorflow>=2.9.0,<=2.15.1 +tensorflow>=2.16.2,<=2.18.0 mlflow>=2.12.2,<2.13 huggingface_hub==0.26.2 uvicorn>=0.30.1 diff --git a/tests/data/serve_resources/mlflow/xgboost/requirements.txt b/tests/data/serve_resources/mlflow/xgboost/requirements.txt index e296c4aaed..6f879340a7 100644 --- a/tests/data/serve_resources/mlflow/xgboost/requirements.txt +++ b/tests/data/serve_resources/mlflow/xgboost/requirements.txt @@ -4,5 +4,5 @@ numpy==1.26.4 pandas==2.0.3 psutil==5.9.8 scikit-learn==1.3.2 -scipy==1.10.1 +scipy==1.11.3 xgboost==1.7.1 From 4116094876ba4936e30651aea4c7a81d713aca04 Mon Sep 17 00:00:00 2001 From: Molly He Date: Fri, 28 Feb 2025 17:01:27 -0800 Subject: [PATCH 26/35] bump dill --- src/sagemaker/serve/utils/conda_in_process.yml | 2 +- src/sagemaker/serve/utils/in_process_requirements.txt | 2 +- tests/data/serve_resources/mlflow/pytorch/conda.yaml | 2 +- tests/data/serve_resources/mlflow/pytorch/requirements.txt | 2 +- tox.ini | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/sagemaker/serve/utils/conda_in_process.yml b/src/sagemaker/serve/utils/conda_in_process.yml index b6266a9cf0..c423909791 100644 --- a/src/sagemaker/serve/utils/conda_in_process.yml +++ b/src/sagemaker/serve/utils/conda_in_process.yml @@ -43,7 +43,7 @@ dependencies: - colorama>=0.4.4 - contextlib2>=21.6.0 - decorator>=5.1.1 - - dill>=0.3.6 + - dill>=0.3.9 - docutils>=0.16 - entrypoints>=0.4 - filelock>=3.11.0 diff --git a/src/sagemaker/serve/utils/in_process_requirements.txt b/src/sagemaker/serve/utils/in_process_requirements.txt index c3569cd132..da1fd8e617 100644 --- a/src/sagemaker/serve/utils/in_process_requirements.txt +++ b/src/sagemaker/serve/utils/in_process_requirements.txt @@ -11,7 +11,7 @@ cloudpickle==2.2.1 colorama>=0.4.4 contextlib2>=21.6.0 decorator>=5.1.1 -dill>=0.3.6 +dill>=0.3.9 docutils>=0.16 entrypoints>=0.4 filelock>=3.11.0 diff --git a/tests/data/serve_resources/mlflow/pytorch/conda.yaml b/tests/data/serve_resources/mlflow/pytorch/conda.yaml index be61456197..021fe8ab9b 100644 --- a/tests/data/serve_resources/mlflow/pytorch/conda.yaml +++ b/tests/data/serve_resources/mlflow/pytorch/conda.yaml @@ -9,7 +9,7 @@ dependencies: - cffi==1.16.0 - cloudpickle==2.2.1 - defusedxml==0.7.1 - - dill==0.3.8 + - dill==0.3.9 - gmpy2==2.1.2 - numpy==1.26.4 - opt-einsum==3.3.0 diff --git a/tests/data/serve_resources/mlflow/pytorch/requirements.txt b/tests/data/serve_resources/mlflow/pytorch/requirements.txt index 0c07bf38fd..2bb0eb6761 100644 --- a/tests/data/serve_resources/mlflow/pytorch/requirements.txt +++ b/tests/data/serve_resources/mlflow/pytorch/requirements.txt @@ -3,7 +3,7 @@ astunparse==1.6.3 cffi==1.16.0 cloudpickle==2.2.1 defusedxml==0.7.1 -dill==0.3.8 +dill==0.3.9 gmpy2==2.1.2 numpy==1.26.4 opt-einsum==3.3.0 diff --git a/tox.ini b/tox.ini index eea75eab2a..ddb50674de 100644 --- a/tox.ini +++ b/tox.ini @@ -85,7 +85,7 @@ commands = pip install 'apache-airflow==2.9.3' --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-2.9.3/constraints-3.8.txt" pip install 'torch==2.0.1+cpu' -f 'https://download.pytorch.org/whl/torch_stable.html' pip install 'torchvision==0.15.2+cpu' -f 'https://download.pytorch.org/whl/torch_stable.html' - pip install 'dill>=0.3.8' + pip install 'dill>=0.3.9' pytest {posargs} deps = .[test] From 1a23c2a5356d12881b7e13fbc8d667d5e1166c22 Mon Sep 17 00:00:00 2001 From: Molly He Date: Fri, 28 Feb 2025 17:53:54 -0800 Subject: [PATCH 27/35] bump apache-airflow to ensure dill and greenlet version --- requirements/extras/test_requirements.txt | 2 +- tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/extras/test_requirements.txt b/requirements/extras/test_requirements.txt index 3b5dcd2d5d..c254b57f3e 100644 --- a/requirements/extras/test_requirements.txt +++ b/requirements/extras/test_requirements.txt @@ -14,7 +14,7 @@ awslogs==0.14.0 black==24.3.0 stopit==1.1.2 # Update tox.ini to have correct version of airflow constraints file -apache-airflow==2.9.3 +apache-airflow==2.10.4 apache-airflow-providers-amazon==7.2.1 attrs>=23.1.0,<24 fabric==2.6.0 diff --git a/tox.ini b/tox.ini index ddb50674de..d71d858f13 100644 --- a/tox.ini +++ b/tox.ini @@ -82,7 +82,7 @@ passenv = # Can be used to specify which tests to run, e.g.: tox -- -s commands = python -c "import os; os.system('install-custom-pkgs --install-boto-wheels')" - pip install 'apache-airflow==2.9.3' --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-2.9.3/constraints-3.8.txt" + pip install 'apache-airflow==2.10.4' --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-2.9.3/constraints-3.8.txt" pip install 'torch==2.0.1+cpu' -f 'https://download.pytorch.org/whl/torch_stable.html' pip install 'torchvision==0.15.2+cpu' -f 'https://download.pytorch.org/whl/torch_stable.html' pip install 'dill>=0.3.9' From 9b9eb329dc190e934d2aac2f6c34513caa0d60b5 Mon Sep 17 00:00:00 2001 From: Molly He Date: Mon, 3 Mar 2025 12:22:43 -0800 Subject: [PATCH 28/35] remove constraint for apache-airflow --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index d71d858f13..0c4aad3ddd 100644 --- a/tox.ini +++ b/tox.ini @@ -82,7 +82,7 @@ passenv = # Can be used to specify which tests to run, e.g.: tox -- -s commands = python -c "import os; os.system('install-custom-pkgs --install-boto-wheels')" - pip install 'apache-airflow==2.10.4' --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-2.9.3/constraints-3.8.txt" + pip install 'apache-airflow==2.10.4'" pip install 'torch==2.0.1+cpu' -f 'https://download.pytorch.org/whl/torch_stable.html' pip install 'torchvision==0.15.2+cpu' -f 'https://download.pytorch.org/whl/torch_stable.html' pip install 'dill>=0.3.9' From b5da91528683acd8a688882e3c4a8e4836ae0ee5 Mon Sep 17 00:00:00 2001 From: Molly He Date: Mon, 3 Mar 2025 12:32:33 -0800 Subject: [PATCH 29/35] remove constraint for apache-airflow --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 0c4aad3ddd..714e99d2e4 100644 --- a/tox.ini +++ b/tox.ini @@ -82,7 +82,7 @@ passenv = # Can be used to specify which tests to run, e.g.: tox -- -s commands = python -c "import os; os.system('install-custom-pkgs --install-boto-wheels')" - pip install 'apache-airflow==2.10.4'" + pip install 'apache-airflow==2.10.4' pip install 'torch==2.0.1+cpu' -f 'https://download.pytorch.org/whl/torch_stable.html' pip install 'torchvision==0.15.2+cpu' -f 'https://download.pytorch.org/whl/torch_stable.html' pip install 'dill>=0.3.9' From e0caf765a7f5894082eae37d3a5d330c6b166a3d Mon Sep 17 00:00:00 2001 From: Molly He Date: Mon, 3 Mar 2025 13:03:30 -0800 Subject: [PATCH 30/35] bump torch version --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 714e99d2e4..ca6252284f 100644 --- a/tox.ini +++ b/tox.ini @@ -83,7 +83,7 @@ passenv = commands = python -c "import os; os.system('install-custom-pkgs --install-boto-wheels')" pip install 'apache-airflow==2.10.4' - pip install 'torch==2.0.1+cpu' -f 'https://download.pytorch.org/whl/torch_stable.html' + pip install 'torch==2.3.1+cpu' -f 'https://download.pytorch.org/whl/torch_stable.html' pip install 'torchvision==0.15.2+cpu' -f 'https://download.pytorch.org/whl/torch_stable.html' pip install 'dill>=0.3.9' From c69de67b287e35470be7ae50b3f03bd024e257c9 Mon Sep 17 00:00:00 2001 From: Molly He Date: Mon, 3 Mar 2025 13:35:55 -0800 Subject: [PATCH 31/35] bump torchvision version --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index ca6252284f..77ed7d1fd5 100644 --- a/tox.ini +++ b/tox.ini @@ -84,7 +84,7 @@ commands = python -c "import os; os.system('install-custom-pkgs --install-boto-wheels')" pip install 'apache-airflow==2.10.4' pip install 'torch==2.3.1+cpu' -f 'https://download.pytorch.org/whl/torch_stable.html' - pip install 'torchvision==0.15.2+cpu' -f 'https://download.pytorch.org/whl/torch_stable.html' + pip install 'torchvision==0.18.1+cpu' -f 'https://download.pytorch.org/whl/torch_stable.html' pip install 'dill>=0.3.9' pytest {posargs} From ff0ab5abcac58d2c21af839488ec080f8bdbecb2 Mon Sep 17 00:00:00 2001 From: Molly He Date: Mon, 3 Mar 2025 15:39:36 -0800 Subject: [PATCH 32/35] modified tests to comply with py312 requirements --- .../feature_processor/test_config_uploader.py | 4 +- .../test_feature_scheduler.py | 2 +- .../sagemaker/huggingface/test_llm_utils.py | 4 +- .../estimator/test_sagemaker_config.py | 100 +++++++++--------- .../jumpstart/model/test_sagemaker_config.py | 44 ++++---- tests/unit/sagemaker/jumpstart/test_utils.py | 24 ++--- .../modules/train/test_model_trainer.py | 2 +- .../test_runtime_environment_manager.py | 2 +- .../sagemaker/remote_function/test_job.py | 2 +- .../djl_serving/test_djl_prepare.py | 6 +- .../test_multi_model_server_prepare.py | 6 +- .../model_server/tgi/test_tgi_prepare.py | 6 +- .../unit/sagemaker/workflow/test_pipeline.py | 48 ++++----- .../unit/sagemaker/workflow/test_triggers.py | 2 +- tests/unit/test_multidatamodel.py | 2 +- tests/unit/test_predictor_async.py | 4 +- tests/unit/test_session.py | 48 ++++----- 17 files changed, 153 insertions(+), 153 deletions(-) diff --git a/tests/unit/sagemaker/feature_store/feature_processor/test_config_uploader.py b/tests/unit/sagemaker/feature_store/feature_processor/test_config_uploader.py index 8193e93708..17b6060fb1 100644 --- a/tests/unit/sagemaker/feature_store/feature_processor/test_config_uploader.py +++ b/tests/unit/sagemaker/feature_store/feature_processor/test_config_uploader.py @@ -100,7 +100,7 @@ def remote_decorator_config_with_filter(sagemaker_session): def test_prepare_and_upload_callable(mock_stored_function, config_uploader, wrapped_func): mock_stored_function.save(wrapped_func).return_value = None config_uploader._prepare_and_upload_callable(wrapped_func, "s3_base_uri", sagemaker_session) - assert mock_stored_function.called_once_with( + assert mock_stored_function.assert_called_once_with( s3_base_uri="s3_base_uri", s3_kms_key=config_uploader.remote_decorator_config.s3_kms_key, hmac_key="some_secret_key", @@ -244,7 +244,7 @@ def test_prepare_step_input_channel( ) remote_decorator_config = config_uploader.remote_decorator_config - assert mock_upload_callable.called_once_with(wrapped_func) + assert mock_upload_callable.assert_called_once_with(wrapped_func) mock_script_upload.assert_called_once_with( spark_config=config_uploader.remote_decorator_config.spark_config, diff --git a/tests/unit/sagemaker/feature_store/feature_processor/test_feature_scheduler.py b/tests/unit/sagemaker/feature_store/feature_processor/test_feature_scheduler.py index 00bd3ca090..1823d0fa06 100644 --- a/tests/unit/sagemaker/feature_store/feature_processor/test_feature_scheduler.py +++ b/tests/unit/sagemaker/feature_store/feature_processor/test_feature_scheduler.py @@ -269,7 +269,7 @@ def test_to_pipeline( ) assert pipeline_arn == PIPELINE_ARN - assert mock_upload_callable.called_once_with(job_function) + assert mock_upload_callable.assert_called_once_with(job_function) local_dependencies_path = mock_runtime_manager().snapshot() mock_python_version = mock_runtime_manager()._current_python_version() container_args.extend(["--client_python_version", mock_python_version]) diff --git a/tests/unit/sagemaker/huggingface/test_llm_utils.py b/tests/unit/sagemaker/huggingface/test_llm_utils.py index 675a6fd885..9bb1b451a1 100644 --- a/tests/unit/sagemaker/huggingface/test_llm_utils.py +++ b/tests/unit/sagemaker/huggingface/test_llm_utils.py @@ -65,7 +65,7 @@ def test_huggingface_model_metadata_unauthorized_exception(self, mock_urllib): "Trying to access a gated/private HuggingFace model without valid credentials. " "Please provide a HUGGING_FACE_HUB_TOKEN in env_vars" ) - self.assertEquals(expected_error_msg, str(context.exception)) + self.assertEqual(expected_error_msg, str(context.exception)) @patch("sagemaker.huggingface.llm_utils.urllib") def test_huggingface_model_metadata_general_exception(self, mock_urllib): @@ -76,7 +76,7 @@ def test_huggingface_model_metadata_general_exception(self, mock_urllib): expected_error_msg = ( f"Did not find model metadata for the following HuggingFace Model ID {MOCK_HF_ID}" ) - self.assertEquals(expected_error_msg, str(context.exception)) + self.assertEqual(expected_error_msg, str(context.exception)) @patch("huggingface_hub.snapshot_download") def test_download_huggingface_model_metadata(self, mock_snapshot_download): diff --git a/tests/unit/sagemaker/jumpstart/estimator/test_sagemaker_config.py b/tests/unit/sagemaker/jumpstart/estimator/test_sagemaker_config.py index 073921d5ba..39eca166ee 100644 --- a/tests/unit/sagemaker/jumpstart/estimator/test_sagemaker_config.py +++ b/tests/unit/sagemaker/jumpstart/estimator/test_sagemaker_config.py @@ -123,16 +123,16 @@ def test_without_arg_overwrites_without_kwarg_collisions_with_config( mock_retrieve_model_init_kwargs.return_value = {} - self.assertEquals(mock_get_sagemaker_config_value.call_count, 1) - self.assertEquals(mock_estimator_init.call_args[1].get("role"), config_role) + self.assertEqual(mock_get_sagemaker_config_value.call_count, 1) + self.assertEqual(mock_estimator_init.call_args[1].get("role"), config_role) assert "enable_network_isolation" not in mock_estimator_init.call_args[1] assert "encrypt_inter_container_traffic" not in mock_estimator_init.call_args[1] estimator.deploy() - self.assertEquals(mock_get_sagemaker_config_value.call_count, 3) + self.assertEqual(mock_get_sagemaker_config_value.call_count, 3) - self.assertEquals(mock_estimator_deploy.call_args[1].get("role"), config_inference_role) + self.assertEqual(mock_estimator_deploy.call_args[1].get("role"), config_inference_role) assert "enable_network_isolation" not in mock_estimator_deploy.call_args[1] @@ -181,13 +181,13 @@ def test_without_arg_overwrites_with_kwarg_collisions_with_config( model_id=model_id, ) - self.assertEquals(mock_get_sagemaker_config_value.call_count, 3) - self.assertEquals(mock_estimator_init.call_args[1].get("role"), config_role) - self.assertEquals( + self.assertEqual(mock_get_sagemaker_config_value.call_count, 3) + self.assertEqual(mock_estimator_init.call_args[1].get("role"), config_role) + self.assertEqual( mock_estimator_init.call_args[1].get("enable_network_isolation"), config_enable_network_isolation, ) - self.assertEquals( + self.assertEqual( mock_estimator_init.call_args[1].get("encrypt_inter_container_traffic"), config_intercontainer_encryption, ) @@ -200,11 +200,11 @@ def test_without_arg_overwrites_with_kwarg_collisions_with_config( estimator.deploy() - self.assertEquals(mock_get_sagemaker_config_value.call_count, 6) + self.assertEqual(mock_get_sagemaker_config_value.call_count, 6) - self.assertEquals(mock_estimator_deploy.call_args[1].get("role"), config_inference_role) + self.assertEqual(mock_estimator_deploy.call_args[1].get("role"), config_inference_role) - self.assertEquals( + self.assertEqual( mock_estimator_deploy.call_args[1].get("enable_network_isolation"), config_inference_enable_network_isolation, ) @@ -257,13 +257,13 @@ def test_with_arg_overwrites_with_kwarg_collisions_with_config( encrypt_inter_container_traffic=override_encrypt_inter_container_traffic, ) - self.assertEquals(mock_get_sagemaker_config_value.call_count, 1) - self.assertEquals(mock_estimator_init.call_args[1].get("role"), override_role) - self.assertEquals( + self.assertEqual(mock_get_sagemaker_config_value.call_count, 1) + self.assertEqual(mock_estimator_init.call_args[1].get("role"), override_role) + self.assertEqual( mock_estimator_init.call_args[1].get("enable_network_isolation"), override_enable_network_isolation, ) - self.assertEquals( + self.assertEqual( mock_estimator_init.call_args[1].get("encrypt_inter_container_traffic"), override_encrypt_inter_container_traffic, ) @@ -280,13 +280,13 @@ def test_with_arg_overwrites_with_kwarg_collisions_with_config( enable_network_isolation=override_inference_enable_network_isolation, ) - self.assertEquals(mock_get_sagemaker_config_value.call_count, 3) + self.assertEqual(mock_get_sagemaker_config_value.call_count, 3) - self.assertEquals( + self.assertEqual( mock_estimator_deploy.call_args[1].get("role"), mock_inference_override_role ) - self.assertEquals( + self.assertEqual( mock_estimator_deploy.call_args[1].get("enable_network_isolation"), override_inference_enable_network_isolation, ) @@ -336,13 +336,13 @@ def test_with_arg_overwrites_without_kwarg_collisions_with_config( encrypt_inter_container_traffic=override_encrypt_inter_container_traffic, ) - self.assertEquals(mock_get_sagemaker_config_value.call_count, 1) - self.assertEquals(mock_estimator_init.call_args[1].get("role"), override_role) - self.assertEquals( + self.assertEqual(mock_get_sagemaker_config_value.call_count, 1) + self.assertEqual(mock_estimator_init.call_args[1].get("role"), override_role) + self.assertEqual( mock_estimator_init.call_args[1].get("enable_network_isolation"), override_enable_network_isolation, ) - self.assertEquals( + self.assertEqual( mock_estimator_init.call_args[1].get("encrypt_inter_container_traffic"), override_encrypt_inter_container_traffic, ) @@ -355,13 +355,13 @@ def test_with_arg_overwrites_without_kwarg_collisions_with_config( enable_network_isolation=override_inference_enable_network_isolation, ) - self.assertEquals(mock_get_sagemaker_config_value.call_count, 3) + self.assertEqual(mock_get_sagemaker_config_value.call_count, 3) - self.assertEquals( + self.assertEqual( mock_estimator_deploy.call_args[1].get("role"), mock_inference_override_role ) - self.assertEquals( + self.assertEqual( mock_estimator_deploy.call_args[1].get("enable_network_isolation"), override_inference_enable_network_isolation, ) @@ -412,8 +412,8 @@ def test_without_arg_overwrites_without_kwarg_collisions_without_config( model_id=model_id, ) - self.assertEquals(mock_get_sagemaker_config_value.call_count, 1) - self.assertEquals(mock_estimator_init.call_args[1].get("role"), execution_role) + self.assertEqual(mock_get_sagemaker_config_value.call_count, 1) + self.assertEqual(mock_estimator_init.call_args[1].get("role"), execution_role) assert "enable_network_isolation" not in mock_estimator_init.call_args[1] assert "encrypt_inter_container_traffic" not in mock_estimator_init.call_args[1] @@ -421,9 +421,9 @@ def test_without_arg_overwrites_without_kwarg_collisions_without_config( mock_retrieve_model_init_kwargs.return_value = {} - self.assertEquals(mock_get_sagemaker_config_value.call_count, 3) + self.assertEqual(mock_get_sagemaker_config_value.call_count, 3) - self.assertEquals(mock_estimator_deploy.call_args[1].get("role"), execution_role) + self.assertEqual(mock_estimator_deploy.call_args[1].get("role"), execution_role) assert "enable_network_isolation" not in mock_estimator_deploy.call_args[1] @@ -475,13 +475,13 @@ def test_without_arg_overwrites_with_kwarg_collisions_without_config( model_id=model_id, ) - self.assertEquals(mock_get_sagemaker_config_value.call_count, 3) - self.assertEquals(mock_estimator_init.call_args[1].get("role"), execution_role) - self.assertEquals( + self.assertEqual(mock_get_sagemaker_config_value.call_count, 3) + self.assertEqual(mock_estimator_init.call_args[1].get("role"), execution_role) + self.assertEqual( mock_estimator_init.call_args[1].get("enable_network_isolation"), metadata_enable_network_isolation, ) - self.assertEquals( + self.assertEqual( mock_estimator_init.call_args[1].get("encrypt_inter_container_traffic"), metadata_intercontainer_encryption, ) @@ -492,11 +492,11 @@ def test_without_arg_overwrites_with_kwarg_collisions_without_config( estimator.deploy() - self.assertEquals(mock_get_sagemaker_config_value.call_count, 6) + self.assertEqual(mock_get_sagemaker_config_value.call_count, 6) - self.assertEquals(mock_estimator_deploy.call_args[1].get("role"), execution_role) + self.assertEqual(mock_estimator_deploy.call_args[1].get("role"), execution_role) - self.assertEquals( + self.assertEqual( mock_estimator_deploy.call_args[1].get("enable_network_isolation"), metadata_inference_enable_network_isolation, ) @@ -548,13 +548,13 @@ def test_with_arg_overwrites_with_kwarg_collisions_without_config( encrypt_inter_container_traffic=override_encrypt_inter_container_traffic, ) - self.assertEquals(mock_get_sagemaker_config_value.call_count, 1) - self.assertEquals(mock_estimator_init.call_args[1].get("role"), override_role) - self.assertEquals( + self.assertEqual(mock_get_sagemaker_config_value.call_count, 1) + self.assertEqual(mock_estimator_init.call_args[1].get("role"), override_role) + self.assertEqual( mock_estimator_init.call_args[1].get("enable_network_isolation"), override_enable_network_isolation, ) - self.assertEquals( + self.assertEqual( mock_estimator_init.call_args[1].get("encrypt_inter_container_traffic"), override_encrypt_inter_container_traffic, ) @@ -568,11 +568,11 @@ def test_with_arg_overwrites_with_kwarg_collisions_without_config( enable_network_isolation=override_inference_enable_network_isolation, ) - self.assertEquals(mock_get_sagemaker_config_value.call_count, 3) + self.assertEqual(mock_get_sagemaker_config_value.call_count, 3) - self.assertEquals(mock_estimator_deploy.call_args[1].get("role"), override_inference_role) + self.assertEqual(mock_estimator_deploy.call_args[1].get("role"), override_inference_role) - self.assertEquals( + self.assertEqual( mock_estimator_deploy.call_args[1].get("enable_network_isolation"), override_inference_enable_network_isolation, ) @@ -618,13 +618,13 @@ def test_with_arg_overwrites_without_kwarg_collisions_without_config( enable_network_isolation=override_enable_network_isolation, encrypt_inter_container_traffic=override_encrypt_inter_container_traffic, ) - self.assertEquals(mock_get_sagemaker_config_value.call_count, 1) - self.assertEquals(mock_estimator_init.call_args[1].get("role"), override_role) - self.assertEquals( + self.assertEqual(mock_get_sagemaker_config_value.call_count, 1) + self.assertEqual(mock_estimator_init.call_args[1].get("role"), override_role) + self.assertEqual( mock_estimator_init.call_args[1].get("enable_network_isolation"), override_enable_network_isolation, ) - self.assertEquals( + self.assertEqual( mock_estimator_init.call_args[1].get("encrypt_inter_container_traffic"), override_encrypt_inter_container_traffic, ) @@ -634,11 +634,11 @@ def test_with_arg_overwrites_without_kwarg_collisions_without_config( enable_network_isolation=override_enable_network_isolation, ) - self.assertEquals(mock_get_sagemaker_config_value.call_count, 3) + self.assertEqual(mock_get_sagemaker_config_value.call_count, 3) - self.assertEquals(mock_estimator_deploy.call_args[1].get("role"), override_inference_role) + self.assertEqual(mock_estimator_deploy.call_args[1].get("role"), override_inference_role) - self.assertEquals( + self.assertEqual( mock_estimator_deploy.call_args[1].get("enable_network_isolation"), override_enable_network_isolation, ) diff --git a/tests/unit/sagemaker/jumpstart/model/test_sagemaker_config.py b/tests/unit/sagemaker/jumpstart/model/test_sagemaker_config.py index 2be4bde7e4..a0299ebb1a 100644 --- a/tests/unit/sagemaker/jumpstart/model/test_sagemaker_config.py +++ b/tests/unit/sagemaker/jumpstart/model/test_sagemaker_config.py @@ -99,9 +99,9 @@ def test_without_arg_overwrites_without_kwarg_collisions_with_config( model_id=model_id, ) - self.assertEquals(mock_get_sagemaker_config_value.call_count, 1) + self.assertEqual(mock_get_sagemaker_config_value.call_count, 1) - self.assertEquals(mock_model_init.call_args[1].get("role"), config_role) + self.assertEqual(mock_model_init.call_args[1].get("role"), config_role) assert "enable_network_isolation" not in mock_model_init.call_args[1] @@ -147,10 +147,10 @@ def test_all_arg_overwrites_without_kwarg_collisions_with_config( role=override_role, ) - self.assertEquals(mock_get_sagemaker_config_value.call_count, 1) + self.assertEqual(mock_get_sagemaker_config_value.call_count, 1) - self.assertEquals(mock_model_init.call_args[1].get("role"), override_role) - self.assertEquals( + self.assertEqual(mock_model_init.call_args[1].get("role"), override_role) + self.assertEqual( mock_model_init.call_args[1].get("enable_network_isolation"), override_enable_network_isolation, ) @@ -197,10 +197,10 @@ def test_without_arg_overwrites_all_kwarg_collisions_with_config( model_id=model_id, ) - self.assertEquals(mock_get_sagemaker_config_value.call_count, 2) + self.assertEqual(mock_get_sagemaker_config_value.call_count, 2) - self.assertEquals(mock_model_init.call_args[1].get("role"), config_role) - self.assertEquals( + self.assertEqual(mock_model_init.call_args[1].get("role"), config_role) + self.assertEqual( mock_model_init.call_args[1].get("enable_network_isolation"), config_enable_network_isolation, ) @@ -249,10 +249,10 @@ def test_with_arg_overwrites_all_kwarg_collisions_with_config( enable_network_isolation=override_enable_network_isolation, ) - self.assertEquals(mock_get_sagemaker_config_value.call_count, 1) + self.assertEqual(mock_get_sagemaker_config_value.call_count, 1) - self.assertEquals(mock_model_init.call_args[1].get("role"), override_role) - self.assertEquals( + self.assertEqual(mock_model_init.call_args[1].get("role"), override_role) + self.assertEqual( mock_model_init.call_args[1].get("enable_network_isolation"), override_enable_network_isolation, ) @@ -299,10 +299,10 @@ def test_without_arg_overwrites_all_kwarg_collisions_without_config( model_id=model_id, ) - self.assertEquals(mock_get_sagemaker_config_value.call_count, 2) + self.assertEqual(mock_get_sagemaker_config_value.call_count, 2) - self.assertEquals(mock_model_init.call_args[1].get("role"), execution_role) - self.assertEquals( + self.assertEqual(mock_model_init.call_args[1].get("role"), execution_role) + self.assertEqual( mock_model_init.call_args[1].get("enable_network_isolation"), metadata_enable_network_isolation, ) @@ -350,10 +350,10 @@ def test_with_arg_overwrites_all_kwarg_collisions_without_config( enable_network_isolation=override_enable_network_isolation, ) - self.assertEquals(mock_get_sagemaker_config_value.call_count, 1) + self.assertEqual(mock_get_sagemaker_config_value.call_count, 1) - self.assertEquals(mock_model_init.call_args[1].get("role"), override_role) - self.assertEquals( + self.assertEqual(mock_model_init.call_args[1].get("role"), override_role) + self.assertEqual( mock_model_init.call_args[1].get("enable_network_isolation"), override_enable_network_isolation, ) @@ -398,9 +398,9 @@ def test_without_arg_overwrites_without_kwarg_collisions_without_config( model_id=model_id, ) - self.assertEquals(mock_get_sagemaker_config_value.call_count, 1) + self.assertEqual(mock_get_sagemaker_config_value.call_count, 1) - self.assertEquals(mock_model_init.call_args[1].get("role"), execution_role) + self.assertEqual(mock_model_init.call_args[1].get("role"), execution_role) assert "enable_network_isolation" not in mock_model_init.call_args[1] @mock.patch( @@ -445,10 +445,10 @@ def test_with_arg_overwrites_without_kwarg_collisions_without_config( enable_network_isolation=override_enable_network_isolation, ) - self.assertEquals(mock_get_sagemaker_config_value.call_count, 1) + self.assertEqual(mock_get_sagemaker_config_value.call_count, 1) - self.assertEquals(mock_model_init.call_args[1].get("role"), override_role) - self.assertEquals( + self.assertEqual(mock_model_init.call_args[1].get("role"), override_role) + self.assertEqual( mock_model_init.call_args[1].get("enable_network_isolation"), override_enable_network_isolation, ) diff --git a/tests/unit/sagemaker/jumpstart/test_utils.py b/tests/unit/sagemaker/jumpstart/test_utils.py index ea4d64f289..2e63bc80eb 100644 --- a/tests/unit/sagemaker/jumpstart/test_utils.py +++ b/tests/unit/sagemaker/jumpstart/test_utils.py @@ -1386,7 +1386,7 @@ def test_no_model_id_no_version_found(self): mock_sagemaker_session.list_tags = mock_list_tags mock_list_tags.return_value = [{"Key": "blah", "Value": "blah1"}] - self.assertEquals( + self.assertEqual( utils.get_jumpstart_model_info_from_resource_arn("some-arn", mock_sagemaker_session), (None, None, None, None), ) @@ -1401,7 +1401,7 @@ def test_model_id_no_version_found(self): {"Key": JumpStartTag.MODEL_ID, "Value": "model_id"}, ] - self.assertEquals( + self.assertEqual( utils.get_jumpstart_model_info_from_resource_arn("some-arn", mock_sagemaker_session), ("model_id", None, None, None), ) @@ -1416,7 +1416,7 @@ def test_no_model_id_version_found(self): {"Key": JumpStartTag.MODEL_VERSION, "Value": "model_version"}, ] - self.assertEquals( + self.assertEqual( utils.get_jumpstart_model_info_from_resource_arn("some-arn", mock_sagemaker_session), (None, "model_version", None, None), ) @@ -1428,7 +1428,7 @@ def test_no_config_name_found(self): mock_sagemaker_session.list_tags = mock_list_tags mock_list_tags.return_value = [{"Key": "blah", "Value": "blah1"}] - self.assertEquals( + self.assertEqual( utils.get_jumpstart_model_info_from_resource_arn("some-arn", mock_sagemaker_session), (None, None, None, None), ) @@ -1443,7 +1443,7 @@ def test_inference_config_name_found(self): {"Key": JumpStartTag.INFERENCE_CONFIG_NAME, "Value": "config_name"}, ] - self.assertEquals( + self.assertEqual( utils.get_jumpstart_model_info_from_resource_arn("some-arn", mock_sagemaker_session), (None, None, "config_name", None), ) @@ -1458,7 +1458,7 @@ def test_training_config_name_found(self): {"Key": JumpStartTag.TRAINING_CONFIG_NAME, "Value": "config_name"}, ] - self.assertEquals( + self.assertEqual( utils.get_jumpstart_model_info_from_resource_arn("some-arn", mock_sagemaker_session), (None, None, None, "config_name"), ) @@ -1474,7 +1474,7 @@ def test_both_config_name_found(self): {"Key": JumpStartTag.TRAINING_CONFIG_NAME, "Value": "training_config_name"}, ] - self.assertEquals( + self.assertEqual( utils.get_jumpstart_model_info_from_resource_arn("some-arn", mock_sagemaker_session), (None, None, "inference_config_name", "training_config_name"), ) @@ -1490,7 +1490,7 @@ def test_model_id_version_found(self): {"Key": JumpStartTag.MODEL_VERSION, "Value": "model_version"}, ] - self.assertEquals( + self.assertEqual( utils.get_jumpstart_model_info_from_resource_arn("some-arn", mock_sagemaker_session), ("model_id", "model_version", None, None), ) @@ -1508,7 +1508,7 @@ def test_multiple_model_id_versions_found(self): {"Key": JumpStartTag.MODEL_VERSION, "Value": "model_version_2"}, ] - self.assertEquals( + self.assertEqual( utils.get_jumpstart_model_info_from_resource_arn("some-arn", mock_sagemaker_session), (None, None, None, None), ) @@ -1526,7 +1526,7 @@ def test_multiple_model_id_versions_found_aliases_consistent(self): {"Key": random.choice(EXTRA_MODEL_VERSION_TAGS), "Value": "model_version_1"}, ] - self.assertEquals( + self.assertEqual( utils.get_jumpstart_model_info_from_resource_arn("some-arn", mock_sagemaker_session), ("model_id_1", "model_version_1", None, None), ) @@ -1544,7 +1544,7 @@ def test_multiple_model_id_versions_found_aliases_inconsistent(self): {"Key": random.choice(EXTRA_MODEL_VERSION_TAGS), "Value": "model_version_2"}, ] - self.assertEquals( + self.assertEqual( utils.get_jumpstart_model_info_from_resource_arn("some-arn", mock_sagemaker_session), (None, None, None, None), ) @@ -1562,7 +1562,7 @@ def test_multiple_config_names_found_aliases_inconsistent(self): {"Key": JumpStartTag.INFERENCE_CONFIG_NAME, "Value": "config_name_2"}, ] - self.assertEquals( + self.assertEqual( utils.get_jumpstart_model_info_from_resource_arn("some-arn", mock_sagemaker_session), ("model_id_1", "model_version_1", None, None), ) diff --git a/tests/unit/sagemaker/modules/train/test_model_trainer.py b/tests/unit/sagemaker/modules/train/test_model_trainer.py index 29da03bcd9..2606e21cbc 100644 --- a/tests/unit/sagemaker/modules/train/test_model_trainer.py +++ b/tests/unit/sagemaker/modules/train/test_model_trainer.py @@ -1048,7 +1048,7 @@ def mock_upload_data(path, bucket, key_prefix): model_trainer.train() - assert mock_local_container.train.called_once_with( + assert mock_local_container.train.assert_called_once_with( training_job_name=unique_name, instance_type=compute.instance_type, instance_count=compute.instance_count, diff --git a/tests/unit/sagemaker/remote_function/runtime_environment/test_runtime_environment_manager.py b/tests/unit/sagemaker/remote_function/runtime_environment/test_runtime_environment_manager.py index ce14a8c977..5ae1264b8a 100644 --- a/tests/unit/sagemaker/remote_function/runtime_environment/test_runtime_environment_manager.py +++ b/tests/unit/sagemaker/remote_function/runtime_environment/test_runtime_environment_manager.py @@ -450,7 +450,7 @@ def test_run_pre_exec_script_cmd_error(isfile): def test_change_dir_permission(mock_subprocess_run): RuntimeEnvironmentManager().change_dir_permission(dirs=["a", "b", "c"], new_permission="777") expected_command = ["sudo", "chmod", "-R", "777", "a", "b", "c"] - assert mock_subprocess_run.called_once_with( + assert mock_subprocess_run.assert_called_once_with( expected_command, check=True, stderr=subprocess.PIPE ) diff --git a/tests/unit/sagemaker/remote_function/test_job.py b/tests/unit/sagemaker/remote_function/test_job.py index 671f091d02..19cc684003 100644 --- a/tests/unit/sagemaker/remote_function/test_job.py +++ b/tests/unit/sagemaker/remote_function/test_job.py @@ -1190,7 +1190,7 @@ def test_start_with_spark( assert job.job_name.startswith("job-function") - assert mock_stored_function.called_once_with( + assert mock_stored_function.assert_called_once_with( sagemaker_session=session(), s3_base_uri=f"{S3_URI}/{job.job_name}", s3_kms_key=None ) diff --git a/tests/unit/sagemaker/serve/model_server/djl_serving/test_djl_prepare.py b/tests/unit/sagemaker/serve/model_server/djl_serving/test_djl_prepare.py index 183d15d13e..aa99e1971c 100644 --- a/tests/unit/sagemaker/serve/model_server/djl_serving/test_djl_prepare.py +++ b/tests/unit/sagemaker/serve/model_server/djl_serving/test_djl_prepare.py @@ -52,8 +52,8 @@ def test_create_dir_structure_from_new(self, mock_path, mock_disk_usage, mock_di mock_disk_space.assert_called_once_with(mock_model_path) mock_disk_usage.assert_called_once() - self.assertEquals(ret_model_path, mock_model_path) - self.assertEquals(ret_code_dir, mock_code_dir) + self.assertEqual(ret_model_path, mock_model_path) + self.assertEqual(ret_code_dir, mock_code_dir) @patch("sagemaker.serve.model_server.djl_serving.prepare.Path") def test_create_dir_structure_invalid_path(self, mock_path): @@ -65,7 +65,7 @@ def test_create_dir_structure_invalid_path(self, mock_path): with self.assertRaises(ValueError) as context: _create_dir_structure(mock_model_path) - self.assertEquals("model_dir is not a valid directory", str(context.exception)) + self.assertEqual("model_dir is not a valid directory", str(context.exception)) @patch("sagemaker.serve.model_server.djl_serving.prepare.S3Downloader") @patch("builtins.open", new_callable=mock_open, read_data="data") diff --git a/tests/unit/sagemaker/serve/model_server/multi_model_server/test_multi_model_server_prepare.py b/tests/unit/sagemaker/serve/model_server/multi_model_server/test_multi_model_server_prepare.py index e877c1e7e9..567a72182a 100644 --- a/tests/unit/sagemaker/serve/model_server/multi_model_server/test_multi_model_server_prepare.py +++ b/tests/unit/sagemaker/serve/model_server/multi_model_server/test_multi_model_server_prepare.py @@ -91,8 +91,8 @@ def test_create_dir_structure_from_new(self, mock_path, mock_disk_usage, mock_di mock_disk_space.assert_called_once_with(mock_model_path) mock_disk_usage.assert_called_once() - self.assertEquals(ret_model_path, mock_model_path) - self.assertEquals(ret_code_dir, mock_code_dir) + self.assertEqual(ret_model_path, mock_model_path) + self.assertEqual(ret_code_dir, mock_code_dir) @patch("sagemaker.serve.model_server.multi_model_server.prepare.Path") def test_create_dir_structure_invalid_path(self, mock_path): @@ -104,4 +104,4 @@ def test_create_dir_structure_invalid_path(self, mock_path): with self.assertRaises(ValueError) as context: _create_dir_structure(mock_model_path) - self.assertEquals("model_dir is not a valid directory", str(context.exception)) + self.assertEqual("model_dir is not a valid directory", str(context.exception)) diff --git a/tests/unit/sagemaker/serve/model_server/tgi/test_tgi_prepare.py b/tests/unit/sagemaker/serve/model_server/tgi/test_tgi_prepare.py index 88d109831d..ed94f10ce9 100644 --- a/tests/unit/sagemaker/serve/model_server/tgi/test_tgi_prepare.py +++ b/tests/unit/sagemaker/serve/model_server/tgi/test_tgi_prepare.py @@ -50,8 +50,8 @@ def test_create_dir_structure_from_new(self, mock_path, mock_disk_usage, mock_di mock_disk_space.assert_called_once_with(mock_model_path) mock_disk_usage.assert_called_once() - self.assertEquals(ret_model_path, mock_model_path) - self.assertEquals(ret_code_dir, mock_code_dir) + self.assertEqual(ret_model_path, mock_model_path) + self.assertEqual(ret_code_dir, mock_code_dir) @patch("sagemaker.serve.model_server.tgi.prepare.Path") def test_create_dir_structure_invalid_path(self, mock_path): @@ -63,7 +63,7 @@ def test_create_dir_structure_invalid_path(self, mock_path): with self.assertRaises(ValueError) as context: _create_dir_structure(mock_model_path) - self.assertEquals("model_dir is not a valid directory", str(context.exception)) + self.assertEqual("model_dir is not a valid directory", str(context.exception)) @patch("sagemaker.serve.model_server.tgi.prepare.S3Downloader") @patch("builtins.open", read_data="data") diff --git a/tests/unit/sagemaker/workflow/test_pipeline.py b/tests/unit/sagemaker/workflow/test_pipeline.py index 14c2d442eb..bc8ee26c24 100644 --- a/tests/unit/sagemaker/workflow/test_pipeline.py +++ b/tests/unit/sagemaker/workflow/test_pipeline.py @@ -99,7 +99,7 @@ def test_pipeline_create_and_update_with_config_injection(sagemaker_session_mock RoleArn=pipeline_role_arn, ) pipeline.upsert() - assert sagemaker_session_mock.sagemaker_client.update_pipeline.called_with( + assert sagemaker_session_mock.sagemaker_client.update_pipeline.assert_called_once_with( PipelineName="MyPipeline", PipelineDefinition=pipeline.definition(), RoleArn=pipeline_role_arn, @@ -130,7 +130,7 @@ def test_pipeline_create_with_parallelism_config(sagemaker_session_mock, role_ar role_arn=role_arn, parallelism_config=dict(MaxParallelExecutionSteps=10), ) - assert sagemaker_session_mock.sagemaker_client.create_pipeline.called_with( + assert sagemaker_session_mock.sagemaker_client.create_pipeline.assert_called_once_with( PipelineName="MyPipeline", PipelineDefinition=pipeline.definition(), RoleArn=role_arn, @@ -149,7 +149,7 @@ def test_pipeline_create_and_start_with_parallelism_config(sagemaker_session_moc role_arn=role_arn, parallelism_config=dict(MaxParallelExecutionSteps=10), ) - assert sagemaker_session_mock.sagemaker_client.create_pipeline.called_with( + assert sagemaker_session_mock.sagemaker_client.create_pipeline.assert_called_once_with( PipelineName="MyPipeline", PipelineDefinition=pipeline.definition(), RoleArn=role_arn, @@ -168,7 +168,7 @@ def test_pipeline_create_and_start_with_parallelism_config(sagemaker_session_moc # Specify ParallelismConfiguration to another value which will be honored in backend pipeline.start(parallelism_config=dict(MaxParallelExecutionSteps=20)) - assert sagemaker_session_mock.sagemaker_client.start_pipeline_execution.called_with( + assert sagemaker_session_mock.sagemaker_client.start_pipeline_execution.assert_called_once_with( PipelineName="MyPipeline", ParallelismConfiguration={"MaxParallelExecutionSteps": 20}, ) @@ -187,11 +187,11 @@ def test_large_pipeline_create(sagemaker_session_mock, role_arn): pipeline.create(role_arn=role_arn) - assert s3.S3Uploader.upload_string_as_file_body.called_with( + assert s3.S3Uploader.upload_string_as_file_body.assert_called_once_with( body=pipeline.definition(), s3_uri="s3://s3_bucket/MyPipeline" ) - assert sagemaker_session_mock.sagemaker_client.create_pipeline.called_with( + assert sagemaker_session_mock.sagemaker_client.create_pipeline.assert_called_once_with( PipelineName="MyPipeline", PipelineDefinitionS3Location={"Bucket": "s3_bucket", "ObjectKey": "MyPipeline"}, RoleArn=role_arn, @@ -209,7 +209,7 @@ def test_pipeline_update(sagemaker_session_mock, role_arn): assert not pipeline.steps pipeline.update(role_arn=role_arn) assert len(json.loads(pipeline.definition())["Steps"]) == 0 - assert sagemaker_session_mock.sagemaker_client.update_pipeline.called_with( + assert sagemaker_session_mock.sagemaker_client.update_pipeline.assert_called_once_with( PipelineName="MyPipeline", PipelineDefinition=pipeline.definition(), RoleArn=role_arn ) @@ -253,7 +253,7 @@ def test_pipeline_update(sagemaker_session_mock, role_arn): pipeline.update(role_arn=role_arn) assert len(json.loads(pipeline.definition())["Steps"]) == 3 - assert sagemaker_session_mock.sagemaker_client.update_pipeline.called_with( + assert sagemaker_session_mock.sagemaker_client.update_pipeline.assert_called_once_with( PipelineName="MyPipeline", PipelineDefinition=pipeline.definition(), RoleArn=role_arn ) @@ -345,7 +345,7 @@ def test_pipeline_update_with_parallelism_config(sagemaker_session_mock, role_ar role_arn=role_arn, parallelism_config=dict(MaxParallelExecutionSteps=10), ) - assert sagemaker_session_mock.sagemaker_client.update_pipeline.called_with( + assert sagemaker_session_mock.sagemaker_client.update_pipeline.assert_called_once_with( PipelineName="MyPipeline", PipelineDefinition=pipeline.definition(), RoleArn=role_arn, @@ -366,11 +366,11 @@ def test_large_pipeline_update(sagemaker_session_mock, role_arn): pipeline.create(role_arn=role_arn) - assert s3.S3Uploader.upload_string_as_file_body.called_with( + assert s3.S3Uploader.upload_string_as_file_body.assert_called_once_with( body=pipeline.definition(), s3_uri="s3://s3_bucket/MyPipeline" ) - assert sagemaker_session_mock.sagemaker_client.update_pipeline.called_with( + assert sagemaker_session_mock.sagemaker_client.update_pipeline.assert_called_once_with( PipelineName="MyPipeline", PipelineDefinitionS3Location={"Bucket": "s3_bucket", "ObjectKey": "MyPipeline"}, RoleArn=role_arn, @@ -418,12 +418,12 @@ def _raise_does_already_exists_client_error(**kwargs): sagemaker_session_mock.sagemaker_client.update_pipeline.assert_called_once_with( PipelineName="MyPipeline", PipelineDefinition=pipeline.definition(), RoleArn=role_arn ) - assert sagemaker_session_mock.sagemaker_client.list_tags.called_with( + assert sagemaker_session_mock.sagemaker_client.list_tags.assert_called_once_with( ResourceArn="mock_pipeline_arn" ) tags.append({"Key": "dummy", "Value": "dummy_tag"}) - assert sagemaker_session_mock.sagemaker_client.add_tags.called_with( + assert sagemaker_session_mock.sagemaker_client.add_tags.assert_called_once_with( ResourceArn="mock_pipeline_arn", Tags=tags ) @@ -523,7 +523,7 @@ def test_pipeline_delete(sagemaker_session_mock): sagemaker_session=sagemaker_session_mock, ) pipeline.delete() - assert sagemaker_session_mock.sagemaker_client.delete_pipeline.called_with( + assert sagemaker_session_mock.sagemaker_client.delete_pipeline.assert_called_once_with( PipelineName="MyPipeline", ) @@ -536,7 +536,7 @@ def test_pipeline_describe(sagemaker_session_mock): sagemaker_session=sagemaker_session_mock, ) pipeline.describe() - assert sagemaker_session_mock.sagemaker_client.describe_pipeline.called_with( + assert sagemaker_session_mock.sagemaker_client.describe_pipeline.assert_called_once_with( PipelineName="MyPipeline", ) @@ -552,17 +552,17 @@ def test_pipeline_start(sagemaker_session_mock): sagemaker_session=sagemaker_session_mock, ) pipeline.start() - assert sagemaker_session_mock.start_pipeline_execution.called_with( + assert sagemaker_session_mock.start_pipeline_execution.assert_called_once_with( PipelineName="MyPipeline", ) pipeline.start(execution_display_name="pipeline-execution") - assert sagemaker_session_mock.start_pipeline_execution.called_with( + assert sagemaker_session_mock.start_pipeline_execution.assert_called_once_with( PipelineName="MyPipeline", PipelineExecutionDisplayName="pipeline-execution" ) pipeline.start(parameters=dict(alpha="epsilon")) - assert sagemaker_session_mock.start_pipeline_execution.called_with( + assert sagemaker_session_mock.start_pipeline_execution.assert_called_once_with( PipelineName="MyPipeline", PipelineParameters=[{"Name": "alpha", "Value": "epsilon"}] ) @@ -822,7 +822,7 @@ def test_pipeline_build_parameters_from_execution(sagemaker_session_mock): parameter_value_overrides=parameter_value_overrides, ) assert ( - sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with( + sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.assert_called_once_with( PipelineExecutionArn=reference_execution_arn ) ) @@ -851,7 +851,7 @@ def test_pipeline_build_parameters_from_execution_with_invalid_overrides(sagemak in str(error) ) assert ( - sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.called_with( + sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.assert_called_once_with( PipelineExecutionArn=reference_execution_arn ) ) @@ -908,21 +908,21 @@ def test_pipeline_execution_basics(sagemaker_session_mock): ) execution = pipeline.start() execution.stop() - assert sagemaker_session_mock.sagemaker_client.stop_pipeline_execution.called_with( + assert sagemaker_session_mock.sagemaker_client.stop_pipeline_execution.assert_called_once_with( PipelineExecutionArn="my:arn" ) execution.describe() - assert sagemaker_session_mock.sagemaker_client.describe_pipeline_execution.called_with( + assert sagemaker_session_mock.sagemaker_client.describe_pipeline_execution.assert_called_once_with( PipelineExecutionArn="my:arn" ) steps = execution.list_steps() - assert sagemaker_session_mock.sagemaker_client.describe_pipeline_execution_steps.called_with( + assert sagemaker_session_mock.sagemaker_client.describe_pipeline_execution_steps.assert_called_once_with( 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( + sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.assert_called_once_with( PipelineExecutionArn="my:arn" ) ) diff --git a/tests/unit/sagemaker/workflow/test_triggers.py b/tests/unit/sagemaker/workflow/test_triggers.py index fd723a9085..ef1ee827cf 100644 --- a/tests/unit/sagemaker/workflow/test_triggers.py +++ b/tests/unit/sagemaker/workflow/test_triggers.py @@ -194,7 +194,7 @@ def test_schedule_trigger_functionality(eb_helper, sagemaker_session_mock, role_ eb_helper().delete_schedule.assert_called_once_with(schedule_name=schedule.name) # delete pipeline pipeline.delete() - assert sagemaker_session_mock.sagemaker_client.delete_pipeline.called_with( + assert sagemaker_session_mock.sagemaker_client.delete_pipeline.assert_called_once_with( PipelineName=PIPELINE_NAME, ) diff --git a/tests/unit/test_multidatamodel.py b/tests/unit/test_multidatamodel.py index e354c0240e..43ebaabcf2 100644 --- a/tests/unit/test_multidatamodel.py +++ b/tests/unit/test_multidatamodel.py @@ -321,6 +321,6 @@ def test_list_models(multi_data_model): multi_data_model.list_models() multi_data_model.sagemaker_session.list_s3_files.assert_called() - assert multi_data_model.sagemaker_session.list_s3_files.called_with( + assert multi_data_model.sagemaker_session.list_s3_files.assert_called_once_with( Bucket=S3_URL_SOURCE_BUCKET, Prefix=S3_URL_SOURCE_PREFIX ) diff --git a/tests/unit/test_predictor_async.py b/tests/unit/test_predictor_async.py index fa2d6da6c7..a2f7b26b08 100644 --- a/tests/unit/test_predictor_async.py +++ b/tests/unit/test_predictor_async.py @@ -296,7 +296,7 @@ def test_async_predict_call_pass_through_output_failure_paths(): assert result == RETURN_VALUE assert sagemaker_session.sagemaker_runtime_client.invoke_endpoint_async.called - assert sagemaker_session.s3_client.get_waiter.called_with("object_exists") + assert sagemaker_session.s3_client.get_waiter.assert_called_once_with("object_exists") assert sagemaker_session.sagemaker_client.describe_endpoint.not_called assert sagemaker_session.sagemaker_client.describe_endpoint_config.not_called @@ -332,7 +332,7 @@ def test_async_predict_call_pass_through_with_null_failure_path(): assert result == RETURN_VALUE assert sagemaker_session.sagemaker_runtime_client.invoke_endpoint_async.called - assert sagemaker_session.s3_client.get_waiter.called_with("object_exists") + assert sagemaker_session.s3_client.get_waiter.assert_called_once_with("object_exists") assert sagemaker_session.sagemaker_client.describe_endpoint.not_called assert sagemaker_session.sagemaker_client.describe_endpoint_config.not_called diff --git a/tests/unit/test_session.py b/tests/unit/test_session.py index d2d2c3bcfb..9e604df7e7 100644 --- a/tests/unit/test_session.py +++ b/tests/unit/test_session.py @@ -5599,7 +5599,7 @@ def test_feature_group_create(sagemaker_session, feature_group_dummy_definitions feature_definitions=feature_group_dummy_definitions, role_arn="dummy_role", ) - assert sagemaker_session.sagemaker_client.create_feature_group.called_with( + assert sagemaker_session.sagemaker_client.create_feature_group.assert_called_once_with( FeatureGroupName="MyFeatureGroup", RecordIdentifierFeatureName="feature1", EventTimeFeatureName="feature2", @@ -5610,14 +5610,14 @@ def test_feature_group_create(sagemaker_session, feature_group_dummy_definitions def test_feature_group_delete(sagemaker_session): sagemaker_session.delete_feature_group(feature_group_name="MyFeatureGroup") - assert sagemaker_session.sagemaker_client.delete_feature_group.called_with( + assert sagemaker_session.sagemaker_client.delete_feature_group.assert_called_once_with( FeatureGroupName="MyFeatureGroup", ) def test_feature_group_describe(sagemaker_session): sagemaker_session.describe_feature_group(feature_group_name="MyFeatureGroup") - assert sagemaker_session.sagemaker_client.describe_feature_group.called_with( + assert sagemaker_session.sagemaker_client.describe_feature_group.assert_called_once_with( FeatureGroupName="MyFeatureGroup", ) @@ -5627,7 +5627,7 @@ def test_feature_group_feature_additions_update(sagemaker_session, feature_group feature_group_name="MyFeatureGroup", feature_additions=feature_group_dummy_definitions, ) - assert sagemaker_session.sagemaker_client.update_feature_group.called_with( + assert sagemaker_session.sagemaker_client.update_feature_group.assert_called_once_with( FeatureGroupName="MyFeatureGroup", FeatureAdditions=feature_group_dummy_definitions, ) @@ -5639,7 +5639,7 @@ def test_feature_group_online_store_config_update(sagemaker_session): feature_group_name="MyFeatureGroup", online_store_config=os_conf_update, ) - assert sagemaker_session.sagemaker_client.update_feature_group.called_with( + assert sagemaker_session.sagemaker_client.update_feature_group.assert_called_once_with( FeatureGroupName="MyFeatureGroup", OnlineStoreConfig=os_conf_update ) @@ -5654,7 +5654,7 @@ def test_feature_group_throughput_config_update(sagemaker_session): feature_group_name="MyFeatureGroup", throughput_config=tp_update, ) - assert sagemaker_session.sagemaker_client.update_feature_group.called_with( + assert sagemaker_session.sagemaker_client.update_feature_group.assert_called_once_with( FeatureGroupName="MyFeatureGroup", ThroughputConfig=tp_update ) @@ -5675,7 +5675,7 @@ def test_feature_metadata_update(sagemaker_session): parameter_additions=parameter_additions, parameter_removals=parameter_removals, ) - assert sagemaker_session.sagemaker_client.update_feature_group.called_with( + assert sagemaker_session.sagemaker_client.update_feature_group.assert_called_once_with( feature_group_name="TestFeatureGroup", FeatureName="TestFeature", Description="TestDescription", @@ -5686,7 +5686,7 @@ def test_feature_metadata_update(sagemaker_session): feature_group_name="TestFeatureGroup", feature_name="TestFeature", ) - assert sagemaker_session.sagemaker_client.update_feature_group.called_with( + assert sagemaker_session.sagemaker_client.update_feature_group.assert_called_once_with( feature_group_name="TestFeatureGroup", FeatureName="TestFeature", ) @@ -5696,7 +5696,7 @@ def test_feature_metadata_describe(sagemaker_session): sagemaker_session.describe_feature_metadata( feature_group_name="MyFeatureGroup", feature_name="TestFeature" ) - assert sagemaker_session.sagemaker_client.describe_feature_metadata.called_with( + assert sagemaker_session.sagemaker_client.describe_feature_metadata.assert_called_once_with( FeatureGroupName="MyFeatureGroup", FeatureName="TestFeature" ) @@ -5725,7 +5725,7 @@ def test_list_feature_groups(sagemaker_session): next_token="token", ) assert sagemaker_session.sagemaker_client.list_feature_groups.called_once() - assert sagemaker_session.sagemaker_client.list_feature_groups.called_with( + assert sagemaker_session.sagemaker_client.list_feature_groups.assert_called_once_with( **expected_list_feature_groups_args ) @@ -5746,7 +5746,7 @@ def test_feature_group_put_record(sagemaker_session_with_fs_runtime_client): ) fs_client_mock = sagemaker_session_with_fs_runtime_client.sagemaker_featurestore_runtime_client - assert fs_client_mock.put_record.called_with( + assert fs_client_mock.put_record.assert_called_once_with( FeatureGroupName="MyFeatureGroup", record=[{"FeatureName": "feature1", "ValueAsString": "value1"}], ) @@ -5762,7 +5762,7 @@ def test_feature_group_put_record_with_ttl_and_target_stores( target_stores=["OnlineStore", "OfflineStore"], ) fs_client_mock = sagemaker_session_with_fs_runtime_client.sagemaker_featurestore_runtime_client - assert fs_client_mock.put_record.called_with( + assert fs_client_mock.put_record.assert_called_once_with( FeatureGroupName="MyFeatureGroup", record=[{"FeatureName": "feature1", "ValueAsString": "value1"}], target_stores=["OnlineStore", "OfflineStore"], @@ -5781,7 +5781,7 @@ def test_start_query_execution(sagemaker_session): query_string="query", output_location="s3://results", ) - assert athena_mock.start_query_execution.called_once_with( + assert athena_mock.start_query_execution.assert_called_once_with( QueryString="query", QueryExecutionContext={"Catalog": "catalog", "Database": "database"}, OutputLocation="s3://results", @@ -5794,7 +5794,7 @@ def test_get_query_execution(sagemaker_session): "athena", region_name=sagemaker_session.boto_region_name ).return_value = athena_mock sagemaker_session.get_query_execution(query_execution_id="query_id") - assert athena_mock.get_query_execution.called_with(QueryExecutionId="query_id") + assert athena_mock.get_query_execution.assert_called_once_with(QueryExecutionId="query_id") def test_download_athena_query_result(sagemaker_session): @@ -5805,7 +5805,7 @@ def test_download_athena_query_result(sagemaker_session): query_execution_id="query_id", filename="filename", ) - assert sagemaker_session.s3_client.download_file.called_with( + assert sagemaker_session.s3_client.download_file.assert_called_once_with( Bucket="bucket", Key="prefix/query_id.csv", Filename="filename", @@ -5819,7 +5819,7 @@ def test_update_monitoring_alert(sagemaker_session): data_points_to_alert=1, evaluation_period=1, ) - assert sagemaker_session.sagemaker_client.update_monitoring_alert.called_with( + assert sagemaker_session.sagemaker_client.update_monitoring_alert.assert_called_once_with( MonitoringScheduleName="schedule-name", MonitoringAlertName="alert-name", DatapointsToAlert=1, @@ -5833,7 +5833,7 @@ def test_list_monitoring_alerts(sagemaker_session): next_token="next_token", max_results=100, ) - assert sagemaker_session.sagemaker_client.list_monitoring_alerts.called_with( + assert sagemaker_session.sagemaker_client.list_monitoring_alerts.assert_called_once_with( MonitoringScheduleName="schedule-name", NextToken="next_token", MaxResults=100, @@ -5852,7 +5852,7 @@ def test_list_monitoring_alert_history(sagemaker_session): creation_time_before="creation_time_before", creation_time_after="creation_time_after", ) - assert sagemaker_session.sagemaker_client.list_monitoring_alerts.called_with( + assert sagemaker_session.sagemaker_client.list_monitoring_alerts.assert_called_once_with( MonitoringScheduleName="schedule-name", MonitoringAlertName="alert-name", SortBy="CreationTime", @@ -5869,7 +5869,7 @@ def test_list_monitoring_alert_history(sagemaker_session): def test_wait_for_athena_query(query_execution, sagemaker_session): query_execution.return_value = {"QueryExecution": {"Status": {"State": "SUCCEEDED"}}} sagemaker_session.wait_for_athena_query(query_execution_id="query_id") - assert query_execution.called_with(query_execution_id="query_id") + assert query_execution.assert_called_once_with(query_execution_id="query_id") def test_search(sagemaker_session): @@ -5908,7 +5908,7 @@ def test_search(sagemaker_session): max_results=50, ) assert sagemaker_session.sagemaker_client.search.called_once() - assert sagemaker_session.sagemaker_client.search.called_with(**expected_search_args) + assert sagemaker_session.sagemaker_client.search.assert_called_once_with(**expected_search_args) def test_batch_get_record(sagemaker_session): @@ -5931,7 +5931,7 @@ def test_batch_get_record(sagemaker_session): ] ) assert sagemaker_session.sagemaker_client.batch_get_record.called_once() - assert sagemaker_session.sagemaker_client.batch_get_record.called_with( + assert sagemaker_session.sagemaker_client.batch_get_record.assert_called_once_with( **expected_batch_get_record_args ) @@ -5958,7 +5958,7 @@ def test_batch_get_record_expiration_time_response(sagemaker_session): expiration_time_response="Disabled", ) assert sagemaker_session.sagemaker_client.batch_get_record.called_once() - assert sagemaker_session.sagemaker_client.batch_get_record.called_with( + assert sagemaker_session.sagemaker_client.batch_get_record.assert_called_once_with( **expected_batch_get_record_args ) @@ -6292,7 +6292,7 @@ def test_create_inference_recommendations_job_propogate_other_exception( def test_create_presigned_mlflow_tracking_server_url(sagemaker_session): sagemaker_session.create_presigned_mlflow_tracking_server_url("ts", 1, 2) assert ( - sagemaker_session.sagemaker_client.create_presigned_mlflow_tracking_server_url.called_with( + sagemaker_session.sagemaker_client.create_presigned_mlflow_tracking_server_url.assert_called_once_with( TrackingServerName="ts", ExpiresInSeconds=1, SessionExpirationDurationInSeconds=2 ) ) @@ -6301,7 +6301,7 @@ def test_create_presigned_mlflow_tracking_server_url(sagemaker_session): def test_create_presigned_mlflow_tracking_server_url_minimal(sagemaker_session): sagemaker_session.create_presigned_mlflow_tracking_server_url("ts") assert ( - sagemaker_session.sagemaker_client.create_presigned_mlflow_tracking_server_url.called_with( + sagemaker_session.sagemaker_client.create_presigned_mlflow_tracking_server_url.assert_called_once_with( TrackingServerName="ts" ) ) From e25e8b0daf2e760f898c3695a39535f325b89e80 Mon Sep 17 00:00:00 2001 From: Molly He Date: Mon, 3 Mar 2025 16:32:39 -0800 Subject: [PATCH 33/35] modified tests again to comply with py312 requirements --- .../unit/sagemaker/workflow/test_pipeline.py | 48 +++++++++---------- .../unit/sagemaker/workflow/test_triggers.py | 2 +- tests/unit/test_multidatamodel.py | 2 +- tests/unit/test_predictor_async.py | 4 +- tests/unit/test_session.py | 46 +++++++++--------- 5 files changed, 51 insertions(+), 51 deletions(-) diff --git a/tests/unit/sagemaker/workflow/test_pipeline.py b/tests/unit/sagemaker/workflow/test_pipeline.py index bc8ee26c24..bf3798e5eb 100644 --- a/tests/unit/sagemaker/workflow/test_pipeline.py +++ b/tests/unit/sagemaker/workflow/test_pipeline.py @@ -99,7 +99,7 @@ def test_pipeline_create_and_update_with_config_injection(sagemaker_session_mock RoleArn=pipeline_role_arn, ) pipeline.upsert() - assert sagemaker_session_mock.sagemaker_client.update_pipeline.assert_called_once_with( + assert sagemaker_session_mock.sagemaker_client.update_pipeline.assert_called_with( PipelineName="MyPipeline", PipelineDefinition=pipeline.definition(), RoleArn=pipeline_role_arn, @@ -130,7 +130,7 @@ def test_pipeline_create_with_parallelism_config(sagemaker_session_mock, role_ar role_arn=role_arn, parallelism_config=dict(MaxParallelExecutionSteps=10), ) - assert sagemaker_session_mock.sagemaker_client.create_pipeline.assert_called_once_with( + assert sagemaker_session_mock.sagemaker_client.create_pipeline.assert_called_with( PipelineName="MyPipeline", PipelineDefinition=pipeline.definition(), RoleArn=role_arn, @@ -149,7 +149,7 @@ def test_pipeline_create_and_start_with_parallelism_config(sagemaker_session_moc role_arn=role_arn, parallelism_config=dict(MaxParallelExecutionSteps=10), ) - assert sagemaker_session_mock.sagemaker_client.create_pipeline.assert_called_once_with( + assert sagemaker_session_mock.sagemaker_client.create_pipeline.assert_called_with( PipelineName="MyPipeline", PipelineDefinition=pipeline.definition(), RoleArn=role_arn, @@ -168,7 +168,7 @@ def test_pipeline_create_and_start_with_parallelism_config(sagemaker_session_moc # Specify ParallelismConfiguration to another value which will be honored in backend pipeline.start(parallelism_config=dict(MaxParallelExecutionSteps=20)) - assert sagemaker_session_mock.sagemaker_client.start_pipeline_execution.assert_called_once_with( + assert sagemaker_session_mock.sagemaker_client.start_pipeline_execution.assert_called_with( PipelineName="MyPipeline", ParallelismConfiguration={"MaxParallelExecutionSteps": 20}, ) @@ -187,11 +187,11 @@ def test_large_pipeline_create(sagemaker_session_mock, role_arn): pipeline.create(role_arn=role_arn) - assert s3.S3Uploader.upload_string_as_file_body.assert_called_once_with( + assert s3.S3Uploader.upload_string_as_file_body.assert_called_with( body=pipeline.definition(), s3_uri="s3://s3_bucket/MyPipeline" ) - assert sagemaker_session_mock.sagemaker_client.create_pipeline.assert_called_once_with( + assert sagemaker_session_mock.sagemaker_client.create_pipeline.assert_called_with( PipelineName="MyPipeline", PipelineDefinitionS3Location={"Bucket": "s3_bucket", "ObjectKey": "MyPipeline"}, RoleArn=role_arn, @@ -209,7 +209,7 @@ def test_pipeline_update(sagemaker_session_mock, role_arn): assert not pipeline.steps pipeline.update(role_arn=role_arn) assert len(json.loads(pipeline.definition())["Steps"]) == 0 - assert sagemaker_session_mock.sagemaker_client.update_pipeline.assert_called_once_with( + assert sagemaker_session_mock.sagemaker_client.update_pipeline.assert_called_with( PipelineName="MyPipeline", PipelineDefinition=pipeline.definition(), RoleArn=role_arn ) @@ -253,7 +253,7 @@ def test_pipeline_update(sagemaker_session_mock, role_arn): pipeline.update(role_arn=role_arn) assert len(json.loads(pipeline.definition())["Steps"]) == 3 - assert sagemaker_session_mock.sagemaker_client.update_pipeline.assert_called_once_with( + assert sagemaker_session_mock.sagemaker_client.update_pipeline.assert_called_with( PipelineName="MyPipeline", PipelineDefinition=pipeline.definition(), RoleArn=role_arn ) @@ -345,7 +345,7 @@ def test_pipeline_update_with_parallelism_config(sagemaker_session_mock, role_ar role_arn=role_arn, parallelism_config=dict(MaxParallelExecutionSteps=10), ) - assert sagemaker_session_mock.sagemaker_client.update_pipeline.assert_called_once_with( + assert sagemaker_session_mock.sagemaker_client.update_pipeline.assert_called_with( PipelineName="MyPipeline", PipelineDefinition=pipeline.definition(), RoleArn=role_arn, @@ -366,11 +366,11 @@ def test_large_pipeline_update(sagemaker_session_mock, role_arn): pipeline.create(role_arn=role_arn) - assert s3.S3Uploader.upload_string_as_file_body.assert_called_once_with( + assert s3.S3Uploader.upload_string_as_file_body.assert_called_with( body=pipeline.definition(), s3_uri="s3://s3_bucket/MyPipeline" ) - assert sagemaker_session_mock.sagemaker_client.update_pipeline.assert_called_once_with( + assert sagemaker_session_mock.sagemaker_client.update_pipeline.assert_called_with( PipelineName="MyPipeline", PipelineDefinitionS3Location={"Bucket": "s3_bucket", "ObjectKey": "MyPipeline"}, RoleArn=role_arn, @@ -418,12 +418,12 @@ def _raise_does_already_exists_client_error(**kwargs): sagemaker_session_mock.sagemaker_client.update_pipeline.assert_called_once_with( PipelineName="MyPipeline", PipelineDefinition=pipeline.definition(), RoleArn=role_arn ) - assert sagemaker_session_mock.sagemaker_client.list_tags.assert_called_once_with( + assert sagemaker_session_mock.sagemaker_client.list_tags.assert_called_with( ResourceArn="mock_pipeline_arn" ) tags.append({"Key": "dummy", "Value": "dummy_tag"}) - assert sagemaker_session_mock.sagemaker_client.add_tags.assert_called_once_with( + assert sagemaker_session_mock.sagemaker_client.add_tags.assert_called_with( ResourceArn="mock_pipeline_arn", Tags=tags ) @@ -523,7 +523,7 @@ def test_pipeline_delete(sagemaker_session_mock): sagemaker_session=sagemaker_session_mock, ) pipeline.delete() - assert sagemaker_session_mock.sagemaker_client.delete_pipeline.assert_called_once_with( + assert sagemaker_session_mock.sagemaker_client.delete_pipeline.assert_called_with( PipelineName="MyPipeline", ) @@ -536,7 +536,7 @@ def test_pipeline_describe(sagemaker_session_mock): sagemaker_session=sagemaker_session_mock, ) pipeline.describe() - assert sagemaker_session_mock.sagemaker_client.describe_pipeline.assert_called_once_with( + assert sagemaker_session_mock.sagemaker_client.describe_pipeline.assert_called_with( PipelineName="MyPipeline", ) @@ -552,17 +552,17 @@ def test_pipeline_start(sagemaker_session_mock): sagemaker_session=sagemaker_session_mock, ) pipeline.start() - assert sagemaker_session_mock.start_pipeline_execution.assert_called_once_with( + assert sagemaker_session_mock.start_pipeline_execution.assert_called_with( PipelineName="MyPipeline", ) pipeline.start(execution_display_name="pipeline-execution") - assert sagemaker_session_mock.start_pipeline_execution.assert_called_once_with( + assert sagemaker_session_mock.start_pipeline_execution.assert_called_with( PipelineName="MyPipeline", PipelineExecutionDisplayName="pipeline-execution" ) pipeline.start(parameters=dict(alpha="epsilon")) - assert sagemaker_session_mock.start_pipeline_execution.assert_called_once_with( + assert sagemaker_session_mock.start_pipeline_execution.assert_called_with( PipelineName="MyPipeline", PipelineParameters=[{"Name": "alpha", "Value": "epsilon"}] ) @@ -822,7 +822,7 @@ def test_pipeline_build_parameters_from_execution(sagemaker_session_mock): parameter_value_overrides=parameter_value_overrides, ) assert ( - sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.assert_called_once_with( + sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.assert_called_with( PipelineExecutionArn=reference_execution_arn ) ) @@ -851,7 +851,7 @@ def test_pipeline_build_parameters_from_execution_with_invalid_overrides(sagemak in str(error) ) assert ( - sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.assert_called_once_with( + sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.assert_called_with( PipelineExecutionArn=reference_execution_arn ) ) @@ -908,21 +908,21 @@ def test_pipeline_execution_basics(sagemaker_session_mock): ) execution = pipeline.start() execution.stop() - assert sagemaker_session_mock.sagemaker_client.stop_pipeline_execution.assert_called_once_with( + assert sagemaker_session_mock.sagemaker_client.stop_pipeline_execution.assert_called_with( PipelineExecutionArn="my:arn" ) execution.describe() - assert sagemaker_session_mock.sagemaker_client.describe_pipeline_execution.assert_called_once_with( + assert sagemaker_session_mock.sagemaker_client.describe_pipeline_execution.assert_called_with( PipelineExecutionArn="my:arn" ) steps = execution.list_steps() - assert sagemaker_session_mock.sagemaker_client.describe_pipeline_execution_steps.assert_called_once_with( + assert sagemaker_session_mock.sagemaker_client.describe_pipeline_execution_steps.assert_called_with( PipelineExecutionArn="my:arn" ) assert len(steps) == 1 list_parameters_response = execution.list_parameters() assert ( - sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.assert_called_once_with( + sagemaker_session_mock.sagemaker_client.list_pipeline_parameters_for_execution.assert_called_with( PipelineExecutionArn="my:arn" ) ) diff --git a/tests/unit/sagemaker/workflow/test_triggers.py b/tests/unit/sagemaker/workflow/test_triggers.py index ef1ee827cf..3a435585e6 100644 --- a/tests/unit/sagemaker/workflow/test_triggers.py +++ b/tests/unit/sagemaker/workflow/test_triggers.py @@ -194,7 +194,7 @@ def test_schedule_trigger_functionality(eb_helper, sagemaker_session_mock, role_ eb_helper().delete_schedule.assert_called_once_with(schedule_name=schedule.name) # delete pipeline pipeline.delete() - assert sagemaker_session_mock.sagemaker_client.delete_pipeline.assert_called_once_with( + assert sagemaker_session_mock.sagemaker_client.delete_pipeline.assert_called_with( PipelineName=PIPELINE_NAME, ) diff --git a/tests/unit/test_multidatamodel.py b/tests/unit/test_multidatamodel.py index 43ebaabcf2..7b0d7069d5 100644 --- a/tests/unit/test_multidatamodel.py +++ b/tests/unit/test_multidatamodel.py @@ -321,6 +321,6 @@ def test_list_models(multi_data_model): multi_data_model.list_models() multi_data_model.sagemaker_session.list_s3_files.assert_called() - assert multi_data_model.sagemaker_session.list_s3_files.assert_called_once_with( + assert multi_data_model.sagemaker_session.list_s3_files.assert_called_with( Bucket=S3_URL_SOURCE_BUCKET, Prefix=S3_URL_SOURCE_PREFIX ) diff --git a/tests/unit/test_predictor_async.py b/tests/unit/test_predictor_async.py index a2f7b26b08..ca5b69c2bf 100644 --- a/tests/unit/test_predictor_async.py +++ b/tests/unit/test_predictor_async.py @@ -296,7 +296,7 @@ def test_async_predict_call_pass_through_output_failure_paths(): assert result == RETURN_VALUE assert sagemaker_session.sagemaker_runtime_client.invoke_endpoint_async.called - assert sagemaker_session.s3_client.get_waiter.assert_called_once_with("object_exists") + assert sagemaker_session.s3_client.get_waiter.assert_called_with("object_exists") assert sagemaker_session.sagemaker_client.describe_endpoint.not_called assert sagemaker_session.sagemaker_client.describe_endpoint_config.not_called @@ -332,7 +332,7 @@ def test_async_predict_call_pass_through_with_null_failure_path(): assert result == RETURN_VALUE assert sagemaker_session.sagemaker_runtime_client.invoke_endpoint_async.called - assert sagemaker_session.s3_client.get_waiter.assert_called_once_with("object_exists") + assert sagemaker_session.s3_client.get_waiter.assert_called_with("object_exists") assert sagemaker_session.sagemaker_client.describe_endpoint.not_called assert sagemaker_session.sagemaker_client.describe_endpoint_config.not_called diff --git a/tests/unit/test_session.py b/tests/unit/test_session.py index 9e604df7e7..17be14336e 100644 --- a/tests/unit/test_session.py +++ b/tests/unit/test_session.py @@ -5599,7 +5599,7 @@ def test_feature_group_create(sagemaker_session, feature_group_dummy_definitions feature_definitions=feature_group_dummy_definitions, role_arn="dummy_role", ) - assert sagemaker_session.sagemaker_client.create_feature_group.assert_called_once_with( + assert sagemaker_session.sagemaker_client.create_feature_group.assert_called_with( FeatureGroupName="MyFeatureGroup", RecordIdentifierFeatureName="feature1", EventTimeFeatureName="feature2", @@ -5610,14 +5610,14 @@ def test_feature_group_create(sagemaker_session, feature_group_dummy_definitions def test_feature_group_delete(sagemaker_session): sagemaker_session.delete_feature_group(feature_group_name="MyFeatureGroup") - assert sagemaker_session.sagemaker_client.delete_feature_group.assert_called_once_with( + assert sagemaker_session.sagemaker_client.delete_feature_group.called_with( FeatureGroupName="MyFeatureGroup", ) def test_feature_group_describe(sagemaker_session): sagemaker_session.describe_feature_group(feature_group_name="MyFeatureGroup") - assert sagemaker_session.sagemaker_client.describe_feature_group.assert_called_once_with( + assert sagemaker_session.sagemaker_client.describe_feature_group.called_with( FeatureGroupName="MyFeatureGroup", ) @@ -5627,7 +5627,7 @@ def test_feature_group_feature_additions_update(sagemaker_session, feature_group feature_group_name="MyFeatureGroup", feature_additions=feature_group_dummy_definitions, ) - assert sagemaker_session.sagemaker_client.update_feature_group.assert_called_once_with( + assert sagemaker_session.sagemaker_client.update_feature_group.called_with( FeatureGroupName="MyFeatureGroup", FeatureAdditions=feature_group_dummy_definitions, ) @@ -5639,7 +5639,7 @@ def test_feature_group_online_store_config_update(sagemaker_session): feature_group_name="MyFeatureGroup", online_store_config=os_conf_update, ) - assert sagemaker_session.sagemaker_client.update_feature_group.assert_called_once_with( + assert sagemaker_session.sagemaker_client.update_feature_group.called_with( FeatureGroupName="MyFeatureGroup", OnlineStoreConfig=os_conf_update ) @@ -5654,7 +5654,7 @@ def test_feature_group_throughput_config_update(sagemaker_session): feature_group_name="MyFeatureGroup", throughput_config=tp_update, ) - assert sagemaker_session.sagemaker_client.update_feature_group.assert_called_once_with( + assert sagemaker_session.sagemaker_client.update_feature_group.called_with( FeatureGroupName="MyFeatureGroup", ThroughputConfig=tp_update ) @@ -5675,7 +5675,7 @@ def test_feature_metadata_update(sagemaker_session): parameter_additions=parameter_additions, parameter_removals=parameter_removals, ) - assert sagemaker_session.sagemaker_client.update_feature_group.assert_called_once_with( + assert sagemaker_session.sagemaker_client.update_feature_group.called_with( feature_group_name="TestFeatureGroup", FeatureName="TestFeature", Description="TestDescription", @@ -5686,7 +5686,7 @@ def test_feature_metadata_update(sagemaker_session): feature_group_name="TestFeatureGroup", feature_name="TestFeature", ) - assert sagemaker_session.sagemaker_client.update_feature_group.assert_called_once_with( + assert sagemaker_session.sagemaker_client.update_feature_group.called_with( feature_group_name="TestFeatureGroup", FeatureName="TestFeature", ) @@ -5696,7 +5696,7 @@ def test_feature_metadata_describe(sagemaker_session): sagemaker_session.describe_feature_metadata( feature_group_name="MyFeatureGroup", feature_name="TestFeature" ) - assert sagemaker_session.sagemaker_client.describe_feature_metadata.assert_called_once_with( + assert sagemaker_session.sagemaker_client.describe_feature_metadata.called_with( FeatureGroupName="MyFeatureGroup", FeatureName="TestFeature" ) @@ -5725,7 +5725,7 @@ def test_list_feature_groups(sagemaker_session): next_token="token", ) assert sagemaker_session.sagemaker_client.list_feature_groups.called_once() - assert sagemaker_session.sagemaker_client.list_feature_groups.assert_called_once_with( + assert sagemaker_session.sagemaker_client.list_feature_groups.called_with( **expected_list_feature_groups_args ) @@ -5746,7 +5746,7 @@ def test_feature_group_put_record(sagemaker_session_with_fs_runtime_client): ) fs_client_mock = sagemaker_session_with_fs_runtime_client.sagemaker_featurestore_runtime_client - assert fs_client_mock.put_record.assert_called_once_with( + assert fs_client_mock.put_record.called_with( FeatureGroupName="MyFeatureGroup", record=[{"FeatureName": "feature1", "ValueAsString": "value1"}], ) @@ -5762,7 +5762,7 @@ def test_feature_group_put_record_with_ttl_and_target_stores( target_stores=["OnlineStore", "OfflineStore"], ) fs_client_mock = sagemaker_session_with_fs_runtime_client.sagemaker_featurestore_runtime_client - assert fs_client_mock.put_record.assert_called_once_with( + assert fs_client_mock.put_record.called_with( FeatureGroupName="MyFeatureGroup", record=[{"FeatureName": "feature1", "ValueAsString": "value1"}], target_stores=["OnlineStore", "OfflineStore"], @@ -5794,7 +5794,7 @@ def test_get_query_execution(sagemaker_session): "athena", region_name=sagemaker_session.boto_region_name ).return_value = athena_mock sagemaker_session.get_query_execution(query_execution_id="query_id") - assert athena_mock.get_query_execution.assert_called_once_with(QueryExecutionId="query_id") + assert athena_mock.get_query_execution.called_with(QueryExecutionId="query_id") def test_download_athena_query_result(sagemaker_session): @@ -5805,7 +5805,7 @@ def test_download_athena_query_result(sagemaker_session): query_execution_id="query_id", filename="filename", ) - assert sagemaker_session.s3_client.download_file.assert_called_once_with( + assert sagemaker_session.s3_client.download_file.called_with( Bucket="bucket", Key="prefix/query_id.csv", Filename="filename", @@ -5819,7 +5819,7 @@ def test_update_monitoring_alert(sagemaker_session): data_points_to_alert=1, evaluation_period=1, ) - assert sagemaker_session.sagemaker_client.update_monitoring_alert.assert_called_once_with( + assert sagemaker_session.sagemaker_client.update_monitoring_alert.called_with( MonitoringScheduleName="schedule-name", MonitoringAlertName="alert-name", DatapointsToAlert=1, @@ -5833,7 +5833,7 @@ def test_list_monitoring_alerts(sagemaker_session): next_token="next_token", max_results=100, ) - assert sagemaker_session.sagemaker_client.list_monitoring_alerts.assert_called_once_with( + assert sagemaker_session.sagemaker_client.list_monitoring_alerts.called_with( MonitoringScheduleName="schedule-name", NextToken="next_token", MaxResults=100, @@ -5852,7 +5852,7 @@ def test_list_monitoring_alert_history(sagemaker_session): creation_time_before="creation_time_before", creation_time_after="creation_time_after", ) - assert sagemaker_session.sagemaker_client.list_monitoring_alerts.assert_called_once_with( + assert sagemaker_session.sagemaker_client.list_monitoring_alerts.called_with( MonitoringScheduleName="schedule-name", MonitoringAlertName="alert-name", SortBy="CreationTime", @@ -5869,7 +5869,7 @@ def test_list_monitoring_alert_history(sagemaker_session): def test_wait_for_athena_query(query_execution, sagemaker_session): query_execution.return_value = {"QueryExecution": {"Status": {"State": "SUCCEEDED"}}} sagemaker_session.wait_for_athena_query(query_execution_id="query_id") - assert query_execution.assert_called_once_with(query_execution_id="query_id") + assert query_execution.called_with(query_execution_id="query_id") def test_search(sagemaker_session): @@ -5908,7 +5908,7 @@ def test_search(sagemaker_session): max_results=50, ) assert sagemaker_session.sagemaker_client.search.called_once() - assert sagemaker_session.sagemaker_client.search.assert_called_once_with(**expected_search_args) + assert sagemaker_session.sagemaker_client.search.called_with(**expected_search_args) def test_batch_get_record(sagemaker_session): @@ -5931,7 +5931,7 @@ def test_batch_get_record(sagemaker_session): ] ) assert sagemaker_session.sagemaker_client.batch_get_record.called_once() - assert sagemaker_session.sagemaker_client.batch_get_record.assert_called_once_with( + assert sagemaker_session.sagemaker_client.batch_get_record.called_with( **expected_batch_get_record_args ) @@ -5958,7 +5958,7 @@ def test_batch_get_record_expiration_time_response(sagemaker_session): expiration_time_response="Disabled", ) assert sagemaker_session.sagemaker_client.batch_get_record.called_once() - assert sagemaker_session.sagemaker_client.batch_get_record.assert_called_once_with( + assert sagemaker_session.sagemaker_client.batch_get_record.called_with( **expected_batch_get_record_args ) @@ -6292,7 +6292,7 @@ def test_create_inference_recommendations_job_propogate_other_exception( def test_create_presigned_mlflow_tracking_server_url(sagemaker_session): sagemaker_session.create_presigned_mlflow_tracking_server_url("ts", 1, 2) assert ( - sagemaker_session.sagemaker_client.create_presigned_mlflow_tracking_server_url.assert_called_once_with( + sagemaker_session.sagemaker_client.create_presigned_mlflow_tracking_server_url.called_with( TrackingServerName="ts", ExpiresInSeconds=1, SessionExpirationDurationInSeconds=2 ) ) @@ -6301,7 +6301,7 @@ def test_create_presigned_mlflow_tracking_server_url(sagemaker_session): def test_create_presigned_mlflow_tracking_server_url_minimal(sagemaker_session): sagemaker_session.create_presigned_mlflow_tracking_server_url("ts") assert ( - sagemaker_session.sagemaker_client.create_presigned_mlflow_tracking_server_url.assert_called_once_with( + sagemaker_session.sagemaker_client.create_presigned_mlflow_tracking_server_url.called_with( TrackingServerName="ts" ) ) From 5dd3c04240dbb2af213f762868d268f855ebfd26 Mon Sep 17 00:00:00 2001 From: Molly He Date: Mon, 3 Mar 2025 16:33:44 -0800 Subject: [PATCH 34/35] git related --- .githooks/pre-push | 4 ++-- .github/workflows/codebuild-ci-health.yml | 2 +- .github/workflows/codebuild-ci.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.githooks/pre-push b/.githooks/pre-push index 995ab70108..f73fa492b3 100755 --- a/.githooks/pre-push +++ b/.githooks/pre-push @@ -12,5 +12,5 @@ start_time=`date +%s` tox -e sphinx,doc8 --parallel all ./ci-scripts/displaytime.sh 'sphinx,doc8' $start_time start_time=`date +%s` -tox -e py38,py39,py310 --parallel all -- tests/unit -./ci-scripts/displaytime.sh 'py38,py39,py310 unit' $start_time +tox -e py39,py310,py311,py312 --parallel all -- tests/unit +./ci-scripts/displaytime.sh 'py39,py310,py311,py312 unit' $start_time diff --git a/.github/workflows/codebuild-ci-health.yml b/.github/workflows/codebuild-ci-health.yml index 69f982f638..119b9dbe9c 100644 --- a/.github/workflows/codebuild-ci-health.yml +++ b/.github/workflows/codebuild-ci-health.yml @@ -26,7 +26,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["py38", "py39", "py310", "py311","py312"] + python-version: ["py39", "py310", "py311","py312"] steps: - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index f9fcffbd48..eef53ff06c 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -63,7 +63,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["py38","py39","py310","py311","py312"] + python-version: ["py39","py310","py311","py312"] steps: - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 From eb51f6fd5896728e2034f22b5e1700382798785b Mon Sep 17 00:00:00 2001 From: Molly He Date: Tue, 4 Mar 2025 11:24:21 -0800 Subject: [PATCH 35/35] remove assert before assert_called_once_with --- .../feature_store/feature_processor/test_config_uploader.py | 4 ++-- .../feature_store/feature_processor/test_feature_scheduler.py | 2 +- tests/unit/sagemaker/modules/train/test_model_trainer.py | 2 +- .../runtime_environment/test_runtime_environment_manager.py | 2 +- tests/unit/sagemaker/remote_function/test_job.py | 2 +- tests/unit/test_session.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/unit/sagemaker/feature_store/feature_processor/test_config_uploader.py b/tests/unit/sagemaker/feature_store/feature_processor/test_config_uploader.py index 17b6060fb1..72c152dbab 100644 --- a/tests/unit/sagemaker/feature_store/feature_processor/test_config_uploader.py +++ b/tests/unit/sagemaker/feature_store/feature_processor/test_config_uploader.py @@ -100,7 +100,7 @@ def remote_decorator_config_with_filter(sagemaker_session): def test_prepare_and_upload_callable(mock_stored_function, config_uploader, wrapped_func): mock_stored_function.save(wrapped_func).return_value = None config_uploader._prepare_and_upload_callable(wrapped_func, "s3_base_uri", sagemaker_session) - assert mock_stored_function.assert_called_once_with( + mock_stored_function.assert_called_once_with( s3_base_uri="s3_base_uri", s3_kms_key=config_uploader.remote_decorator_config.s3_kms_key, hmac_key="some_secret_key", @@ -244,7 +244,7 @@ def test_prepare_step_input_channel( ) remote_decorator_config = config_uploader.remote_decorator_config - assert mock_upload_callable.assert_called_once_with(wrapped_func) + mock_upload_callable.assert_called_once_with(wrapped_func) mock_script_upload.assert_called_once_with( spark_config=config_uploader.remote_decorator_config.spark_config, diff --git a/tests/unit/sagemaker/feature_store/feature_processor/test_feature_scheduler.py b/tests/unit/sagemaker/feature_store/feature_processor/test_feature_scheduler.py index 1823d0fa06..7357650802 100644 --- a/tests/unit/sagemaker/feature_store/feature_processor/test_feature_scheduler.py +++ b/tests/unit/sagemaker/feature_store/feature_processor/test_feature_scheduler.py @@ -269,7 +269,7 @@ def test_to_pipeline( ) assert pipeline_arn == PIPELINE_ARN - assert mock_upload_callable.assert_called_once_with(job_function) + mock_upload_callable.assert_called_once_with(job_function) local_dependencies_path = mock_runtime_manager().snapshot() mock_python_version = mock_runtime_manager()._current_python_version() container_args.extend(["--client_python_version", mock_python_version]) diff --git a/tests/unit/sagemaker/modules/train/test_model_trainer.py b/tests/unit/sagemaker/modules/train/test_model_trainer.py index 2606e21cbc..06e868eb7f 100644 --- a/tests/unit/sagemaker/modules/train/test_model_trainer.py +++ b/tests/unit/sagemaker/modules/train/test_model_trainer.py @@ -1048,7 +1048,7 @@ def mock_upload_data(path, bucket, key_prefix): model_trainer.train() - assert mock_local_container.train.assert_called_once_with( + mock_local_container.train.assert_called_once_with( training_job_name=unique_name, instance_type=compute.instance_type, instance_count=compute.instance_count, diff --git a/tests/unit/sagemaker/remote_function/runtime_environment/test_runtime_environment_manager.py b/tests/unit/sagemaker/remote_function/runtime_environment/test_runtime_environment_manager.py index 5ae1264b8a..1a3e553526 100644 --- a/tests/unit/sagemaker/remote_function/runtime_environment/test_runtime_environment_manager.py +++ b/tests/unit/sagemaker/remote_function/runtime_environment/test_runtime_environment_manager.py @@ -450,7 +450,7 @@ def test_run_pre_exec_script_cmd_error(isfile): def test_change_dir_permission(mock_subprocess_run): RuntimeEnvironmentManager().change_dir_permission(dirs=["a", "b", "c"], new_permission="777") expected_command = ["sudo", "chmod", "-R", "777", "a", "b", "c"] - assert mock_subprocess_run.assert_called_once_with( + mock_subprocess_run.assert_called_once_with( expected_command, check=True, stderr=subprocess.PIPE ) diff --git a/tests/unit/sagemaker/remote_function/test_job.py b/tests/unit/sagemaker/remote_function/test_job.py index 19cc684003..199bbd05cc 100644 --- a/tests/unit/sagemaker/remote_function/test_job.py +++ b/tests/unit/sagemaker/remote_function/test_job.py @@ -1190,7 +1190,7 @@ def test_start_with_spark( assert job.job_name.startswith("job-function") - assert mock_stored_function.assert_called_once_with( + mock_stored_function.assert_called_once_with( sagemaker_session=session(), s3_base_uri=f"{S3_URI}/{job.job_name}", s3_kms_key=None ) diff --git a/tests/unit/test_session.py b/tests/unit/test_session.py index 17be14336e..35407b1f7a 100644 --- a/tests/unit/test_session.py +++ b/tests/unit/test_session.py @@ -5781,7 +5781,7 @@ def test_start_query_execution(sagemaker_session): query_string="query", output_location="s3://results", ) - assert athena_mock.start_query_execution.assert_called_once_with( + athena_mock.start_query_execution.assert_called_once_with( QueryString="query", QueryExecutionContext={"Catalog": "catalog", "Database": "database"}, OutputLocation="s3://results",