sagemaker 2.161.0__tar.gz → 2.167.0__tar.gz

{sagemaker-2.161.0/src/sagemaker.egg-info → sagemaker-2.167.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sagemaker
-Version: 2.161.0
+Version: 2.167.0
 Summary: Open source library for training and deploying models on Amazon SageMaker.
 Home-page: https://github.com/aws/sagemaker-python-sdk/
 Author: Amazon Web Services
@@ -262,5 +262,6 @@ Classifier: Programming Language :: Python :: 3.10
 Requires-Python: >= 3.6
 Provides-Extra: local
 Provides-Extra: scipy
+Provides-Extra: feature-processor
 Provides-Extra: all
 Provides-Extra: test

sagemaker-2.167.0/VERSION

@@ -0,0 +1 @@
+2.167.0

sagemaker-2.167.0/requirements/extras/feature-processor_requirements.txt

@@ -0,0 +1,2 @@
+pyspark==3.3.1
+sagemaker-feature-store-pyspark-3.3

{sagemaker-2.161.0 → sagemaker-2.167.0}/requirements/extras/local_requirements.txt

@@ -1,4 +1,3 @@
 urllib3>=1.26.8,<1.26.15
-docker-compose==1.29.2
 docker>=5.0.2,<7.0.0
-PyYAML==5.4.1
+PyYAML>=5.4.1,<7

{sagemaker-2.161.0 → sagemaker-2.167.0}/requirements/extras/test_requirements.txt

@@ -27,3 +27,5 @@ scipy==1.7.3
 urllib3>=1.26.8,<1.26.15
 docker>=5.0.2,<7.0.0
 PyYAML==6.0
+pyspark==3.3.1
+sagemaker-feature-store-pyspark-3.3

{sagemaker-2.161.0 → sagemaker-2.167.0}/setup.py

@@ -71,6 +71,9 @@ required_packages = [
 extras = {
     "local": read_requirements("requirements/extras/local_requirements.txt"),
     "scipy": read_requirements("requirements/extras/scipy_requirements.txt"),
+    "feature-processor": read_requirements(
+        "requirements/extras/feature-processor_requirements.txt"
+    ),
 }
 # Meta dependency groups
 extras["all"] = [item for group in extras.values() for item in group]

{sagemaker-2.161.0 → sagemaker-2.167.0}/src/sagemaker/config/__init__.py

@@ -20,16 +20,19 @@ from sagemaker.config.config_schema import (  # noqa: F401
     TRAINING_JOB_INTER_CONTAINER_ENCRYPTION_PATH,
     TRAINING_JOB_ROLE_ARN_PATH,
     TRAINING_JOB_ENABLE_NETWORK_ISOLATION_PATH,
+    TRAINING_JOB_ENVIRONMENT_PATH,
     TRAINING_JOB_VPC_CONFIG_PATH,
     TRAINING_JOB_OUTPUT_DATA_CONFIG_PATH,
     TRAINING_JOB_RESOURCE_CONFIG_PATH,
     PROCESSING_JOB_INPUTS_PATH,
     PROCESSING_JOB,
+    PROCESSING_JOB_ENVIRONMENT_PATH,
     PROCESSING_JOB_INTER_CONTAINER_ENCRYPTION_PATH,
     PROCESSING_JOB_ROLE_ARN_PATH,
     PROCESSING_JOB_NETWORK_CONFIG_PATH,
     PROCESSING_OUTPUT_CONFIG_PATH,
     PROCESSING_JOB_PROCESSING_RESOURCES_PATH,
+    MONITORING_JOB_ENVIRONMENT_PATH,
     MONITORING_JOB_ROLE_ARN_PATH,
     MONITORING_JOB_VOLUME_KMS_KEY_ID_PATH,
     MONITORING_JOB_NETWORK_CONFIG_PATH,
@@ -45,6 +48,7 @@ from sagemaker.config.config_schema import (  # noqa: F401
     COMPILATION_JOB_VPC_CONFIG_PATH,
     COMPILATION_JOB,
     EDGE_PACKAGING_ROLE_ARN_PATH,
+    EDGE_PACKAGING_RESOURCE_KEY_PATH,
     EDGE_PACKAGING_OUTPUT_CONFIG_PATH,
     EDGE_PACKAGING_JOB,
     TRANSFORM_JOB,
@@ -53,19 +57,26 @@ from sagemaker.config.config_schema import (  # noqa: F401
     VOLUME_KMS_KEY_ID,
     TRANSFORM_JOB_VOLUME_KMS_KEY_ID_PATH,
     MODEL,
+    MODEL_CONTAINERS_PATH,
     MODEL_EXECUTION_ROLE_ARN_PATH,
     MODEL_ENABLE_NETWORK_ISOLATION_PATH,
     MODEL_VPC_CONFIG_PATH,
     MODEL_PACKAGE_VALIDATION_ROLE_PATH,
     VALIDATION_ROLE,
     VALIDATION_PROFILES,
+    MODEL_PACKAGE_INFERENCE_SPECIFICATION_CONTAINERS_PATH,
     MODEL_PACKAGE_VALIDATION_PROFILES_PATH,
+    MODEL_PRIMARY_CONTAINER_PATH,
+    MODEL_PRIMARY_CONTAINER_ENVIRONMENT_PATH,
     ENDPOINT_CONFIG_PRODUCTION_VARIANTS_PATH,
     KMS_KEY_ID,
+    RESOURCE_KEY,
     ENDPOINT_CONFIG_KMS_KEY_ID_PATH,
     ENDPOINT_CONFIG,
     ENDPOINT_CONFIG_DATA_CAPTURE_PATH,
     ENDPOINT_CONFIG_ASYNC_INFERENCE_PATH,
+    ENDPOINT,
+    ENDPOINT_TAGS_PATH,
     SAGEMAKER,
     FEATURE_GROUP,
     TAGS,
@@ -117,6 +128,7 @@ from sagemaker.config.config_schema import (  # noqa: F401
     MODEL_PACKAGE,
     VALIDATION_SPECIFICATION,
     TRANSFORM_JOB_DEFINITION,
+    TRANSFORM_JOB_ENVIRONMENT_PATH,
     TRANSFORM_OUTPUT,
     TRANSFORM_RESOURCES,
     OFFLINE_STORE_CONFIG,
@@ -138,4 +150,8 @@ from sagemaker.config.config_schema import (  # noqa: F401
     DEFAULT_S3_BUCKET,
     DEFAULT_S3_OBJECT_KEY_PREFIX,
     SESSION,
+    ENVIRONMENT,
+    CONTAINERS,
+    PRIMARY_CONTAINER,
+    INFERENCE_SPECIFICATION,
 )

{sagemaker-2.161.0 → sagemaker-2.167.0}/src/sagemaker/config/config_schema.py

@@ -18,6 +18,7 @@ SUBNETS = "Subnets"
 ENABLE_NETWORK_ISOLATION = "EnableNetworkIsolation"
 VOLUME_KMS_KEY_ID = "VolumeKmsKeyId"
 KMS_KEY_ID = "KmsKeyId"
+RESOURCE_KEY = "ResourceKey"
 ROLE_ARN = "RoleArn"
 TAGS = "Tags"
 KEY = "Key"
@@ -78,6 +79,7 @@ MODEL_PACKAGE = "ModelPackage"
 MODEL = "Model"
 MONITORING_SCHEDULE = "MonitoringSchedule"
 ENDPOINT_CONFIG = "EndpointConfig"
+ENDPOINT = "Endpoint"
 AUTO_ML_JOB = "AutoMLJob"
 COMPILATION_JOB = "CompilationJob"
 CUSTOM_PARAMETERS = "CustomParameters"
@@ -92,6 +94,10 @@ ENABLE_INTER_CONTAINER_TRAFFIC_ENCRYPTION = "EnableInterContainerTrafficEncrypti
 SESSION = "Session"
 DEFAULT_S3_BUCKET = "DefaultS3Bucket"
 DEFAULT_S3_OBJECT_KEY_PREFIX = "DefaultS3ObjectKeyPrefix"
+ENVIRONMENT = "Environment"
+CONTAINERS = "Containers"
+PRIMARY_CONTAINER = "PrimaryContainer"
+INFERENCE_SPECIFICATION = "InferenceSpecification"
 
 
 def _simple_path(*args: str):
@@ -106,6 +112,7 @@ COMPILATION_JOB_KMS_KEY_ID_PATH = _simple_path(
 )
 COMPILATION_JOB_OUTPUT_CONFIG_PATH = _simple_path(SAGEMAKER, COMPILATION_JOB, OUTPUT_CONFIG)
 COMPILATION_JOB_ROLE_ARN_PATH = _simple_path(SAGEMAKER, COMPILATION_JOB, ROLE_ARN)
+TRAINING_JOB_ENVIRONMENT_PATH = _simple_path(SAGEMAKER, TRAINING_JOB, ENVIRONMENT)
 TRAINING_JOB_ENABLE_NETWORK_ISOLATION_PATH = _simple_path(
     SAGEMAKER, TRAINING_JOB, ENABLE_NETWORK_ISOLATION
 )
@@ -126,6 +133,7 @@ EDGE_PACKAGING_KMS_KEY_ID_PATH = _simple_path(
 )
 EDGE_PACKAGING_OUTPUT_CONFIG_PATH = _simple_path(SAGEMAKER, EDGE_PACKAGING_JOB, OUTPUT_CONFIG)
 EDGE_PACKAGING_ROLE_ARN_PATH = _simple_path(SAGEMAKER, EDGE_PACKAGING_JOB, ROLE_ARN)
+EDGE_PACKAGING_RESOURCE_KEY_PATH = _simple_path(SAGEMAKER, EDGE_PACKAGING_JOB, RESOURCE_KEY)
 ENDPOINT_CONFIG_DATA_CAPTURE_KMS_KEY_ID_PATH = _simple_path(
     SAGEMAKER, ENDPOINT_CONFIG, DATA_CAPTURE_CONFIG, KMS_KEY_ID
 )
@@ -140,6 +148,7 @@ ENDPOINT_CONFIG_ASYNC_KMS_KEY_ID_PATH = _simple_path(
     SAGEMAKER, ENDPOINT_CONFIG, ASYNC_INFERENCE_CONFIG, OUTPUT_CONFIG, KMS_KEY_ID
 )
 ENDPOINT_CONFIG_KMS_KEY_ID_PATH = _simple_path(SAGEMAKER, ENDPOINT_CONFIG, KMS_KEY_ID)
+ENDPOINT_TAGS_PATH = _simple_path(SAGEMAKER, ENDPOINT, TAGS)
 FEATURE_GROUP_ONLINE_STORE_CONFIG_PATH = _simple_path(SAGEMAKER, FEATURE_GROUP, ONLINE_STORE_CONFIG)
 FEATURE_GROUP_OFFLINE_STORE_CONFIG_PATH = _simple_path(
     SAGEMAKER, FEATURE_GROUP, OFFLINE_STORE_CONFIG
@@ -162,13 +171,20 @@ AUTO_ML_VPC_CONFIG_PATH = _simple_path(
 )
 AUTO_ML_JOB_CONFIG_PATH = _simple_path(SAGEMAKER, AUTO_ML_JOB, AUTO_ML_JOB_CONFIG)
 MONITORING_JOB_DEFINITION_PREFIX = _simple_path(
-    SAGEMAKER, MONITORING_SCHEDULE, MONITORING_SCHEDULE_CONFIG, MONITORING_JOB_DEFINITION
+    SAGEMAKER,
+    MONITORING_SCHEDULE,
+    MONITORING_SCHEDULE_CONFIG,
+    MONITORING_JOB_DEFINITION,
 )
+MONITORING_JOB_ENVIRONMENT_PATH = _simple_path(MONITORING_JOB_DEFINITION_PREFIX, ENVIRONMENT)
 MONITORING_JOB_OUTPUT_KMS_KEY_ID_PATH = _simple_path(
     MONITORING_JOB_DEFINITION_PREFIX, MONITORING_OUTPUT_CONFIG, KMS_KEY_ID
 )
 MONITORING_JOB_VOLUME_KMS_KEY_ID_PATH = _simple_path(
-    MONITORING_JOB_DEFINITION_PREFIX, MONITORING_RESOURCES, CLUSTER_CONFIG, VOLUME_KMS_KEY_ID
+    MONITORING_JOB_DEFINITION_PREFIX,
+    MONITORING_RESOURCES,
+    CLUSTER_CONFIG,
+    VOLUME_KMS_KEY_ID,
 )
 MONITORING_JOB_NETWORK_CONFIG_PATH = _simple_path(MONITORING_JOB_DEFINITION_PREFIX, NETWORK_CONFIG)
 MONITORING_JOB_ENABLE_NETWORK_ISOLATION_PATH = _simple_path(
@@ -184,6 +200,7 @@ MONITORING_JOB_SUBNETS_PATH = _simple_path(MONITORING_JOB_VPC_CONFIG_PATH, SUBNE
 MONITORING_JOB_ROLE_ARN_PATH = _simple_path(MONITORING_JOB_DEFINITION_PREFIX, ROLE_ARN)
 PIPELINE_ROLE_ARN_PATH = _simple_path(SAGEMAKER, PIPELINE, ROLE_ARN)
 PIPELINE_TAGS_PATH = _simple_path(SAGEMAKER, PIPELINE, TAGS)
+TRANSFORM_JOB_ENVIRONMENT_PATH = _simple_path(SAGEMAKER, TRANSFORM_JOB, ENVIRONMENT)
 TRANSFORM_OUTPUT_KMS_KEY_ID_PATH = _simple_path(
     SAGEMAKER, TRANSFORM_JOB, TRANSFORM_OUTPUT, KMS_KEY_ID
 )
@@ -196,9 +213,12 @@ TRANSFORM_JOB_KMS_KEY_ID_PATH = _simple_path(
 TRANSFORM_JOB_VOLUME_KMS_KEY_ID_PATH = _simple_path(
     SAGEMAKER, TRANSFORM_JOB, TRANSFORM_RESOURCES, VOLUME_KMS_KEY_ID
 )
+MODEL_CONTAINERS_PATH = _simple_path(SAGEMAKER, MODEL, CONTAINERS)
 MODEL_VPC_CONFIG_PATH = _simple_path(SAGEMAKER, MODEL, VPC_CONFIG)
 MODEL_ENABLE_NETWORK_ISOLATION_PATH = _simple_path(SAGEMAKER, MODEL, ENABLE_NETWORK_ISOLATION)
 MODEL_EXECUTION_ROLE_ARN_PATH = _simple_path(SAGEMAKER, MODEL, EXECUTION_ROLE_ARN)
+MODEL_PRIMARY_CONTAINER_PATH = _simple_path(SAGEMAKER, MODEL, PRIMARY_CONTAINER)
+MODEL_PRIMARY_CONTAINER_ENVIRONMENT_PATH = _simple_path(MODEL_PRIMARY_CONTAINER_PATH, ENVIRONMENT)
 PROCESSING_JOB_ENABLE_NETWORK_ISOLATION_PATH = _simple_path(
     SAGEMAKER, PROCESSING_JOB, NETWORK_CONFIG, ENABLE_NETWORK_ISOLATION
 )
@@ -229,6 +249,9 @@ PROCESSING_JOB_VOLUME_KMS_KEY_ID_PATH = _simple_path(
     SAGEMAKER, PROCESSING_JOB, PROCESSING_RESOURCES, CLUSTER_CONFIG, VOLUME_KMS_KEY_ID
 )
 PROCESSING_JOB_ROLE_ARN_PATH = _simple_path(SAGEMAKER, PROCESSING_JOB, ROLE_ARN)
+MODEL_PACKAGE_INFERENCE_SPECIFICATION_CONTAINERS_PATH = _simple_path(
+    SAGEMAKER, MODEL_PACKAGE, INFERENCE_SPECIFICATION, CONTAINERS
+)
 MODEL_PACKAGE_VALIDATION_ROLE_PATH = _simple_path(
     SAGEMAKER, MODEL_PACKAGE, VALIDATION_SPECIFICATION, VALIDATION_ROLE
 )
@@ -275,7 +298,11 @@ REMOTE_FUNCTION_VPC_CONFIG_SECURITY_GROUP_IDS = _simple_path(
     SAGEMAKER, PYTHON_SDK, MODULES, REMOTE_FUNCTION, VPC_CONFIG, SECURITY_GROUP_IDS
 )
 REMOTE_FUNCTION_ENABLE_INTER_CONTAINER_TRAFFIC_ENCRYPTION = _simple_path(
-    SAGEMAKER, PYTHON_SDK, MODULES, REMOTE_FUNCTION, ENABLE_INTER_CONTAINER_TRAFFIC_ENCRYPTION
+    SAGEMAKER,
+    PYTHON_SDK,
+    MODULES,
+    REMOTE_FUNCTION,
+    ENABLE_INTER_CONTAINER_TRAFFIC_ENCRYPTION,
 )
 MONITORING_SCHEDULE_INTER_CONTAINER_ENCRYPTION_PATH = _simple_path(
     SAGEMAKER,
@@ -292,6 +319,7 @@ AUTO_ML_INTER_CONTAINER_ENCRYPTION_PATH = _simple_path(
     SECURITY_CONFIG,
     ENABLE_INTER_CONTAINER_TRAFFIC_ENCRYPTION,
 )
+PROCESSING_JOB_ENVIRONMENT_PATH = _simple_path(SAGEMAKER, PROCESSING_JOB, ENVIRONMENT)
 PROCESSING_JOB_INTER_CONTAINER_ENCRYPTION_PATH = _simple_path(
     SAGEMAKER, PROCESSING_JOB, NETWORK_CONFIG, ENABLE_INTER_CONTAINER_TRAFFIC_ENCRYPTION
 )
@@ -373,6 +401,9 @@ SAGEMAKER_PYTHON_SDK_CONFIG_SCHEMA = {
                     TYPE: OBJECT,
                     ADDITIONAL_PROPERTIES: False,
                     PROPERTIES: {
+                        ENVIRONMENT: {
+                            "$ref": "#/definitions/environment-Length10240-Properties16",
+                        },
                         TRANSFORM_OUTPUT: {
                             TYPE: OBJECT,
                             ADDITIONAL_PROPERTIES: False,
@@ -451,7 +482,11 @@ SAGEMAKER_PYTHON_SDK_CONFIG_SCHEMA = {
             "maxProperties": 48,
         },
         # Regex is taken from https://docs.aws.amazon.com/sagemaker/latest/APIReference/API_S3DataSource.html#sagemaker-Type-S3DataSource-S3Uri
-        "s3Uri": {TYPE: "string", "pattern": "^(https|s3)://([^/]+)/?(.*)$", "maxLength": 1024},
+        "s3Uri": {
+            TYPE: "string",
+            "pattern": "^(https|s3)://([^/]+)/?(.*)$",
+            "maxLength": 1024,
+        },
         # Regex is taken from https://docs.aws.amazon.com/sagemaker/latest/APIReference/API_AlgorithmSpecification.html#sagemaker-Type-AlgorithmSpecification-ContainerEntrypoint
         "preExecutionCommand": {TYPE: "string", "pattern": r".*"},
         # Regex based on https://docs.aws.amazon.com/sagemaker/latest/APIReference/API_PipelineDefinitionS3Location.html
@@ -463,6 +498,94 @@ SAGEMAKER_PYTHON_SDK_CONFIG_SCHEMA = {
             "minLength": 3,
             "maxLength": 63,
         },
+        # Regex is taken from https://docs.aws.amazon.com/sagemaker/latest/APIReference/API_MonitoringJobDefinition.html#sagemaker-Type-MonitoringJobDefinition-Environment
+        "environment-Length256-Properties50": {
+            TYPE: OBJECT,
+            ADDITIONAL_PROPERTIES: False,
+            PATTERN_PROPERTIES: {
+                r"([a-zA-Z_][a-zA-Z0-9_]*){1,256}": {
+                    TYPE: "string",
+                    "pattern": r"[\S\s]*",
+                    "maxLength": 256,
+                }
+            },
+            "maxProperties": 50,
+        },
+        # Regex is taken from https://docs.aws.amazon.com/sagemaker/latest/APIReference/API_CreateTransformJob.html#sagemaker-CreateTransformJob-request-Environment
+        "environment-Length10240-Properties16": {
+            TYPE: OBJECT,
+            ADDITIONAL_PROPERTIES: False,
+            PATTERN_PROPERTIES: {
+                r"[a-zA-Z_][a-zA-Z0-9_]{0,1023}": {
+                    TYPE: "string",
+                    "pattern": r"[\S\s]*",
+                    "maxLength": 10240,
+                }
+            },
+            "maxProperties": 16,
+        },
+        # Regex is taken from https://docs.aws.amazon.com/sagemaker/latest/APIReference/API_ContainerDefinition.html#sagemaker-Type-ContainerDefinition-Environment
+        "environment-Length1024-Properties16": {
+            TYPE: OBJECT,
+            ADDITIONAL_PROPERTIES: False,
+            PATTERN_PROPERTIES: {
+                r"([a-zA-Z_][a-zA-Z0-9_]*){1,1024}": {
+                    TYPE: "string",
+                    "pattern": r"[\S\s]*",
+                    "maxLength": 1024,
+                }
+            },
+            "maxProperties": 16,
+        },
+        # Regex is taken from https://docs.aws.amazon.com/sagemaker/latest/APIReference/API_CreateProcessingJob.html#sagemaker-CreateProcessingJob-request-Environment
+        "environment-Length256-Properties100": {
+            TYPE: OBJECT,
+            ADDITIONAL_PROPERTIES: False,
+            PATTERN_PROPERTIES: {
+                r"([a-zA-Z_][a-zA-Z0-9_]*){1,256}": {
+                    TYPE: "string",
+                    "pattern": r"[\S\s]*",
+                    "maxLength": 256,
+                }
+            },
+            "maxProperties": 100,
+        },
+        # Regex is taken from https://docs.aws.amazon.com/sagemaker/latest/APIReference/API_CreateTrainingJob.html#sagemaker-CreateTrainingJob-request-Environment
+        "environment-Length512-Properties48": {
+            TYPE: OBJECT,
+            ADDITIONAL_PROPERTIES: False,
+            PATTERN_PROPERTIES: {
+                r"([a-zA-Z_][a-zA-Z0-9_]*){1,512}": {
+                    TYPE: "string",
+                    "pattern": r"[\S\s]*",
+                    "maxLength": 512,
+                }
+            },
+            "maxProperties": 48,
+        },
+        "container": {
+            TYPE: OBJECT,
+            ADDITIONAL_PROPERTIES: False,
+            PROPERTIES: {
+                ENVIRONMENT: {"$ref": "#/definitions/environment-Length1024-Properties16"},
+            },
+        },
+        "containers": {
+            TYPE: "array",
+            "items": {"$ref": "#/definitions/container"},
+            # https://docs.aws.amazon.com/sagemaker/latest/APIReference/API_ContainerDefinition.html
+            # According to the API docs, the array can have maximum of 15 items.
+            "minItems": 0,
+            "maxItems": 15,
+        },
+        "modelPackageContainers": {
+            TYPE: "array",
+            "items": {"$ref": "#/definitions/container"},
+            # https://docs.aws.amazon.com/sagemaker/latest/APIReference/API_ModelPackageContainerDefinition.html
+            # According to the API docs, the array can have minimum of 1 and maximum of 15 items.
+            "minItems": 1,
+            "maxItems": 15,
+        },
     },
     PROPERTIES: {
         SCHEMA_VERSION: {
@@ -595,6 +718,11 @@ SAGEMAKER_PYTHON_SDK_CONFIG_SCHEMA = {
                                     TYPE: OBJECT,
                                     ADDITIONAL_PROPERTIES: False,
                                     PROPERTIES: {
+                                        ENVIRONMENT: {
+                                            "$ref": (
+                                                "#/definitions/environment-Length256-Properties50"
+                                            ),
+                                        },
                                         MONITORING_OUTPUT_CONFIG: {
                                             TYPE: OBJECT,
                                             ADDITIONAL_PROPERTIES: False,
@@ -636,6 +764,13 @@ SAGEMAKER_PYTHON_SDK_CONFIG_SCHEMA = {
                         TAGS: {"$ref": "#/definitions/tags"},
                     },
                 },
+                # Endpoint
+                # https://docs.aws.amazon.com/sagemaker/latest/APIReference/API_CreateEndpoint.html
+                ENDPOINT: {
+                    TYPE: OBJECT,
+                    ADDITIONAL_PROPERTIES: False,
+                    PROPERTIES: {TAGS: {"$ref": "#/definitions/tags"}},
+                },
                 # Endpoint Config
                 # https://docs.aws.amazon.com/sagemaker/latest/APIReference/API_CreateEndpointConfig.html
                 # Note: there is a separate API for creating Endpoints.
@@ -710,6 +845,7 @@ SAGEMAKER_PYTHON_SDK_CONFIG_SCHEMA = {
                             ADDITIONAL_PROPERTIES: False,
                             PROPERTIES: {KMS_KEY_ID: {"$ref": "#/definitions/kmsKeyId"}},
                         },
+                        ENVIRONMENT: {"$ref": "#/definitions/environment-Length10240-Properties16"},
                         TRANSFORM_OUTPUT: {
                             TYPE: OBJECT,
                             ADDITIONAL_PROPERTIES: False,
@@ -752,22 +888,38 @@ SAGEMAKER_PYTHON_SDK_CONFIG_SCHEMA = {
                 },
                 # Model
                 # https://docs.aws.amazon.com/sagemaker/latest/APIReference/API_CreateModel.html
+                # Note: It is recommended that customers should use either of
+                # [Containers] or [PrimaryContainer] but not both
+                # Since SDK will throw a ValueError as both can't be passed in.
                 MODEL: {
                     TYPE: OBJECT,
                     ADDITIONAL_PROPERTIES: False,
                     PROPERTIES: {
+                        CONTAINERS: {"$ref": "#/definitions/containers"},
                         ENABLE_NETWORK_ISOLATION: {TYPE: "boolean"},
                         EXECUTION_ROLE_ARN: {"$ref": "#/definitions/roleArn"},
+                        PRIMARY_CONTAINER: {"$ref": "#/definitions/container"},
                         VPC_CONFIG: {"$ref": "#/definitions/vpcConfig"},
                         TAGS: {"$ref": "#/definitions/tags"},
                     },
                 },
                 # Model Package
-                # https://docs.aws.amazon.com/sagemaker/latest/APIReference/API_CreateModelPackage.html
+                # https://docs.aws.amazon.com/sagemaker/latest
+                # /APIReference/API_CreateModelPackage.html
+                # At present, we are not supporting [Environment] defaults for
+                # [AdditionalInfereceSpecifcations] Since this parameter is not supported
+                # in the SDK, we are not adding it to the config schema as well.
                 MODEL_PACKAGE: {
                     TYPE: OBJECT,
                     ADDITIONAL_PROPERTIES: False,
                     PROPERTIES: {
+                        INFERENCE_SPECIFICATION: {
+                            TYPE: OBJECT,
+                            ADDITIONAL_PROPERTIES: False,
+                            PROPERTIES: {
+                                CONTAINERS: {"$ref": "#/definitions/modelPackageContainers"}
+                            },
+                        },
                         VALIDATION_SPECIFICATION: {
                             TYPE: OBJECT,
                             ADDITIONAL_PROPERTIES: False,
@@ -792,6 +944,7 @@ SAGEMAKER_PYTHON_SDK_CONFIG_SCHEMA = {
                     TYPE: OBJECT,
                     ADDITIONAL_PROPERTIES: False,
                     PROPERTIES: {
+                        ENVIRONMENT: {"$ref": "#/definitions/environment-Length256-Properties100"},
                         NETWORK_CONFIG: {
                             TYPE: OBJECT,
                             ADDITIONAL_PROPERTIES: False,
@@ -837,6 +990,7 @@ SAGEMAKER_PYTHON_SDK_CONFIG_SCHEMA = {
                     PROPERTIES: {
                         ENABLE_INTER_CONTAINER_TRAFFIC_ENCRYPTION: {TYPE: "boolean"},
                         ENABLE_NETWORK_ISOLATION: {TYPE: "boolean"},
+                        ENVIRONMENT: {"$ref": "#/definitions/environment-Length512-Properties48"},
                         OUTPUT_DATA_CONFIG: {
                             TYPE: OBJECT,
                             ADDITIONAL_PROPERTIES: False,
@@ -863,6 +1017,7 @@ SAGEMAKER_PYTHON_SDK_CONFIG_SCHEMA = {
                             ADDITIONAL_PROPERTIES: False,
                             PROPERTIES: {KMS_KEY_ID: {"$ref": "#/definitions/kmsKeyId"}},
                         },
+                        RESOURCE_KEY: {"$ref": "#/definitions/kmsKeyId"},
                         ROLE_ARN: {"$ref": "#/definitions/roleArn"},
                         TAGS: {"$ref": "#/definitions/tags"},
                     },

{sagemaker-2.161.0 → sagemaker-2.167.0}/src/sagemaker/djl_inference/model.py

@@ -739,10 +739,7 @@ class DJLModel(FrameworkModel):
             serving_properties = {}
         serving_properties["engine"] = self.engine.value[0]  # pylint: disable=E1101
         serving_properties["option.entryPoint"] = self.engine.value[1]  # pylint: disable=E1101
-        if self.model_id.startswith("s3://"):
-            serving_properties["option.s3url"] = self.model_id
-        else:
-            serving_properties["option.model_id"] = self.model_id
+        serving_properties["option.model_id"] = self.model_id
         if self.number_of_partitions:
             serving_properties["option.tensor_parallel_degree"] = self.number_of_partitions
         if self.entry_point:

{sagemaker-2.161.0 → sagemaker-2.167.0}/src/sagemaker/estimator.py

@@ -36,6 +36,7 @@ from sagemaker.config import (
     TRAINING_JOB_KMS_KEY_ID_PATH,
     TRAINING_JOB_ROLE_ARN_PATH,
     TRAINING_JOB_ENABLE_NETWORK_ISOLATION_PATH,
+    TRAINING_JOB_ENVIRONMENT_PATH,
     TRAINING_JOB_INTER_CONTAINER_ENCRYPTION_PATH,
 )
 from sagemaker.debugger import (  # noqa: F401 # pylint: disable=unused-import
@@ -169,6 +170,8 @@ class EstimatorBase(with_metaclass(ABCMeta, object)):  # pylint: disable=too-man
         instance_groups: Optional[List[InstanceGroup]] = None,
         training_repository_access_mode: Optional[Union[str, PipelineVariable]] = None,
         training_repository_credentials_provider_arn: Optional[Union[str, PipelineVariable]] = None,
+        container_entry_point: Optional[List[str]] = None,
+        container_arguments: Optional[List[str]] = None,
         **kwargs,
     ):
         """Initialize an ``EstimatorBase`` instance.
@@ -522,6 +525,11 @@ class EstimatorBase(with_metaclass(ABCMeta, object)):  # pylint: disable=too-man
                 private Docker registry where your training image is hosted (default: None).
                 When it's set to None, SageMaker will not do authentication before pulling the image
                 in the private Docker registry.
+            container_entry_point (List[str]): Optional. The entrypoint script for a Docker
+                container used to run a training job. This script takes precedence over
+                the default train processing instructions.
+            container_arguments (List[str]): Optional. The arguments for a container used to run
+                a training job.
         """
         instance_count = renamed_kwargs(
             "train_instance_count", "instance_count", instance_count, kwargs
@@ -646,6 +654,10 @@ class EstimatorBase(with_metaclass(ABCMeta, object)):  # pylint: disable=too-man
             training_repository_credentials_provider_arn
         )
 
+        # container entry point / arguments configs
+        self.container_entry_point = container_entry_point
+        self.container_arguments = container_arguments
+
         self.encrypt_inter_container_traffic = resolve_value_from_config(
             direct_input=encrypt_inter_container_traffic,
             config_path=TRAINING_JOB_INTER_CONTAINER_ENCRYPTION_PATH,
@@ -677,7 +689,12 @@ class EstimatorBase(with_metaclass(ABCMeta, object)):  # pylint: disable=too-man
         self.profiler_config = profiler_config
         self.disable_profiler = disable_profiler
 
-        self.environment = environment
+        self.environment = resolve_value_from_config(
+            direct_input=environment,
+            config_path=TRAINING_JOB_ENVIRONMENT_PATH,
+            default_value=None,
+            sagemaker_session=self.sagemaker_session,
+        )
 
         self.max_retry_attempts = max_retry_attempts
 
@@ -1780,6 +1797,16 @@ class EstimatorBase(with_metaclass(ABCMeta, object)):  # pylint: disable=too-man
                 "MetricsDefinition"
             ]
 
+        if "ContainerEntrypoint" in job_details["AlgorithmSpecification"]:
+            init_params["container_entry_point"] = job_details["AlgorithmSpecification"][
+                "ContainerEntrypoint"
+            ]
+
+        if "ContainerArguments" in job_details["AlgorithmSpecification"]:
+            init_params["container_arguments"] = job_details["AlgorithmSpecification"][
+                "ContainerArguments"
+            ]
+
         if "EnableInterContainerTrafficEncryption" in job_details:
             init_params["encrypt_inter_container_traffic"] = job_details[
                 "EnableInterContainerTrafficEncryption"
@@ -2260,6 +2287,12 @@ class _TrainingJob(_Job):
                 ] = estimator.training_repository_credentials_provider_arn
             train_args["training_image_config"] = training_image_config
 
+        if estimator.container_entry_point is not None:
+            train_args["container_entry_point"] = estimator.container_entry_point
+
+        if estimator.container_arguments is not None:
+            train_args["container_arguments"] = estimator.container_arguments
+
         # encrypt_inter_container_traffic may be a pipeline variable place holder object
         # which is parsed in execution time
         # This does not check config because the EstimatorBase constuctor already did that check
@@ -2466,6 +2499,8 @@ class Estimator(EstimatorBase):
         instance_groups: Optional[List[InstanceGroup]] = None,
         training_repository_access_mode: Optional[Union[str, PipelineVariable]] = None,
         training_repository_credentials_provider_arn: Optional[Union[str, PipelineVariable]] = None,
+        container_entry_point: Optional[List[str]] = None,
+        container_arguments: Optional[List[str]] = None,
         **kwargs,
     ):
         """Initialize an ``Estimator`` instance.
@@ -2818,6 +2853,11 @@ class Estimator(EstimatorBase):
                 private Docker registry where your training image is hosted (default: None).
                 When it's set to None, SageMaker will not do authentication before pulling the image
                 in the private Docker registry.
+            container_entry_point (List[str]): Optional. The entrypoint script for a Docker
+                container used to run a training job. This script takes precedence over
+                the default train processing instructions.
+            container_arguments (List[str]): Optional. The arguments for a container used to run
+                a training job.
         """
         self.image_uri = image_uri
         self._hyperparameters = hyperparameters.copy() if hyperparameters else {}
@@ -2865,6 +2905,8 @@ class Estimator(EstimatorBase):
             instance_groups=instance_groups,
             training_repository_access_mode=training_repository_access_mode,
             training_repository_credentials_provider_arn=training_repository_credentials_provider_arn,  # noqa: E501 # pylint: disable=line-too-long
+            container_entry_point=container_entry_point,
+            container_arguments=container_arguments,
             **kwargs,
         )
 

sagemaker-2.167.0/src/sagemaker/feature_store/feature_processor/__init__.py

@@ -0,0 +1,35 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+"""Exported classes for the sagemaker.feature_store.feature_processor module."""
+from __future__ import absolute_import
+
+from sagemaker.feature_store.feature_processor._data_source import (  # noqa: F401
+    CSVDataSource,
+    FeatureGroupDataSource,
+    ParquetDataSource,
+)
+from sagemaker.feature_store.feature_processor._exceptions import (  # noqa: F401
+    IngestionError,
+)
+from sagemaker.feature_store.feature_processor.feature_processor import (  # noqa: F401
+    feature_processor,
+)
+from sagemaker.feature_store.feature_processor.feature_scheduler import (  # noqa: F401
+    to_pipeline,
+    schedule,
+    describe,
+    delete_schedule,
+    list_pipelines,
+    execute,
+    TransformationCode,
+)