sagemaker-core 1.0.29__py3-none-any.whl → 1.0.31__py3-none-any.whl

sagemaker_core/main/shapes.py

@@ -12,7 +12,7 @@
 # language governing permissions and limitations under the License.
 import datetime
 
-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel, ConfigDict, Field
 from typing import List, Dict, Optional, Any, Union
 from sagemaker_core.main.utils import Unassigned
 
@@ -712,6 +712,19 @@ class Alarm(Base):
     alarm_name: Optional[str] = Unassigned()
 
 
+class AlarmDetails(Base):
+    """
+    AlarmDetails
+      The details of the alarm to monitor during the AMI update.
+
+    Attributes
+    ----------------------
+    alarm_name: The name of the alarm.
+    """
+
+    alarm_name: str
+
+
 class MetricDefinition(Base):
     """
     MetricDefinition
@@ -1013,7 +1026,7 @@ class StoppingCondition(Base):
     ----------------------
     max_runtime_in_seconds: The maximum length of time, in seconds, that a training or compilation job can run before it is stopped. For compilation jobs, if the job does not complete during this time, a TimeOut error is generated. We recommend starting with 900 seconds and increasing as necessary based on your model. For all other jobs, if the job does not complete during this time, SageMaker ends the job. When RetryStrategy is specified in the job request, MaxRuntimeInSeconds specifies the maximum time for all of the attempts in total, not each individual attempt. The default value is 1 day. The maximum value is 28 days. The maximum time that a TrainingJob can run in total, including any time spent publishing metrics or archiving and uploading models after it has been stopped, is 30 days.
     max_wait_time_in_seconds: The maximum length of time, in seconds, that a managed Spot training job has to complete. It is the amount of time spent waiting for Spot capacity plus the amount of time the job can run. It must be equal to or greater than MaxRuntimeInSeconds. If the job does not complete during this time, SageMaker ends the job. When RetryStrategy is specified in the job request, MaxWaitTimeInSeconds specifies the maximum time for all of the attempts in total, not each individual attempt.
-    max_pending_time_in_seconds: The maximum length of time, in seconds, that a training or compilation job can be pending before it is stopped.
+    max_pending_time_in_seconds: The maximum length of time, in seconds, that a training or compilation job can be pending before it is stopped.  When working with training jobs that use capacity from training plans, not all Pending job states count against the MaxPendingTimeInSeconds limit. The following scenarios do not increment the MaxPendingTimeInSeconds counter:   The plan is in a Scheduled state: Jobs queued (in Pending status) before a plan's start date (waiting for scheduled start time)   Between capacity reservations: Jobs temporarily back to Pending status between two capacity reservation periods    MaxPendingTimeInSeconds only increments when jobs are actively waiting for capacity in an Active plan.
     """
 
     max_runtime_in_seconds: Optional[int] = Unassigned()
@@ -2543,12 +2556,12 @@ class MonitoringDatasetFormat(Base):
     Attributes
     ----------------------
     csv: The CSV dataset used in the monitoring job.
-    json: The JSON dataset used in the monitoring job
+    json_format: The JSON dataset used in the monitoring job
     parquet: The Parquet dataset used in the monitoring job
     """
 
     csv: Optional[MonitoringCsvDatasetFormat] = Unassigned()
-    json: Optional[MonitoringJsonDatasetFormat] = Unassigned()
+    json_format: Optional[MonitoringJsonDatasetFormat] = Field(default=Unassigned(), alias="json")
     parquet: Optional[MonitoringParquetDatasetFormat] = Unassigned()
 
 
@@ -2873,6 +2886,21 @@ class CanvasAppSettings(Base):
     emr_serverless_settings: Optional[EmrServerlessSettings] = Unassigned()
 
 
+class CapacitySizeConfig(Base):
+    """
+    CapacitySizeConfig
+      The configuration of the size measurements of the AMI update. Using this configuration, you can specify whether SageMaker should update your instance group by an amount or percentage of instances.
+
+    Attributes
+    ----------------------
+    type: Specifies whether SageMaker should process the update by amount or percentage of instances.
+    value: Specifies the amount or percentage of instances SageMaker updates at a time.
+    """
+
+    type: str
+    value: int
+
+
 class CaptureContentTypeHeader(Base):
     """
     CaptureContentTypeHeader
@@ -3153,6 +3181,53 @@ class ClusterInstanceStorageConfig(Base):
     ebs_volume_config: Optional[ClusterEbsVolumeConfig] = Unassigned()
 
 
