Merge branch 'master' into doc

Author: ahsan-z-khan

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v2.48.2 (2021-07-12)
+
+### Bug Fixes and Other Changes
+
+ * default time for compilation jobs
+ * skip hf inference test
+
 ## v2.48.1 (2021-07-08)
 
 ### Bug Fixes and Other Changes

VERSION

@@ -1 +1 @@
-2.48.2.dev0
+2.48.3.dev0

doc/api/inference/model_monitor.rst

@@ -26,3 +26,8 @@ Model Monitor
     :members:
     :undoc-members:
     :show-inheritance:
+
+.. automodule:: sagemaker.model_monitor.clarify_model_monitoring
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/frameworks/huggingface/index.rst

@@ -9,4 +9,5 @@ For general information about using the SageMaker Python SDK, see :ref:`overview
     :maxdepth: 2
 
     sagemaker.huggingface
-    Use Hugging Face with the SageMaker Python SDK <https://huggingface.co/transformers/sagemaker.html>
+    Train Hugging Face models on Amazon SageMaker with the SageMaker Python SDK <https://huggingface.co/docs/sagemaker/train>
+    Deploy Hugging Face models to Amazon SageMaker with the SageMaker Python SDK <https://huggingface.co/docs/sagemaker/inference>

doc/workflows/pipelines/sagemaker.workflow.pipelines.rst

@@ -112,12 +112,16 @@ Steps
 
 .. autoclass:: sagemaker.workflow.steps.TrainingStep
 
-.. autoclass:: sagemaker.workflow.steps.CreateModelStep
+.. autoclass:: sagemaker.workflow.steps.TuningStep
+
+.. autofunction:: sagemaker.workflow.steps.TuningStep.get_top_model_s3_uri
 
 .. autoclass:: sagemaker.workflow.steps.TransformStep
 
 .. autoclass:: sagemaker.workflow.steps.ProcessingStep
 
-.. autoclass:: sagemaker.workflow.steps.TuningStep
+.. autoclass:: sagemaker.workflow.steps.CreateModelStep
+
+.. autoclass:: sagemaker.workflow.callback_step.CallbackStep
 
 .. autoclass:: sagemaker.workflow.steps.CacheConfig

src/sagemaker/__init__.py

@@ -55,6 +55,7 @@
 from sagemaker.processing import Processor, ScriptProcessor  # noqa: F401
 from sagemaker.session import Session  # noqa: F401
 from sagemaker.session import container_def, pipeline_container_def  # noqa: F401
+from sagemaker.session import get_model_package_args  # noqa: F401
 from sagemaker.session import production_variant  # noqa: F401
 from sagemaker.session import get_execution_role  # noqa: F401
 

src/sagemaker/model.py

@@ -158,14 +158,15 @@ def register(
         if self.model_data is None:
             raise ValueError("SageMaker Model Package cannot be created without model data.")
 
-        model_pkg_args = self._get_model_package_args(
+        model_pkg_args = sagemaker.get_model_package_args(
             content_types,
             response_types,
             inference_instances,
             transform_instances,
             model_package_name,
             model_package_group_name,
-            image_uri,
+            self.model_data,
+            image_uri or self.image_uri,
             model_metrics,
             metadata_properties,
             marketplace_cert,
@@ -181,80 +182,6 @@ def register(
             model_package_arn=model_package.get("ModelPackageArn"),
         )
 
-    def _get_model_package_args(
-        self,
-        content_types,
-        response_types,
-        inference_instances,
-        transform_instances,
-        model_package_name=None,
-        model_package_group_name=None,
-        image_uri=None,
-        model_metrics=None,
-        metadata_properties=None,
-        marketplace_cert=False,
-        approval_status=None,
-        description=None,
-        tags=None,
-    ):
-        """Get arguments for session.create_model_package method.
-
-        Args:
-            content_types (list): The supported MIME types for the input data.
-            response_types (list): The supported MIME types for the output data.
-            inference_instances (list): A list of the instance types that are used to
-                generate inferences in real-time.
-            transform_instances (list): A list of the instance types on which a transformation
-                job can be run or on which an endpoint can be deployed.
-            model_package_name (str): Model Package name, exclusive to `model_package_group_name`,
-                using `model_package_name` makes the Model Package un-versioned (default: None).
-            model_package_group_name (str): Model Package Group name, exclusive to
-                `model_package_name`, using `model_package_group_name` makes the Model Package
-                versioned (default: None).
-            image_uri (str): Inference image uri for the container. Model class' self.image will
-                be used if it is None (default: None).
-            model_metrics (ModelMetrics): ModelMetrics object (default: None).
-            metadata_properties (MetadataProperties): MetadataProperties object (default: None).
-            marketplace_cert (bool): A boolean value indicating if the Model Package is certified
-                for AWS Marketplace (default: False).
-            approval_status (str): Model Approval Status, values can be "Approved", "Rejected",
-                or "PendingManualApproval" (default: "PendingManualApproval").
-            description (str): Model Package description (default: None).
-        Returns:
-            dict: A dictionary of method argument names and values.
-        """
-        if image_uri:
-            self.image_uri = image_uri
-        container = {
-            "Image": self.image_uri,
-            "ModelDataUrl": self.model_data,
-        }
-
-        model_package_args = {
-            "containers": [container],
-            "content_types": content_types,
-            "response_types": response_types,
-            "inference_instances": inference_instances,
-            "transform_instances": transform_instances,
-            "marketplace_cert": marketplace_cert,
-        }
-
-        if model_package_name is not None:
-            model_package_args["model_package_name"] = model_package_name
-        if model_package_group_name is not None:
-            model_package_args["model_package_group_name"] = model_package_group_name
-        if model_metrics is not None:
-            model_package_args["model_metrics"] = model_metrics._to_request_dict()
-        if metadata_properties is not None:
-            model_package_args["metadata_properties"] = metadata_properties._to_request_dict()
-        if approval_status is not None:
-            model_package_args["approval_status"] = approval_status
-        if description is not None:
-            model_package_args["description"] = description
-        if tags is not None:
-            model_package_args["tags"] = tags
-        return model_package_args
-
     def _init_sagemaker_session_if_does_not_exist(self, instance_type):
         """Set ``self.sagemaker_session`` to ``LocalSession`` or ``Session`` if it's not already.
 
@@ -1128,6 +1055,10 @@ def _upload_code(self, key_prefix, repack=False):
             )
 
         if repack and self.model_data is not None and self.entry_point is not None:
+            if isinstance(self.model_data, sagemaker.workflow.properties.Properties):
+                # model is not yet there, defer repacking to later during pipeline execution
+                return
+
             bucket = self.bucket or self.sagemaker_session.default_bucket()
             repacked_model_data = "s3://" + "/".join([bucket, key_prefix, "model.tar.gz"])
 

src/sagemaker/model_monitor/clarify_model_monitoring.py

@@ -1248,6 +1248,7 @@ def suggested_constraints(self, file_name=None, kms_key=None):
         """Returns a sagemaker.model_monitor.
 
         Constraints object representing the constraints JSON file generated by this baselining job.
+
         Args:
             file_name (str): Keep this parameter to align with method signature in super class,
                 but it will be ignored.