update types and var names

Author: bencrabtree

src/sagemaker/jumpstart/cache.py

@@ -467,8 +467,8 @@ def get_hub_model(self, hub_model_arn: str) -> JumpStartModelSpecs:
             hub_model_arn (str): Arn for the Hub model to get specs for
         """
 
-        specs, _ = self._content_cache.get(JumpStartCachedContentKey(HubDataType.MODEL, hub_model_arn))
-        return specs.formatted_content
+        details, _ = self._content_cache.get(JumpStartCachedContentKey(HubDataType.MODEL, hub_model_arn))
+        return details.formatted_content
 
     def get_hub(self, hub_arn: str) -> Dict[str, Any]:
         """Return descriptive info for a given Hub
@@ -477,8 +477,8 @@ def get_hub(self, hub_arn: str) -> Dict[str, Any]:
             hub_arn (str): Arn for the Hub to get info for
         """
 
-        manifest, _ = self._content_cache.get(JumpStartCachedContentKey(HubDataType.HUB, hub_arn))
-        return manifest.formatted_content
+        details, _ = self._content_cache.get(JumpStartCachedContentKey(HubDataType.HUB, hub_arn))
+        return details.formatted_content
 
     def clear(self) -> None:
         """Clears the model ID/version and s3 cache."""

src/sagemaker/jumpstart/curated_hub/curated_hub.py

@@ -12,8 +12,6 @@
 # language governing permissions and limitations under the License.
 from typing import Optional, Dict, Any
 
-import boto3
-
 from sagemaker.session import Session
 
 from sagemaker.jumpstart.curated_hub.constants import DEFAULT_CLIENT_CONFIG
@@ -26,13 +24,8 @@ def __init__(self, hub_name: str, region: str, session: Optional[Session]):
         self.hub_name = hub_name
         self.region = region
         self.session = session
-        self._s3_client = self._get_s3_client()
         self._sm_session = session or Session()
 
-    def _get_s3_client(self) -> Any:
-        """Returns an S3 client."""
-        return boto3.client("s3", region_name=self._region, config=DEFAULT_CLIENT_CONFIG)
-
     def describe_model(self, model_name: str, model_version: str = "*") -> Dict[str, Any]:
         """Returns descriptive information about the Hub Model"""
 

src/sagemaker/jumpstart/types.py

@@ -991,7 +991,7 @@ def __init__(
         data_type: JumpStartContentDataType,
         id_info: str,
     ) -> None:
-        """Instantiates JumpStartCachedS3ContentKey object.
+        """Instantiates JumpStartCachedContentKey object.
 
         Args:
             data_type (JumpStartContentDataType): JumpStart content data type.
@@ -1014,7 +1014,7 @@ def __init__(
         ],
         md5_hash: Optional[str] = None,
     ) -> None:
-        """Instantiates JumpStartCachedS3ContentValue object.
+        """Instantiates JumpStartCachedContentValue object.
 
         Args:
             formatted_content (Union[Dict[JumpStartVersionedModelId, JumpStartModelHeader],