chore: resolve git comments

Author: evakravi

doc/overview.rst

@@ -773,8 +773,8 @@ Deployment may take about 5 minutes.
        instance_type=instance_type,
    )
 
-Because the model and script URIs are owned by JumpStart, the endpoint,
-endpoint config and model resources will be prefixed with
+Because the model and script URIs are distributed by SageMaker JumpStart,
+the endpoint, endpoint config and model resources will be prefixed with
 ``sagemaker-jumpstart``. Refer to the model ``Tags`` to inspect the
 JumpStart artifacts involved in the model creation.
 

src/sagemaker/estimator.py

@@ -570,10 +570,11 @@ def prepare_workflow_for_training(self, job_name=None):
     def _ensure_base_job_name(self):
         """Set ``self.base_job_name`` if it is not set already."""
         # honor supplied base_job_name or generate it
-        if self.base_job_name is None:
-            self.base_job_name = get_jumpstart_base_name_if_jumpstart_model(
-                self.source_dir, self.model_uri
-            ) or base_name_from_image(self.training_image_uri())
+        self.base_job_name = (
+            self.base_job_name
+            or get_jumpstart_base_name_if_jumpstart_model(self.source_dir, self.model_uri)
+            or base_name_from_image(self.training_image_uri())
+        )
 
     def _get_or_create_name(self, name=None):
         """Generate a name based on the base job name or training image if needed.

src/sagemaker/jumpstart/cache.py

@@ -229,7 +229,7 @@ def _get_manifest_key_from_model_id_semantic_version(
             )
 
         else:
-            possible_model_ids = [header.model_id for header in manifest.values()]
+            possible_model_ids = [header.model_id for header in manifest.values()]  # type: ignore
             closest_model_id = get_close_matches(model_id, possible_model_ids, n=1, cutoff=0)[0]
             error_msg += f"Did you mean to use model ID '{closest_model_id}'?"
 

src/sagemaker/jumpstart/utils.py

@@ -233,7 +233,7 @@ def add_single_jumpstart_tag(
 
 
 def get_jumpstart_base_name_if_jumpstart_model(
-    *uris,
+    *uris: Optional[str],
 ) -> Optional[str]:
     """Return default JumpStart base name if a URI belongs to JumpStart.
 

src/sagemaker/model.py

@@ -532,7 +532,10 @@ def _create_sagemaker_model(self, instance_type=None, accelerator_type=None, tag
         )
 
     def _ensure_base_name_if_needed(self, image_uri, script_uri, model_uri):
-        """Create a base name from the image URI if there is no model name provided."""
+        """Create a base name from the image URI if there is no model name provided.
+
+        If a JumpStart script or model uri is used, select the JumpStart base name.
+        """
         if self.name is None:
             self._base_name = (
                 self._base_name

tests/unit/sagemaker/jumpstart/test_utils.py

@@ -883,3 +883,15 @@ def test_get_jumpstart_base_name_if_jumpstart_model():
 
     uris = ["s3://not-jumpstart-bucket/some-key" for _ in range(random.randint(0, 10))]
     assert utils.get_jumpstart_base_name_if_jumpstart_model(*uris) is None
+
+    uris = ["s3://not-jumpstart-bucket/some-key" for _ in range(random.randint(1, 10))] + [
+        random_jumpstart_s3_uri("random_key")
+    ]
+    assert JUMPSTART_RESOURCE_BASE_NAME == utils.get_jumpstart_base_name_if_jumpstart_model(*uris)
+
+    uris = (
+        ["s3://not-jumpstart-bucket/some-key" for _ in range(random.randint(1, 10))]
+        + [random_jumpstart_s3_uri("random_key")]
+        + ["s3://not-jumpstart-bucket/some-key-2" for _ in range(random.randint(1, 10))]
+    )
+    assert JUMPSTART_RESOURCE_BASE_NAME == utils.get_jumpstart_base_name_if_jumpstart_model(*uris)