Add forbid extra for pydantic BaseModel

docs/conf.py

@@ -9,8 +9,7 @@
 
 project = "sagemaker-core"
 copyright = (
-    "%s, Amazon Web Services, Inc. or its affiliates. All rights reserved."
-    % datetime.now().year
+    "%s, Amazon Web Services, Inc. or its affiliates. All rights reserved." % datetime.now().year
 )
 author = "Amazon Web Services"
 
@@ -65,4 +64,3 @@
 
 # autosectionlabel
 autosectionlabel_prefix_document = True
-

integ/test_codegen.py

@@ -144,7 +144,8 @@ def test_training_and_inference(self):
         )
         endpoint: Endpoint = Endpoint.create(
             endpoint_name=key,
-            endpoint_config_name=endpoint_config,  # Pass `EndpointConfig` object created above
+            # Pass `EndpointConfig` object created above
+            endpoint_config_name=endpoint_config,
         )
         endpoint.wait_for_status("InService")
 

pyproject.toml

@@ -46,6 +46,7 @@ Repository = "https://github.com/aws/sagemaker-core.git"
 
 [tool.black]
 line-length = 100
+exclude = '\.ipynb$'
 
 [tool.setuptools.dynamic]
 version = { attr = "sagemaker_core._version.__version__"}

src/sagemaker_core/main/resources.py

@@ -51,7 +51,7 @@
 
 
 class Base(BaseModel):
-    model_config = ConfigDict(protected_namespaces=(), validate_assignment=True)
+    model_config = ConfigDict(protected_namespaces=(), validate_assignment=True, extra="forbid")
 
     @classmethod
     def get_sagemaker_client(cls, session=None, region_name=None, service_name="sagemaker"):

src/sagemaker_core/main/shapes.py

@@ -18,7 +18,7 @@
 
 
 class Base(BaseModel):
-    model_config = ConfigDict(protected_namespaces=(), validate_assignment=True)
+    model_config = ConfigDict(protected_namespaces=(), validate_assignment=True, extra="forbid")
 
 
 class ActionSource(Base):

src/sagemaker_core/main/utils.py

@@ -438,6 +438,11 @@ def __next__(self) -> T:
 
                 if self.custom_key_mapping:
                     init_data = {self.custom_key_mapping.get(k, k): v for k, v in init_data.items()}
+
+                # Filter out the fields that are not in the resource class
+                fields = self.resource_cls.__annotations__
+                init_data = {k: v for k, v in init_data.items() if k in fields}
+
                 resource_object = self.resource_cls(**init_data)
 
             # If the resource object has refresh method, refresh and return it

src/sagemaker_core/tools/resources_codegen.py

@@ -897,7 +897,8 @@ def generate_create_method(self, resource_name: str, **kwargs) -> str:
                     resource_name=resource_name,
                     create_args=create_args,
                     resource_lower=resource_lower,
-                    service_name="sagemaker",  # TODO: change service name based on the service - runtime, sagemaker, etc.
+                    # TODO: change service name based on the service - runtime, sagemaker, etc.
+                    service_name="sagemaker",
                     operation_input_args=operation_input_args,
                     operation=operation,
                     get_args=get_args,
@@ -908,7 +909,8 @@ def generate_create_method(self, resource_name: str, **kwargs) -> str:
                     resource_name=resource_name,
                     create_args=create_args,
                     resource_lower=resource_lower,
-                    service_name="sagemaker",  # TODO: change service name based on the service - runtime, sagemaker, etc.
+                    # TODO: change service name based on the service - runtime, sagemaker, etc.
+                    service_name="sagemaker",
                     operation_input_args=operation_input_args,
                     operation=operation,
                     get_args=get_args,
@@ -1074,7 +1076,8 @@ def generate_import_method(self, resource_name: str) -> str:
             resource_name=resource_name,
             import_args=import_args,
             resource_lower=resource_lower,
-            service_name="sagemaker",  # TODO: change service name based on the service - runtime, sagemaker, etc.
+            # TODO: change service name based on the service - runtime, sagemaker, etc.
+            service_name="sagemaker",
             operation_input_args=operation_input_args,
             operation=operation,
             get_args=get_args,
@@ -1378,7 +1381,8 @@ def generate_get_method(self, resource_name: str) -> str:
         formatted_method = GET_METHOD_TEMPLATE.format(
             docstring=docstring,
             resource_name=resource_name,
-            service_name="sagemaker",  # TODO: change service name based on the service - runtime, sagemaker, etc.
+            # TODO: change service name based on the service - runtime, sagemaker, etc.
+            service_name="sagemaker",
             describe_args=describe_args,
             resource_lower=resource_lower,
             operation_input_args=operation_input_args,

src/sagemaker_core/tools/templates.py

@@ -622,7 +622,7 @@ def {method_name}(
 
 RESOURCE_BASE_CLASS_TEMPLATE = """
 class Base(BaseModel):
-    model_config = ConfigDict(protected_namespaces=(), validate_assignment=True)
+    model_config = ConfigDict(protected_namespaces=(), validate_assignment=True, extra="forbid")
 
     @classmethod
     def get_sagemaker_client(cls, session = None, region_name = None, service_name = 'sagemaker'):
@@ -709,7 +709,7 @@ def wrapper(*args, **kwargs):
 
 SHAPE_BASE_CLASS_TEMPLATE = """
 class {class_name}:
-    model_config = ConfigDict(protected_namespaces=(), validate_assignment=True)
+    model_config = ConfigDict(protected_namespaces=(), validate_assignment=True, extra="forbid")
 """
 
 SHAPE_CLASS_TEMPLATE = '''

tst/generated/test_resources.py

@@ -1,5 +1,6 @@
 import datetime
-import importlib, inspect
+import importlib
+import inspect
 import unittest
 from unittest.mock import patch
 

workflow_helper/compute_boto_api_coverage.py

@@ -6,7 +6,7 @@ def main():
     """
     This function computes the number of APIs covered and uncovered by sagemaker core to the ones in Botocore.
     """
-    configure_logging("ERROR") # Disable other log messages
+    configure_logging("ERROR")  # Disable other log messages
     resources_extractor = ResourcesExtractor()
     # Print the number of unsupported Botocore API and supported Botocore API
     print(len(resources_extractor.actions), len(resources_extractor.actions_under_resource))