chore: improve error msg, remove * imports

Author: evakravi

src/sagemaker/accept_types.py

@@ -48,7 +48,7 @@ def retrieve_options(
     """
     if not jumpstart_utils.is_jumpstart_model_input(model_id, model_version):
         raise ValueError(
-            "Must specify `model_id` and `model_version` when retrieving accept types."
+            "Must specify JumpStart `model_id` and `model_version` when retrieving accept types."
         )
 
     return artifacts._retrieve_supported_accept_types(
@@ -91,7 +91,7 @@ def retrieve_default(
     """
     if not jumpstart_utils.is_jumpstart_model_input(model_id, model_version):
         raise ValueError(
-            "Must specify `model_id` and `model_version` when retrieving accept types."
+            "Must specify JumpStart `model_id` and `model_version` when retrieving accept types."
         )
 
     return artifacts._retrieve_default_accept_type(

src/sagemaker/content_types.py

@@ -48,7 +48,7 @@ def retrieve_options(
     """
     if not jumpstart_utils.is_jumpstart_model_input(model_id, model_version):
         raise ValueError(
-            "Must specify `model_id` and `model_version` when retrieving content types."
+            "Must specify JumpStart `model_id` and `model_version` when retrieving content types."
         )
 
     return artifacts._retrieve_supported_content_types(
@@ -91,7 +91,7 @@ def retrieve_default(
     """
     if not jumpstart_utils.is_jumpstart_model_input(model_id, model_version):
         raise ValueError(
-            "Must specify `model_id` and `model_version` when retrieving content types."
+            "Must specify JumpStart `model_id` and `model_version` when retrieving content types."
         )
 
     return artifacts._retrieve_default_content_type(

src/sagemaker/deserializers.py

@@ -18,9 +18,19 @@
 
 # base_deserializers was refactored from deserializers.
 # this import ensures backward compatibility.
-from sagemaker.base_deserializers import *  # noqa: F403, F401 # pylint: disable=W0614,W0401
-
-from sagemaker.base_deserializers import BaseDeserializer
+from sagemaker.base_deserializers import (  # noqa: F401 # pylint: disable=W0611
+    BaseDeserializer,
+    BytesDeserializer,
+    CSVDeserializer,
+    DeferredError,
+    JSONDeserializer,
+    JSONLinesDeserializer,
+    NumpyDeserializer,
+    PandasDeserializer,
+    SimpleBaseDeserializer,
+    StreamDeserializer,
+    StringDeserializer,
+)
 
 from sagemaker.jumpstart import artifacts, utils as jumpstart_utils
 
@@ -57,7 +67,7 @@ def retrieve_options(
 
     if not jumpstart_utils.is_jumpstart_model_input(model_id, model_version):
         raise ValueError(
-            "Must specify `model_id` and `model_version` when retrieving deserializers."
+            "Must specify JumpStart `model_id` and `model_version` when retrieving deserializers."
         )
 
     return artifacts._retrieve_deserializer_options(
@@ -101,7 +111,7 @@ def retrieve_default(
 
     if not jumpstart_utils.is_jumpstart_model_input(model_id, model_version):
         raise ValueError(
-            "Must specify `model_id` and `model_version` when retrieving deserializers."
+            "Must specify JumpStart `model_id` and `model_version` when retrieving deserializers."
         )
 
     return artifacts._retrieve_default_deserializer(

src/sagemaker/environment_variables.py

@@ -59,7 +59,8 @@ def retrieve_default(
     """
     if not jumpstart_utils.is_jumpstart_model_input(model_id, model_version):
         raise ValueError(
-            "Must specify `model_id` and `model_version` when retrieving environment variables."
+            "Must specify JumpStart `model_id` and `model_version` "
+            "when retrieving environment variables."
         )
 
     return artifacts._retrieve_default_environment_variables(

src/sagemaker/hyperparameters.py

@@ -64,7 +64,7 @@ def retrieve_default(
     """
     if not jumpstart_utils.is_jumpstart_model_input(model_id, model_version):
         raise ValueError(
-            "Must specify `model_id` and `model_version` when retrieving hyperparameters."
+            "Must specify JumpStart `model_id` and `model_version` when retrieving hyperparameters."
         )
 
     return artifacts._retrieve_default_hyperparameters(
@@ -110,7 +110,7 @@ def validate(
 
     if not jumpstart_utils.is_jumpstart_model_input(model_id, model_version):
         raise ValueError(
-            "Must specify `model_id` and `model_version` when validating hyperparameters."
+            "Must specify JumpStart `model_id` and `model_version` when validating hyperparameters."
         )
 
     if model_id is None or model_version is None:

src/sagemaker/instance_types.py

@@ -57,7 +57,7 @@ def retrieve_default(
     """
     if not jumpstart_utils.is_jumpstart_model_input(model_id, model_version):
         raise ValueError(
-            "Must specify `model_id` and `model_version` when retrieving instance types."
+            "Must specify JumpStart `model_id` and `model_version` when retrieving instance types."
         )
 
     if scope is None:
@@ -105,7 +105,7 @@ def retrieve(
     """
     if not jumpstart_utils.is_jumpstart_model_input(model_id, model_version):
         raise ValueError(
-            "Must specify `model_id` and `model_version` when retrieving instance types."
+            "Must specify JumpStart `model_id` and `model_version` when retrieving instance types."
         )
 
     if scope is None:

src/sagemaker/jumpstart/utils.py

@@ -165,7 +165,7 @@ def is_jumpstart_model_input(model_id: Optional[str], version: Optional[str]) ->
     if model_id is not None or version is not None:
         if model_id is None or version is None:
             raise ValueError(
-                "Must specify `model_id` and `model_version` when getting specs for "
+                "Must specify JumpStart `model_id` and `model_version` when getting specs for "
                 "JumpStart models."
             )
         return True

src/sagemaker/metric_definitions.py

@@ -54,8 +54,8 @@ def retrieve_default(
     """
     if not jumpstart_utils.is_jumpstart_model_input(model_id, model_version):
         raise ValueError(
-            "Must specify `model_id` and `model_version` when retrieving default training "
-            "metric definitions."
+            "Must specify JumpStart `model_id` and `model_version` "
+            "when retrieving default training metric definitions."
         )
 
     return artifacts._retrieve_default_training_metric_definitions(

src/sagemaker/model_uris.py

@@ -59,7 +59,9 @@ def retrieve(
         DeprecatedJumpStartModelError: If the version of the model is deprecated.
     """
     if not jumpstart_utils.is_jumpstart_model_input(model_id, model_version):
-        raise ValueError("Must specify `model_id` and `model_version` when retrieving model URIs.")
+        raise ValueError(
+            "Must specify JumpStart `model_id` and `model_version` when retrieving model URIs."
+        )
 
     return artifacts._retrieve_model_uri(
         model_id,

src/sagemaker/predictor.py

@@ -20,11 +20,14 @@
 
 from sagemaker.session import Session
 
-from sagemaker.base_predictor import Predictor
 
 # base_predictor was refactored from predictor.
 # this import ensures backward compatibility.
-from sagemaker.base_predictor import *  # noqa: F403, F401 # pylint: disable=W0614,W0401
+from sagemaker.base_predictor import (  # noqa: F401 # pylint: disable=W0611
+    Predictor,
+    PredictorBase,
+    RealTimePredictor,
+)
 
 
 def retrieve_default(
@@ -64,7 +67,8 @@ def retrieve_default(
 
     if not is_jumpstart_model_input(model_id, model_version):
         raise ValueError(
-            "Must specify `model_id` and `model_version` when retrieving default predictor."
+            "Must specify JumpStart `model_id` and `model_version` "
+            "when retrieving default predictor."
         )
 
     predictor = Predictor(endpoint_name=endpoint_name, sagemaker_session=sagemaker_session)

src/sagemaker/script_uris.py

@@ -59,7 +59,9 @@ def retrieve(
         DeprecatedJumpStartModelError: If the version of the model is deprecated.
     """
     if not jumpstart_utils.is_jumpstart_model_input(model_id, model_version):
-        raise ValueError("Must specify `model_id` and `model_version` when retrieving script URIs.")
+        raise ValueError(
+            "Must specify JumpStart `model_id` and `model_version` when retrieving script URIs."
+        )
 
     return artifacts._retrieve_script_uri(
         model_id,

src/sagemaker/serializers.py

@@ -15,12 +15,20 @@
 
 from typing import List, Optional
 
-# base_predictor was refactored from predictor.
+# base_serializers was refactored from serializers.
 # this import ensures backward compatibility.
-from sagemaker.base_serializers import *  # noqa: F403, F401 # pylint: disable=W0614,W0401
-
-
-from sagemaker.base_serializers import BaseSerializer
+from sagemaker.base_serializers import (  # noqa: F401 # pylint: disable=W0611
+    BaseSerializer,
+    CSVSerializer,
+    DataSerializer,
+    IdentitySerializer,
+    JSONLinesSerializer,
+    JSONSerializer,
+    LibSVMSerializer,
+    NumpySerializer,
+    SimpleBaseSerializer,
+    SparseMatrixSerializer,
+)
 
 from sagemaker.jumpstart import artifacts, utils as jumpstart_utils
 
@@ -56,7 +64,9 @@ def retrieve_options(
     """
 
     if not jumpstart_utils.is_jumpstart_model_input(model_id, model_version):
-        raise ValueError("Must specify `model_id` and `model_version` when retrieving serializers.")
+        raise ValueError(
+            "Must specify JumpStart `model_id` and `model_version` when retrieving serializers."
+        )
 
     return artifacts._retrieve_serializer_options(
         model_id,
@@ -98,7 +108,9 @@ def retrieve_default(
     """
 
     if not jumpstart_utils.is_jumpstart_model_input(model_id, model_version):
-        raise ValueError("Must specify `model_id` and `model_version` when retrieving serializers.")
+        raise ValueError(
+            "Must specify JumpStart `model_id` and `model_version` when retrieving serializers."
+        )
 
     return artifacts._retrieve_default_serializer(
         model_id,

tests/unit/test_predictor.py

@@ -493,11 +493,11 @@ def test_endpoint_context_fail():
     assert not context
 
 
-@patch("sagemaker.predictor.ModelExplainabilityMonitor.attach")
-@patch("sagemaker.predictor.ModelBiasMonitor.attach")
-@patch("sagemaker.predictor.ModelQualityMonitor.attach")
-@patch("sagemaker.predictor.ModelMonitor.attach")
-@patch("sagemaker.predictor.DefaultModelMonitor.attach")
+@patch("sagemaker.base_predictor.ModelExplainabilityMonitor.attach")
+@patch("sagemaker.base_predictor.ModelBiasMonitor.attach")
+@patch("sagemaker.base_predictor.ModelQualityMonitor.attach")
+@patch("sagemaker.base_predictor.ModelMonitor.attach")
+@patch("sagemaker.base_predictor.DefaultModelMonitor.attach")
 def test_list_monitors(default_model_monitor_attach, *attach_methods):
     sagemaker_session = empty_sagemaker_session()
     sagemaker_session.list_monitoring_schedules = Mock(