+class RollingDeploymentPolicy(Base):
+    """
+    RollingDeploymentPolicy
+      The configurations that SageMaker uses when updating the AMI versions.
+
+    Attributes
+    ----------------------
+    maximum_batch_size: The maximum amount of instances in the cluster that SageMaker can update at a time.
+    rollback_maximum_batch_size: The maximum amount of instances in the cluster that SageMaker can roll back at a time.
+    """
+
+    maximum_batch_size: CapacitySizeConfig
+    rollback_maximum_batch_size: Optional[CapacitySizeConfig] = Unassigned()
+
+
+class DeploymentConfiguration(Base):
+    """
+    DeploymentConfiguration
+      The configuration to use when updating the AMI versions.
+
+    Attributes
+    ----------------------
+    rolling_update_policy: The policy that SageMaker uses when updating the AMI versions of the cluster.
+    wait_interval_in_seconds: The duration in seconds that SageMaker waits before updating more instances in the cluster.
+    auto_rollback_configuration: An array that contains the alarms that SageMaker monitors to know whether to roll back the AMI update.
+    """
+
+    rolling_update_policy: Optional[RollingDeploymentPolicy] = Unassigned()
+    wait_interval_in_seconds: Optional[int] = Unassigned()
+    auto_rollback_configuration: Optional[List[AlarmDetails]] = Unassigned()
+
+
+class ScheduledUpdateConfig(Base):
+    """
+    ScheduledUpdateConfig
+      The configuration object of the schedule that SageMaker follows when updating the AMI.
+
+    Attributes
+    ----------------------
+    schedule_expression: A cron expression that specifies the schedule that SageMaker follows when updating the AMI.
+    deployment_config: The configuration to use when updating the AMI versions.
+    """
+
+    schedule_expression: str
+    deployment_config: Optional[DeploymentConfiguration] = Unassigned()
+
+
 class ClusterInstanceGroupDetails(Base):
     """
     ClusterInstanceGroupDetails
@@ -3173,6 +3248,7 @@ class ClusterInstanceGroupDetails(Base):
     training_plan_arn: The Amazon Resource Name (ARN); of the training plan associated with this cluster instance group. For more information about how to reserve GPU capacity for your SageMaker HyperPod clusters using Amazon SageMaker Training Plan, see  CreateTrainingPlan .
     training_plan_status: The current status of the training plan associated with this cluster instance group.
     override_vpc_config: The customized Amazon VPC configuration at the instance group level that overrides the default Amazon VPC configuration of the SageMaker HyperPod cluster.
+    scheduled_update_config: The configuration object of the schedule that SageMaker follows when updating the AMI.
     """
 
     current_count: Optional[int] = Unassigned()
@@ -3188,6 +3264,7 @@ class ClusterInstanceGroupDetails(Base):
     training_plan_arn: Optional[str] = Unassigned()
     training_plan_status: Optional[str] = Unassigned()
     override_vpc_config: Optional[VpcConfig] = Unassigned()
+    scheduled_update_config: Optional[ScheduledUpdateConfig] = Unassigned()
 
 
 class ClusterInstanceGroupSpecification(Base):
@@ -3207,6 +3284,7 @@ class ClusterInstanceGroupSpecification(Base):
     on_start_deep_health_checks: A flag indicating whether deep health checks should be performed when the cluster instance group is created or updated.
     training_plan_arn: The Amazon Resource Name (ARN); of the training plan to use for this cluster instance group. For more information about how to reserve GPU capacity for your SageMaker HyperPod clusters using Amazon SageMaker Training Plan, see  CreateTrainingPlan .
     override_vpc_config: To configure multi-AZ deployments, customize the Amazon VPC configuration at the instance group level. You can specify different subnets and security groups across different AZs in the instance group specification to override a SageMaker HyperPod cluster's default Amazon VPC configuration. For more information about deploying a cluster in multiple AZs, see Setting up SageMaker HyperPod clusters across multiple AZs.  When your Amazon VPC and subnets support IPv6, network communications differ based on the cluster orchestration platform:   Slurm-orchestrated clusters automatically configure nodes with dual IPv6 and IPv4 addresses, allowing immediate IPv6 network communications.   In Amazon EKS-orchestrated clusters, nodes receive dual-stack addressing, but pods can only use IPv6 when the Amazon EKS cluster is explicitly IPv6-enabled. For information about deploying an IPv6 Amazon EKS cluster, see Amazon EKS IPv6 Cluster Deployment.   Additional resources for IPv6 configuration:   For information about adding IPv6 support to your VPC, see to IPv6 Support for VPC.   For information about creating a new IPv6-compatible VPC, see Amazon VPC Creation Guide.   To configure SageMaker HyperPod with a custom Amazon VPC, see Custom Amazon VPC Setup for SageMaker HyperPod.
+    scheduled_update_config: The configuration object of the schedule that SageMaker uses to update the AMI.
     """
 
     instance_count: int
@@ -3219,6 +3297,7 @@ class ClusterInstanceGroupSpecification(Base):
     on_start_deep_health_checks: Optional[List[str]] = Unassigned()
     training_plan_arn: Optional[str] = Unassigned()
     override_vpc_config: Optional[VpcConfig] = Unassigned()
+    scheduled_update_config: Optional[ScheduledUpdateConfig] = Unassigned()
 
 
 class ClusterInstancePlacement(Base):
@@ -3263,6 +3342,7 @@ class ClusterNodeDetails(Base):
     instance_status: The status of the instance.
     instance_type: The type of the instance.
     launch_time: The time when the instance is launched.
+    last_software_update_time: The time of when the cluster was last updated.
     life_cycle_config: The LifeCycle configuration applied to the instance.
     override_vpc_config: The customized Amazon VPC configuration at the instance group level that overrides the default Amazon VPC configuration of the SageMaker HyperPod cluster.
     threads_per_core: The number of threads per CPU core you specified under CreateCluster.
@@ -3278,6 +3358,7 @@ class ClusterNodeDetails(Base):
     instance_status: Optional[ClusterInstanceStatusDetails] = Unassigned()
     instance_type: Optional[str] = Unassigned()
     launch_time: Optional[datetime.datetime] = Unassigned()
+    last_software_update_time: Optional[datetime.datetime] = Unassigned()
     life_cycle_config: Optional[ClusterLifeCycleConfig] = Unassigned()
     override_vpc_config: Optional[VpcConfig] = Unassigned()
     threads_per_core: Optional[int] = Unassigned()
@@ -3299,6 +3380,7 @@ class ClusterNodeSummary(Base):
     instance_id: The ID of the instance.
     instance_type: The type of the instance.
     launch_time: The time when the instance is launched.
+    last_software_update_time: The time of when SageMaker last updated the software of the instances in the cluster.
     instance_status: The status of the instance.
     """
 
