From 280efe0142bdc061404e19cee535a7070efc201f Mon Sep 17 00:00:00 2001 From: Kevin Chang Date: Thu, 19 Dec 2024 10:25:28 -0500 Subject: [PATCH 01/11] Fix hub model reference arn enum bug --- src/sagemaker/jumpstart/hub/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sagemaker/jumpstart/hub/utils.py b/src/sagemaker/jumpstart/hub/utils.py index 77540926c6..edc3c08fa7 100644 --- a/src/sagemaker/jumpstart/hub/utils.py +++ b/src/sagemaker/jumpstart/hub/utils.py @@ -106,7 +106,7 @@ def construct_hub_model_reference_arn_from_inputs( info = get_info_from_hub_resource_arn(hub_arn) arn = ( f"arn:{info.partition}:sagemaker:{info.region}:{info.account_id}:hub-content/" - f"{info.hub_name}/{HubContentType.MODEL_REFERENCE}/{model_name}/{version}" + f"{info.hub_name}/{HubContentType.MODEL_REFERENCE.value}/{model_name}/{version}" ) return arn From 50fa48e48688709172cc1a7b3535e1a1a168bff6 Mon Sep 17 00:00:00 2001 From: Kevin Chang Date: Thu, 19 Dec 2024 10:45:13 -0500 Subject: [PATCH 02/11] Add unit test for construct hub model reference arn util --- tests/unit/sagemaker/jumpstart/hub/test_utils.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/unit/sagemaker/jumpstart/hub/test_utils.py b/tests/unit/sagemaker/jumpstart/hub/test_utils.py index 22bc527b18..5f068a3ebd 100644 --- a/tests/unit/sagemaker/jumpstart/hub/test_utils.py +++ b/tests/unit/sagemaker/jumpstart/hub/test_utils.py @@ -95,6 +95,20 @@ def test_construct_hub_model_arn_from_inputs(): == "arn:aws:sagemaker:us-west-2:123456789123:hub-content/my-mock-hub/Model/pytorch-ic-imagenet-v2/*" ) +def test_construct_hub_model_reference_arn_from_inputs(): + model_name, version = "pytorch-ic-imagenet-v2", "1.0.2" + hub_arn = "arn:aws:sagemaker:us-west-2:123456789123:hub/my-mock-hub" + + assert ( + utils.construct_hub_model_arn_from_inputs(hub_arn, model_name, version) + == "arn:aws:sagemaker:us-west-2:123456789123:hub-content/my-mock-hub/ModelReference/pytorch-ic-imagenet-v2/1.0.2" + ) + + version = "*" + assert ( + utils.construct_hub_model_arn_from_inputs(hub_arn, model_name, version) + == "arn:aws:sagemaker:us-west-2:123456789123:hub-content/my-mock-hub/ModelReference/pytorch-ic-imagenet-v2/*" + ) def test_generate_hub_arn_for_init_kwargs(): hub_name = "my-hub-name" From e8dfd574aeea5973a6dc925bd6d6e5ef63e956f1 Mon Sep 17 00:00:00 2001 From: Kevin Chang Date: Mon, 23 Dec 2024 12:18:13 -0500 Subject: [PATCH 03/11] fix broken unit test --- tests/unit/sagemaker/jumpstart/hub/test_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/sagemaker/jumpstart/hub/test_utils.py b/tests/unit/sagemaker/jumpstart/hub/test_utils.py index 5f068a3ebd..db1d1870b7 100644 --- a/tests/unit/sagemaker/jumpstart/hub/test_utils.py +++ b/tests/unit/sagemaker/jumpstart/hub/test_utils.py @@ -100,13 +100,13 @@ def test_construct_hub_model_reference_arn_from_inputs(): hub_arn = "arn:aws:sagemaker:us-west-2:123456789123:hub/my-mock-hub" assert ( - utils.construct_hub_model_arn_from_inputs(hub_arn, model_name, version) + utils.construct_hub_model_arn_reference_from_inputs(hub_arn, model_name, version) == "arn:aws:sagemaker:us-west-2:123456789123:hub-content/my-mock-hub/ModelReference/pytorch-ic-imagenet-v2/1.0.2" ) version = "*" assert ( - utils.construct_hub_model_arn_from_inputs(hub_arn, model_name, version) + utils.construct_hub_model_arn_reference_from_inputs(hub_arn, model_name, version) == "arn:aws:sagemaker:us-west-2:123456789123:hub-content/my-mock-hub/ModelReference/pytorch-ic-imagenet-v2/*" ) From 2946a48cd1cba6a79b2188d5ec2336841ae8dd44 Mon Sep 17 00:00:00 2001 From: Kevin Chang Date: Tue, 24 Dec 2024 09:34:43 -0500 Subject: [PATCH 04/11] formatting: add extra newline after unit test --- tests/unit/sagemaker/jumpstart/hub/test_utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/unit/sagemaker/jumpstart/hub/test_utils.py b/tests/unit/sagemaker/jumpstart/hub/test_utils.py index db1d1870b7..2c3f487d7a 100644 --- a/tests/unit/sagemaker/jumpstart/hub/test_utils.py +++ b/tests/unit/sagemaker/jumpstart/hub/test_utils.py @@ -110,6 +110,7 @@ def test_construct_hub_model_reference_arn_from_inputs(): == "arn:aws:sagemaker:us-west-2:123456789123:hub-content/my-mock-hub/ModelReference/pytorch-ic-imagenet-v2/*" ) + def test_generate_hub_arn_for_init_kwargs(): hub_name = "my-hub-name" hub_arn = "arn:aws:sagemaker:us-west-2:12346789123:hub/my-awesome-hub" From e1b9420ded7c71fa3baa5af54b74dde543790d27 Mon Sep 17 00:00:00 2001 From: Kevin Chang Date: Tue, 24 Dec 2024 09:37:07 -0500 Subject: [PATCH 05/11] fix broken unit test --- tests/unit/sagemaker/jumpstart/hub/test_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/sagemaker/jumpstart/hub/test_utils.py b/tests/unit/sagemaker/jumpstart/hub/test_utils.py index 2c3f487d7a..993838ed1d 100644 --- a/tests/unit/sagemaker/jumpstart/hub/test_utils.py +++ b/tests/unit/sagemaker/jumpstart/hub/test_utils.py @@ -100,13 +100,13 @@ def test_construct_hub_model_reference_arn_from_inputs(): hub_arn = "arn:aws:sagemaker:us-west-2:123456789123:hub/my-mock-hub" assert ( - utils.construct_hub_model_arn_reference_from_inputs(hub_arn, model_name, version) + utils.construct_hub_model_reference_arn_from_inputs(hub_arn, model_name, version) == "arn:aws:sagemaker:us-west-2:123456789123:hub-content/my-mock-hub/ModelReference/pytorch-ic-imagenet-v2/1.0.2" ) version = "*" assert ( - utils.construct_hub_model_arn_reference_from_inputs(hub_arn, model_name, version) + utils.construct_hub_model_reference_arn_from_inputs(hub_arn, model_name, version) == "arn:aws:sagemaker:us-west-2:123456789123:hub-content/my-mock-hub/ModelReference/pytorch-ic-imagenet-v2/*" ) From 58d1d49c45176bf3f99d5def14d5262927c3b306 Mon Sep 17 00:00:00 2001 From: Kevin Chang Date: Tue, 24 Dec 2024 14:07:09 -0500 Subject: [PATCH 06/11] fix formatting --- tests/unit/sagemaker/jumpstart/hub/test_utils.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/unit/sagemaker/jumpstart/hub/test_utils.py b/tests/unit/sagemaker/jumpstart/hub/test_utils.py index 993838ed1d..d212186dd1 100644 --- a/tests/unit/sagemaker/jumpstart/hub/test_utils.py +++ b/tests/unit/sagemaker/jumpstart/hub/test_utils.py @@ -110,7 +110,6 @@ def test_construct_hub_model_reference_arn_from_inputs(): == "arn:aws:sagemaker:us-west-2:123456789123:hub-content/my-mock-hub/ModelReference/pytorch-ic-imagenet-v2/*" ) - def test_generate_hub_arn_for_init_kwargs(): hub_name = "my-hub-name" hub_arn = "arn:aws:sagemaker:us-west-2:12346789123:hub/my-awesome-hub" From 2e0e1912141f02ec8ff4793daa1b815ca0635f55 Mon Sep 17 00:00:00 2001 From: Kevin Chang Date: Fri, 27 Dec 2024 14:38:59 -0500 Subject: [PATCH 07/11] add more newlines around test --- tests/unit/sagemaker/jumpstart/hub/test_utils.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/unit/sagemaker/jumpstart/hub/test_utils.py b/tests/unit/sagemaker/jumpstart/hub/test_utils.py index d212186dd1..392308480f 100644 --- a/tests/unit/sagemaker/jumpstart/hub/test_utils.py +++ b/tests/unit/sagemaker/jumpstart/hub/test_utils.py @@ -95,6 +95,7 @@ def test_construct_hub_model_arn_from_inputs(): == "arn:aws:sagemaker:us-west-2:123456789123:hub-content/my-mock-hub/Model/pytorch-ic-imagenet-v2/*" ) + def test_construct_hub_model_reference_arn_from_inputs(): model_name, version = "pytorch-ic-imagenet-v2", "1.0.2" hub_arn = "arn:aws:sagemaker:us-west-2:123456789123:hub/my-mock-hub" @@ -110,6 +111,7 @@ def test_construct_hub_model_reference_arn_from_inputs(): == "arn:aws:sagemaker:us-west-2:123456789123:hub-content/my-mock-hub/ModelReference/pytorch-ic-imagenet-v2/*" ) + def test_generate_hub_arn_for_init_kwargs(): hub_name = "my-hub-name" hub_arn = "arn:aws:sagemaker:us-west-2:12346789123:hub/my-awesome-hub" From 0b6867a4955146012f2ae04f3ff344afefa7648c Mon Sep 17 00:00:00 2001 From: Kevin Chang Date: Mon, 30 Dec 2024 09:27:07 -0500 Subject: [PATCH 08/11] codestyle: fix line too long --- tests/unit/sagemaker/jumpstart/hub/test_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/sagemaker/jumpstart/hub/test_utils.py b/tests/unit/sagemaker/jumpstart/hub/test_utils.py index 392308480f..858ecf62c5 100644 --- a/tests/unit/sagemaker/jumpstart/hub/test_utils.py +++ b/tests/unit/sagemaker/jumpstart/hub/test_utils.py @@ -102,13 +102,13 @@ def test_construct_hub_model_reference_arn_from_inputs(): assert ( utils.construct_hub_model_reference_arn_from_inputs(hub_arn, model_name, version) - == "arn:aws:sagemaker:us-west-2:123456789123:hub-content/my-mock-hub/ModelReference/pytorch-ic-imagenet-v2/1.0.2" + == hub_arn + "/ModelReference/pytorch-ic-imagenet-v2/1.0.2" ) version = "*" assert ( utils.construct_hub_model_reference_arn_from_inputs(hub_arn, model_name, version) - == "arn:aws:sagemaker:us-west-2:123456789123:hub-content/my-mock-hub/ModelReference/pytorch-ic-imagenet-v2/*" + == hub_arn + "ModelReference/pytorch-ic-imagenet-v2/*" ) From 368131a30d7bd92f4be30f510bd638eae140c763 Mon Sep 17 00:00:00 2001 From: Kevin Chang Date: Mon, 30 Dec 2024 12:49:05 -0500 Subject: [PATCH 09/11] Revert "codestyle: fix line too long" This reverts commit 0b6867a4955146012f2ae04f3ff344afefa7648c. --- tests/unit/sagemaker/jumpstart/hub/test_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/sagemaker/jumpstart/hub/test_utils.py b/tests/unit/sagemaker/jumpstart/hub/test_utils.py index 858ecf62c5..392308480f 100644 --- a/tests/unit/sagemaker/jumpstart/hub/test_utils.py +++ b/tests/unit/sagemaker/jumpstart/hub/test_utils.py @@ -102,13 +102,13 @@ def test_construct_hub_model_reference_arn_from_inputs(): assert ( utils.construct_hub_model_reference_arn_from_inputs(hub_arn, model_name, version) - == hub_arn + "/ModelReference/pytorch-ic-imagenet-v2/1.0.2" + == "arn:aws:sagemaker:us-west-2:123456789123:hub-content/my-mock-hub/ModelReference/pytorch-ic-imagenet-v2/1.0.2" ) version = "*" assert ( utils.construct_hub_model_reference_arn_from_inputs(hub_arn, model_name, version) - == hub_arn + "ModelReference/pytorch-ic-imagenet-v2/*" + == "arn:aws:sagemaker:us-west-2:123456789123:hub-content/my-mock-hub/ModelReference/pytorch-ic-imagenet-v2/*" ) From 085aaafccedd5ae84b47de48dfc5ea2f126c69f7 Mon Sep 17 00:00:00 2001 From: Kevin Chang Date: Mon, 30 Dec 2024 12:52:05 -0500 Subject: [PATCH 10/11] fix test --- tests/unit/sagemaker/jumpstart/hub/test_utils.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/unit/sagemaker/jumpstart/hub/test_utils.py b/tests/unit/sagemaker/jumpstart/hub/test_utils.py index 392308480f..60e5d30a3d 100644 --- a/tests/unit/sagemaker/jumpstart/hub/test_utils.py +++ b/tests/unit/sagemaker/jumpstart/hub/test_utils.py @@ -99,16 +99,17 @@ def test_construct_hub_model_arn_from_inputs(): def test_construct_hub_model_reference_arn_from_inputs(): model_name, version = "pytorch-ic-imagenet-v2", "1.0.2" hub_arn = "arn:aws:sagemaker:us-west-2:123456789123:hub/my-mock-hub" - + hub_content_arn_prefix = "arn:aws:sagemaker:us-west-2:123456789123:hub-content/my-mock-hub + assert ( utils.construct_hub_model_reference_arn_from_inputs(hub_arn, model_name, version) - == "arn:aws:sagemaker:us-west-2:123456789123:hub-content/my-mock-hub/ModelReference/pytorch-ic-imagenet-v2/1.0.2" + == hub_content_arn_prefix + "/ModelReference/pytorch-ic-imagenet-v2/1.0.2" ) version = "*" assert ( utils.construct_hub_model_reference_arn_from_inputs(hub_arn, model_name, version) - == "arn:aws:sagemaker:us-west-2:123456789123:hub-content/my-mock-hub/ModelReference/pytorch-ic-imagenet-v2/*" + == hub_content_arn_prefix + "/ModelReference/pytorch-ic-imagenet-v2/*" ) From 97f706ccea45dc9fefb50fc0d4b147eed6cdea4d Mon Sep 17 00:00:00 2001 From: Kevin Chang Date: Mon, 30 Dec 2024 13:25:00 -0500 Subject: [PATCH 11/11] add missing quote --- tests/unit/sagemaker/jumpstart/hub/test_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/sagemaker/jumpstart/hub/test_utils.py b/tests/unit/sagemaker/jumpstart/hub/test_utils.py index 60e5d30a3d..6dbb1340f4 100644 --- a/tests/unit/sagemaker/jumpstart/hub/test_utils.py +++ b/tests/unit/sagemaker/jumpstart/hub/test_utils.py @@ -99,8 +99,8 @@ def test_construct_hub_model_arn_from_inputs(): def test_construct_hub_model_reference_arn_from_inputs(): model_name, version = "pytorch-ic-imagenet-v2", "1.0.2" hub_arn = "arn:aws:sagemaker:us-west-2:123456789123:hub/my-mock-hub" - hub_content_arn_prefix = "arn:aws:sagemaker:us-west-2:123456789123:hub-content/my-mock-hub - + hub_content_arn_prefix = "arn:aws:sagemaker:us-west-2:123456789123:hub-content/my-mock-hub" + assert ( utils.construct_hub_model_reference_arn_from_inputs(hub_arn, model_name, version) == hub_content_arn_prefix + "/ModelReference/pytorch-ic-imagenet-v2/1.0.2"