diff --git a/setup.py b/setup.py index df10a002af..4680f18125 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ import os from glob import glob -from setuptools import setup, find_packages +from setuptools import find_packages, setup def read(fname): @@ -81,6 +81,7 @@ def read_version(): "fabric==2.6.0", "requests==2.27.1", "sagemaker-experiments==0.1.35", + "Jinja2==3.0.3", ], ) diff --git a/tests/integ/sagemaker/lineage/conftest.py b/tests/integ/sagemaker/lineage/conftest.py index 8922c011f7..45954dd5c6 100644 --- a/tests/integ/sagemaker/lineage/conftest.py +++ b/tests/integ/sagemaker/lineage/conftest.py @@ -709,9 +709,10 @@ def static_model_artifact(sagemaker_session, static_pipeline_execution_arn): ) ) - yield artifact.ModelArtifact.load( - artifacts[0]["ArtifactArn"], sagemaker_session=sagemaker_session - ) + artifact_arn = artifacts[0]["ArtifactArn"] + logging.info(f"Using static model artifact {artifact_arn}") + + yield artifact.ModelArtifact.load(artifact_arn, sagemaker_session=sagemaker_session) @pytest.fixture diff --git a/tests/integ/sagemaker/lineage/test_action.py b/tests/integ/sagemaker/lineage/test_action.py index cae7a395aa..cdb7461b3c 100644 --- a/tests/integ/sagemaker/lineage/test_action.py +++ b/tests/integ/sagemaker/lineage/test_action.py @@ -120,6 +120,7 @@ def test_tags(action_obj, sagemaker_session): assert [actual_tags[-1]] == tags +@pytest.mark.skip("data inconsistency P61661075") def test_upstream_artifacts(static_model_deployment_action): artifacts_from_query = static_model_deployment_action.artifacts( direction=LineageQueryDirectionEnum.ASCENDANTS @@ -129,6 +130,7 @@ def test_upstream_artifacts(static_model_deployment_action): assert "artifact" in artifact.artifact_arn +@pytest.mark.skip("data inconsistency P61661075") def test_downstream_artifacts(static_approval_action): artifacts_from_query = static_approval_action.artifacts( direction=LineageQueryDirectionEnum.DESCENDANTS @@ -138,6 +140,7 @@ def test_downstream_artifacts(static_approval_action): assert "artifact" in artifact.artifact_arn +@pytest.mark.skip("data inconsistency P61661075") def test_datasets(static_approval_action, static_dataset_artifact, sagemaker_session): try: sagemaker_session.sagemaker_client.add_association( @@ -165,6 +168,7 @@ def test_datasets(static_approval_action, static_dataset_artifact, sagemaker_ses pass +@pytest.mark.skip("data inconsistency P61661075") def test_endpoints(static_approval_action): endpoint_contexts_from_query = static_approval_action.endpoints() assert len(endpoint_contexts_from_query) > 0 diff --git a/tests/integ/sagemaker/lineage/test_artifact.py b/tests/integ/sagemaker/lineage/test_artifact.py index 7ecbd0ac15..c629fcdc30 100644 --- a/tests/integ/sagemaker/lineage/test_artifact.py +++ b/tests/integ/sagemaker/lineage/test_artifact.py @@ -102,6 +102,7 @@ def test_list_by_type(artifact_objs, sagemaker_session): assert artifact_names_listed[0] == expected_name +@pytest.mark.skip("data inconsistency P61661075") def test_get_artifact(static_dataset_artifact): s3_uri = static_dataset_artifact.source.source_uri expected_artifact = static_dataset_artifact.s3_uri_artifacts(s3_uri=s3_uri) diff --git a/tests/integ/sagemaker/lineage/test_dataset_artifact.py b/tests/integ/sagemaker/lineage/test_dataset_artifact.py index ee81b7e137..24991bfc9a 100644 --- a/tests/integ/sagemaker/lineage/test_dataset_artifact.py +++ b/tests/integ/sagemaker/lineage/test_dataset_artifact.py @@ -13,6 +13,8 @@ """This module contains code to test SageMaker ``DatasetArtifact``""" from __future__ import absolute_import +import pytest + def test_trained_models( dataset_artifact_associated_models, @@ -27,6 +29,7 @@ def test_trained_models( assert model.destination_type == "Context" +@pytest.mark.skip("data inconsistency P61661075") def test_endpoint_contexts( static_dataset_artifact, ): @@ -37,6 +40,7 @@ def test_endpoint_contexts( assert context.context_type == "Endpoint" +@pytest.mark.skip("data inconsistency P61661075") def test_get_upstream_datasets(static_dataset_artifact, sagemaker_session): artifacts_from_query = static_dataset_artifact.upstream_datasets() assert len(artifacts_from_query) > 0 @@ -45,6 +49,7 @@ def test_get_upstream_datasets(static_dataset_artifact, sagemaker_session): assert "artifact" in artifact.artifact_arn +@pytest.mark.skip("data inconsistency P61661075") def test_get_down_datasets(static_dataset_artifact, sagemaker_session): artifacts_from_query = static_dataset_artifact.downstream_datasets() assert len(artifacts_from_query) > 0 diff --git a/tests/integ/sagemaker/lineage/test_endpoint_context.py b/tests/integ/sagemaker/lineage/test_endpoint_context.py index 2a797bd5cb..f6d9ff4828 100644 --- a/tests/integ/sagemaker/lineage/test_endpoint_context.py +++ b/tests/integ/sagemaker/lineage/test_endpoint_context.py @@ -14,6 +14,8 @@ from __future__ import absolute_import import time +import pytest + SLEEP_TIME_ONE_SECONDS = 1 SLEEP_TIME_THREE_SECONDS = 3 @@ -38,6 +40,7 @@ def test_model_v2(endpoint_context_associate_with_model, model_obj, sagemaker_se assert model.properties == model_obj.properties +@pytest.mark.skip("data inconsistency P61661075") def test_dataset_artifacts(static_endpoint_context): artifacts_from_query = static_endpoint_context.dataset_artifacts() @@ -46,6 +49,7 @@ def test_dataset_artifacts(static_endpoint_context): assert artifact.artifact_type == "DataSet" +@pytest.mark.skip("data inconsistency P61661075") def test_training_job_arns( static_endpoint_context, ): @@ -56,12 +60,14 @@ def test_training_job_arns( assert "training-job" in arn +@pytest.mark.skip("data inconsistency P61661075") def test_pipeline_execution_arn(static_endpoint_context, static_pipeline_execution_arn): pipeline_execution_arn = static_endpoint_context.pipeline_execution_arn() assert pipeline_execution_arn == static_pipeline_execution_arn +@pytest.mark.skip("data inconsistency P61661075") def test_transform_jobs( sagemaker_session, static_transform_job_trial_component, static_endpoint_context ): @@ -84,6 +90,7 @@ def test_transform_jobs( ) +@pytest.mark.skip("data inconsistency P61661075") def test_processing_jobs( sagemaker_session, static_transform_job_trial_component, static_endpoint_context ): @@ -94,6 +101,7 @@ def test_processing_jobs( assert "ProcessingJob" in processing_job.source.get("SourceType") +@pytest.mark.skip("data inconsistency P61661075") def test_trial_components( sagemaker_session, static_transform_job_trial_component, static_endpoint_context ): diff --git a/tests/integ/sagemaker/lineage/test_image_artifact.py b/tests/integ/sagemaker/lineage/test_image_artifact.py index bd0f76445d..9037f553a3 100644 --- a/tests/integ/sagemaker/lineage/test_image_artifact.py +++ b/tests/integ/sagemaker/lineage/test_image_artifact.py @@ -13,9 +13,12 @@ """This module contains code to test SageMaker ``ImageArtifact``""" from __future__ import absolute_import +import pytest + from sagemaker.lineage.query import LineageQueryDirectionEnum +@pytest.mark.skip("data inconsistency P61661075") def test_dataset(static_image_artifact, sagemaker_session): artifacts_from_query = static_image_artifact.datasets( direction=LineageQueryDirectionEnum.DESCENDANTS diff --git a/tests/integ/sagemaker/lineage/test_lineage_trial_component.py b/tests/integ/sagemaker/lineage/test_lineage_trial_component.py index d8a8a5d9c8..9a3db7e42c 100644 --- a/tests/integ/sagemaker/lineage/test_lineage_trial_component.py +++ b/tests/integ/sagemaker/lineage/test_lineage_trial_component.py @@ -13,7 +13,10 @@ """This module contains code to test SageMaker ``Trial Component``""" from __future__ import absolute_import +import pytest + +@pytest.mark.skip("data inconsistency P61661075") def test_dataset_artifacts(static_training_job_trial_component): artifacts_from_query = static_training_job_trial_component.dataset_artifacts() assert len(artifacts_from_query) > 0 @@ -21,6 +24,7 @@ def test_dataset_artifacts(static_training_job_trial_component): assert artifact.artifact_type == "DataSet" +@pytest.mark.skip("data inconsistency P61661075") def test_models(static_processing_job_trial_component): artifacts_from_query = static_processing_job_trial_component.models() assert len(artifacts_from_query) > 0 @@ -28,6 +32,7 @@ def test_models(static_processing_job_trial_component): assert artifact.artifact_type == "Model" +@pytest.mark.skip("data inconsistency P61661075") def test_pipeline_execution_arn(static_training_job_trial_component, static_pipeline_execution_arn): pipeline_execution_arn = static_training_job_trial_component.pipeline_execution_arn() assert pipeline_execution_arn == static_pipeline_execution_arn diff --git a/tests/integ/sagemaker/lineage/test_model_artifact.py b/tests/integ/sagemaker/lineage/test_model_artifact.py index 8d9048726d..453e934280 100644 --- a/tests/integ/sagemaker/lineage/test_model_artifact.py +++ b/tests/integ/sagemaker/lineage/test_model_artifact.py @@ -13,6 +13,8 @@ """This module contains code to test SageMaker ``DatasetArtifact``""" from __future__ import absolute_import +import pytest + def test_endpoints( model_artifact_associated_endpoints, @@ -38,6 +40,7 @@ def test_endpoint_contexts( assert context.context_type == "Endpoint" +@pytest.mark.skip("data inconsistency P61661075") def test_dataset_artifacts( static_model_artifact, ): @@ -48,6 +51,7 @@ def test_dataset_artifacts( assert artifact.artifact_type == "DataSet" +@pytest.mark.skip("data inconsistency P61661075") def test_training_job_arns( static_model_artifact, ): @@ -58,6 +62,7 @@ def test_training_job_arns( assert "training-job" in arn +@pytest.mark.skip("data inconsistency P61661075") def test_pipeline_execution_arn(static_model_artifact, static_pipeline_execution_arn): pipeline_execution_arn = static_model_artifact.pipeline_execution_arn() diff --git a/tests/integ/sagemaker/lineage/test_model_package_group_context.py b/tests/integ/sagemaker/lineage/test_model_package_group_context.py index 8f6cd85e77..8abbc5a44e 100644 --- a/tests/integ/sagemaker/lineage/test_model_package_group_context.py +++ b/tests/integ/sagemaker/lineage/test_model_package_group_context.py @@ -13,7 +13,10 @@ """This module contains code to test SageMaker ``ModelPackageGroup``""" from __future__ import absolute_import +import pytest + +@pytest.mark.skip("data inconsistency P61661075") def test_pipeline_execution_arn(static_model_package_group_context, static_pipeline_execution_arn): pipeline_execution_arn = static_model_package_group_context.pipeline_execution_arn()