@@ -3307,6 +3389,7 @@ class ClusterNodeSummary(Base):
     instance_type: str
     launch_time: datetime.datetime
     instance_status: ClusterInstanceStatusDetails
+    last_software_update_time: Optional[datetime.datetime] = Unassigned()
 
 
 class ClusterOrchestratorEksConfig(Base):
@@ -4877,7 +4960,7 @@ class ProductionVariant(Base):
     enable_ssm_access:  You can use this parameter to turn on native Amazon Web Services Systems Manager (SSM) access for a production variant behind an endpoint. By default, SSM access is disabled for all production variants behind an endpoint. You can turn on or turn off SSM access for a production variant behind an existing endpoint by creating a new endpoint configuration and calling UpdateEndpoint.
     managed_instance_scaling: Settings that control the range in the number of instances that the endpoint provisions as it scales up or down to accommodate traffic.
     routing_config: Settings that control how the endpoint routes incoming traffic to the instances that the endpoint hosts.
-    inference_ami_version: Specifies an option from a collection of preconfigured Amazon Machine Image (AMI) images. Each image is configured by Amazon Web Services with a set of software and driver versions. Amazon Web Services optimizes these configurations for different machine learning workloads. By selecting an AMI version, you can ensure that your inference environment is compatible with specific software requirements, such as CUDA driver versions, Linux kernel versions, or Amazon Web Services Neuron driver versions. The AMI version names, and their configurations, are the following:  al2-ami-sagemaker-inference-gpu-2    Accelerator: GPU   NVIDIA driver version: 535   CUDA version: 12.2    al2-ami-sagemaker-inference-gpu-2-1    Accelerator: GPU   NVIDIA driver version: 535   CUDA version: 12.2   NVIDIA Container Toolkit with disabled CUDA-compat mounting    al2-ami-sagemaker-inference-gpu-3-1    Accelerator: GPU   NVIDIA driver version: 550   CUDA version: 12.4   NVIDIA Container Toolkit with disabled CUDA-compat mounting
+    inference_ami_version: Specifies an option from a collection of preconfigured Amazon Machine Image (AMI) images. Each image is configured by Amazon Web Services with a set of software and driver versions. Amazon Web Services optimizes these configurations for different machine learning workloads. By selecting an AMI version, you can ensure that your inference environment is compatible with specific software requirements, such as CUDA driver versions, Linux kernel versions, or Amazon Web Services Neuron driver versions. The AMI version names, and their configurations, are the following:  al2-ami-sagemaker-inference-gpu-2    Accelerator: GPU   NVIDIA driver version: 535   CUDA version: 12.2    al2-ami-sagemaker-inference-gpu-2-1    Accelerator: GPU   NVIDIA driver version: 535   CUDA version: 12.2   NVIDIA Container Toolkit with disabled CUDA-compat mounting    al2-ami-sagemaker-inference-gpu-3-1    Accelerator: GPU   NVIDIA driver version: 550   CUDA version: 12.4   NVIDIA Container Toolkit with disabled CUDA-compat mounting    al2-ami-sagemaker-inference-neuron-2    Accelerator: Inferentia2 and Trainium   Neuron driver version: 2.19
     """
 
     variant_name: str
@@ -10680,6 +10763,7 @@ class ModelPackageSummary(Base):
     creation_time: A timestamp that shows when the model package was created.
     model_package_status: The overall status of the model package.
     model_approval_status: The approval status of the model. This can be one of the following values.    APPROVED - The model is approved    REJECTED - The model is rejected.    PENDING_MANUAL_APPROVAL - The model is waiting for manual approval.
+    model_life_cycle
     """
 
     model_package_arn: str
@@ -10690,6 +10774,7 @@ class ModelPackageSummary(Base):
     model_package_version: Optional[int] = Unassigned()
     model_package_description: Optional[str] = Unassigned()
     model_approval_status: Optional[str] = Unassigned()
+    model_life_cycle: Optional[ModelLifeCycle] = Unassigned()
 
 
 class ModelSummary(Base):
@@ -12598,6 +12683,19 @@ class ThroughputConfigUpdate(Base):
     provisioned_write_capacity_units: Optional[int] = Unassigned()
 
 
