Fix models + make mypy happy

Author: leandrodamascena

aws_lambda_powertools/utilities/parser/models/cloudwatch.py

@@ -27,7 +27,7 @@ class CloudWatchLogsDecode(BaseModel):
 
 
 class CloudWatchLogsData(BaseModel):
-    decoded_data: CloudWatchLogsDecode = Field(None, alias="data")
+    decoded_data: CloudWatchLogsDecode = Field(..., alias="data")
 
     @field_validator("decoded_data", mode="before")
     def prepare_data(cls, value):

aws_lambda_powertools/utilities/parser/models/event_bridge.py

@@ -1,19 +1,21 @@
 from datetime import datetime
 from typing import List, Optional
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field
 
 from aws_lambda_powertools.utilities.parser.types import RawDictOrModel
 
 
 class EventBridgeModel(BaseModel):
+    model_config = ConfigDict(populate_by_name=True)
+
     version: str
     id: str  # noqa: A003,VNE003
     source: str
     account: str
     time: datetime
     region: str
     resources: List[str]
-    detail_type: str = Field(None, alias="detail-type")
+    detail_type: str = Field(..., alias="detail-type")
     detail: RawDictOrModel
     replay_name: Optional[str] = Field(None, alias="replay-name")

aws_lambda_powertools/utilities/parser/models/s3.py

@@ -27,8 +27,8 @@ class S3RequestParameters(BaseModel):
 
 
 class S3ResponseElements(BaseModel):
-    x_amz_request_id: str = Field(None, alias="x-amz-request-id")
-    x_amz_id_2: str = Field(None, alias="x-amz-id-2")
+    x_amz_request_id: str = Field(..., alias="x-amz-request-id")
+    x_amz_id_2: str = Field(..., alias="x-amz-id-2")
 
 
 class S3OwnerIdentify(BaseModel):
@@ -60,7 +60,7 @@ class S3EventNotificationObjectModel(BaseModel):
     key: str
     size: Optional[NonNegativeFloat] = None
     etag: str = Field(default="")
-    version_id: str = Field(None, alias="version-id")
+    version_id: Optional[str] = Field(None, alias="version-id")
     sequencer: Optional[str] = None
 
 
@@ -72,9 +72,9 @@ class S3EventNotificationEventBridgeDetailModel(BaseModel):
     version: str
     bucket: S3EventNotificationEventBridgeBucketModel
     object: S3EventNotificationObjectModel  # noqa: A003,VNE003
-    request_id: str = Field(None, alias="request-id")
+    request_id: str = Field(..., alias="request-id")
     requester: str
-    source_ip_address: str = Field(None, alias="source-ip-address")
+    source_ip_address: Optional[str] = Field(None, alias="source-ip-address")
     reason: Optional[str] = None
     deletion_type: Optional[str] = Field(None, alias="deletion-type")
     restore_expiry_time: Optional[str] = Field(None, alias="restore-expiry-time")

aws_lambda_powertools/utilities/parser/models/ses.py

@@ -32,7 +32,7 @@ class SesMailHeaders(BaseModel):
 
 
 class SesMailCommonHeaders(BaseModel):
-    header_from: List[str] = Field(None, alias="from")
+    header_from: List[str] = Field(..., alias="from")
     to: List[str]
     cc: Optional[List[str]] = None
     bcc: Optional[List[str]] = None

aws_lambda_powertools/utilities/parser/models/vpc_latticev2.py

@@ -39,4 +39,4 @@ class VpcLatticeV2Model(BaseModel):
     query_string_parameters: Optional[Dict[str, str]] = Field(None, alias="queryStringParameters")
     body: Optional[Union[str, Type[BaseModel]]] = None
     is_base64_encoded: Optional[bool] = Field(None, alias="isBase64Encoded")
-    request_context: VpcLatticeV2RequestContext = Field(None, alias="requestContext")
+    request_context: VpcLatticeV2RequestContext = Field(..., alias="requestContext")

tests/functional/parser/test_parser.py

@@ -210,6 +210,7 @@ def test_parser_with_model_type_model_and_envelope():
                     source="source",
                     account="account",
                     time=datetime.now(),
+                    detail_type="MyEvent",
                     region="region",
                     resources=[],
                     detail={"key": "value"},