fix altconfig hubcontent and reenable integ test

Author: bencrabtree

src/sagemaker/jumpstart/accessors.py

@@ -287,8 +287,9 @@ def get_model_specs(
             {**JumpStartModelsAccessor._cache_kwargs, **additional_kwargs}
         )
         JumpStartModelsAccessor._set_cache_and_region(region, cache_kwargs)
-
-        if hub_arn:
+        
+        # Users only input model id, not contentType, so first try to describe with ModelReference, then with Model
+        if hub_arn:    
             try:
                 hub_model_arn = construct_hub_model_reference_arn_from_inputs(
                     hub_arn=hub_arn, model_name=model_id, version=version
@@ -308,11 +309,22 @@ def get_model_specs(
                 hub_model_arn = construct_hub_model_arn_from_inputs(
                     hub_arn=hub_arn, model_name=model_id, version=version
                 )
-                model_specs = JumpStartModelsAccessor._cache.get_hub_model(
-                    hub_model_arn=hub_model_arn
-                )
-                model_specs.set_hub_content_type(HubContentType.MODEL)
-                return model_specs
+
+                # Failed to describe ModelReference, try with Model
+                try:
+                    model_specs = JumpStartModelsAccessor._cache.get_hub_model(
+                        hub_model_arn=hub_model_arn
+                    )
+                    model_specs.set_hub_content_type(HubContentType.MODEL)
+
+                    return model_specs
+                except Exception as ex:
+                    # Failed with both, throw a custom error message
+                    raise Exception(
+                        f"Cannot get details for {model_id} in Hub {hub_arn}. \
+                            {model_id} does not exist as a Model or ModelReference: \n"
+                        + str(ex)
+                    )
 
         return JumpStartModelsAccessor._cache.get_specs(  # type: ignore
             model_id=model_id, version_str=version, model_type=model_type

src/sagemaker/jumpstart/hub/hub.py

@@ -272,18 +272,21 @@ def delete_model_reference(self, model_name: str) -> None:
     def describe_model(
         self, model_name: str, hub_name: Optional[str] = None, model_version: Optional[str] = None
     ) -> DescribeHubContentResponse:
-        """Describe model in the SageMaker Hub."""
+        """Describe Model or ModelReference in a Hub."""
+        hub_name = self.hub_name if not hub_name else hub_name
+
+        # Users only input model id, not contentType, so first try to describe with ModelReference, then with Model
         try:
             model_version = get_hub_model_version(
                 hub_model_name=model_name,
                 hub_model_type=HubContentType.MODEL_REFERENCE.value,
-                hub_name=self.hub_name if not hub_name else hub_name,
+                hub_name=hub_name,
                 sagemaker_session=self._sagemaker_session,
                 hub_model_version=model_version,
             )
 
             hub_content_description: Dict[str, Any] = self._sagemaker_session.describe_hub_content(
-                hub_name=self.hub_name if not hub_name else hub_name,
+                hub_name=hub_name,
                 hub_content_name=model_name,
                 hub_content_version=model_version,
                 hub_content_type=HubContentType.MODEL_REFERENCE.value,
@@ -294,19 +297,30 @@ def describe_model(
                 "Received exeption while calling APIs for ContentType ModelReference, retrying with ContentType Model: "
                 + str(ex)
             )
-            model_version = get_hub_model_version(
-                hub_model_name=model_name,
-                hub_model_type=HubContentType.MODEL.value,
-                hub_name=self.hub_name if not hub_name else hub_name,
-                sagemaker_session=self._sagemaker_session,
-                hub_model_version=model_version,
-            )
 
-            hub_content_description: Dict[str, Any] = self._sagemaker_session.describe_hub_content(
-                hub_name=self.hub_name if not hub_name else hub_name,
-                hub_content_name=model_name,
-                hub_content_version=model_version,
-                hub_content_type=HubContentType.MODEL.value,
-            )
+            # Failed to describe ModelReference, try with Model
+            try:
+                model_version = get_hub_model_version(
+                    hub_model_name=model_name,
+                    hub_model_type=HubContentType.MODEL.value,
+                    hub_name=hub_name,
+                    sagemaker_session=self._sagemaker_session,
+                    hub_model_version=model_version,
+                )
+
+                hub_content_description: Dict[str, Any] = self._sagemaker_session.describe_hub_content(
+                    hub_name=hub_name,
+                    hub_content_name=model_name,
+                    hub_content_version=model_version,
+                    hub_content_type=HubContentType.MODEL.value,
+                )
+            
+            except Exception as ex:
+                # Failed with both, throw a custom error message
+                raise Exception(
+                    f"Cannot get details for {model_name} in Hub {hub_name}. \
+                        {model_name} does not exist as a Model or ModelReference in {hub_name}: \n"
+                    + str(ex)
+                )
 
         return DescribeHubContentResponse(hub_content_description)

src/sagemaker/jumpstart/types.py

@@ -1363,9 +1363,9 @@ def from_json(self, json_obj: Dict[str, Any]) -> None:
         self.deploy_kwargs = deepcopy(json_obj.get("deploy_kwargs", {}))
         self.predictor_specs: Optional[JumpStartPredictorSpecs] = (
             JumpStartPredictorSpecs(
-                json_obj["predictor_specs"], is_hub_content=self._is_hub_content
+                json_obj.get("predictor_specs"), is_hub_content=self._is_hub_content
             )
-            if "predictor_specs" in json_obj
+            if json_obj.get("predictor_specs")
             else None
         )
         self.default_payloads: Optional[Dict[str, JumpStartSerializablePayload]] = (

tests/integ/sagemaker/jumpstart/private_hub/model/test_jumpstart_private_hub_model.py

@@ -122,7 +122,6 @@ def test_jumpstart_hub_gated_model(setup, add_model_references):
     assert response is not None
 
 
-@pytest.mark.skip(reason="blocking PR checks and release pipeline.")
 def test_jumpstart_gated_model_inference_component_enabled(setup, add_model_references):
 
     model_id = "meta-textgeneration-llama-2-7b"