+class UpdateClusterSoftwareInstanceGroupSpecification(Base):
+    """
+    UpdateClusterSoftwareInstanceGroupSpecification
+      The configuration that describes specifications of the instance groups to update.
+
+    Attributes
+    ----------------------
+    instance_group_name: The name of the instance group to update.
+    """
+
+    instance_group_name: str
+
+
 class VariantProperty(Base):
     """
     VariantProperty

sagemaker_core/main/utils.py

@@ -182,8 +182,11 @@ def get_textual_rich_logger(name: str, log_level: str = "INFO") -> logging.Logge
     """
     enable_textual_rich_console_and_traceback()
     handler = get_rich_handler()
-    logging.basicConfig(level=getattr(logging, log_level), handlers=[handler])
     logger = logging.getLogger(name)
+    for handler in logger.handlers:
+        logger.removeHandler(handler)
+    logger.addHandler(handler)
+    logger.setLevel(getattr(logging, log_level))
 
     return logger
 

sagemaker_core/tools/constants.py

@@ -97,3 +97,5 @@ SHAPES_CODEGEN_FILE_NAME = "shapes.py"
 CONFIG_SCHEMA_FILE_NAME = "config_schema.py"
 
 API_COVERAGE_JSON_FILE_PATH = os.getcwd() + "/src/sagemaker_core/tools/api_coverage.json"
+
+SHAPES_WITH_JSON_FIELD_ALIAS = ["MonitoringDatasetFormat"]  # Shapes with field name with "json"

sagemaker_core/tools/resources_codegen.py

@@ -177,7 +177,7 @@ class ResourcesCodeGen:
             "import datetime",
             "import time",
             "import functools",
-            "from pydantic import validate_call",
+            "from pydantic import validate_call, ConfigDict, BaseModel",
             "from typing import Dict, List, Literal, Optional, Union, Any\n"
             "from boto3.session import Session",
             "from rich.console import Group",
@@ -192,8 +192,8 @@ class ResourcesCodeGen:
             "snake_to_pascal, pascal_to_snake, is_not_primitive, is_not_str_dict, is_primitive_list, serialize",
             "from sagemaker_core.main.intelligent_defaults_helper import load_default_configs_for_resource_name, get_config_value",
             "from sagemaker_core.main.logs import MultiLogStreamHandler",
-            "from sagemaker_core.main.shapes import *",
             "from sagemaker_core.main.exceptions import *",
+            "import sagemaker_core.main.shapes as shapes",
         ]
 
         formated_imports = "\n".join(imports)
@@ -1388,9 +1388,12 @@ class ResourcesCodeGen:
                 return_type_conversion = "cls"
                 return_string = f"Returns:\n" f"    {method.resource_name}\n"
             else:
-                return_type = f"Optional[{method.return_type}]"
                 return_type_conversion = method.return_type
-                return_string = f"Returns:\n" f"    {method.return_type}\n"
+                if method.resource_name != method.return_type and method.return_type in self.shapes:
+                    return_type_conversion = f"shapes.{method.return_type}"
+                return_type = f"Optional[{return_type_conversion}]"
+
+                return_string = f"Returns:\n" f"    {return_type_conversion}\n"
             operation_output_shape = operation_metadata["output"]["shape"]
             deserialize_response = DESERIALIZE_RESPONSE_TEMPLATE.format(
                 operation_output_shape=operation_output_shape,
@@ -1471,10 +1474,14 @@ class ResourcesCodeGen:
         method_args += add_indent("session: Optional[Session] = None,\n", 4)
         method_args += add_indent("region: Optional[str] = None,", 4)
 
+        iterator_return_type = method.return_type
+        if method.resource_name != method.return_type and method.return_type in self.shapes:
+            iterator_return_type = f"shapes.{method.return_type}"
+
         if method.return_type == method.resource_name:
-            return_type = f'ResourceIterator["{method.resource_name}"]'
+            method_return_type = f'ResourceIterator["{method.resource_name}"]'
         else:
-            return_type = f"ResourceIterator[{method.return_type}]"
+            method_return_type = f"ResourceIterator[{iterator_return_type}]"
         return_string = f"Returns:\n" f"    Iterator for listed {method.return_type}.\n"
 
         get_list_operation_output_shape = operation_metadata["output"]["shape"]
@@ -1497,7 +1504,7 @@ class ResourcesCodeGen:
             f"list_method='{list_method}'",
             f"summaries_key='{summaries_key}'",
             f"summary_name='{summary_name}'",
-            f"resource_cls={method.return_type}",
+            f"resource_cls={iterator_return_type}",
             "list_method_kwargs=operation_input_args",
         ]
 
@@ -1527,7 +1534,7 @@ class ResourcesCodeGen:
             decorator=decorator,
             method_name=method.method_name,
             method_args=method_args,
-            return_type=return_type,
+            return_type=method_return_type,
             serialize_operation_input=serialize_operation_input,
             initialize_client=initialize_client,
             call_operation_api="",
@@ -1901,6 +1908,8 @@ class ResourcesCodeGen:
             new_val = value.split("=")[0].strip()
             if new_val.startswith("Optional"):
                 new_val = new_val.replace("Optional[", "")[:-1]
