Refactoring

Author: Jonathan Makunga

VERSION

@@ -1 +1 @@
-2.224.5.dev0
+2.224.5.dev0

src/sagemaker/jumpstart/factory/estimator.py

@@ -62,7 +62,6 @@
 from sagemaker.jumpstart.utils import (
     add_hub_content_arn_tags,
     add_jumpstart_model_info_tags,
-    add_jumpstart_model_id_version_tags,
     get_eula_message,
     get_default_jumpstart_session_with_user_agent_suffix,
     update_dict_if_key_not_present,

src/sagemaker/jumpstart/factory/model.py

@@ -49,7 +49,6 @@
 from sagemaker.jumpstart.utils import (
     add_hub_content_arn_tags,
     add_jumpstart_model_info_tags,
-    add_jumpstart_model_id_version_tags,
     get_default_jumpstart_session_with_user_agent_suffix,
     get_neo_content_bucket,
     update_dict_if_key_not_present,

src/sagemaker/jumpstart/hub/interfaces.py

@@ -585,7 +585,7 @@ def from_json(self, json_obj: Dict[str, Any]) -> None:
         )
         self.hosting_eula_uri: Optional[str] = json_obj.get("HostingEulaUri")
         self.hosting_model_package_arn: Optional[str] = json_obj.get("HostingModelPackageArn")
-          
+
         self.inference_config_rankings = self._get_config_rankings(json_obj)
         self.inference_config_components = self._get_config_components(json_obj)
         self.inference_configs = self._get_configs(json_obj)

src/sagemaker/jumpstart/types.py

@@ -1975,14 +1975,15 @@ def extract_region_from_arn(arn: str) -> Optional[str]:
         if match:
             hub_region = match.group(2)
             return hub_region
-          
+
         match = re.match(HUB_ARN_REGEX, arn)
         if match:
             hub_region = match.group(2)
             return hub_region
 
         return hub_region
 
+
 class JumpStartCachedContentValue(JumpStartDataHolderType):
     """Data class for the s3 cached content values."""
 

src/sagemaker/jumpstart/utils.py

@@ -446,21 +446,6 @@ def add_hub_content_arn_tags(
     return tags
 
 
-def add_hub_content_arn_tags(
-    tags: Optional[List[TagsDict]],
-    hub_arn: str,
-) -> Optional[List[TagsDict]]:
-    """Adds custom Hub arn tag to JumpStart related resources."""
-
-    tags = add_single_jumpstart_tag(
-        hub_arn,
-        enums.JumpStartTag.HUB_CONTENT_ARN,
-        tags,
-        is_uri=False,
-    )
-    return tags
-
-
 def add_jumpstart_uri_tags(
     tags: Optional[List[TagsDict]] = None,
     inference_model_uri: Optional[Union[str, dict]] = None,

src/sagemaker/serve/builder/model_builder.py

@@ -309,20 +309,6 @@ class ModelBuilder(Triton, DJL, JumpStart, TGI, Transformers, TensorflowServing,
         },
     )
 
-    def _build_validations(self):
-        """Validations needed for model server overrides, or auto-detection or fallback"""
-        if self.mode == Mode.IN_PROCESS:
-            raise ValueError("IN_PROCESS mode is not supported yet!")
-
-        if self.inference_spec and self.model:
-            raise ValueError("Can only set one of the following: model, inference_spec.")
-
-        if self.image_uri and not is_1p_image_uri(self.image_uri) and self.model_server is None:
-            raise ValueError(
-                "Model_server must be set when non-first-party image_uri is set. "
-                + "Supported model servers: %s" % supported_model_servers
-            )
-
     def _save_model_inference_spec(self):
         """Placeholder docstring"""
         # check if path exists and create if not

tests/unit/sagemaker/jumpstart/constants.py

@@ -9805,27 +9805,6 @@
                 "p5": {"properties": {"image_uri": "$gpu_ecr_uri_1"}},
             },
         },
-        "ContextualHelp": {
-            "HubFormatTrainData": [
-                "A train and an optional validation directories. Each directory contains a CSV/JSON/TXT. ",
-                "- For CSV/JSON files, the text data is used from the column called 'text' or the first column if no column called 'text' is found",  # noqa: E501
-                "- The number of files under train and validation (if provided) should equal to one, respectively.",
-                " [Learn how to setup an AWS S3 bucket.](https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingBucket.html)",  # noqa: E501
-            ],
-            "HubDefaultTrainData": [
-                "Dataset: [SEC](https://www.sec.gov/edgar/searchedgar/companysearch)",
-                "SEC filing contains regulatory documents that companies and issuers of securities must submit to the Securities and Exchange Commission (SEC) on a regular basis.",  # noqa: E501
-                "License: [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/legalcode)",
-            ],
-        },
-        "ModelDataDownloadTimeout": 1200,
-        "ContainerStartupHealthCheckTimeout": 1200,
-        "EncryptInterContainerTraffic": True,
-        "DisableOutputCompression": True,
-        "MaxRuntimeInSeconds": 360000,
-        "DynamicContainerDeploymentSupported": True,
-        "TrainingModelPackageArtifactUri": None,
-        "Dependencies": [],
         "InferenceConfigRankings": {
             "overall": {"Description": "default", "Rankings": ["variant1"]}
         },

tests/unit/sagemaker/jumpstart/model/test_model.py

@@ -1492,7 +1492,7 @@ def test_attach(
             model_version="some-version",
             inference_component_name="some-ic-name",
         )
-        
+
         mock_get_model_info_from_endpoint.assert_not_called()
 
     @mock.patch(