change: Use sagemaker config keyword (#3934)

Author: evakravi

src/sagemaker/jumpstart/estimator.py

@@ -34,7 +34,7 @@
 from sagemaker.jumpstart.factory.model import get_default_predictor
 from sagemaker.jumpstart.utils import (
     is_valid_model_id,
-    resolve_model_intelligent_default_field,
+    resolve_model_sagemaker_config_field,
 )
 from sagemaker.utils import stringify_object
 from sagemaker.model_monitor.data_capture_config import DataCaptureConfig
@@ -913,7 +913,7 @@ def deploy(
         self.orig_predictor_cls = predictor_cls
 
         sagemaker_session = sagemaker_session or self.sagemaker_session
-        role = resolve_model_intelligent_default_field(
+        role = resolve_model_sagemaker_config_field(
             field_name="role",
             field_val=role,
             sagemaker_session=sagemaker_session,

src/sagemaker/jumpstart/factory/estimator.py

@@ -55,7 +55,7 @@
 )
 from sagemaker.jumpstart.utils import (
     update_dict_if_key_not_present,
-    resolve_estimator_intelligent_default_field,
+    resolve_estimator_sagemaker_config_field,
 )
 
 
@@ -386,7 +386,7 @@ def _add_model_version_to_kwargs(kwargs: JumpStartKwargs) -> JumpStartKwargs:
 def _add_role_to_kwargs(kwargs: JumpStartEstimatorInitKwargs) -> JumpStartEstimatorInitKwargs:
     """Sets role based on default or override, returns full kwargs."""
 
-    kwargs.role = resolve_estimator_intelligent_default_field(
+    kwargs.role = resolve_estimator_sagemaker_config_field(
         field_name="role",
         field_val=kwargs.role,
         sagemaker_session=kwargs.sagemaker_session,
@@ -604,7 +604,7 @@ def _add_estimator_extra_kwargs(
 
     for key, value in estimator_kwargs_to_add.items():
         if getattr(kwargs, key) is None:
-            resolved_value = resolve_estimator_intelligent_default_field(
+            resolved_value = resolve_estimator_sagemaker_config_field(
                 field_name=key,
                 field_val=value,
                 sagemaker_session=kwargs.sagemaker_session,

src/sagemaker/jumpstart/factory/model.py

@@ -38,7 +38,7 @@
 )
 from sagemaker.jumpstart.utils import (
     update_dict_if_key_not_present,
-    resolve_model_intelligent_default_field,
+    resolve_model_sagemaker_config_field,
 )
 
 from sagemaker.model_monitor.data_capture_config import DataCaptureConfig
@@ -123,7 +123,7 @@ def _add_sagemaker_session_to_kwargs(kwargs: JumpStartModelInitKwargs) -> JumpSt
 def _add_role_to_kwargs(kwargs: JumpStartModelInitKwargs) -> JumpStartModelInitKwargs:
     """Sets role based on default or override, returns full kwargs."""
 
-    kwargs.role = resolve_model_intelligent_default_field(
+    kwargs.role = resolve_model_sagemaker_config_field(
         field_name="role",
         field_val=kwargs.role,
         sagemaker_session=kwargs.sagemaker_session,
@@ -301,7 +301,7 @@ def _add_extra_model_kwargs(kwargs: JumpStartModelInitKwargs) -> JumpStartModelI
 
     for key, value in model_kwargs_to_add.items():
         if getattr(kwargs, key) is None:
-            resolved_value = resolve_model_intelligent_default_field(
+            resolved_value = resolve_model_sagemaker_config_field(
                 field_name=key,
                 field_val=value,
                 sagemaker_session=kwargs.sagemaker_session,

src/sagemaker/jumpstart/utils.py

@@ -444,24 +444,24 @@ def update_dict_if_key_not_present(
     return dict_to_update
 
 
-def resolve_model_intelligent_default_field(
+def resolve_model_sagemaker_config_field(
     field_name: str,
     field_val: Optional[Any],
     sagemaker_session: Session,
     default_value: Optional[str] = None,
 ) -> Any:
-    """Given a field name, checks if there are intelligent defaults to set.
+    """Given a field name, checks if there is a sagemaker config value to set.
 
     For the role field, which is customer-supplied, we allow ``field_val`` to take precedence
-    over intelligent defaults. For all other fields, intelligent defaults takes precedence
+    over sagemaker config values. For all other fields, sagemaker config values take precedence
     over the JumpStart default fields.
     """
     # In case, sagemaker_session is None, get sagemaker_config from load_sagemaker_config()
     # to resolve value from config for the respective field_name parameter
     _sagemaker_config = load_sagemaker_config() if (sagemaker_session is None) else None
 
     # We allow customers to define a role which takes precedence
-    # over intelligent defaults
+    # over the one defined in sagemaker config
     if field_name == "role":
         return resolve_value_from_config(
             direct_input=field_val,
@@ -472,7 +472,7 @@ def resolve_model_intelligent_default_field(
         )
 
     # JumpStart Models have certain default field values. We want
-    # intelligent defaults to take priority over the model-specific defaults.
+    # sagemaker config values to take priority over the model-specific defaults.
     if field_name == "enable_network_isolation":
         resolved_val = resolve_value_from_config(
             direct_input=None,
@@ -483,20 +483,20 @@ def resolve_model_intelligent_default_field(
         )
         return resolved_val if resolved_val is not None else field_val
 
-    # field is not covered by intelligent defaults so return as is
+    # field is not covered by sagemaker config so return as is
     return field_val
 
 
-def resolve_estimator_intelligent_default_field(
+def resolve_estimator_sagemaker_config_field(
     field_name: str,
     field_val: Optional[Any],
     sagemaker_session: Session,
     default_value: Optional[str] = None,
 ) -> Any:
-    """Given a field name, checks if there are intelligent defaults to set.
+    """Given a field name, checks if there is a sagemaker config value to set.
 
     For the role field, which is customer-supplied, we allow ``field_val`` to take precedence
-    over intelligent defaults. For all other fields, intelligent defaults takes precedence
+    over sagemaker config values. For all other fields, sagemaker config values take precedence
     over the JumpStart default fields.
     """
 
@@ -506,7 +506,7 @@ def resolve_estimator_intelligent_default_field(
     _sagemaker_config = load_sagemaker_config() if (sagemaker_session is None) else None
 
     # We allow customers to define a role which takes precedence
-    # over intelligent defaults
+    # over the one defined in sagemaker config
     if field_name == "role":
         return resolve_value_from_config(
             direct_input=field_val,
@@ -517,7 +517,7 @@ def resolve_estimator_intelligent_default_field(
         )
 
     # JumpStart Estimators have certain default field values. We want
-    # intelligent defaults to take priority over the model-specific defaults.
+    # sagemaker config values to take priority over the model-specific defaults.
     if field_name == "enable_network_isolation":
 
         resolved_val = resolve_value_from_config(
@@ -540,7 +540,7 @@ def resolve_estimator_intelligent_default_field(
         )
         return resolved_val if resolved_val is not None else field_val
 
-    # field is not covered by intelligent defaults so return as is
+    # field is not covered by sagemaker config so return as is
     return field_val