+            if new_val.startswith("shapes."):
+                new_val = new_val.replace("shapes.", "")
             cleaned_class_attributes[key] = new_val
         return cleaned_class_attributes
 

sagemaker_core/tools/shapes_codegen.py

@@ -22,6 +22,7 @@ from sagemaker_core.tools.constants import (
     LICENCES_STRING,
     GENERATED_CLASSES_LOCATION,
     SHAPES_CODEGEN_FILE_NAME,
+    SHAPES_WITH_JSON_FIELD_ALIAS,
 )
 from sagemaker_core.tools.shapes_extractor import ShapesExtractor
 from sagemaker_core.main.utils import (
@@ -148,7 +149,7 @@ class ShapesCodeGen:
         """
         class_name = shape
         init_data = self.shapes_extractor.generate_data_shape_string_body(
-            shape, self.resources_plan
+            shape, self.resources_plan, add_shapes_prefix=False
         )
         try:
             data_class_members = add_indent(init_data, 4)
@@ -180,7 +181,13 @@ class ShapesCodeGen:
 
         if "members" in shape_dict:
             for member, member_attributes in shape_dict["members"].items():
-                docstring += f"\n{convert_to_snake_case(member)}"
+                # Add alias if field name is json, to address the Bug: https://github.com/aws/sagemaker-python-sdk/issues/4944
+                if shape in SHAPES_WITH_JSON_FIELD_ALIAS and member == "Json":
+                    updated_member = "JsonFormat"
+                    docstring += f"\n{convert_to_snake_case(updated_member)}"
+                else:
+                    docstring += f"\n{convert_to_snake_case(member)}"
+
                 if "documentation" in member_attributes:
                     docstring += f": {member_attributes['documentation']}"
 
@@ -204,7 +211,7 @@ class ShapesCodeGen:
         """
         imports = "import datetime\n"
         imports += "\n"
-        imports += "from pydantic import BaseModel, ConfigDict\n"
+        imports += "from pydantic import BaseModel, ConfigDict, Field\n"
         imports += "from typing import List, Dict, Optional, Any, Union\n"
         imports += "from sagemaker_core.main.utils import Unassigned"
         imports += "\n"

sagemaker_core/tools/shapes_extractor.py

@@ -16,7 +16,11 @@ import pprint
 from functools import lru_cache
 from typing import Optional, Any
 
-from sagemaker_core.tools.constants import BASIC_JSON_TYPES_TO_PYTHON_TYPES, SHAPE_DAG_FILE_PATH
+from sagemaker_core.tools.constants import (
+    BASIC_JSON_TYPES_TO_PYTHON_TYPES,
+    SHAPE_DAG_FILE_PATH,
+    SHAPES_WITH_JSON_FIELD_ALIAS,
+)
 from sagemaker_core.main.utils import (
     reformat_file_with_black,
     convert_to_snake_case,
@@ -99,6 +103,11 @@ class ShapesExtractor:
                 _dag[shape] = {"type": "structure", "members": []}
                 for member, member_attrs in shape_data["members"].items():
                     shape_node_member = {"name": member, "shape": member_attrs["shape"]}
+                    # Add alias if field name is json, to address the Bug: https://github.com/aws/sagemaker-python-sdk/issues/4944
+                    if shape in SHAPES_WITH_JSON_FIELD_ALIAS and member == "Json":
+                        shape_node_member["name"] = "JsonFormat"
+                        shape_node_member["alias"] = "json"
+
                     member_shape_dict = _all_shapes[member_attrs["shape"]]
                     shape_node_member["type"] = member_shape_dict["type"]
                     _dag[shape]["members"].append(shape_node_member)
@@ -117,19 +126,21 @@ class ShapesExtractor:
                 _dag[shape]["value_type"] = _all_shapes[_map_value_shape]["type"]
         return _dag
 
-    def _evaluate_list_type(self, member_shape):
+    def _evaluate_list_type(self, member_shape, add_shapes_prefix=True):
         list_shape_name = member_shape["member"]["shape"]
         list_shape_member = self.combined_shapes[list_shape_name]
         list_shape_type = list_shape_member["type"]
         if list_shape_type == "list":
-            member_type = f"List[{self._evaluate_list_type(list_shape_member)}]"
+            member_type = f"List[{self._evaluate_list_type(list_shape_member, add_shapes_prefix)}]"
         elif list_shape_type == "map":
-            member_type = f"List[{self._evaluate_map_type(list_shape_member)}]"
+            member_type = f"List[{self._evaluate_map_type(list_shape_member, add_shapes_prefix)}]"
         elif list_shape_type == "structure":
             # handling an edge case of nested structure
             if list_shape_name == "SearchExpression":
                 member_type = f"List['{list_shape_name}']"
             else:
+                if add_shapes_prefix:
+                    list_shape_name = f"shapes.{list_shape_name}"
                 member_type = f"List[{list_shape_name}]"
         elif list_shape_type in BASIC_JSON_TYPES_TO_PYTHON_TYPES.keys():
             member_type = f"List[{BASIC_JSON_TYPES_TO_PYTHON_TYPES[list_shape_type]}]"
@@ -139,7 +150,7 @@ class ShapesExtractor:
             )
         return member_type
 
-    def _evaluate_map_type(self, member_shape):
+    def _evaluate_map_type(self, member_shape, add_shapes_prefix=True):
         map_key_shape_name = member_shape["key"]["shape"]
         map_value_shape_name = member_shape["value"]["shape"]
         map_key_shape = self.combined_shapes[map_key_shape_name]
@@ -152,6 +163,8 @@ class ShapesExtractor:
                 "Unhandled map shape key type encountered, needs extra logic to handle this"
             )
         if map_value_shape_type == "structure":
