Merge master into master-benchmark-feature (aws#1502)

* prepare release v2.222.0

* update development version to v2.222.1.dev0

* fix: estimator.deploy not respecting instance type (aws#4724)

* fix: estimator.deploy not respecting instance type

* chore: add inline comment about using user supplied instance type

* First changes (aws#4723)

Co-authored-by: Bryannah Hernandez <[email protected]>

* prepare release v2.222.1

* update development version to v2.222.2.dev0

* change: update image_uri_configs  06-12-2024 07:17:03 PST

* fix: Fix ci unit-tests (aws#4728)

* Implement custom telemetry logging in SDK (aws#4721)

* Fix Sniping bug fix (aws#4730)

* Python SDK bucket sniping fix bug

* Python SDK bucket sniping fix bug

* Minor fixes to default bucket function and fixing unit tests

* fix  - Fixes from Pylint failures

* fix  - Fixes from Flake8 failures

* fix  - More Flake8 fixes

* fix  - Remove Whitespace from blankline

* fix  - Fix black recommendations

* fix  - Adjust tabbing

---------

Co-authored-by: Jiao Liu <[email protected]>
Co-authored-by: liujiaor <[email protected]>

* feature: add 'ModelCard' property to Register step (aws#4726)

* feature: add 'ModelCard' property to RegisterModel step

* Updated ModelCard content type

* fix: ModelCard Object integ Test fix

---------

Co-authored-by: Gokul A <[email protected]>

* prepare release v2.223.0

* update development version to v2.223.1.dev0

* Fix Dependabot Issues - MLFlow Version (aws#4731)

* fix  - Address Dependapot issues

* fix  -Update MLFLOW Version

* Fix: AttributeError: 'NoneType' object has no attribute 'len' error in session.py (aws#4735)

* fix  - Address Dependapot issues

* fix  -Update MLFLOW Version

* fix  - Update fetching Length for NoneType Error

* change: Enable telemetry logging for Remote function (aws#4729)

* change: Enhance telemetry logging module and feature coverage

* Fix default session issue

* fix unit-tests

* chore: use ml.g5.2xlarge for integ test (aws#4741)

* feat: JumpStartModel attach (aws#4680)

* feat: JumpStartModel attach

* fix: unit tests

* chore: change order of kwargs to pass unit tests

* chore: update docstrings, add tests

* fix: docstring

* fix: integ tests

* chore: address PR comments

---------

Co-authored-by: Erick Benitez-Ramos <[email protected]>

* Upgrading to PT 2.3 for release (aws#4732)

* upgrading to PT 2.3 for release

* reverting mistake in modifying dataparallel

---------

Co-authored-by: Andrew Tian <[email protected]>
Co-authored-by: Erick Benitez-Ramos <[email protected]>

* feat(sagemaker-mlflow): New features for SageMaker MLflow (aws#4744)

* feat: add support for mlflow inputs (aws#1441)

* feat: add support for mlflow inputs

* fix: typo

* fix: doc

* fix: S3 regex

* fix: refactor

* fix: refactor typo

* fix: pylint

* fix: pylint

* fix: black and pylint

---------

Co-authored-by: Jacky Lee <[email protected]>

* fix: lineage tracking bug (aws#1447)

* fix: lineage bug

* fix: lineage

* fix: add validation for tracking ARN input with MLflow input type

* fix: bug

* fix: unit tests

* fix: mock

* fix: args

---------

Co-authored-by: Jacky Lee <[email protected]>

* [Fix] regex for RunId to handle empty artifact path and change mlflow plugin name (aws#1455)

* [Fix] run id regex pattern such that empty artifact path is handled

* Change mlflow plugin name as per legal team requirement

* Update describe_mlflow_tracking_server call to align with api changes (aws#1466)

* feat: (sagemaker-mlflow) Adding Presigned Url function to SDK (aws#1462) (aws#1477)

* mlflow presigned url changes

* addressing design feedback

* test changes

* change: mlflow plugin name (aws#1489)

Co-authored-by: Jacky Lee <[email protected]>

---------

Co-authored-by: Jacky Lee <[email protected]>
Co-authored-by: Jacky Lee <[email protected]>
Co-authored-by: jiapinw <[email protected]>
Co-authored-by: Erick Benitez-Ramos <[email protected]>

* prepare release v2.224.0

* update development version to v2.224.1.dev0

* fix: Model server override logic (aws#4733)

* fix: Model server override logic

* Fix formatting

---------

Co-authored-by: Erick Benitez-Ramos <[email protected]>

* chore(deps): bump apache-airflow from 2.9.1 to 2.9.2 in /requirements/extras (aws#4740)

Bumps [apache-airflow](https://github.com/apache/airflow) from 2.9.1 to 2.9.2.
- [Release notes](https://github.com/apache/airflow/releases)
- [Changelog](https://github.com/apache/airflow/blob/main/RELEASE_NOTES.rst)
- [Commits](apache/airflow@2.9.1...2.9.2)

---
updated-dependencies:
- dependency-name: apache-airflow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Erick Benitez-Ramos <[email protected]>

* fix: Update tox.ini (aws#4747)

* change: Update README.rst to show conda-forge version of SageMaker SDK (aws#4749)

* JumpStart CuratedHub Launch (aws#4748)

* Implement CuratedHub APIs (aws#1449)

* Implement CuratedHub Admin APIs

* making some parameters optional in create_hub_content_reference as per the API design

* add describe_hub and list_hubs APIs

* implement delete_hub API

* Implement list_hub_contents API

* create CuratedHub class and supported utils

* implement list_models and address comments

* Add unit tests

* add describe_model function

* cache retrieval for describeHubContent changes

* fix curated hub class unit tests

* add utils needed for curatedHub

* Cache retrieval

* implement get_hub_model_reference()

* cleanup HUB type datatype

* cleanup constants

* rename list_public_models to list_jumpstart_service_hub_models

* implement describe_model_reference

* Rename CuratedHub to Hub

* address nit

* address nits and fix failing tests

---------

Co-authored-by: Malav Shastri <[email protected]>

* feat: implement list_jumpstart_service_hub_models function to fetch JumpStart public hub models (aws#1456)

* Implement CuratedHub Admin APIs

* making some parameters optional in create_hub_content_reference as per the API design

* add describe_hub and list_hubs APIs

* implement delete_hub API

* Implement list_hub_contents API

* create CuratedHub class and supported utils

* implement list_models and address comments

* Add unit tests

* add describe_model function

* cache retrieval for describeHubContent changes

* fix curated hub class unit tests

* add utils needed for curatedHub

* Cache retrieval

* implement get_hub_model_reference()

* cleanup HUB type datatype

* cleanup constants

* rename list_public_models to list_jumpstart_service_hub_models

* implement describe_model_reference

* Rename CuratedHub to Hub

* address nit

* address nits and fix failing tests

* implement list_jumpstart_service_hub_models function

---------

Co-authored-by: Malav Shastri <[email protected]>

* Feat/Curated Hub hub_arn and hub_content_type support (aws#1453)

* get_model_spec() changes to support hub_arn and hub_content_type

* implement get_hub_model_reference()

* support hub_arn and hub_content_type for specs retrieval

* add support for hub_arn and hub_content_type for serializers, deserializers, estimators, models, predictors and various spec retrieval functionalities

* address nits and test failures

* remove hub_content_type support

---------

Co-authored-by: Malav Shastri <[email protected]>

* feat: implement curated hub parser and bug bash fixes (aws#1457)

* implement HubContentDocument parser

* modify the parser to remove aliases for hubcontent documents

* bug fix

* update boto3

* Bug Fix in the parser

* Improve Hub Class and related functionalities

* Bug Fix and parser updates

* add missing hub_arn support

* Add model reference deployment support and other minor bug fixes

* fix: retrieve correct image_uri (parser update)

* fix: retrieve correct model URI and model data path from HubContentDocument (parser update)

* Add model reference deployment support

* Model accessor and cache retrival bug fixes

* fix: curated hub model training workflow

* fix: pass sagemaker sessions object to retrieve model specs from describe_hub_content call

* fix: fix payload retrieval for curated hub models

* modify constants, enums

* fix: update parser

* Address nits in the parser

* Add unit tests for parser

* implement pagination for list_models utility

* feat: support wildcard chars for model versions

* Address nits and comments

* Add Hub Content Arn Tag to training and hosting

* Add Hub Content Arn Tag to training and hosting

* fix: HubContentDocument schema version

* fix broken unit tests

* fix prepare_container_def unit tests to include ModelReferenceArn

* fix unit tests for test_session.py

* revert boto version changes

* Fix unit tests

* support wildcard model versions for training workflow

* Add test cases for get_model_versions

* Add/fix unit tests

---------

Co-authored-by: Malav Shastri <[email protected]>

* address unit tests failures in codebuild

* change list_jumpstart_service_hub_models to list_sagemaker_public_hub_models()

* fix: Changing list input output shapes

* fix: gated model training bug

* run black -l 100

* flake 8

* address formatting issues

* black -l

* DocStyle issues

* address flake8, pylint

* blake -l

* pass model type down

* disabling pylint for release

* disable pylint

---------

Co-authored-by: Malav Shastri <[email protected]>
Co-authored-by: chrstfu <[email protected]>
Co-authored-by: Erick Benitez-Ramos <[email protected]>

* prepare release v2.224.1

* update development version to v2.224.2.dev0

* fix: list_models() for python3.8 (aws#4756)

* fix: list_models() for python3.8

* fix linting

---------

Co-authored-by: Malav Shastri <[email protected]>

* Update DJLModel class for latest container releases (aws#4754)

* simplify and refactor djl model for latest container releases

* update model builder for new DJLModel implementation

* fix formatting/linting suggestions

* update DJLModel documentation on docs site

* address reviewer feedback

* Feature: Update model card on model package request (aws#4739)

* Feature: Update model card on model package request

* Feature: Update model card on model package request

* fix: update_model_card input types

* Feature: register proprietary models from jumpstart (aws#4753)

* Feature: register proprietary models from jumpstart

Feature: register proprietary models from jumpstart

* fix: register jumpstart models on model registry

* fixed get_model_id_version_from_endpoint naming issue

* fixed issues with model builder

* cleanup types.py file

* fixed jumpstart unit tests

* fixed issue in model_builder

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: ci <ci>
Co-authored-by: evakravi <[email protected]>
Co-authored-by: bryannahm1 <[email protected]>
Co-authored-by: Bryannah Hernandez <[email protected]>
Co-authored-by: sagemaker-bot <[email protected]>
Co-authored-by: Kalyani Nikure <[email protected]>
Co-authored-by: Gokul A <[email protected]>
Co-authored-by: Jiao Liu <[email protected]>
Co-authored-by: liujiaor <[email protected]>
Co-authored-by: selvask-aws <[email protected]>
Co-authored-by: Erick Benitez-Ramos <[email protected]>
Co-authored-by: adtian2 <[email protected]>
Co-authored-by: Andrew Tian <[email protected]>
Co-authored-by: ananth102 <[email protected]>
Co-authored-by: Jacky Lee <[email protected]>
Co-authored-by: Jacky Lee <[email protected]>
Co-authored-by: jiapinw <[email protected]>
Co-authored-by: Samrudhi Sharma <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Malav Shastri <[email protected]>
Co-authored-by: Malav Shastri <[email protected]>
Co-authored-by: chrstfu <[email protected]>
Co-authored-by: Siddharth Venkatesan <[email protected]>

Author: 22 people

CHANGELOG.md

@@ -1,5 +1,71 @@
 # Changelog
 
+## v2.224.1 (2024-06-21)
+
+### Bug Fixes and Other Changes
+
+ * JumpStart CuratedHub Launch
+ * Update README.rst to show conda-forge version of SageMaker SDK
+ * Update tox.ini
+ * chore(deps): bump apache-airflow from 2.9.1 to 2.9.2 in /requirements/extras
+ * Model server override logic
+
+## v2.224.0 (2024-06-19)
+
+### Features
+
+ * JumpStartModel attach
+
+### Bug Fixes and Other Changes
+
+ * feat(sagemaker-mlflow): New features for SageMaker MLflow
+ * Upgrading to PT 2.3 for release
+ * chore: use ml.g5.2xlarge for integ test
+ * Enable telemetry logging for Remote function
+ * Fix Dependabot Issues - MLFlow Version
+
+## v2.223.0 (2024-06-13)
+
+### Features
+
+ * add 'ModelCard' property to Register step
+
+### Bug Fixes and Other Changes
+
+ * Fix Sniping bug fix
+ * Implement custom telemetry logging in SDK
+ * Fix ci unit-tests
+ * update image_uri_configs  06-12-2024 07:17:03 PST
+
+## v2.222.1 (2024-06-12)
+
+### Bug Fixes and Other Changes
+
+ * First changes
+ * estimator.deploy not respecting instance type
+
+## v2.222.0 (2024-06-07)
+
+### Features
+
+ * jumpstart telemetry
+
+### Bug Fixes and Other Changes
+
+ * update image_uri_configs  06-06-2024 07:17:31 PST
+ * bump requests from 2.31.0 to 2.32.2 in /requirements/extras
+ * chore: add HF LLM neuronx 0.0.23 image
+ * Updates for DJL 0.28.0 release
+ * chore(deps): bump mlflow from 2.11.1 to 2.12.1 in /tests/data/serve_resources/mlflow/tensorflow
+ * chore(deps): bump mlflow from 2.11.1 to 2.12.1 in /tests/data/serve_resources/mlflow/xgboost
+ * chore(deps): bump mlflow from 2.10.2 to 2.12.1 in /tests/data/serve_resources/mlflow/pytorch
+ * chore(deps): bump apache-airflow from 2.9.0 to 2.9.1 in /requirements/extras
+ * chore(deps): bump requests from 2.31.0 to 2.32.2 in /tests/data/serve_resources/mlflow/pytorch
+ * Fix ci unit-tests
+ * Making project name in workflow files dynamic
+ * update image_uri_configs  05-29-2024 07:17:35 PST
+ * Update: SM Endpoint Routing Strategy Support.
+
 ## v2.221.1 (2024-05-22)
 
 ### Bug Fixes and Other Changes

README.rst

@@ -10,6 +10,10 @@ SageMaker Python SDK
    :target: https://pypi.python.org/pypi/sagemaker
    :alt: Latest Version
 
+.. image:: https://img.shields.io/conda/vn/conda-forge/sagemaker-python-sdk.svg
+   :target: https://anaconda.org/conda-forge/sagemaker-python-sdk
+   :alt: Conda-Forge Version
+
 .. image:: https://img.shields.io/pypi/pyversions/sagemaker.svg
    :target: https://pypi.python.org/pypi/sagemaker
    :alt: Supported Python Versions
@@ -95,6 +99,13 @@ SageMaker Python SDK is tested on:
 - Python 3.10
 - Python 3.11
 
+Telemetry
+~~~~~~~~~~~~~~~
+
+The ``sagemaker`` library has telemetry enabled to help us better understand user needs, diagnose issues, and deliver new features. This telemetry tracks the usage of various SageMaker functions.
+
+If you prefer to opt out of telemetry, you can easily do so by setting the ``TelemetryOptOut`` parameter to ``true`` in the SDK defaults configuration. For detailed instructions, please visit `Configuring and using defaults with the SageMaker Python SDK <https://sagemaker.readthedocs.io/en/stable/overview.html#configuring-and-using-defaults-with-the-sagemaker-python-sdk>`__.
+
 AWS Permissions
 ~~~~~~~~~~~~~~~
 

VERSION

@@ -1 +1 @@
-2.221.2.dev0
+2.224.2.dev0

doc/frameworks/djl/sagemaker.djl_inference.rst

@@ -5,39 +5,15 @@ DJL Classes
 DJLModel
 ---------------------------
 
-.. autoclass:: sagemaker.djl_inference.model.DJLModel
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-DeepSpeedModel
----------------------------
-
-.. autoclass:: sagemaker.djl_inference.model.DeepSpeedModel
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-HuggingFaceAccelerateModel
----------------------------
-
-.. autoclass:: sagemaker.djl_inference.model.HuggingFaceAccelerateModel
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-FasterTransformerModel
----------------------------
-
-.. autoclass:: sagemaker.djl_inference.model.FasterTransformerModel
+.. autoclass:: sagemaker.djl_inference.DJLModel
     :members:
     :undoc-members:
     :show-inheritance:
 
 DJLPredictor
 ---------------------------
 
-.. autoclass:: sagemaker.djl_inference.model.DJLPredictor
+.. autoclass:: sagemaker.djl_inference.DJLPredictor
     :members:
     :undoc-members:
     :show-inheritance: