chore: improve error msg for deprecated and vulnerable models, fix pylint

Author: evakravi

src/sagemaker/jumpstart/exceptions.py

@@ -81,15 +81,17 @@ def __init__(
                 self.message = (
                     f"Version '{version}' of JumpStart model '{model_id}' "  # type: ignore
                     "has at least 1 vulnerable dependency in the inference script. "
-                    "Please try targetting a higher version of the model. "
-                    f"List of vulnerabilities: {', '.join(vulnerabilities)}"  # type: ignore
+                    "Please try targetting a higher version of the model or using a "
+                    "different model. List of vulnerabilities: "
+                    f"{', '.join(vulnerabilities)}"  # type: ignore
                 )
             elif scope == JumpStartScriptScope.TRAINING:
                 self.message = (
                     f"Version '{version}' of JumpStart model '{model_id}' "  # type: ignore
                     "has at least 1 vulnerable dependency in the training script. "
-                    "Please try targetting a higher version of the model. "
-                    f"List of vulnerabilities: {', '.join(vulnerabilities)}"  # type: ignore
+                    "Please try targetting a higher version of the model or using a "
+                    "different model. List of vulnerabilities: "
+                    f"{', '.join(vulnerabilities)}"  # type: ignore
                 )
             else:
                 raise NotImplementedError(
@@ -123,7 +125,8 @@ def __init__(
                 raise RuntimeError("Must specify `model_id` and `version` arguments.")
             self.message = (
                 f"Version '{version}' of JumpStart model '{model_id}' is deprecated. "
-                "Please try targetting a higher version of the model."
+                "Please try targetting a higher version of the model or using a "
+                "different model."
             )
 
         super().__init__(self.message)

src/sagemaker/jumpstart/factory/estimator.py

@@ -412,8 +412,8 @@ def _add_instance_type_and_count_to_kwargs(
     kwargs.instance_count = kwargs.instance_count or 1
 
     if orig_instance_type is None:
-        logger.info(  # pylint: disable=W1203
-            f"No instance type selected for training job. Defaulting to {kwargs.instance_type}."
+        logger.info(
+            "No instance type selected for training job. Defaulting to %s.", kwargs.instance_type
         )
 
     return kwargs
@@ -458,9 +458,10 @@ def _add_model_uri_to_kwargs(kwargs: JumpStartEstimatorInitKwargs) -> JumpStartE
             tolerate_vulnerable_model=kwargs.tolerate_vulnerable_model,
         )
     ):
-        logger.warning(  # pylint: disable=W1203
-            f"'{kwargs.model_id}' does not support incremental training but is being trained with"
-            " non-default model artifact."
+        logger.warning(
+            "'%s' does not support incremental training but is being trained with"
+            " non-default model artifact.",
+            kwargs.model_id,
         )
 
     kwargs.model_uri = kwargs.model_uri or default_model_uri

src/sagemaker/jumpstart/factory/model.py

@@ -168,9 +168,9 @@ def _add_instance_type_to_kwargs(kwargs: JumpStartModelInitKwargs) -> JumpStartM
     )
 
     if orig_instance_type is None:
-        logger.info(  # pylint: disable=W1203
-            "No instance type selected for inference hosting endpoint. "
-            f"Defaulting to {kwargs.instance_type}."
+        logger.info(
+            "No instance type selected for inference hosting endpoint. Defaulting to %s.",
+            kwargs.instance_type,
         )
 
     return kwargs

src/sagemaker/model.py

@@ -612,11 +612,15 @@ def _upload_code(self, key_prefix: str, repack: bool = False) -> None:
                     s3_prefix=repacked_model_data, script_name=os.path.basename(self.entry_point)
                 )
 
-            LOGGER.info(  # pylint: disable=W1203
-                f"Repacking model artifact ({self.model_data}), script artifact "
-                f"({self.source_dir}), and dependencies ({self.dependencies}) "
-                f"into single tar.gz file located at {repacked_model_data}. "
-                "This may take some time depending on model size..."
+            LOGGER.info(
+                "Repacking model artifact (%s), script artifact "
+                "(%s), and dependencies (%s) "
+                "into single tar.gz file located at %s. "
+                "This may take some time depending on model size...",
+                self.model_data,
+                self.source_dir,
+                self.dependencies,
+                repacked_model_data,
             )
 
             utils.repack_model(

tests/unit/sagemaker/jumpstart/estimator/test_estimator.py

@@ -715,7 +715,8 @@ def test_incremental_training_with_unsupported_model_logs_warning(
         )
 
         mock_logger_warning.assert_called_once_with(
-            f"'{model_id}' does not support incremental training but is being trained with non-default model artifact."
+            "'%s' does not support incremental training but is being trained with non-default model artifact.",
+            model_id,
         )
         mock_supports_incremental_training.assert_called_once_with(
             model_id=model_id,

tests/unit/sagemaker/jumpstart/test_utils.py

@@ -788,7 +788,7 @@ def make_vulnerable_inference_spec(*largs, **kwargs):
     assert (
         "Version '*' of JumpStart model 'pytorch-eqa-bert-base-cased' has at least 1 "
         "vulnerable dependency in the inference script. "
-        "Please try targetting a higher version of the model. "
+        "Please try targetting a higher version of the model or using a different model. "
         "List of vulnerabilities: some, vulnerability"
     ) == str(e.value.message)
 
@@ -827,7 +827,7 @@ def make_vulnerable_training_spec(*largs, **kwargs):
     assert (
         "Version '*' of JumpStart model 'pytorch-eqa-bert-base-cased' has at least 1 "
         "vulnerable dependency in the training script. "
-        "Please try targetting a higher version of the model. "
+        "Please try targetting a higher version of the model or using a different model. "
         "List of vulnerabilities: some, vulnerability"
     ) == str(e.value.message)
 
@@ -866,7 +866,9 @@ def make_deprecated_spec(*largs, **kwargs):
             region="us-west-2",
         )
     assert "Version '*' of JumpStart model 'pytorch-eqa-bert-base-cased' is deprecated. "
-    "Please try targetting a higher version of the model." == str(e.value.message)
+    "Please try targetting a higher version of the model or using a different model." == str(
+        e.value.message
+    )
 
     with patch("logging.Logger.warning") as mocked_warning_log:
         assert (