+            if add_shapes_prefix:
+                map_value_shape_name = f"shapes.{map_value_shape_name}"
             member_type = (
                 f"Dict[{BASIC_JSON_TYPES_TO_PYTHON_TYPES[map_key_shape_type]}, "
                 f"{map_value_shape_name}]"
@@ -159,12 +172,12 @@ class ShapesExtractor:
         elif map_value_shape_type == "list":
             member_type = (
                 f"Dict[{BASIC_JSON_TYPES_TO_PYTHON_TYPES[map_key_shape_type]}, "
-                f"{self._evaluate_list_type(map_value_shape)}]"
+                f"{self._evaluate_list_type(map_value_shape, add_shapes_prefix)}]"
             )
         elif map_value_shape_type == "map":
             member_type = (
                 f"Dict[{BASIC_JSON_TYPES_TO_PYTHON_TYPES[map_key_shape_type]}, "
-                f"{self._evaluate_map_type(map_value_shape)}]"
+                f"{self._evaluate_map_type(map_value_shape, add_shapes_prefix)}]"
             )
         else:
             member_type = (
@@ -174,9 +187,13 @@ class ShapesExtractor:
         return member_type
 
     def generate_data_shape_members_and_string_body(
-        self, shape, resource_plan: Optional[Any] = None, required_override=()
+        self,
+        shape,
+        resource_plan: Optional[Any] = None,
+        required_override=(),
+        add_shapes_prefix=True,
     ):
-        shape_members = self.generate_shape_members(shape, required_override)
+        shape_members = self.generate_shape_members(shape, required_override, add_shapes_prefix)
         resource_names = None
         if resource_plan is not None:
             resource_names = [row["resource_name"] for _, row in resource_plan.iterrows()]
@@ -199,18 +216,22 @@ class ShapesExtractor:
                 init_data_body += f"{attr}: {value}\n"
         return shape_members, init_data_body
 
-    def generate_data_shape_string_body(self, shape, resource_plan, required_override=()):
+    def generate_data_shape_string_body(
+        self, shape, resource_plan, required_override=(), add_shapes_prefix=True
+    ):
         return self.generate_data_shape_members_and_string_body(
-            shape, resource_plan, required_override
+            shape, resource_plan, required_override, add_shapes_prefix
         )[1]
 
-    def generate_data_shape_members(self, shape, resource_plan, required_override=()):
+    def generate_data_shape_members(
+        self, shape, resource_plan, required_override=(), add_shapes_prefix=True
+    ):
         return self.generate_data_shape_members_and_string_body(
-            shape, resource_plan, required_override
+            shape, resource_plan, required_override, add_shapes_prefix
         )[0]
 
     @lru_cache
-    def generate_shape_members(self, shape, required_override=()):
+    def generate_shape_members(self, shape, required_override=(), add_shapes_prefix=True):
         shape_dict = self.combined_shapes[shape]
         members = shape_dict["members"]
         required_args = list(required_override) or shape_dict.get("required", [])
@@ -218,29 +239,48 @@ class ShapesExtractor:
         # bring the required members in front
         ordered_members = {key: members[key] for key in required_args if key in members}
         ordered_members.update(members)
+        field_aliases = {}
+
         for member_name, member_attrs in ordered_members.items():
             member_shape_name = member_attrs["shape"]
             if self.combined_shapes[member_shape_name]:
                 member_shape = self.combined_shapes[member_shape_name]
                 member_shape_type = member_shape["type"]
                 if member_shape_type == "structure":
-                    member_type = member_shape_name
+                    if add_shapes_prefix:
+                        member_shape_name = f"shapes.{member_shape_name}"
+                    member_type = f"{member_shape_name}"
                 elif member_shape_type == "list":
-                    member_type = self._evaluate_list_type(member_shape)
+                    member_type = self._evaluate_list_type(member_shape, add_shapes_prefix)
                 elif member_shape_type == "map":
-                    member_type = self._evaluate_map_type(member_shape)
+                    member_type = self._evaluate_map_type(member_shape, add_shapes_prefix)
                 else:
                     # Shape is a simple type like string
                     member_type = BASIC_JSON_TYPES_TO_PYTHON_TYPES[member_shape_type]
             else:
                 raise Exception("The Shape definition mush exist. The Json Data might be corrupt")
-            member_name_snake_case = convert_to_snake_case(member_name)
-            if member_name in required_args:
-                init_data_body[f"{member_name_snake_case}"] = f"{member_type}"
-            else:
-                init_data_body[f"{member_name_snake_case}"] = (
-                    f"Optional[{member_type}] = Unassigned()"
+
+            is_required = member_name in required_args
+            # Add alias if field name is json, to address the Bug: https://github.com/aws/sagemaker-python-sdk/issues/4944
+            if shape in SHAPES_WITH_JSON_FIELD_ALIAS and member_name == "Json":
+                updated_member_name_snake_case = "json_format"
+                field_aliases[updated_member_name_snake_case] = "json"
+                init_data_body[f"{updated_member_name_snake_case}"] = (
+                    (
+                        f"{member_type} = Field(alias='{field_aliases[updated_member_name_snake_case]}')"
+                    )
+                    if is_required
+                    else f"Optional[{member_type}] = Field(default=Unassigned(), alias='json')"
                 )
+            else:
+                member_name_snake_case = convert_to_snake_case(member_name)
+                if is_required:
+                    init_data_body[f"{member_name_snake_case}"] = f"{member_type}"
+                else:
+                    init_data_body[f"{member_name_snake_case}"] = (
+                        f"Optional[{member_type}] = Unassigned()"
+                    )
+
         return init_data_body
 
     @lru_cache

sagemaker_core/tools/templates.py

@@ -75,7 +75,7 @@ def create(
 ) -> Optional["{resource_name}"]:
 {docstring}
     logger.info("Creating {resource_lower} resource.")
-    client =Base.get_sagemaker_client(session=session, region_name=region, service_name='{service_name}')
+    client = Base.get_sagemaker_client(session=session, region_name=region, service_name='{service_name}')
 
     operation_input_args = {{
 {operation_input_args}
@@ -623,7 +623,7 @@ class Base(BaseModel):
                         configurable_attribute, resource_defaults, global_defaults
                     ):
                         resource_name = snake_to_pascal(configurable_attribute)
-                        class_object = globals()[resource_name]
+                        class_object = getattr(shapes, resource_name, None) or globals().get(resource_name)
                         kwargs[configurable_attribute] = class_object(**config_value)
         except BaseException as e:
             logger.debug("Could not load Default Configs. Continuing.", exc_info=True)
@@ -669,7 +669,9 @@ class Base(BaseModel):
     @staticmethod
     def _get_chained_attribute(item_value: Any):
         resource_name = type(item_value).__name__
-        class_object = globals()[resource_name]
+        class_object = globals().get(resource_name) or getattr(shapes, resource_name, None)
+        if class_object is None:
+            return item_value
         return class_object(**Base.populate_chained_attributes(
             resource_name=resource_name,
             operation_input_args=vars(item_value)

{sagemaker_core-1.0.29.dist-info → sagemaker_core-1.0.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sagemaker-core
-Version: 1.0.29
+Version: 1.0.31
 Summary: An python package for sagemaker core functionalities
 Author-email: AWS <sagemaker-interests@amazon.com>
 Project-URL: Repository, https://github.com/aws/sagemaker-core.git

{sagemaker_core-1.0.29.dist-info → sagemaker_core-1.0.31.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sagemaker_core/__init__.py,sha256=kM7971seaG8p8wFv2T0kOrFLRBhjOpjAHo3DGCaqRHc,126
-sagemaker_core/_version.py,sha256=t-XEKT8_pvKkl5z_UrfcIU256c_NxaI16qGWMuNVpbM,321
+sagemaker_core/_version.py,sha256=4UH5LevZBa3Kl1OiDbkaeIzXUQNSYVFrc-2su2TCco4,86
 sagemaker_core/helper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sagemaker_core/helper/session_helper.py,sha256=GO1UJgpN1L9a25nYlVb-KWk4KvmFzVkLqFMqw-VaI4c,33126
 sagemaker_core/main/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -7,29 +7,29 @@ sagemaker_core/main/config_schema.py,sha256=lBwIm5CT_dSXeW5i6cgRzbiLDjs0qtH1FrM7
 sagemaker_core/main/exceptions.py,sha256=87DUlrmHxaWoiYNlpNY9ixxFMPRk_dIGPsA2e_xdVwQ,5602
 sagemaker_core/main/intelligent_defaults_helper.py,sha256=5SDM6UavZtp-k5LhqRL7GRIDgzFB5UsC_p7YuiSPK9A,8334
 sagemaker_core/main/logs.py,sha256=yfEH7uP91nbE1lefymOlBr81ziBzsDSIOF2Qyd54FJE,6241
-sagemaker_core/main/resources.py,sha256=ezCu5Hqw9OYu8-rLrC6jJPZYEaUAghJ5rxcsb1XkXRw,1413476
-sagemaker_core/main/shapes.py,sha256=tpq9dp4X1aKDOGNQwt3pslrMMAetQfxJv-oLY-ovYvc,731767
+sagemaker_core/main/resources.py,sha256=jNX5jp5tmwa0t8PYPxWrRRBAGIn0G-iq3C-7TvBxEPw,1420815
+sagemaker_core/main/shapes.py,sha256=r6a24wbWncTXBpDqmP_VPUtO0Uc7QYFdOs7EZ-bLz0A,736265
 sagemaker_core/main/user_agent.py,sha256=BPYDAfDd70ObP-VAjl7aDHALHyGknkpRP21ktVr_LDw,2744
-sagemaker_core/main/utils.py,sha256=LCFDM6oxf6_e1i-_Dgtkm3ehl7YfoEpJ2kTTFTL6iOU,18471
+sagemaker_core/main/utils.py,sha256=qTGJDcZwrAQSsdyg8A78x4PKU4Wu1rY6Cn3OIbIspaA,18546
 sagemaker_core/main/code_injection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sagemaker_core/main/code_injection/base.py,sha256=11_Jif0nOzfbLGlXaacKf-wcizzfS64U0OSZGoVffFU,1733
 sagemaker_core/main/code_injection/codec.py,sha256=nA51E9iNWHyKou1G23rKSRL4WitdkFRbMuFkyrGHzKU,8428
 sagemaker_core/main/code_injection/constants.py,sha256=2ICExGge8vAWx7lSTW0JGh-bH1korkvpOpDu5M63eI4,980
-sagemaker_core/main/code_injection/shape_dag.py,sha256=YE-5PMUXhjByNNt0ymf6jvYogRBiPpmc2as2-lAb3Xs,699939
+sagemaker_core/main/code_injection/shape_dag.py,sha256=qUUqZfPh9q7lYjifbApH_t94xN03N1e6JgWOv7ttofw,703067
 sagemaker_core/resources/__init__.py,sha256=EAYTFMN-nPjnPjjBbhIUeaL67FLKNPd7qbcbl9VIrws,31
 sagemaker_core/shapes/__init__.py,sha256=RnbIu9eTxKt-DNsOFJabrWIgrrtS9_SdAozP9JBl_ic,28
 sagemaker_core/tools/__init__.py,sha256=xX79JImxCVzrWMnjgntLCve2G5I-R4pRar5s20kT9Rs,56
 sagemaker_core/tools/codegen.py,sha256=mKWVi2pWnPxyIoWUEPYjEc9Gw7D9bCOrHqa00yzIZ1o,2005
-sagemaker_core/tools/constants.py,sha256=a2WjUDK7gzxgilZs99vp30qh4kQ-y6JKhrwwqVAA12o,3385
+sagemaker_core/tools/constants.py,sha256=XEwsUJ4w952mpnk-K0TS7R2uJhZyVPjcR47nrzgVXtg,3483
 sagemaker_core/tools/data_extractor.py,sha256=pNfmTA0NUA96IgfLrla7a36Qjc1NljbwgZYaOhouKqQ,2113
 sagemaker_core/tools/method.py,sha256=Ud2YeH2SPkj7xtIxBuUdRfQwCmovMUzGGkcIvzhpQeQ,805
-sagemaker_core/tools/resources_codegen.py,sha256=bnufJgmVUcIGyMifZKbtwaO_bG_0bN2_A7CYq629pNc,84550
+sagemaker_core/tools/resources_codegen.py,sha256=wz9HU_crbHeZUp5ylMqgfWbHCCgVLfD31hFBGBSuW_A,85100
 sagemaker_core/tools/resources_extractor.py,sha256=hN61ehZbPnhFW-2FIVDi7NsEz4rLvGr-WoglHQGfrug,14523
-sagemaker_core/tools/shapes_codegen.py,sha256=_ve959bwH8usZ6dPlpXxi2on9t0hLpcmhRWnaWHCWMQ,11745
-sagemaker_core/tools/shapes_extractor.py,sha256=GFy55JHGW0V8cwN5SL5gGLUxihLGswueyh5iNCn1sYk,12310
-sagemaker_core/tools/templates.py,sha256=yX2RQKeClgYwKS5Qu_mDpnWJIBCuj0yELrdm95aiTpk,23262
-sagemaker_core-1.0.29.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-sagemaker_core-1.0.29.dist-info/METADATA,sha256=7qm0ZhVK2oLeFUK5pAu1iaiMARQnCS3AkN3G2JCvhbU,4885
-sagemaker_core-1.0.29.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-sagemaker_core-1.0.29.dist-info/top_level.txt,sha256=R3GAZZ1zC5JxqdE_0x2Lu_WYi2Xfke7VsiP3L5zngfA,15
-sagemaker_core-1.0.29.dist-info/RECORD,,
+sagemaker_core/tools/shapes_codegen.py,sha256=4lsePZpjk7M6RpJs5yar_m4z5MzwGHFrvCkdS_-R12c,12172
+sagemaker_core/tools/shapes_extractor.py,sha256=vxVKjXD3lmjrkoKiexjUnOt8ITbFxQSeiDtx7P6Qtkw,14226
+sagemaker_core/tools/templates.py,sha256=vIgRWConRGAQ-Mri6LwfkArqWHlL3KXcvbbYa-t_MV4,23414
+sagemaker_core-1.0.31.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+sagemaker_core-1.0.31.dist-info/METADATA,sha256=oPcMceosjqH8YzEQe2pcSyFkoyWbWbdt0IPptyEGwsg,4885
+sagemaker_core-1.0.31.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
+sagemaker_core-1.0.31.dist-info/top_level.txt,sha256=R3GAZZ1zC5JxqdE_0x2Lu_WYi2Xfke7VsiP3L5zngfA,15
+sagemaker_core-1.0.31.dist-info/RECORD,,