move the accept eula configurations into deploy flow

Author: gwang111

src/sagemaker/jumpstart/factory/model.py

@@ -655,7 +655,7 @@ def get_deploy_kwargs(
     training_config_name: Optional[str] = None,
     config_name: Optional[str] = None,
     routing_config: Optional[Dict[str, Any]] = None,
-    model_access_configs: Optional[List[ModelAccessConfig]] = None,
+    model_access_configs: Optional[Dict[str, ModelAccessConfig]] = None,
 ) -> JumpStartModelDeployKwargs:
     """Returns kwargs required to call `deploy` on `sagemaker.estimator.Model` object."""
 

src/sagemaker/jumpstart/model.py

@@ -766,9 +766,9 @@ def deploy(
                 (Default: EndpointType.MODEL_BASED).
             routing_config (Optional[Dict]): Settings the control how the endpoint routes
                 incoming traffic to the instances that the endpoint hosts.
-            model_access_configs (Optional[List[ModelAccessConfig]]): For models that require Model Access Configs,
-                provide one or multiple ModelAccessConfig objects to indicate whether model terms of use have been accepted.
-                The `AcceptEula` value must be explicitly defined as `True` in order to
+            model_access_configs (Optional[Dict[str, ModelAccessConfig]]): For models that require ModelAccessConfig,
+                provide a `{ "model_id", ModelAccessConfig(accept_eula=True) }` to indicate whether model terms
+                of use have been accepted. The `accept_eula` value must be explicitly defined as `True` in order to
                 accept the end-user license agreement (EULA) that some.
                 (Default: None)
 

src/sagemaker/jumpstart/types.py

@@ -2294,7 +2294,7 @@ def __init__(
         endpoint_type: Optional[EndpointType] = None,
         config_name: Optional[str] = None,
         routing_config: Optional[Dict[str, Any]] = None,
-        model_access_configs: Optional[List[CoreModelAccessConfig]] = None
+        model_access_configs: Optional[Dict[str, CoreModelAccessConfig]] = None
     ) -> None:
         """Instantiates JumpStartModelDeployKwargs object."""
 

src/sagemaker/jumpstart/utils.py

@@ -1538,7 +1538,7 @@ def wrapped_f(*args, **kwargs):
 
 def _add_model_access_configs_to_model_data_sources(
     model_data_sources: List[Dict[str, any]],
-    model_access_configs: List[ModelAccessConfig],
+    model_access_configs: Dict[str, ModelAccessConfig],
     model_id: str,
     region: str,
 ):
@@ -1548,25 +1548,29 @@ def _add_model_access_configs_to_model_data_sources(
         return model_data_sources
 
     acked_model_data_sources = []
-    acked_model_access_configs = 0
     for model_data_source in model_data_sources:
-        hosting_eula_key = model_data_source.pop("HostingEulaKey", None)
+        hosting_eula_key = model_data_source.get("HostingEulaKey")
         if hosting_eula_key:
-            if not model_access_configs or acked_model_access_configs == len(model_access_configs):
+            if not model_access_configs or not model_access_configs.get(model_id):
                 eula_message_template = "{model_source}{base_eula_message}{model_access_configs_message}"
+                model_access_config_entry = (
+                    "\"{model_id}\":ModelAccessConfig(accept_eula=True)".format(model_id=model_id)
+                )
                 raise ValueError(eula_message_template.format(
                     model_source="Draft " if model_data_source.get("ChannelName") else "",
                     base_eula_message=format_eula_message_from_specs(
                         model_id=model_id, region=region, hosting_eula_key=hosting_eula_key
                     ),
                     model_access_configs_message=(
-                        " Please add a ModelAccessConfig with AcceptEula=True"
-                        " to model_access_configs to acknowledge the EULA."
+                        " Please add a ModelAccessConfig entry:"
+                        f" {model_access_config_entry} "
+                        "to model_access_configs to acknowledge the EULA."
                     )
                 ))
             acked_model_data_source = model_data_source.copy()
+            acked_model_data_source.pop("HostingEulaKey")
             acked_model_data_source["S3DataSource"]["ModelAccessConfig"] = (
-                camel_case_to_pascal_case(model_access_configs[acked_model_access_configs].model_dump())
+                camel_case_to_pascal_case(model_access_configs.get(model_id).model_dump())
             )
             acked_model_data_sources.append(acked_model_data_source)
         else: