From 22af10ed83c65b90b1aa599dc8eab3c771bf9f52 Mon Sep 17 00:00:00 2001
From: manshahH <jasperthejelly@gmail.com>
Date: Mon, 24 Aug 2026 17:29:06 +0500
Subject: [PATCH] refactor(typing): use PEP 604 syntax for Optional annotations
 (UP045)

Convert Optional[X] to X | None across the codebase and remove the
temporary UP045 ignore from ruff.toml, so the fix and the removal of the
ignore land together.

283 of the 285 violations were handled by the ruff autofix. The two
remaining cases in utilities/batch/types.py are runtime assignments
rather than annotations, so they were converted by hand and verified to
compare equal to their previous definitions.

Union is left in place, since it belongs to UP007.
---
 .../utilities/batch/exceptions.py             |  4 +-
 .../utilities/batch/types.py                  |  9 +-
 .../utilities/parser/models/apigw.py          | 72 ++++++++--------
 .../parser/models/apigw_websocket.py          |  6 +-
 .../utilities/parser/models/apigwv2.py        | 40 ++++-----
 .../utilities/parser/models/appsync.py        | 20 ++---
 .../utilities/parser/models/appsync_events.py | 12 +--
 .../utilities/parser/models/bedrock_agent.py  |  8 +-
 .../utilities/parser/models/cloudwatch.py     |  4 +-
 .../utilities/parser/models/cognito.py        | 84 +++++++++----------
 .../utilities/parser/models/dynamodb.py       | 12 +--
 .../utilities/parser/models/event_bridge.py   |  4 +-
 .../parser/models/iot_registry_events.py      | 12 +--
 .../utilities/parser/models/kafka.py          |  8 +-
 .../parser/models/kinesis_firehose.py         |  6 +-
 .../parser/models/kinesis_firehose_sqs.py     |  6 +-
 .../utilities/parser/models/s3.py             | 38 ++++-----
 .../parser/models/s3_batch_operation.py       | 10 +--
 .../parser/models/s3_object_event.py          |  8 +-
 .../utilities/parser/models/ses.py            | 10 +--
 .../utilities/parser/models/sns.py            | 12 +--
 .../utilities/parser/models/sqs.py            | 18 ++--
 .../parser/models/transfer_family.py          |  4 +-
 .../utilities/parser/models/vpc_latticev2.py  | 28 +++----
 .../src/advanced_accessing_lambda_context.py  |  4 +-
 ...vanced_accessing_lambda_context_manager.py |  4 +-
 .../batch_processing/src/pydantic_dynamodb.py |  6 +-
 examples/build_recipes/poetry/app_poetry.py   |  4 +-
 .../sam/no-layers/src/app_sam_no_layer.py     |  4 +-
 .../sam/with-layers/src/app/app_sam_layer.py  |  4 +-
 .../src/enable_exceptions_batch_resolver.py   |  4 +-
 .../src/accessing_request_details.py          |  6 +-
 .../src/customizing_response_validation.py    |  3 +-
 ...stomizing_response_validation_exception.py |  3 +-
 .../event_handler_rest/src/data_validation.py |  4 +-
 .../data_validation_fine_grained_response.py  |  3 +-
 .../src/data_validation_sanitized_error.py    |  4 +-
 .../src/skip_validating_query_strings.py      |  6 +-
 .../src/validating_headers.py                 |  4 +-
 .../src/validating_headers_with_pydantic.py   |  4 +-
 .../event_handler_rest/src/validating_path.py |  4 +-
 .../src/validating_payload_subset.py          |  4 +-
 .../src/validating_payloads.py                |  4 +-
 .../validating_query_string_with_pydantic.py  |  4 +-
 .../src/validating_query_strings.py           |  6 +-
 .../src/bring_your_own_persistent_store.py    |  6 +-
 .../bring_your_own_formatter_from_scratch.py  |  4 +-
 .../src/assert_transformation_module.py       |  4 +-
 examples/streaming/src/s3_json_transform.py   |  6 +-
 ruff.toml                                     |  1 -
 tests/e2e/utils/data_fetcher/common.py        | 14 ++--
 tests/e2e/utils/data_fetcher/logs.py          | 34 ++++----
 tests/e2e/utils/data_fetcher/traces.py        | 56 ++++++-------
 .../batch/_pydantic/sample_models.py          |  6 +-
 .../test_utilities_batch_pydantic.py          | 10 +--
 .../_pydantic/test_bedrock_agent.py           |  6 +-
 .../_pydantic/test_openapi_params.py          | 10 +--
 .../_pydantic/test_openapi_responses.py       |  4 +-
 .../test_openapi_schema_pydantic_v2.py        |  4 +-
 .../_pydantic/test_openapi_serialization.py   |  4 +-
 .../test_openapi_validation_middleware.py     | 34 ++++----
 .../idempotency/_boto3/test_idempotency.py    |  4 +-
 .../test_idempotency_with_pydantic.py         |  4 +-
 tests/functional/idempotency/utils.py         |  4 +-
 tests/unit/parser/_pydantic/schemas.py        |  6 +-
 65 files changed, 361 insertions(+), 384 deletions(-)

diff --git a/aws_lambda_powertools/utilities/batch/exceptions.py b/aws_lambda_powertools/utilities/batch/exceptions.py
index 87a2df22d6d..247388a9886 100644
--- a/aws_lambda_powertools/utilities/batch/exceptions.py
+++ b/aws_lambda_powertools/utilities/batch/exceptions.py
@@ -6,9 +6,9 @@
 
 import traceback
 from types import TracebackType
-from typing import Optional, Tuple, Type
+from typing import Tuple, Type
 
-ExceptionInfo = Tuple[Optional[Type[BaseException]], Optional[BaseException], Optional[TracebackType]]
+ExceptionInfo = Tuple[Type[BaseException] | None, BaseException | None, TracebackType | None]
 
 
 class BaseBatchProcessingError(Exception):
diff --git a/aws_lambda_powertools/utilities/batch/types.py b/aws_lambda_powertools/utilities/batch/types.py
index ec543bf51ea..32e11b5ae07 100644
--- a/aws_lambda_powertools/utilities/batch/types.py
+++ b/aws_lambda_powertools/utilities/batch/types.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import sys
-from typing import Optional, Type, TypedDict, Union
+from typing import Type, TypedDict, Union
 
 has_pydantic = "pydantic" in sys.modules
 
@@ -14,15 +14,16 @@
     )
     from aws_lambda_powertools.utilities.parser.models.kafka import KafkaRecordModel
 
-    BatchTypeModels = Optional[
+    BatchTypeModels = (
         Union[
             Type[SqsRecordModel],
             Type[DynamoDBStreamRecordModel],
             Type[KinesisDataStreamRecordModel],
             Type[KafkaRecordModel],
         ]
-    ]
-    BatchSqsTypeModel = Optional[Type[SqsRecordModel]]
+        | None
+    )
+    BatchSqsTypeModel = Type[SqsRecordModel] | None
 else:  # pragma: no cover
     BatchTypeModels = "BatchTypeModels"  # type: ignore
     BatchSqsTypeModel = "BatchSqsTypeModel"  # type: ignore
diff --git a/aws_lambda_powertools/utilities/parser/models/apigw.py b/aws_lambda_powertools/utilities/parser/models/apigw.py
index ea01a5e8a6b..349ebbb512b 100644
--- a/aws_lambda_powertools/utilities/parser/models/apigw.py
+++ b/aws_lambda_powertools/utilities/parser/models/apigw.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Any, Dict, List, Literal, Optional, Type, Union
+from typing import Any, Dict, List, Literal, Type, Union
 
 from pydantic import BaseModel, field_validator, model_validator
 from pydantic.networks import IPvAnyNetwork
@@ -21,23 +21,23 @@ class ApiGatewayUserCert(BaseModel):
 
 
 class APIGatewayEventIdentity(BaseModel):
-    accessKey: Optional[str] = None
-    accountId: Optional[str] = None
-    apiKey: Optional[str] = None
-    apiKeyId: Optional[str] = None
-    caller: Optional[str] = None
-    cognitoAuthenticationProvider: Optional[str] = None
-    cognitoAuthenticationType: Optional[str] = None
-    cognitoIdentityId: Optional[str] = None
-    cognitoIdentityPoolId: Optional[str] = None
-    principalOrgId: Optional[str] = None
+    accessKey: str | None = None
+    accountId: str | None = None
+    apiKey: str | None = None
+    apiKeyId: str | None = None
+    caller: str | None = None
+    cognitoAuthenticationProvider: str | None = None
+    cognitoAuthenticationType: str | None = None
+    cognitoIdentityId: str | None = None
+    cognitoIdentityPoolId: str | None = None
+    principalOrgId: str | None = None
     # see #1562, temp workaround until API Gateway fixes it the Test button payload
     # removing it will not be considered a regression in the future
     sourceIp: Union[IPvAnyNetwork, str]
-    user: Optional[str] = None
-    userAgent: Optional[str] = None
-    userArn: Optional[str] = None
-    clientCert: Optional[ApiGatewayUserCert] = None
+    user: str | None = None
+    userAgent: str | None = None
+    userArn: str | None = None
+    clientCert: ApiGatewayUserCert | None = None
 
     @field_validator("sourceIp", mode="before")
     @classmethod
@@ -46,34 +46,34 @@ def _validate_source_ip(cls, value):
 
 
 class APIGatewayEventAuthorizer(BaseModel):
-    claims: Optional[Dict[str, Any]] = None
-    scopes: Optional[List[str]] = None
+    claims: Dict[str, Any] | None = None
+    scopes: List[str] | None = None
 
 
 class APIGatewayEventRequestContext(BaseModel):
     accountId: str
     apiId: str
-    authorizer: Optional[APIGatewayEventAuthorizer] = None
+    authorizer: APIGatewayEventAuthorizer | None = None
     stage: str
     protocol: str
     identity: APIGatewayEventIdentity
     requestId: str
     requestTime: str
     requestTimeEpoch: datetime
-    resourceId: Optional[str] = None
+    resourceId: str | None = None
     resourcePath: str
-    domainName: Optional[str] = None
-    domainPrefix: Optional[str] = None
-    extendedRequestId: Optional[str] = None
+    domainName: str | None = None
+    domainPrefix: str | None = None
+    extendedRequestId: str | None = None
     httpMethod: Literal["DELETE", "GET", "HEAD", "OPTIONS", "PATCH", "POST", "PUT"]
     path: str
-    connectedAt: Optional[datetime] = None
-    connectionId: Optional[str] = None
-    eventType: Optional[Literal["CONNECT", "MESSAGE", "DISCONNECT"]] = None
-    messageDirection: Optional[str] = None
-    messageId: Optional[str] = None
-    routeKey: Optional[str] = None
-    operationName: Optional[str] = None
+    connectedAt: datetime | None = None
+    connectionId: str | None = None
+    eventType: Literal["CONNECT", "MESSAGE", "DISCONNECT"] | None = None
+    messageDirection: str | None = None
+    messageId: str | None = None
+    routeKey: str | None = None
+    operationName: str | None = None
 
     @model_validator(mode="before")
     def check_message_id(cls, values):
@@ -84,19 +84,19 @@ def check_message_id(cls, values):
 
 
 class APIGatewayProxyEventModel(BaseModel):
-    version: Optional[str] = None
+    version: str | None = None
     resource: str
     path: str
     httpMethod: Literal["DELETE", "GET", "HEAD", "OPTIONS", "PATCH", "POST", "PUT"]
     headers: Dict[str, str]
     multiValueHeaders: Dict[str, List[str]]
-    queryStringParameters: Optional[Dict[str, str]] = None
-    multiValueQueryStringParameters: Optional[Dict[str, List[str]]] = None
+    queryStringParameters: Dict[str, str] | None = None
+    multiValueQueryStringParameters: Dict[str, List[str]] | None = None
     requestContext: APIGatewayEventRequestContext
-    pathParameters: Optional[Dict[str, str]] = None
-    stageVariables: Optional[Dict[str, str]] = None
-    isBase64Encoded: Optional[bool] = None
-    body: Optional[Union[str, Type[BaseModel]]] = None
+    pathParameters: Dict[str, str] | None = None
+    stageVariables: Dict[str, str] | None = None
+    isBase64Encoded: bool | None = None
+    body: Union[str, Type[BaseModel]] | None = None
 
 
 class ApiGatewayAuthorizerToken(BaseModel):
diff --git a/aws_lambda_powertools/utilities/parser/models/apigw_websocket.py b/aws_lambda_powertools/utilities/parser/models/apigw_websocket.py
index b9e7ecd68c7..3454d7d30a0 100644
--- a/aws_lambda_powertools/utilities/parser/models/apigw_websocket.py
+++ b/aws_lambda_powertools/utilities/parser/models/apigw_websocket.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Dict, List, Literal, Optional, Type, Union
+from typing import Dict, List, Literal, Type, Union
 
 from pydantic import BaseModel, Field
 from pydantic.networks import IPvAnyNetwork
@@ -7,7 +7,7 @@
 
 class APIGatewayWebSocketEventIdentity(BaseModel):
     source_ip: IPvAnyNetwork = Field(alias="sourceIp")
-    user_agent: Optional[str] = Field(None, alias="userAgent")
+    user_agent: str | None = Field(None, alias="userAgent")
 
 
 class APIGatewayWebSocketEventRequestContextBase(BaseModel):
@@ -61,4 +61,4 @@ class APIGatewayWebSocketDisconnectEventModel(BaseModel):
 class APIGatewayWebSocketMessageEventModel(BaseModel):
     request_context: APIGatewayWebSocketMessageEventRequestContext = Field(alias="requestContext")
     is_base64_encoded: bool = Field(alias="isBase64Encoded")
-    body: Optional[Union[str, Type[BaseModel]]] = Field(None, alias="body")
+    body: Union[str, Type[BaseModel]] | None = Field(None, alias="body")
diff --git a/aws_lambda_powertools/utilities/parser/models/apigwv2.py b/aws_lambda_powertools/utilities/parser/models/apigwv2.py
index 9bd66b7a585..b01cb1beb03 100644
--- a/aws_lambda_powertools/utilities/parser/models/apigwv2.py
+++ b/aws_lambda_powertools/utilities/parser/models/apigwv2.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Any, Dict, List, Literal, Optional, Type, Union
+from typing import Any, Dict, List, Literal, Type, Union
 
 from pydantic import BaseModel, Field, field_validator
 from pydantic.networks import IPvAnyNetwork
@@ -14,24 +14,24 @@ class RequestContextV2AuthorizerIamCognito(BaseModel):
 
 
 class RequestContextV2AuthorizerIam(BaseModel):
-    accessKey: Optional[str] = None
-    accountId: Optional[str] = None
-    callerId: Optional[str] = None
-    principalOrgId: Optional[str] = None
-    userArn: Optional[str] = None
-    userId: Optional[str] = None
-    cognitoIdentity: Optional[RequestContextV2AuthorizerIamCognito] = None
+    accessKey: str | None = None
+    accountId: str | None = None
+    callerId: str | None = None
+    principalOrgId: str | None = None
+    userArn: str | None = None
+    userId: str | None = None
+    cognitoIdentity: RequestContextV2AuthorizerIamCognito | None = None
 
 
 class RequestContextV2AuthorizerJwt(BaseModel):
     claims: Dict[str, Any]
-    scopes: Optional[List[str]] = None
+    scopes: List[str] | None = None
 
 
 class RequestContextV2Authorizer(BaseModel):
-    jwt: Optional[RequestContextV2AuthorizerJwt] = None
-    iam: Optional[RequestContextV2AuthorizerIam] = None
-    lambda_value: Optional[Dict[str, Any]] = Field(None, alias="lambda")
+    jwt: RequestContextV2AuthorizerJwt | None = None
+    iam: RequestContextV2AuthorizerIam | None = None
+    lambda_value: Dict[str, Any] | None = Field(None, alias="lambda")
 
 
 class RequestContextV2Http(BaseModel):
@@ -50,7 +50,7 @@ def _validate_source_ip(cls, value):
 class RequestContextV2(BaseModel):
     accountId: str
     apiId: str
-    authorizer: Optional[RequestContextV2Authorizer] = None
+    authorizer: RequestContextV2Authorizer | None = None
     domainName: str
     domainPrefix: str
     requestId: str
@@ -66,17 +66,17 @@ class APIGatewayProxyEventV2Model(BaseModel):
     routeKey: str
     rawPath: str
     rawQueryString: str
-    cookies: Optional[List[str]] = None
+    cookies: List[str] | None = None
     headers: Dict[str, str]
-    queryStringParameters: Optional[Dict[str, str]] = None
-    pathParameters: Optional[Dict[str, str]] = None
-    stageVariables: Optional[Dict[str, str]] = None
+    queryStringParameters: Dict[str, str] | None = None
+    pathParameters: Dict[str, str] | None = None
+    stageVariables: Dict[str, str] | None = None
     requestContext: RequestContextV2
-    body: Optional[Union[str, Type[BaseModel]]] = None
-    isBase64Encoded: Optional[bool] = None
+    body: Union[str, Type[BaseModel]] | None = None
+    isBase64Encoded: bool | None = None
 
 
 class ApiGatewayAuthorizerRequestV2(APIGatewayProxyEventV2Model):
     type: Literal["REQUEST"]
     routeArn: str
-    identitySource: Optional[List[str]] = None
+    identitySource: List[str] | None = None
diff --git a/aws_lambda_powertools/utilities/parser/models/appsync.py b/aws_lambda_powertools/utilities/parser/models/appsync.py
index 6d6deedcdcc..e9fe251d38f 100644
--- a/aws_lambda_powertools/utilities/parser/models/appsync.py
+++ b/aws_lambda_powertools/utilities/parser/models/appsync.py
@@ -1,16 +1,16 @@
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Union
 
 from pydantic import BaseModel, Field
 
 
 class AppSyncIamIdentity(BaseModel):
     accountId: str = Field(description="The AWS account ID of the caller.", examples=["123456789012"])
-    cognitoIdentityPoolId: Optional[str] = Field(
+    cognitoIdentityPoolId: str | None = Field(
         default=None,
         description="The Amazon Cognito identity pool ID associated with the caller.",
         examples=["us-east-1:12345678-1234-1234-1234-123456789012"],
     )
-    cognitoIdentityId: Optional[str] = Field(
+    cognitoIdentityId: str | None = Field(
         default=None,
         description="The Amazon Cognito identity ID of the caller.",
         examples=["us-east-1:12345678-1234-1234-1234-123456789012"],
@@ -29,12 +29,12 @@ class AppSyncIamIdentity(BaseModel):
         description="The Amazon Resource Name (ARN) of the IAM user.",
         examples=["arn:aws:iam::123456789012:user/appsync", "arn:aws:iam::123456789012:user/service-user"],
     )
-    cognitoIdentityAuthType: Optional[str] = Field(
+    cognitoIdentityAuthType: str | None = Field(
         default=None,
         description="Either authenticated or unauthenticated based on the identity type.",
         examples=["authenticated", "unauthenticated"],
     )
-    cognitoIdentityAuthProvider: Optional[str] = Field(
+    cognitoIdentityAuthProvider: str | None = Field(
         default=None,
         description=(
             "A comma-separated list of external identity provider information "
@@ -74,7 +74,7 @@ class AppSyncCognitoIdentity(BaseModel):
         description="The default authorization strategy for this caller (ALLOW or DENY).",
         examples=["ALLOW", "DENY"],
     )
-    groups: Optional[List[str]] = Field(
+    groups: List[str] | None = Field(
         default=None,
         description="The Cognito User Pool groups that the user belongs to.",
         examples=[["admin", "users"], ["developers"]],
@@ -115,7 +115,7 @@ class AppSyncLambdaIdentity(BaseModel):
 
 
 class AppSyncRequestModel(BaseModel):
-    domainName: Optional[str] = Field(
+    domainName: str | None = Field(
         default=None,
         description=(
             "The custom domain name used to access the GraphQL endpoint. "
@@ -190,11 +190,11 @@ class AppSyncResolverEventModel(BaseModel):
             {"page": 2, "size": 1, "name": "value"},
         ],
     )
-    identity: Optional[AppSyncIdentity] = Field(
+    identity: AppSyncIdentity | None = Field(
         default=None,
         description="Information about the caller identity (authenticated user or API key).",
     )
-    source: Optional[Dict[str, Any]] = Field(
+    source: Dict[str, Any] | None = Field(
         default=None,
         description="The parent object for the field. For top-level fields, this will be null.",
         examples=[
@@ -208,7 +208,7 @@ class AppSyncResolverEventModel(BaseModel):
     info: AppSyncInfoModel = Field(
         description="Information about the GraphQL request including selection set and field details.",
     )
-    prev: Optional[AppSyncPrevModel] = Field(
+    prev: AppSyncPrevModel | None = Field(
         default=None,
         description="Results from the previous resolver in a pipeline resolver.",
     )
diff --git a/aws_lambda_powertools/utilities/parser/models/appsync_events.py b/aws_lambda_powertools/utilities/parser/models/appsync_events.py
index ceeb3ae621a..a1168d5dd3f 100644
--- a/aws_lambda_powertools/utilities/parser/models/appsync_events.py
+++ b/aws_lambda_powertools/utilities/parser/models/appsync_events.py
@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Literal, Optional
+from typing import Any, Dict, List, Literal
 
 from pydantic import BaseModel, Field
 
@@ -51,7 +51,7 @@ class AppSyncEventsEventModel(BaseModel):
 
 
 class AppSyncEventsModel(BaseModel):
-    identity: Optional[AppSyncIdentity] = Field(
+    identity: AppSyncIdentity | None = Field(
         default=None,
         description="Information about the caller identity (authenticated user or API key).",
     )
@@ -59,17 +59,17 @@ class AppSyncEventsModel(BaseModel):
     info: AppSyncEventsInfoModel = Field(
         description="Information about the AppSync Events operation including channel details.",
     )
-    prev: Optional[str] = Field(
+    prev: str | None = Field(
         default=None,
         description="Results from the previous operation in a pipeline resolver.",
         examples=["previous-result-data"],
     )
-    outErrors: Optional[List[str]] = Field(
+    outErrors: List[str] | None = Field(
         default=None,
         description="List of output errors that occurred during event processing.",
         examples=[["Error message 1", "Error message 2"]],
     )
-    stash: Optional[Dict[str, Any]] = Field(
+    stash: Dict[str, Any] | None = Field(
         default=None,
         description=(
             "The stash is a map that is made available inside each resolver and function mapping template. "
@@ -77,7 +77,7 @@ class AppSyncEventsModel(BaseModel):
         ),
         examples=[{"customData": "value", "userId": "123"}],
     )
-    events: Optional[List[AppSyncEventsEventModel]] = Field(
+    events: List[AppSyncEventsEventModel] | None = Field(
         default=None,
         description="List of events being published or subscribed to in the AppSync Events operation.",
         examples=[
diff --git a/aws_lambda_powertools/utilities/parser/models/bedrock_agent.py b/aws_lambda_powertools/utilities/parser/models/bedrock_agent.py
index 1aa5ae07a34..c06cfd457b6 100644
--- a/aws_lambda_powertools/utilities/parser/models/bedrock_agent.py
+++ b/aws_lambda_powertools/utilities/parser/models/bedrock_agent.py
@@ -1,4 +1,4 @@
-from typing import Dict, List, Optional
+from typing import Dict, List
 
 from pydantic import BaseModel, Field
 
@@ -34,8 +34,8 @@ class BedrockAgentEventModel(BaseModel):
     session_attributes: Dict[str, str] = Field({}, alias="sessionAttributes")
     prompt_session_attributes: Dict[str, str] = Field({}, alias="promptSessionAttributes")
     agent: BedrockAgentModel
-    parameters: Optional[List[BedrockAgentPropertyModel]] = None
-    request_body: Optional[BedrockAgentRequestBodyModel] = Field(None, alias="requestBody")
+    parameters: List[BedrockAgentPropertyModel] | None = None
+    request_body: BedrockAgentRequestBodyModel | None = Field(None, alias="requestBody")
 
 
 class BedrockAgentFunctionEventModel(BaseModel):
@@ -51,6 +51,6 @@ class BedrockAgentFunctionEventModel(BaseModel):
     session_id: str = Field(..., alias="sessionId")
     action_group: str = Field(..., alias="actionGroup")
     function: str
-    parameters: Optional[List[BedrockAgentPropertyModel]] = None
+    parameters: List[BedrockAgentPropertyModel] | None = None
     session_attributes: Dict[str, str] = Field({}, alias="sessionAttributes")
     prompt_session_attributes: Dict[str, str] = Field({}, alias="promptSessionAttributes")
diff --git a/aws_lambda_powertools/utilities/parser/models/cloudwatch.py b/aws_lambda_powertools/utilities/parser/models/cloudwatch.py
index 6c3d25e1727..0fdc7562962 100644
--- a/aws_lambda_powertools/utilities/parser/models/cloudwatch.py
+++ b/aws_lambda_powertools/utilities/parser/models/cloudwatch.py
@@ -3,7 +3,7 @@
 import logging
 import zlib
 from datetime import datetime
-from typing import List, Optional, Type, Union
+from typing import List, Type, Union
 
 from pydantic import BaseModel, Field, field_validator
 
@@ -47,7 +47,7 @@ class CloudWatchLogsDecode(BaseModel):
         description="Array of log events included in the message.",
         examples=[[{"id": "eventId1", "timestamp": 1673779200000, "message": "Sample log line"}]],
     )
-    policyLevel: Optional[str] = Field(
+    policyLevel: str | None = Field(
         default=None,
         description="Optional field specifying the policy level applied to the subscription filter, if present.",
         examples=["ACCOUNT", "LOG_GROUP"],
diff --git a/aws_lambda_powertools/utilities/parser/models/cognito.py b/aws_lambda_powertools/utilities/parser/models/cognito.py
index 05726e37db4..75a21254324 100644
--- a/aws_lambda_powertools/utilities/parser/models/cognito.py
+++ b/aws_lambda_powertools/utilities/parser/models/cognito.py
@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Literal, Optional
+from typing import Any, Dict, List, Literal
 
 from pydantic import BaseModel
 
@@ -14,22 +14,22 @@ class CognitoTriggerBaseSchema(BaseModel):
     version: str
     region: str
     userPoolId: str
-    userName: Optional[str] = None
+    userName: str | None = None
     callerContext: CognitoCallerContextModel
 
 
 # Models for Pre-Signup flow
 class CognitoPreSignupRequestModel(BaseModel):
     userAttributes: Dict[str, Any]
-    validationData: Optional[Dict[str, Any]] = None
-    clientMetadata: Optional[Dict[str, Any]] = None
-    userNotFound: Optional[bool] = None
+    validationData: Dict[str, Any] | None = None
+    clientMetadata: Dict[str, Any] | None = None
+    userNotFound: bool | None = None
 
 
 class CognitoPreSignupResponseModel(BaseModel):
-    autoConfirmUser: Optional[bool] = False
-    autoVerifyPhone: Optional[bool] = False
-    autoVerifyEmail: Optional[bool] = False
+    autoConfirmUser: bool | None = False
+    autoVerifyPhone: bool | None = False
+    autoVerifyEmail: bool | None = False
 
 
 class CognitoPreSignupTriggerModel(CognitoTriggerBaseSchema):
@@ -41,7 +41,7 @@ class CognitoPreSignupTriggerModel(CognitoTriggerBaseSchema):
 # Models for Post-Confirmation flow
 class CognitoPostConfirmationRequestModel(BaseModel):
     userAttributes: Dict[str, Any]
-    clientMetadata: Optional[Dict[str, Any]] = None
+    clientMetadata: Dict[str, Any] | None = None
 
 
 class CognitoPostConfirmationTriggerModel(CognitoTriggerBaseSchema):
@@ -53,8 +53,8 @@ class CognitoPostConfirmationTriggerModel(CognitoTriggerBaseSchema):
 # Models for Pre-Authentication flow
 class CognitoPreAuthenticationRequestModel(BaseModel):
     userAttributes: Dict[str, Any]
-    validationData: Optional[Dict[str, Any]] = None
-    userNotFound: Optional[bool] = None
+    validationData: Dict[str, Any] | None = None
+    userNotFound: bool | None = None
 
 
 class CognitoPreAuthenticationTriggerModel(CognitoTriggerBaseSchema):
@@ -66,8 +66,8 @@ class CognitoPreAuthenticationTriggerModel(CognitoTriggerBaseSchema):
 # Models for Post-Authentication flow
 class CognitoPostAuthenticationRequestModel(BaseModel):
     userAttributes: Dict[str, Any]
-    newDeviceUsed: Optional[bool] = None
-    clientMetadata: Optional[Dict[str, Any]] = None
+    newDeviceUsed: bool | None = None
+    clientMetadata: Dict[str, Any] | None = None
 
 
 class CognitoPostAuthenticationTriggerModel(CognitoTriggerBaseSchema):
@@ -80,13 +80,13 @@ class CognitoPostAuthenticationTriggerModel(CognitoTriggerBaseSchema):
 class CognitoGroupConfigurationModel(BaseModel):
     groupsToOverride: List[str]
     iamRolesToOverride: List[str]
-    preferredRole: Optional[str] = None
+    preferredRole: str | None = None
 
 
 class CognitoPreTokenGenerationRequestModel(BaseModel):
     userAttributes: Dict[str, Any]
     groupConfiguration: CognitoGroupConfigurationModel
-    clientMetadata: Optional[Dict[str, Any]] = None
+    clientMetadata: Dict[str, Any] | None = None
 
 
 class CognitoPreTokenGenerationTriggerModelV1(CognitoTriggerBaseSchema):
@@ -96,7 +96,7 @@ class CognitoPreTokenGenerationTriggerModelV1(CognitoTriggerBaseSchema):
 
 
 class CognitoPreTokenGenerationRequestModelV2AndV3(CognitoPreTokenGenerationRequestModel):
-    scopes: Optional[Dict[str, Any]] = None
+    scopes: Dict[str, Any] | None = None
 
 
 class CognitoPreTokenGenerationTriggerModelV2AndV3(CognitoTriggerBaseSchema):
@@ -107,17 +107,17 @@ class CognitoPreTokenGenerationTriggerModelV2AndV3(CognitoTriggerBaseSchema):
 # Models for User Migration flow
 class CognitoMigrateUserRequestModel(BaseModel):
     password: str
-    validationData: Optional[Dict[str, Any]] = None
-    clientMetadata: Optional[Dict[str, Any]] = None
+    validationData: Dict[str, Any] | None = None
+    clientMetadata: Dict[str, Any] | None = None
 
 
 class CognitoMigrateUserResponseModel(BaseModel):
-    userAttributes: Optional[Dict[str, Any]] = None
-    finalUserStatus: Optional[str] = None
-    messageAction: Optional[str] = None
-    desiredDeliveryMediums: Optional[List[str]] = None
-    forceAliasCreation: Optional[bool] = None
-    enableSMSMFA: Optional[bool] = None
+    userAttributes: Dict[str, Any] | None = None
+    finalUserStatus: str | None = None
+    messageAction: str | None = None
+    desiredDeliveryMediums: List[str] | None = None
+    forceAliasCreation: bool | None = None
+    enableSMSMFA: bool | None = None
 
 
 class CognitoMigrateUserTriggerModel(CognitoTriggerBaseSchema):
@@ -131,15 +131,15 @@ class CognitoMigrateUserTriggerModel(CognitoTriggerBaseSchema):
 class CognitoCustomMessageRequestModel(BaseModel):
     userAttributes: Dict[str, Any]
     codeParameter: str
-    linkParameter: Optional[str] = None
-    usernameParameter: Optional[str] = None
-    clientMetadata: Optional[Dict[str, Any]] = None
+    linkParameter: str | None = None
+    usernameParameter: str | None = None
+    clientMetadata: Dict[str, Any] | None = None
 
 
 class CognitoCustomMessageResponseModel(BaseModel):
-    smsMessage: Optional[str] = None
-    emailMessage: Optional[str] = None
-    emailSubject: Optional[str] = None
+    smsMessage: str | None = None
+    emailMessage: str | None = None
+    emailSubject: str | None = None
 
 
 class CognitoCustomMessageTriggerModel(CognitoTriggerBaseSchema):
@@ -152,7 +152,7 @@ class CognitoCustomMessageTriggerModel(CognitoTriggerBaseSchema):
 class CognitoCustomEmailSMSSenderRequestModel(BaseModel):
     type: str
     code: str
-    clientMetadata: Optional[Dict[str, Any]] = None
+    clientMetadata: Dict[str, Any] | None = None
     userAttributes: Dict[str, Any]
 
 
@@ -179,20 +179,20 @@ class CognitoChallengeResultModel(BaseModel):
         "ADMIN_NO_SRP_AUTH",
     ]
     challengeResult: bool
-    challengeMetadata: Optional[str] = None
+    challengeMetadata: str | None = None
 
 
 class CognitoAuthChallengeRequestModel(BaseModel):
     userAttributes: Dict[str, Any]
     session: List[CognitoChallengeResultModel]
-    clientMetadata: Optional[Dict[str, Any]] = None
-    userNotFound: Optional[bool] = None
+    clientMetadata: Dict[str, Any] | None = None
+    userNotFound: bool | None = None
 
 
 class CognitoDefineAuthChallengeResponseModel(BaseModel):
-    challengeName: Optional[str] = None
-    issueTokens: Optional[bool] = None
-    failAuthentication: Optional[bool] = None
+    challengeName: str | None = None
+    issueTokens: bool | None = None
+    failAuthentication: bool | None = None
 
 
 class CognitoDefineAuthChallengeTriggerModel(CognitoTriggerBaseSchema):
@@ -202,9 +202,9 @@ class CognitoDefineAuthChallengeTriggerModel(CognitoTriggerBaseSchema):
 
 
 class CognitoCreateAuthChallengeResponseModel(BaseModel):
-    publicChallengeParameters: Optional[Dict[str, Any]] = None
-    privateChallengeParameters: Optional[Dict[str, Any]] = None
-    challengeMetadata: Optional[str] = None
+    publicChallengeParameters: Dict[str, Any] | None = None
+    privateChallengeParameters: Dict[str, Any] | None = None
+    challengeMetadata: str | None = None
 
 
 class CognitoCreateAuthChallengeTriggerModel(CognitoTriggerBaseSchema):
@@ -217,8 +217,8 @@ class CognitoVerifyAuthChallengeRequestModel(BaseModel):
     userAttributes: Dict[str, Any]
     privateChallengeParameters: Dict[str, Any]
     challengeAnswer: str
-    clientMetadata: Optional[Dict[str, Any]] = None
-    userNotFound: Optional[bool] = None
+    clientMetadata: Dict[str, Any] | None = None
+    userNotFound: bool | None = None
 
 
 class CognitoVerifyAuthChallengeResponseModel(BaseModel):
diff --git a/aws_lambda_powertools/utilities/parser/models/dynamodb.py b/aws_lambda_powertools/utilities/parser/models/dynamodb.py
index 595e19068e3..714cb06e90a 100644
--- a/aws_lambda_powertools/utilities/parser/models/dynamodb.py
+++ b/aws_lambda_powertools/utilities/parser/models/dynamodb.py
@@ -1,6 +1,6 @@
 # ruff: noqa: FA100
 from datetime import datetime
-from typing import Any, Dict, List, Literal, Optional, Type, Union
+from typing import Any, Dict, List, Literal, Type, Union
 
 from pydantic import BaseModel, ConfigDict, Field, field_validator
 from pydantic.alias_generators import to_camel
@@ -11,18 +11,18 @@
 
 
 class DynamoDBStreamChangedRecordModel(BaseModel):
-    ApproximateCreationDateTime: Optional[datetime] = Field(  # AWS sends this as Unix epoch float
+    ApproximateCreationDateTime: datetime | None = Field(  # AWS sends this as Unix epoch float
         default=None,
         description="The approximate date and time when the stream record was created (Unix epoch time).",
         examples=[1693997155.0],
     )
     Keys: Dict[str, Any] = Field(description="Primary key attributes for the item.", examples=[{"Id": {"N": "101"}}])
-    NewImage: Optional[Union[Dict[str, Any], Type[BaseModel], BaseModel]] = Field(
+    NewImage: Union[Dict[str, Any], Type[BaseModel], BaseModel] | None = Field(
         default=None,
         description="The item after modifications, in DynamoDB attribute-value format.",
         examples=[{"Message": {"S": "New item!"}, "Id": {"N": "101"}}],
     )
-    OldImage: Optional[Union[Dict[str, Any], Type[BaseModel], BaseModel]] = Field(
+    OldImage: Union[Dict[str, Any], Type[BaseModel], BaseModel] | None = Field(
         default=None,
         description="The item before modifications, in DynamoDB attribute-value format.",
         examples=[{"Message": {"S": "Old item!"}, "Id": {"N": "100"}}],
@@ -80,7 +80,7 @@ class DynamoDBStreamRecordModel(BaseModel):
             },
         ],
     )
-    userIdentity: Optional[UserIdentity] = Field(
+    userIdentity: UserIdentity | None = Field(
         default=None,
         description="Information about the identity that made the request.",
         examples=[{"type": "Service", "principalId": "dynamodb.amazonaws.com"}],
@@ -175,7 +175,7 @@ class ResponseContext(BaseModel):
         description="The version of the Lambda executed",
         examples=["$LATEST"],
     )
-    function_error: Optional[str] = Field(
+    function_error: str | None = Field(
         default=None,
         description="",
         examples=["Unhandled"],
diff --git a/aws_lambda_powertools/utilities/parser/models/event_bridge.py b/aws_lambda_powertools/utilities/parser/models/event_bridge.py
index 67eef21dbf2..11c2e28bc41 100644
--- a/aws_lambda_powertools/utilities/parser/models/event_bridge.py
+++ b/aws_lambda_powertools/utilities/parser/models/event_bridge.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import List, Optional
+from typing import List
 
 from pydantic import BaseModel, ConfigDict, Field, field_validator
 
@@ -50,7 +50,7 @@ class EventBridgeModel(BaseModel):
     detail: RawDictOrModel = Field(
         description="A JSON object, whose content is at the discretion of the service originating the event.",
     )
-    replay_name: Optional[str] = Field(
+    replay_name: str | None = Field(
         None,
         alias="replay-name",
         description="Identifies whether the event is being replayed and what is the name of the replay.",
diff --git a/aws_lambda_powertools/utilities/parser/models/iot_registry_events.py b/aws_lambda_powertools/utilities/parser/models/iot_registry_events.py
index 7af5992a20d..950aa01fe53 100644
--- a/aws_lambda_powertools/utilities/parser/models/iot_registry_events.py
+++ b/aws_lambda_powertools/utilities/parser/models/iot_registry_events.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Any, Dict, List, Literal, Optional
+from typing import Any, Dict, List, Literal
 
 from pydantic import BaseModel, Field
 
@@ -25,7 +25,7 @@ class IoTCoreThingEvent(IoTCoreRegistryEventsBase):
     account_id: str = Field(..., alias="accountId")
     thing_name: str = Field(..., alias="thingName")
     version_number: int = Field(..., alias="versionNumber")
-    thing_type_name: Optional[str] = Field(None, alias="thingTypeName")
+    thing_type_name: str | None = Field(None, alias="thingTypeName")
     attributes: Dict[str, Any]
 
 
@@ -46,7 +46,7 @@ class IoTCoreThingTypeEvent(IoTCoreRegistryEventsBase):
     thing_type_id: str = Field(..., alias="thingTypeId")
     thing_type_name: str = Field(..., alias="thingTypeName")
     is_deprecated: bool = Field(..., alias="isDeprecated")
-    deprecation_date: Optional[datetime] = Field(None, alias="deprecationDate")
+    deprecation_date: datetime | None = Field(None, alias="deprecationDate")
     searchable_attributes: List[str] = Field(..., alias="searchableAttributes")
     propagating_attributes: List[Dict[str, str]] = Field(..., alias="propagatingAttributes")
     description: str
@@ -84,12 +84,12 @@ class IoTCoreThingGroupEvent(IoTCoreRegistryEventsBase):
     thing_group_id: str = Field(..., alias="thingGroupId")
     thing_group_name: str = Field(..., alias="thingGroupName")
     version_number: int = Field(..., alias="versionNumber")
-    parent_group_name: Optional[str] = Field(None, alias="parentGroupName")
-    parent_group_id: Optional[str] = Field(None, alias="parentGroupId")
+    parent_group_name: str | None = Field(None, alias="parentGroupName")
+    parent_group_id: str | None = Field(None, alias="parentGroupId")
     description: str
     root_to_parent_thing_groups: List[Dict[str, str]] = Field(..., alias="rootToParentThingGroups")
     attributes: Dict[str, Any]
-    dynamic_group_mapping_id: Optional[str] = Field(None, alias="dynamicGroupMappingId")
+    dynamic_group_mapping_id: str | None = Field(None, alias="dynamicGroupMappingId")
 
 
 class IoTCoreAddOrRemoveFromThingGroupEvent(IoTCoreRegistryEventsBase):
diff --git a/aws_lambda_powertools/utilities/parser/models/kafka.py b/aws_lambda_powertools/utilities/parser/models/kafka.py
index df232469b95..9ce0063d09b 100644
--- a/aws_lambda_powertools/utilities/parser/models/kafka.py
+++ b/aws_lambda_powertools/utilities/parser/models/kafka.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Dict, List, Literal, Optional, Type, Union
+from typing import Dict, List, Literal, Type, Union
 
 from pydantic import BaseModel, Field, field_validator
 
@@ -40,7 +40,7 @@ class KafkaRecordModel(BaseModel):
         description="The type of timestamp (CREATE_TIME or LOG_APPEND_TIME).",
         examples=["CREATE_TIME", "LOG_APPEND_TIME"],
     )
-    key: Optional[bytes] = Field(
+    key: bytes | None = Field(
         default=None,
         description="The message key, base64-encoded. Can be null for messages without keys.",
         examples=["cmVjb3JkS2V5", "dXNlci0xMjM=", "b3JkZXItNDU2", None],
@@ -61,12 +61,12 @@ class KafkaRecordModel(BaseModel):
             [],
         ],
     )
-    keySchemaMetadata: Optional[KafkaRecordSchemaMetadata] = Field(
+    keySchemaMetadata: KafkaRecordSchemaMetadata | None = Field(
         default=None,
         description="Schema metadata for the message key when using schema registry.",
         examples=[{"dataFormat": "AVRO", "schemaId": "1234"}, None],
     )
-    valueSchemaMetadata: Optional[KafkaRecordSchemaMetadata] = Field(
+    valueSchemaMetadata: KafkaRecordSchemaMetadata | None = Field(
         default=None,
         description="Schema metadata for the message value when using schema registry.",
         examples=[{"dataFormat": "AVRO", "schemaId": "1234"}, None],
diff --git a/aws_lambda_powertools/utilities/parser/models/kinesis_firehose.py b/aws_lambda_powertools/utilities/parser/models/kinesis_firehose.py
index 697a3fbdd89..77e7b47baa6 100644
--- a/aws_lambda_powertools/utilities/parser/models/kinesis_firehose.py
+++ b/aws_lambda_powertools/utilities/parser/models/kinesis_firehose.py
@@ -1,4 +1,4 @@
-from typing import List, Optional, Type, Union
+from typing import List, Type, Union
 
 from pydantic import BaseModel, Field, PositiveInt, field_validator
 
@@ -45,7 +45,7 @@ class KinesisFirehoseRecord(BaseModel):
         (Unix timestamp in milliseconds).",
         examples=[1428537600000, 1609459200500],
     )
-    kinesisRecordMetadata: Optional[KinesisFirehoseRecordMetadata] = Field(
+    kinesisRecordMetadata: KinesisFirehoseRecordMetadata | None = Field(
         None,
         description="Metadata about the original Kinesis stream record \
         (only present when the delivery stream source is a Kinesis stream).",
@@ -69,7 +69,7 @@ class KinesisFirehoseModel(BaseModel):
         description="The AWS region where the delivery stream is located.",
         examples=["us-east-1", "us-west-2", "eu-west-1"],
     )
-    sourceKinesisStreamArn: Optional[str] = Field(
+    sourceKinesisStreamArn: str | None = Field(
         None,
         description="The ARN of the source Kinesis stream \
         (only present when the delivery stream source is a Kinesis stream).",
diff --git a/aws_lambda_powertools/utilities/parser/models/kinesis_firehose_sqs.py b/aws_lambda_powertools/utilities/parser/models/kinesis_firehose_sqs.py
index b9032a4c934..ecad8b26fc7 100644
--- a/aws_lambda_powertools/utilities/parser/models/kinesis_firehose_sqs.py
+++ b/aws_lambda_powertools/utilities/parser/models/kinesis_firehose_sqs.py
@@ -1,5 +1,5 @@
 import json
-from typing import List, Optional
+from typing import List
 
 from pydantic import BaseModel, Field, PositiveInt, field_validator
 
@@ -20,7 +20,7 @@ class KinesisFirehoseSqsRecord(BaseModel):
         (Unix timestamp in milliseconds).",
         examples=[1428537600000, 1609459200500],
     )
-    kinesisRecordMetadata: Optional[KinesisFirehoseRecordMetadata] = Field(
+    kinesisRecordMetadata: KinesisFirehoseRecordMetadata | None = Field(
         None,
         description="Metadata about the original Kinesis stream record \
         (only present when the delivery stream source is a Kinesis stream).",
@@ -45,7 +45,7 @@ class KinesisFirehoseSqsModel(BaseModel):
         description="The AWS region where the delivery stream is located.",
         examples=["us-east-1", "us-west-2", "eu-west-1"],
     )
-    sourceKinesisStreamArn: Optional[str] = Field(
+    sourceKinesisStreamArn: str | None = Field(
         None,
         description="The ARN of the source Kinesis stream \
         (only present when the delivery stream source is a Kinesis stream).",
diff --git a/aws_lambda_powertools/utilities/parser/models/s3.py b/aws_lambda_powertools/utilities/parser/models/s3.py
index d53a0fe5655..a2aeb945e9e 100644
--- a/aws_lambda_powertools/utilities/parser/models/s3.py
+++ b/aws_lambda_powertools/utilities/parser/models/s3.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import List, Literal, Optional, Union
+from typing import List, Literal, Union
 
 from pydantic import BaseModel, model_validator
 from pydantic.fields import Field
@@ -130,12 +130,12 @@ class S3Object(BaseModel):
             "logs/2023/01/15/app.log",
         ],
     )
-    size: Optional[NonNegativeFloat] = Field(
+    size: NonNegativeFloat | None = Field(
         default=None,
         description="The size of the object in bytes.",
         examples=[1024, 2048576, 0],
     )
-    eTag: Optional[str] = Field(
+    eTag: str | None = Field(
         default=None,
         description="The entity tag (ETag) of the object.",
         examples=[
@@ -143,7 +143,7 @@ class S3Object(BaseModel):
             "098f6bcd4621d373cade4e832627b4f6",
         ],
     )
-    sequencer: Optional[str] = Field(
+    sequencer: str | None = Field(
         default=None,
         description="A string representation of a hexadecimal value used to determine event sequence.",
         examples=[
@@ -151,7 +151,7 @@ class S3Object(BaseModel):
             "005B21C13A6F24045E",
         ],
     )
-    versionId: Optional[str] = Field(
+    versionId: str | None = Field(
         default=None,
         description="The version ID of the object (if versioning is enabled).",
         examples=[
@@ -188,7 +188,7 @@ class S3Message(BaseModel):
             },
         ],
     )
-    object: Optional[S3Object] = Field(
+    object: S3Object | None = Field(
         default=None,
         description="The S3 object object. Used by most S3 event types.",
         examples=[
@@ -200,7 +200,7 @@ class S3Message(BaseModel):
             },
         ],
     )  # noqa: A003
-    get_object: Optional[S3Object] = Field(
+    get_object: S3Object | None = Field(
         default=None,
         alias="get_object",
         description="The S3 object object. Used by IntelligentTiering events instead of 'object'.",
@@ -225,7 +225,7 @@ class S3EventNotificationObjectModel(BaseModel):
             "logs/2023/01/15/app.log",
         ],
     )
-    size: Optional[NonNegativeFloat] = Field(
+    size: NonNegativeFloat | None = Field(
         default=None,
         description="The size of the object in bytes.",
         examples=[1024, 2048576, 0],
@@ -238,7 +238,7 @@ class S3EventNotificationObjectModel(BaseModel):
             "098f6bcd4621d373cade4e832627b4f6",
         ],
     )
-    version_id: Optional[str] = Field(
+    version_id: str | None = Field(
         default=None,
         alias="version-id",
         description="The version ID of the object (if versioning is enabled).",
@@ -247,7 +247,7 @@ class S3EventNotificationObjectModel(BaseModel):
             "null",
         ],
     )
-    sequencer: Optional[str] = Field(
+    sequencer: str | None = Field(
         default=None,
         description="A string representation of a hexadecimal value used to determine event sequence.",
         examples=[
@@ -307,7 +307,7 @@ class S3EventNotificationEventBridgeDetailModel(BaseModel):
             "123456789012",
         ],
     )
-    source_ip_address: Optional[str] = Field(
+    source_ip_address: str | None = Field(
         None,
         alias="source-ip-address",
         description="Source IP address of S3 request. Only present for events triggered by an S3 request.",
@@ -315,7 +315,7 @@ class S3EventNotificationEventBridgeDetailModel(BaseModel):
             "255.255.255.255",
         ],
     )
-    reason: Optional[str] = Field(
+    reason: str | None = Field(
         default=None,
         description="For 'Object Created' events, the S3 API used to create the object: PutObject, POST Object, "
         "CopyObject, or CompleteMultipartUpload. For 'Object Deleted' events, this is set to 'DeleteObject' "
@@ -327,7 +327,7 @@ class S3EventNotificationEventBridgeDetailModel(BaseModel):
             "DeleteObject",
         ],
     )
-    deletion_type: Optional[str] = Field(
+    deletion_type: str | None = Field(
         default=None,
         alias="deletion-type",
         description="For 'Object Deleted' events, when an unversioned object is deleted, or a versioned object is "
@@ -336,28 +336,28 @@ class S3EventNotificationEventBridgeDetailModel(BaseModel):
         "see https://docs.aws.amazon.com/AmazonS3/latest/userguide/DeletingObjectVersions.html",
         examples=["Delete Marker Created", "Permanently Deleted"],
     )
-    restore_expiry_time: Optional[str] = Field(
+    restore_expiry_time: str | None = Field(
         default=None,
         alias="restore-expiry-time",
         description="For 'Object Restore Completed' events, the time when the temporary copy of the object will be "
         "deleted from S3. For more information, see https://docs.aws.amazon.com/AmazonS3/latest/userguide/archived-objects.html.",
         examples=["2021-11-13T00:00:00Z"],
     )
-    source_storage_class: Optional[str] = Field(
+    source_storage_class: str | None = Field(
         default=None,
         alias="source-storage-class",
         description="For 'Object Restore Initiated' and 'Object Restore Completed' events, the storage class of the "
         "object being restored. For more information, see https://docs.aws.amazon.com/AmazonS3/latest/userguide/archived-objects.html.",
         examples=["GLACIER", "STANDARD", "STANDARD_IA"],
     )
-    destination_storage_class: Optional[str] = Field(
+    destination_storage_class: str | None = Field(
         default=None,
         alias="destination-storage-class",
         description="For 'Object Storage Class Changed' events, the new storage class of the object. For more "
         "information, see https://docs.aws.amazon.com/AmazonS3/latest/userguide/lifecycle-transition-general-considerations.html.",
         examples=["INTELLIGENT_TIERING", "STANDARD", "STANDARD_IA"],
     )
-    destination_access_tier: Optional[str] = Field(
+    destination_access_tier: str | None = Field(
         default=None,
         alias="destination-access-tier",
         description="For 'Object Access Tier Changed' events, the new access tier of the object. For more information, "
@@ -462,7 +462,7 @@ class S3RecordModel(BaseModel):
             },
         ],
     )
-    glacierEventData: Optional[S3EventRecordGlacierEventData] = Field(
+    glacierEventData: S3EventRecordGlacierEventData | None = Field(
         default=None,
         description="The Glacier event data object.",
         examples=[
@@ -474,7 +474,7 @@ class S3RecordModel(BaseModel):
             },
         ],
     )
-    intelligentTieringEventData: Optional[S3EventRecordIntelligentTieringEventData] = Field(
+    intelligentTieringEventData: S3EventRecordIntelligentTieringEventData | None = Field(
         default=None,
         description="The Intelligent-Tiering event data object.",
         examples=[
diff --git a/aws_lambda_powertools/utilities/parser/models/s3_batch_operation.py b/aws_lambda_powertools/utilities/parser/models/s3_batch_operation.py
index 934ace9ac07..b9581243f51 100644
--- a/aws_lambda_powertools/utilities/parser/models/s3_batch_operation.py
+++ b/aws_lambda_powertools/utilities/parser/models/s3_batch_operation.py
@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Literal, Optional
+from typing import Any, Dict, List, Literal
 
 from pydantic import BaseModel, model_validator
 
@@ -6,9 +6,9 @@
 class S3BatchOperationTaskModel(BaseModel):
     taskId: str
     s3Key: str
-    s3VersionId: Optional[str] = None
-    s3BucketArn: Optional[str] = None
-    s3Bucket: Optional[str] = None
+    s3VersionId: str | None = None
+    s3BucketArn: str | None = None
+    s3Bucket: str | None = None
 
     @model_validator(mode="before")
     def validate_s3bucket(cls, values: Dict[str, Any]) -> Dict[str, Any]:
@@ -20,7 +20,7 @@ def validate_s3bucket(cls, values: Dict[str, Any]) -> Dict[str, Any]:
 
 class S3BatchOperationJobModel(BaseModel):
     id: str
-    userArguments: Optional[Dict[str, Any]] = None
+    userArguments: Dict[str, Any] | None = None
 
 
 class S3BatchOperationModel(BaseModel):
diff --git a/aws_lambda_powertools/utilities/parser/models/s3_object_event.py b/aws_lambda_powertools/utilities/parser/models/s3_object_event.py
index 867cd996fa0..1bd2c2628af 100644
--- a/aws_lambda_powertools/utilities/parser/models/s3_object_event.py
+++ b/aws_lambda_powertools/utilities/parser/models/s3_object_event.py
@@ -1,4 +1,4 @@
-from typing import Dict, Optional, Type, Union
+from typing import Dict, Type, Union
 
 from pydantic import BaseModel, HttpUrl
 
@@ -22,7 +22,7 @@ class S3ObjectUserRequest(BaseModel):
 
 class S3ObjectSessionIssuer(BaseModel):
     type: str  # noqa: A003, VNE003
-    userName: Optional[str] = None
+    userName: str | None = None
     principalId: str
     arn: str
     accountId: str
@@ -42,10 +42,10 @@ class S3ObjectUserIdentity(BaseModel):
     type: str  # noqa: A003
     accountId: str
     accessKeyId: str
-    userName: Optional[str] = None
+    userName: str | None = None
     principalId: str
     arn: str
-    sessionContext: Optional[S3ObjectSessionContext] = None
+    sessionContext: S3ObjectSessionContext | None = None
 
 
 class S3ObjectLambdaEvent(BaseModel):
diff --git a/aws_lambda_powertools/utilities/parser/models/ses.py b/aws_lambda_powertools/utilities/parser/models/ses.py
index 9a7a9914e6e..833cc557df0 100644
--- a/aws_lambda_powertools/utilities/parser/models/ses.py
+++ b/aws_lambda_powertools/utilities/parser/models/ses.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import List, Literal, Optional
+from typing import List, Literal
 
 from pydantic import BaseModel, Field
 from pydantic.types import PositiveInt
@@ -34,10 +34,10 @@ class SesMailHeaders(BaseModel):
 class SesMailCommonHeaders(BaseModel):
     header_from: List[str] = Field(..., alias="from")
     to: List[str]
-    cc: Optional[List[str]] = None
-    bcc: Optional[List[str]] = None
-    sender: Optional[List[str]] = None
-    reply_to: Optional[List[str]] = Field(None, alias="reply-to")
+    cc: List[str] | None = None
+    bcc: List[str] | None = None
+    sender: List[str] | None = None
+    reply_to: List[str] | None = Field(None, alias="reply-to")
     returnPath: str
     messageId: str
     date: str
diff --git a/aws_lambda_powertools/utilities/parser/models/sns.py b/aws_lambda_powertools/utilities/parser/models/sns.py
index 62b8efc2e17..c2a740dbcbd 100644
--- a/aws_lambda_powertools/utilities/parser/models/sns.py
+++ b/aws_lambda_powertools/utilities/parser/models/sns.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Dict, List, Literal, Optional, Union
+from typing import Dict, List, Literal, Union
 from typing import Type as TypingType
 
 from pydantic import BaseModel, Field, model_validator
@@ -18,7 +18,7 @@ class SnsMsgAttributeModel(BaseModel):
 
 
 class SnsNotificationModel(BaseModel):
-    Subject: Optional[str] = Field(
+    Subject: str | None = Field(
         default=None,
         description="The subject parameter provided when the notification was published to the topic.",
         examples=["TestInvoke", "Alert: System maintenance", "Order Confirmation", None],
@@ -48,7 +48,7 @@ class SnsNotificationModel(BaseModel):
         description="The type of message. For Lambda triggers, this is always 'Notification'.",
         examples=["Notification"],
     )
-    MessageAttributes: Optional[Dict[str, SnsMsgAttributeModel]] = Field(
+    MessageAttributes: Dict[str, SnsMsgAttributeModel] | None = Field(
         default=None,
         description="User-defined message attributes as key-value pairs with type information.",
         examples=[
@@ -73,7 +73,7 @@ class SnsNotificationModel(BaseModel):
             "f3c8d4e2-1a2b-4c5d-9e8f-7g6h5i4j3k2l",
         ],
     )
-    SigningCertUrl: Optional[HttpUrl] = Field(
+    SigningCertUrl: HttpUrl | None = Field(
         default=None,
         description=(
             "The URL to the certificate that was used to sign the message. "
@@ -85,7 +85,7 @@ class SnsNotificationModel(BaseModel):
             None,
         ],
     )  # NOTE: FIFO opt-in removes attribute
-    Signature: Optional[str] = Field(
+    Signature: str | None = Field(
         default=None,
         description=(
             "Base64-encoded SHA1withRSA signature of the message. "
@@ -105,7 +105,7 @@ class SnsNotificationModel(BaseModel):
             "2023-12-25T18:45:30.123Z",
         ],
     )
-    SignatureVersion: Optional[str] = Field(
+    SignatureVersion: str | None = Field(
         default=None,
         description=(
             "Version of the Amazon SNS signature used. Not present for FIFO topics with content-based deduplication."
diff --git a/aws_lambda_powertools/utilities/parser/models/sqs.py b/aws_lambda_powertools/utilities/parser/models/sqs.py
index 06452cd2a8f..020fe2288dc 100644
--- a/aws_lambda_powertools/utilities/parser/models/sqs.py
+++ b/aws_lambda_powertools/utilities/parser/models/sqs.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Dict, List, Literal, Optional, Sequence, Type, Union
+from typing import Dict, List, Literal, Sequence, Type, Union
 
 from pydantic import BaseModel, Field
 
@@ -13,12 +13,12 @@ class SqsAttributesModel(BaseModel):
         description="The time the message was first received from the queue (epoch time in milliseconds).",
         examples=["1545082649185", "1545082650649", "1713185156612"],
     )
-    MessageDeduplicationId: Optional[str] = Field(
+    MessageDeduplicationId: str | None = Field(
         default=None,
         description="Returns the value provided by the producer that calls the SendMessage action.",
         examples=["msg-dedup-12345", "unique-msg-abc123", None],
     )
-    MessageGroupId: Optional[str] = Field(
+    MessageGroupId: str | None = Field(
         default=None,
         description="Returns the value provided by the producer that calls the SendMessage action.",
         examples=["order-processing", "user-123-updates", None],
@@ -31,17 +31,17 @@ class SqsAttributesModel(BaseModel):
         description="The time the message was sent to the queue (epoch time in milliseconds).",
         examples=["1545082649183", "1545082650636", "1713185156609"],
     )
-    SequenceNumber: Optional[str] = Field(
+    SequenceNumber: str | None = Field(
         default=None,
         description="Returns the value provided by Amazon SQS.",
         examples=["18849496460467696128", "18849496460467696129", None],
     )
-    AWSTraceHeader: Optional[str] = Field(
+    AWSTraceHeader: str | None = Field(
         default=None,
         description="The AWS X-Ray trace header for request tracing.",
         examples=["Root=1-5e1b4151-5ac6c58239c1e5b4", None],
     )
-    DeadLetterQueueSourceArn: Optional[str] = Field(
+    DeadLetterQueueSourceArn: str | None = Field(
         default=None,
         description="The ARN of the dead-letter queue from which the message was moved.",
         examples=["arn:aws:sqs:eu-central-1:123456789012:sqs-redrive-SampleQueue-RNvLCpwGmLi7", None],
@@ -49,12 +49,12 @@ class SqsAttributesModel(BaseModel):
 
 
 class SqsMsgAttributeModel(BaseModel):
-    stringValue: Optional[str] = Field(
+    stringValue: str | None = Field(
         default=None,
         description="The string value of the message attribute.",
         examples=["100", "active", "user-12345", None],
     )
-    binaryValue: Optional[str] = Field(
+    binaryValue: str | None = Field(
         default=None,
         description="The binary value of the message attribute, base64-encoded.",
         examples=["base64Str", "SGVsbG8gV29ybGQ=", None],
@@ -140,7 +140,7 @@ class SqsRecordModel(BaseModel):
             "6a204bd89f3c8348afd5c77c717a097a",
         ],
     )
-    md5OfMessageAttributes: Optional[str] = Field(
+    md5OfMessageAttributes: str | None = Field(
         default=None,
         description="An MD5 digest of the non-URL-encoded message attribute string.",
         examples=[
diff --git a/aws_lambda_powertools/utilities/parser/models/transfer_family.py b/aws_lambda_powertools/utilities/parser/models/transfer_family.py
index be23c29449f..8219cef179b 100644
--- a/aws_lambda_powertools/utilities/parser/models/transfer_family.py
+++ b/aws_lambda_powertools/utilities/parser/models/transfer_family.py
@@ -1,4 +1,4 @@
-from typing import Literal, Optional
+from typing import Literal
 
 from pydantic import BaseModel, Field
 from pydantic.networks import IPvAnyAddress
@@ -9,7 +9,7 @@ class TransferFamilyAuthorizer(BaseModel):
         description="The username of the user attempting to authenticate.",
         examples=["bobusa", "john.doe", "sftp-user-123", "data-transfer-user"],
     )
-    password: Optional[str] = Field(
+    password: str | None = Field(
         default=None,
         description="The password for authentication.",
         examples=["<password>", "<user-password>", None],
diff --git a/aws_lambda_powertools/utilities/parser/models/vpc_latticev2.py b/aws_lambda_powertools/utilities/parser/models/vpc_latticev2.py
index cdb75642bd5..9ce8b79dd85 100644
--- a/aws_lambda_powertools/utilities/parser/models/vpc_latticev2.py
+++ b/aws_lambda_powertools/utilities/parser/models/vpc_latticev2.py
@@ -1,65 +1,65 @@
 from datetime import datetime
-from typing import Dict, Optional, Type, Union
+from typing import Dict, Type, Union
 
 from pydantic import BaseModel, Field, field_validator
 
 
 class VpcLatticeV2RequestContextIdentity(BaseModel):
-    source_vpc_arn: Optional[str] = Field(
+    source_vpc_arn: str | None = Field(
         None,
         alias="sourceVpcArn",
         description="The ARN of the VPC from which the request originated.",
         examples=["arn:aws:ec2:us-east-2:123456789012:vpc/vpc-0b8276c84697e7339"],
     )
-    get_type: Optional[str] = Field(
+    get_type: str | None = Field(
         None,
         alias="type",
         description="The type of identity making the request.",
         examples=["AWS_IAM", "NONE"],
     )
-    principal: Optional[str] = Field(
+    principal: str | None = Field(
         None,
         alias="principal",
         description="The principal ARN of the identity making the request.",
         examples=["arn:aws:sts::123456789012:assumed-role/example-role/057d00f8b51257ba3c853a0f248943cf"],
     )
-    principal_org_id: Optional[str] = Field(
+    principal_org_id: str | None = Field(
         None,
         alias="principalOrgID",
         description="The AWS organization ID of the principal.",
         examples=["o-1234567890"],
     )
-    session_name: Optional[str] = Field(
+    session_name: str | None = Field(
         None,
         alias="sessionName",
         description="The session name for assumed role sessions.",
         examples=["057d00f8b51257ba3c853a0f248943cf"],
     )
-    x509_subject_cn: Optional[str] = Field(
+    x509_subject_cn: str | None = Field(
         None,
         alias="X509SubjectCn",
         description="The X.509 certificate subject common name.",
         examples=["example.com"],
     )
-    x509_issuer_ou: Optional[str] = Field(
+    x509_issuer_ou: str | None = Field(
         None,
         alias="X509IssuerOu",
         description="The X.509 certificate issuer organizational unit.",
         examples=["IT Department"],
     )
-    x509_san_dns: Optional[str] = Field(
+    x509_san_dns: str | None = Field(
         None,
         alias="x509SanDns",
         description="The X.509 certificate Subject Alternative Name DNS entry.",
         examples=["example.com"],
     )
-    x509_san_uri: Optional[str] = Field(
+    x509_san_uri: str | None = Field(
         None,
         alias="X509SanUri",
         description="The X.509 certificate Subject Alternative Name URI entry.",
         examples=["https://example.com"],
     )
-    x509_san_name_cn: Optional[str] = Field(
+    x509_san_name_cn: str | None = Field(
         None,
         alias="X509SanNameCn",
         description="The X.509 certificate Subject Alternative Name common name.",
@@ -120,17 +120,17 @@ class VpcLatticeV2Model(BaseModel):
             {"content-type": "application/json"},
         ],
     )
-    query_string_parameters: Optional[Dict[str, str]] = Field(
+    query_string_parameters: Dict[str, str] | None = Field(
         None,
         alias="queryStringParameters",
         description="The query string parameters as key-value pairs.",
         examples=[{"order-id": "1"}, {"page": "2", "limit": "10"}],
     )
-    body: Optional[Union[str, Type[BaseModel]]] = Field(
+    body: Union[str, Type[BaseModel]] | None = Field(
         None,
         description="The request body. Can be a string or a parsed model if content-type allows parsing.",
     )
-    is_base64_encoded: Optional[bool] = Field(
+    is_base64_encoded: bool | None = Field(
         None,
         alias="isBase64Encoded",
         description="Indicates whether the body is base64-encoded.",
diff --git a/examples/batch_processing/src/advanced_accessing_lambda_context.py b/examples/batch_processing/src/advanced_accessing_lambda_context.py
index b0e7eeb98af..d8820138fa1 100644
--- a/examples/batch_processing/src/advanced_accessing_lambda_context.py
+++ b/examples/batch_processing/src/advanced_accessing_lambda_context.py
@@ -1,5 +1,3 @@
-from typing import Optional
-
 from aws_lambda_powertools import Logger, Tracer
 from aws_lambda_powertools.utilities.batch import (
     BatchProcessor,
@@ -15,7 +13,7 @@
 
 
 @tracer.capture_method
-def record_handler(record: SQSRecord, lambda_context: Optional[LambdaContext] = None):
+def record_handler(record: SQSRecord, lambda_context: LambdaContext | None = None):
     if lambda_context is not None:
         remaining_time = lambda_context.get_remaining_time_in_millis()
         logger.info(remaining_time)
diff --git a/examples/batch_processing/src/advanced_accessing_lambda_context_manager.py b/examples/batch_processing/src/advanced_accessing_lambda_context_manager.py
index 17b719a84d4..11e92a13f93 100644
--- a/examples/batch_processing/src/advanced_accessing_lambda_context_manager.py
+++ b/examples/batch_processing/src/advanced_accessing_lambda_context_manager.py
@@ -1,5 +1,3 @@
-from typing import Optional
-
 from aws_lambda_powertools import Logger, Tracer
 from aws_lambda_powertools.utilities.batch import BatchProcessor, EventType
 from aws_lambda_powertools.utilities.data_classes.sqs_event import SQSRecord
@@ -11,7 +9,7 @@
 
 
 @tracer.capture_method
-def record_handler(record: SQSRecord, lambda_context: Optional[LambdaContext] = None):
+def record_handler(record: SQSRecord, lambda_context: LambdaContext | None = None):
     if lambda_context is not None:
         remaining_time = lambda_context.get_remaining_time_in_millis()
         logger.info(remaining_time)
diff --git a/examples/batch_processing/src/pydantic_dynamodb.py b/examples/batch_processing/src/pydantic_dynamodb.py
index b46f5c78201..7e411a39caa 100644
--- a/examples/batch_processing/src/pydantic_dynamodb.py
+++ b/examples/batch_processing/src/pydantic_dynamodb.py
@@ -1,5 +1,5 @@
 import json
-from typing import Dict, Optional
+from typing import Dict
 
 from typing_extensions import Literal
 
@@ -32,8 +32,8 @@ def transform_message_to_dict(cls, value: Dict[Literal["S"], str]):
 
 
 class OrderDynamoDBChangeRecord(DynamoDBStreamChangedRecordModel):  # type: ignore[override]
-    NewImage: Optional[OrderDynamoDB]
-    OldImage: Optional[OrderDynamoDB]
+    NewImage: OrderDynamoDB | None
+    OldImage: OrderDynamoDB | None
 
 
 class OrderDynamoDBRecord(DynamoDBStreamRecordModel):  # type: ignore[override]
diff --git a/examples/build_recipes/poetry/app_poetry.py b/examples/build_recipes/poetry/app_poetry.py
index d570cca39cf..47927eb25b9 100644
--- a/examples/build_recipes/poetry/app_poetry.py
+++ b/examples/build_recipes/poetry/app_poetry.py
@@ -1,5 +1,3 @@
-from typing import Optional
-
 from pydantic import BaseModel
 
 from aws_lambda_powertools import Logger, Metrics, Tracer
@@ -16,7 +14,7 @@
 class UserModel(BaseModel):
     name: str
     email: str
-    age: Optional[int] = None
+    age: int | None = None
 
 
 @app.post("/users")
diff --git a/examples/build_recipes/sam/no-layers/src/app_sam_no_layer.py b/examples/build_recipes/sam/no-layers/src/app_sam_no_layer.py
index dcda4cede13..04c2d227c73 100644
--- a/examples/build_recipes/sam/no-layers/src/app_sam_no_layer.py
+++ b/examples/build_recipes/sam/no-layers/src/app_sam_no_layer.py
@@ -1,5 +1,3 @@
-from typing import Optional
-
 from pydantic import BaseModel
 
 from aws_lambda_powertools import Logger, Metrics, Tracer
@@ -16,7 +14,7 @@
 class UserModel(BaseModel):
     name: str
     email: str
-    age: Optional[int] = None
+    age: int | None = None
 
 
 @app.get("/health")
diff --git a/examples/build_recipes/sam/with-layers/src/app/app_sam_layer.py b/examples/build_recipes/sam/with-layers/src/app/app_sam_layer.py
index 9d4b39e63a1..56425bce2aa 100644
--- a/examples/build_recipes/sam/with-layers/src/app/app_sam_layer.py
+++ b/examples/build_recipes/sam/with-layers/src/app/app_sam_layer.py
@@ -1,5 +1,3 @@
-from typing import Optional
-
 import requests
 from pydantic import BaseModel
 
@@ -17,7 +15,7 @@
 class UserModel(BaseModel):
     name: str
     email: str
-    age: Optional[int] = None
+    age: int | None = None
 
 
 @app.get("/health")
diff --git a/examples/event_handler_graphql/src/enable_exceptions_batch_resolver.py b/examples/event_handler_graphql/src/enable_exceptions_batch_resolver.py
index 1d94e4693c8..b32399167fa 100644
--- a/examples/event_handler_graphql/src/enable_exceptions_batch_resolver.py
+++ b/examples/event_handler_graphql/src/enable_exceptions_batch_resolver.py
@@ -1,4 +1,4 @@
-from typing import Dict, Optional
+from typing import Dict
 
 from aws_lambda_powertools.event_handler import AppSyncResolver
 from aws_lambda_powertools.utilities.data_classes import AppSyncResolverEvent
@@ -18,7 +18,7 @@ class PostRelatedNotFound(Exception): ...
 
 
 @app.batch_resolver(type_name="Query", field_name="relatedPosts", raise_on_error=True)  # (1)!
-def related_posts(event: AppSyncResolverEvent, post_id: str) -> Optional[Dict]:
+def related_posts(event: AppSyncResolverEvent, post_id: str) -> Dict | None:
     post_found = posts_related.get(post_id, None)
 
     if not post_found:
diff --git a/examples/event_handler_rest/src/accessing_request_details.py b/examples/event_handler_rest/src/accessing_request_details.py
index e9a5d924017..cd6e8b6a56e 100644
--- a/examples/event_handler_rest/src/accessing_request_details.py
+++ b/examples/event_handler_rest/src/accessing_request_details.py
@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import List
 
 import requests
 from requests import Response
@@ -18,13 +18,13 @@
 def get_todos():
     todo_id: str = app.current_event.query_string_parameters["id"]
     # alternatively
-    _: Optional[str] = app.current_event.query_string_parameters.get("id")
+    _: str | None = app.current_event.query_string_parameters.get("id")
 
     # or multi-value query string parameters; ?category="red"&?category="blue"
     _: List[str] = app.current_event.multi_value_query_string_parameters["category"]
 
     # Payload
-    _: Optional[str] = app.current_event.body  # raw str | None
+    _: str | None = app.current_event.body  # raw str | None
 
     endpoint = "https://jsonplaceholder.typicode.com/todos"
     if todo_id:
diff --git a/examples/event_handler_rest/src/customizing_response_validation.py b/examples/event_handler_rest/src/customizing_response_validation.py
index 25aa07bf52a..2043c0c9c57 100644
--- a/examples/event_handler_rest/src/customizing_response_validation.py
+++ b/examples/event_handler_rest/src/customizing_response_validation.py
@@ -1,5 +1,4 @@
 from http import HTTPStatus
-from typing import Optional
 
 import requests
 from pydantic import BaseModel, Field
@@ -19,7 +18,7 @@
 
 class Todo(BaseModel):
     userId: int
-    id_: Optional[int] = Field(alias="id", default=None)
+    id_: int | None = Field(alias="id", default=None)
     title: str
     completed: bool
 
diff --git a/examples/event_handler_rest/src/customizing_response_validation_exception.py b/examples/event_handler_rest/src/customizing_response_validation_exception.py
index c94ace290d2..871c222151c 100644
--- a/examples/event_handler_rest/src/customizing_response_validation_exception.py
+++ b/examples/event_handler_rest/src/customizing_response_validation_exception.py
@@ -1,5 +1,4 @@
 from http import HTTPStatus
-from typing import Optional
 
 import requests
 from pydantic import BaseModel, Field
@@ -21,7 +20,7 @@
 
 class Todo(BaseModel):
     userId: int
-    id_: Optional[int] = Field(alias="id", default=None)
+    id_: int | None = Field(alias="id", default=None)
     title: str
     completed: bool
 
diff --git a/examples/event_handler_rest/src/data_validation.py b/examples/event_handler_rest/src/data_validation.py
index 1daa9fb2174..bbb43df74ea 100644
--- a/examples/event_handler_rest/src/data_validation.py
+++ b/examples/event_handler_rest/src/data_validation.py
@@ -1,5 +1,3 @@
-from typing import Optional
-
 import requests
 from pydantic import BaseModel, Field
 
@@ -15,7 +13,7 @@
 
 class Todo(BaseModel):  # (2)!
     userId: int
-    id_: Optional[int] = Field(alias="id", default=None)
+    id_: int | None = Field(alias="id", default=None)
     title: str
     completed: bool
 
diff --git a/examples/event_handler_rest/src/data_validation_fine_grained_response.py b/examples/event_handler_rest/src/data_validation_fine_grained_response.py
index 1209c6a1af1..36ee0a41299 100644
--- a/examples/event_handler_rest/src/data_validation_fine_grained_response.py
+++ b/examples/event_handler_rest/src/data_validation_fine_grained_response.py
@@ -1,5 +1,4 @@
 from http import HTTPStatus
-from typing import Optional
 
 import requests
 from pydantic import BaseModel, Field
@@ -16,7 +15,7 @@
 
 class Todo(BaseModel):
     userId: int
-    id_: Optional[int] = Field(alias="id", default=None)
+    id_: int | None = Field(alias="id", default=None)
     title: str
     completed: bool
 
diff --git a/examples/event_handler_rest/src/data_validation_sanitized_error.py b/examples/event_handler_rest/src/data_validation_sanitized_error.py
index 71849938f48..72d8c82b737 100644
--- a/examples/event_handler_rest/src/data_validation_sanitized_error.py
+++ b/examples/event_handler_rest/src/data_validation_sanitized_error.py
@@ -1,5 +1,3 @@
-from typing import Optional
-
 import requests
 from pydantic import BaseModel, Field
 
@@ -16,7 +14,7 @@
 
 class Todo(BaseModel):
     userId: int
-    id_: Optional[int] = Field(alias="id", default=None)
+    id_: int | None = Field(alias="id", default=None)
     title: str
     completed: bool
 
diff --git a/examples/event_handler_rest/src/skip_validating_query_strings.py b/examples/event_handler_rest/src/skip_validating_query_strings.py
index 882769239a1..0cf6628035e 100644
--- a/examples/event_handler_rest/src/skip_validating_query_strings.py
+++ b/examples/event_handler_rest/src/skip_validating_query_strings.py
@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import List
 
 import requests
 from pydantic import BaseModel, Field
@@ -15,14 +15,14 @@
 
 class Todo(BaseModel):
     userId: int
-    id_: Optional[int] = Field(alias="id", default=None)
+    id_: int | None = Field(alias="id", default=None)
     title: str
     completed: bool
 
 
 @app.get("/todos")
 @tracer.capture_method
-def get_todos(completed: Optional[str] = None) -> List[Todo]:  # (1)!
+def get_todos(completed: str | None = None) -> List[Todo]:  # (1)!
     url = "https://jsonplaceholder.typicode.com/todos"
 
     if completed is not None:
diff --git a/examples/event_handler_rest/src/validating_headers.py b/examples/event_handler_rest/src/validating_headers.py
index f92f0ead463..9c649c11bac 100644
--- a/examples/event_handler_rest/src/validating_headers.py
+++ b/examples/event_handler_rest/src/validating_headers.py
@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import List
 
 import requests
 from pydantic import BaseModel, Field
@@ -17,7 +17,7 @@
 
 class Todo(BaseModel):
     userId: int
-    id_: Optional[int] = Field(alias="id", default=None)
+    id_: int | None = Field(alias="id", default=None)
     title: str
     completed: bool
 
diff --git a/examples/event_handler_rest/src/validating_headers_with_pydantic.py b/examples/event_handler_rest/src/validating_headers_with_pydantic.py
index 03f6c56e9fd..821ad566185 100644
--- a/examples/event_handler_rest/src/validating_headers_with_pydantic.py
+++ b/examples/event_handler_rest/src/validating_headers_with_pydantic.py
@@ -1,4 +1,4 @@
-from typing import Any, Dict, Optional
+from typing import Any, Dict
 
 from pydantic import BaseModel, Field
 from typing_extensions import Annotated
@@ -16,7 +16,7 @@
 
 class Todo(BaseModel):
     userId: int
-    id_: Optional[int] = Field(alias="id", default=None)
+    id_: int | None = Field(alias="id", default=None)
     title: str
     completed: bool
 
diff --git a/examples/event_handler_rest/src/validating_path.py b/examples/event_handler_rest/src/validating_path.py
index c5ddbba4f37..f1001a6e18f 100644
--- a/examples/event_handler_rest/src/validating_path.py
+++ b/examples/event_handler_rest/src/validating_path.py
@@ -1,5 +1,3 @@
-from typing import Optional
-
 import requests
 from pydantic import BaseModel, Field
 from typing_extensions import Annotated
@@ -17,7 +15,7 @@
 
 class Todo(BaseModel):
     userId: int
-    id_: Optional[int] = Field(alias="id", default=None)
+    id_: int | None = Field(alias="id", default=None)
     title: str
     completed: bool
 
diff --git a/examples/event_handler_rest/src/validating_payload_subset.py b/examples/event_handler_rest/src/validating_payload_subset.py
index ebd0cf0c20f..051505369f9 100644
--- a/examples/event_handler_rest/src/validating_payload_subset.py
+++ b/examples/event_handler_rest/src/validating_payload_subset.py
@@ -1,5 +1,3 @@
-from typing import Optional
-
 import requests
 from pydantic import BaseModel, Field
 from typing_extensions import Annotated
@@ -13,7 +11,7 @@
 
 class Todo(BaseModel):
     userId: int
-    id_: Optional[int] = Field(alias="id", default=None)
+    id_: int | None = Field(alias="id", default=None)
     title: str
     completed: bool
 
diff --git a/examples/event_handler_rest/src/validating_payloads.py b/examples/event_handler_rest/src/validating_payloads.py
index 945cefd8089..a7ed6c88749 100644
--- a/examples/event_handler_rest/src/validating_payloads.py
+++ b/examples/event_handler_rest/src/validating_payloads.py
@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import List
 
 import requests
 from pydantic import BaseModel, Field
@@ -15,7 +15,7 @@
 
 class Todo(BaseModel):  # (2)!
     userId: int
-    id_: Optional[int] = Field(alias="id", default=None)
+    id_: int | None = Field(alias="id", default=None)
     title: str
     completed: bool
 
diff --git a/examples/event_handler_rest/src/validating_query_string_with_pydantic.py b/examples/event_handler_rest/src/validating_query_string_with_pydantic.py
index 75f6212e1a6..2ea42995c37 100644
--- a/examples/event_handler_rest/src/validating_query_string_with_pydantic.py
+++ b/examples/event_handler_rest/src/validating_query_string_with_pydantic.py
@@ -1,4 +1,4 @@
-from typing import Any, Dict, Optional
+from typing import Any, Dict
 
 from pydantic import BaseModel, Field
 from typing_extensions import Annotated
@@ -16,7 +16,7 @@
 
 class Todo(BaseModel):
     userId: int
-    id_: Optional[int] = Field(alias="id", default=None)
+    id_: int | None = Field(alias="id", default=None)
     title: str
     completed: bool
 
diff --git a/examples/event_handler_rest/src/validating_query_strings.py b/examples/event_handler_rest/src/validating_query_strings.py
index 047e9973b63..75ff7450a1c 100644
--- a/examples/event_handler_rest/src/validating_query_strings.py
+++ b/examples/event_handler_rest/src/validating_query_strings.py
@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import List
 
 import requests
 from pydantic import BaseModel, Field
@@ -17,14 +17,14 @@
 
 class Todo(BaseModel):
     userId: int
-    id_: Optional[int] = Field(alias="id", default=None)
+    id_: int | None = Field(alias="id", default=None)
     title: str
     completed: bool
 
 
 @app.get("/todos")
 @tracer.capture_method
-def get_todos(completed: Annotated[Optional[str], Query(min_length=4)] = None) -> List[Todo]:  # (3)!
+def get_todos(completed: Annotated[str | None, Query(min_length=4)] = None) -> List[Todo]:  # (3)!
     url = "https://jsonplaceholder.typicode.com/todos"
 
     if completed is not None:
diff --git a/examples/idempotency/src/bring_your_own_persistent_store.py b/examples/idempotency/src/bring_your_own_persistent_store.py
index 83ab27b8c4e..50e3595e94f 100644
--- a/examples/idempotency/src/bring_your_own_persistent_store.py
+++ b/examples/idempotency/src/bring_your_own_persistent_store.py
@@ -1,6 +1,6 @@
 import datetime
 import logging
-from typing import Any, Dict, Optional
+from typing import Any, Dict
 
 import boto3
 from botocore.config import Config
@@ -24,8 +24,8 @@ def __init__(
         status_attr: str = "status",
         data_attr: str = "data",
         validation_key_attr: str = "validation",
-        boto_config: Optional[Config] = None,
-        boto3_session: Optional[boto3.session.Session] = None,
+        boto_config: Config | None = None,
+        boto3_session: boto3.session.Session | None = None,
     ):
         boto3_session = boto3_session or boto3.session.Session()
         self._ddb_resource = boto3_session.resource("dynamodb", config=boto_config)
diff --git a/examples/logger/src/bring_your_own_formatter_from_scratch.py b/examples/logger/src/bring_your_own_formatter_from_scratch.py
index 425f00b0d28..7bcffa1d0af 100644
--- a/examples/logger/src/bring_your_own_formatter_from_scratch.py
+++ b/examples/logger/src/bring_your_own_formatter_from_scratch.py
@@ -1,13 +1,13 @@
 import json
 import logging
-from typing import Any, Dict, Iterable, List, Optional
+from typing import Any, Dict, Iterable, List
 
 from aws_lambda_powertools import Logger
 from aws_lambda_powertools.logging.formatter import BasePowertoolsFormatter
 
 
 class CustomFormatter(BasePowertoolsFormatter):
-    def __init__(self, log_record_order: Optional[List[str]] = None, *args, **kwargs):
+    def __init__(self, log_record_order: List[str] | None = None, *args, **kwargs):
         self.log_record_order = log_record_order or ["level", "location", "message", "timestamp"]
         self.log_format = dict.fromkeys(self.log_record_order)
         super().__init__(*args, **kwargs)
diff --git a/examples/streaming/src/assert_transformation_module.py b/examples/streaming/src/assert_transformation_module.py
index eac11abd4af..cc9b1dc4984 100644
--- a/examples/streaming/src/assert_transformation_module.py
+++ b/examples/streaming/src/assert_transformation_module.py
@@ -1,5 +1,5 @@
 import io
-from typing import IO, Optional
+from typing import IO
 
 from aws_lambda_powertools.utilities.streaming.transformations import BaseTransform
 
@@ -9,7 +9,7 @@ def __init__(self, input_stream: IO[bytes], encoding: str):
         self.encoding = encoding
         self.input_stream = io.TextIOWrapper(input_stream, encoding=encoding)
 
-    def read(self, size: int = -1) -> Optional[bytes]:
+    def read(self, size: int = -1) -> bytes | None:
         data = self.input_stream.read(size)
         return data.upper().encode(self.encoding)
 
diff --git a/examples/streaming/src/s3_json_transform.py b/examples/streaming/src/s3_json_transform.py
index 30c31b0f32c..8588498e38b 100644
--- a/examples/streaming/src/s3_json_transform.py
+++ b/examples/streaming/src/s3_json_transform.py
@@ -1,5 +1,5 @@
 import io
-from typing import IO, Optional
+from typing import IO
 
 import ijson
 
@@ -11,10 +11,10 @@ class JsonDeserializer(io.RawIOBase):
     def __init__(self, input_stream: IO[bytes]):
         self.input = ijson.items(input_stream, "", multiple_values=True)
 
-    def read(self, size: int = -1) -> Optional[bytes]:
+    def read(self, size: int = -1) -> bytes | None:
         raise NotImplementedError(f"{__name__} does not implement read")
 
-    def readline(self, size: Optional[int] = None) -> bytes:
+    def readline(self, size: int | None = None) -> bytes:
         raise NotImplementedError(f"{__name__} does not implement readline")
 
     def read_object(self) -> dict:
diff --git a/ruff.toml b/ruff.toml
index 6761e206cdc..249795ef294 100644
--- a/ruff.toml
+++ b/ruff.toml
@@ -44,7 +44,6 @@ lint.ignore = [
     "UP006",
     "UP007",
     "UP035",
-    "UP045",
 ]
 
 # Exclude files and directories
diff --git a/tests/e2e/utils/data_fetcher/common.py b/tests/e2e/utils/data_fetcher/common.py
index 1300daa55aa..61a56386251 100644
--- a/tests/e2e/utils/data_fetcher/common.py
+++ b/tests/e2e/utils/data_fetcher/common.py
@@ -2,7 +2,7 @@
 import time
 from concurrent.futures import Future, ThreadPoolExecutor
 from datetime import datetime
-from typing import List, Optional, Tuple
+from typing import List, Tuple
 
 import boto3
 import requests
@@ -18,8 +18,8 @@
 
 class GetLambdaResponseOptions(BaseModel):
     lambda_arn: str
-    payload: Optional[str] = None
-    client: Optional[LambdaClient] = None
+    payload: str | None = None
+    client: LambdaClient | None = None
     raise_on_error: bool = True
 
     model_config = ConfigDict(
@@ -29,8 +29,8 @@ class GetLambdaResponseOptions(BaseModel):
 
 def get_lambda_response(
     lambda_arn: str,
-    payload: Optional[str] = None,
-    client: Optional[LambdaClient] = None,
+    payload: str | None = None,
+    client: LambdaClient | None = None,
     raise_on_error: bool = True,
 ) -> GetLambdaResponse:
     """Invoke function synchronously
@@ -39,9 +39,9 @@ def get_lambda_response(
     ----------
     lambda_arn : str
         Lambda function ARN to invoke
-    payload : Optional[str], optional
+    payload : str | None, optional
         JSON payload for Lambda invocation, by default None
-    client : Optional[LambdaClient], optional
+    client : LambdaClient | None, optional
         Boto3 Lambda SDK client, by default None
     raise_on_error : bool, optional
         Whether to raise exception upon invocation error, by default True
diff --git a/tests/e2e/utils/data_fetcher/logs.py b/tests/e2e/utils/data_fetcher/logs.py
index dc036cba36e..4e8efa55d2d 100644
--- a/tests/e2e/utils/data_fetcher/logs.py
+++ b/tests/e2e/utils/data_fetcher/logs.py
@@ -1,6 +1,6 @@
 import json
 from datetime import datetime
-from typing import List, Optional, Union
+from typing import List, Union
 
 import boto3
 from mypy_boto3_logs.client import CloudWatchLogsClient
@@ -14,12 +14,12 @@ class Log(BaseModel, extra="allow"):
     message: Union[dict, str]
     timestamp: str
     service: str
-    cold_start: Optional[bool] = None
-    function_name: Optional[str] = None
-    function_memory_size: Optional[str] = None
-    function_arn: Optional[str] = None
-    function_request_id: Optional[str] = None
-    xray_trace_id: Optional[str] = None
+    cold_start: bool | None = None
+    function_name: str | None = None
+    function_memory_size: str | None = None
+    function_arn: str | None = None
+    function_request_id: str | None = None
+    xray_trace_id: str | None = None
 
 
 class LogFetcher:
@@ -27,8 +27,8 @@ def __init__(
         self,
         function_name: str,
         start_time: datetime,
-        log_client: Optional[CloudWatchLogsClient] = None,
-        filter_expression: Optional[str] = None,
+        log_client: CloudWatchLogsClient | None = None,
+        filter_expression: str | None = None,
         minimum_log_entries: int = 1,
     ):
         """Fetch and expose Powertools for AWS Lambda (Python) Logger logs from CloudWatch Logs
@@ -39,9 +39,9 @@ def __init__(
             Name of Lambda function to fetch logs for
         start_time : datetime
             Start date range to filter traces
-        log_client : Optional[CloudWatchLogsClient], optional
+        log_client : CloudWatchLogsClient | None, optional
             Amazon CloudWatch Logs Client, by default boto3.client('logs)
-        filter_expression : Optional[str], optional
+        filter_expression : str | None, optional
             CloudWatch Logs Filter Pattern expression, by default "message"
         minimum_log_entries: int
             Minimum number of log entries to be retrieved before exhausting retry attempts
@@ -54,14 +54,14 @@ def __init__(
         self.minimum_log_entries = minimum_log_entries
         self.logs: List[Log] = self._get_logs()
 
-    def get_log(self, key: str, value: Optional[any] = None) -> List[Log]:
+    def get_log(self, key: str, value: any | None = None) -> List[Log]:
         """Get logs based on key or key and value
 
         Parameters
         ----------
         key : str
             Log key name
-        value : Optional[any], optional
+        value : any | None, optional
             Log value, by default None
 
         Returns
@@ -132,8 +132,8 @@ def get_logs(
     function_name: str,
     start_time: datetime,
     minimum_log_entries: int = 1,
-    filter_expression: Optional[str] = None,
-    log_client: Optional[CloudWatchLogsClient] = None,
+    filter_expression: str | None = None,
+    log_client: CloudWatchLogsClient | None = None,
 ) -> LogFetcher:
     """_summary_
 
@@ -145,9 +145,9 @@ def get_logs(
         Start date range to filter traces
     minimum_log_entries : int
         Minimum number of log entries to be retrieved before exhausting retry attempts
-    log_client : Optional[CloudWatchLogsClient], optional
+    log_client : CloudWatchLogsClient | None, optional
         Amazon CloudWatch Logs Client, by default boto3.client('logs)
-    filter_expression : Optional[str], optional
+    filter_expression : str | None, optional
         CloudWatch Logs Filter Pattern expression, by default "message"
 
     Returns
diff --git a/tests/e2e/utils/data_fetcher/traces.py b/tests/e2e/utils/data_fetcher/traces.py
index f8b364fc97c..86ec11342b9 100644
--- a/tests/e2e/utils/data_fetcher/traces.py
+++ b/tests/e2e/utils/data_fetcher/traces.py
@@ -1,6 +1,6 @@
 import json
 from datetime import datetime, timedelta
-from typing import TYPE_CHECKING, Any, Dict, Generator, List, Optional
+from typing import TYPE_CHECKING, Any, Dict, Generator, List
 
 import boto3
 from botocore.paginate import PageIterator
@@ -17,10 +17,10 @@ class TraceSubsegment(BaseModel):
     name: str
     start_time: float
     end_time: float
-    aws: Optional[dict] = None
-    subsegments: Optional[List["TraceSubsegment"]] = None
-    annotations: Optional[Dict[str, Any]] = None
-    metadata: Optional[Dict[str, Dict[str, Any]]] = None
+    aws: dict | None = None
+    subsegments: List["TraceSubsegment"] | None = None
+    annotations: Dict[str, Any] | None = None
+    metadata: Dict[str, Dict[str, Any]] | None = None
 
 
 class TraceDocument(BaseModel):
@@ -29,10 +29,10 @@ class TraceDocument(BaseModel):
     start_time: float
     end_time: float
     trace_id: str
-    parent_id: Optional[str] = None
+    parent_id: str | None = None
     aws: Dict
     origin: str
-    subsegments: Optional[List[TraceSubsegment]] = None
+    subsegments: List[TraceSubsegment] | None = None
 
 
 class TraceFetcher:
@@ -42,11 +42,11 @@ def __init__(
         self,
         filter_expression: str,
         start_date: datetime,
-        end_date: Optional[datetime] = None,
-        xray_client: Optional[XRayClient] = None,
-        exclude_segment_name: Optional[List[str]] = None,
-        resource_name: Optional[List[str]] = None,
-        origin: Optional[List[str]] = None,
+        end_date: datetime | None = None,
+        xray_client: XRayClient | None = None,
+        exclude_segment_name: List[str] | None = None,
+        resource_name: List[str] | None = None,
+        origin: List[str] | None = None,
         minimum_traces: int = 1,
     ):
         """Fetch and expose traces from X-Ray based on parameters
@@ -67,15 +67,15 @@ def __init__(
             see: https://docs.aws.amazon.com/xray/latest/devguide/xray-console-filters.html
         start_date : datetime
             Start date range to filter traces
-        end_date : Optional[datetime], optional
+        end_date : datetime | None, optional
             End date range to filter traces, by default 5 minutes past start_date
-        xray_client : Optional[XRayClient], optional
+        xray_client : XRayClient | None, optional
             AWS X-Ray SDK Client, by default boto3.client('xray')
-        exclude_segment_name : Optional[List[str]], optional
+        exclude_segment_name : List[str] | None, optional
             Name of segments to exclude, by default ["Initialization", "Invocation", "Overhead"]
-        resource_name : Optional[List[str]], optional
+        resource_name : List[str] | None, optional
             Name of resource to filter traces (e.g., function name), by default None
-        origin : Optional[List[str]], optional
+        origin : List[str] | None, optional
             Trace origin name to filter traces, by default ["AWS::Lambda::Function"]
         minimum_traces : int
             Minimum number of traces to be retrieved before exhausting retry attempts
@@ -106,7 +106,7 @@ def __init__(
         self.trace_documents = self._get_trace_documents(trace_ids)
         self.subsegments = self._get_subsegments()
 
-    def get_annotation(self, key: str, value: Optional[any] = None) -> List:
+    def get_annotation(self, key: str, value: any | None = None) -> List:
         return [
             annotation
             for annotation in self.annotations
@@ -223,11 +223,11 @@ def _get_trace_documents(self, trace_ids: List[str]) -> Dict[str, TraceDocument]
 def get_traces(
     filter_expression: str,
     start_date: datetime,
-    end_date: Optional[datetime] = None,
-    xray_client: Optional[XRayClient] = None,
-    exclude_segment_name: Optional[List[str]] = None,
-    resource_name: Optional[List[str]] = None,
-    origin: Optional[List[str]] = None,
+    end_date: datetime | None = None,
+    xray_client: XRayClient | None = None,
+    exclude_segment_name: List[str] | None = None,
+    resource_name: List[str] | None = None,
+    origin: List[str] | None = None,
     minimum_traces: int = 1,
 ) -> TraceFetcher:
     """Fetch traces from AWS X-Ray
@@ -239,15 +239,15 @@ def get_traces(
         see: https://docs.aws.amazon.com/xray/latest/devguide/xray-console-filters.html
     start_date : datetime
         Start date range to filter traces
-    end_date : Optional[datetime], optional
+    end_date : datetime | None, optional
         End date range to filter traces, by default 5 minutes past start_date
-    xray_client : Optional[XRayClient], optional
+    xray_client : XRayClient | None, optional
         AWS X-Ray SDK Client, by default boto3.client('xray')
-    exclude_segment_name : Optional[List[str]], optional
+    exclude_segment_name : List[str] | None, optional
         Name of segments to exclude, by default ["Initialization", "Invocation", "Overhead"]
-    resource_name : Optional[List[str]], optional
+    resource_name : List[str] | None, optional
         Name of resource to filter traces (e.g., function name), by default None
-    origin : Optional[List[str]], optional
+    origin : List[str] | None, optional
         Trace origin name to filter traces, by default ["AWS::Lambda::Function"]
     minimum_traces : int
         Minimum number of traces to be retrieved before exhausting retry attempts
diff --git a/tests/functional/batch/_pydantic/sample_models.py b/tests/functional/batch/_pydantic/sample_models.py
index c2912b3f8a3..d3974ccce82 100644
--- a/tests/functional/batch/_pydantic/sample_models.py
+++ b/tests/functional/batch/_pydantic/sample_models.py
@@ -1,5 +1,5 @@
 import json
-from typing import Dict, Optional
+from typing import Dict
 
 from pydantic import field_validator
 
@@ -44,8 +44,8 @@ def transform_message_to_dict(cls, value: Dict[Literal["S"], str]):
 
 
 class OrderDynamoDBChangeRecord(DynamoDBStreamChangedRecordModel):
-    NewImage: Optional[OrderDynamoDB] = None
-    OldImage: Optional[OrderDynamoDB] = None
+    NewImage: OrderDynamoDB | None = None
+    OldImage: OrderDynamoDB | None = None
 
 
 class OrderDynamoDBRecord(DynamoDBStreamRecordModel):
diff --git a/tests/functional/batch/_pydantic/test_utilities_batch_pydantic.py b/tests/functional/batch/_pydantic/test_utilities_batch_pydantic.py
index 382cbdb0335..1e6a0452d2a 100644
--- a/tests/functional/batch/_pydantic/test_utilities_batch_pydantic.py
+++ b/tests/functional/batch/_pydantic/test_utilities_batch_pydantic.py
@@ -1,7 +1,7 @@
 import json
 import uuid
 from random import randint
-from typing import Any, Awaitable, Callable, Dict, Optional
+from typing import Any, Awaitable, Callable, Dict
 
 import pytest
 from pydantic import BaseModel, field_validator
@@ -311,8 +311,8 @@ def transform_message_to_dict(cls, value: Dict[Literal["S"], str]):
             return json.loads(value)
 
     class OrderDynamoDBChangeRecord(DynamoDBStreamChangedRecordModel):
-        NewImage: Optional[OrderDynamoDB] = None
-        OldImage: Optional[OrderDynamoDB] = None
+        NewImage: OrderDynamoDB | None = None
+        OldImage: OrderDynamoDB | None = None
 
     class OrderDynamoDBRecord(DynamoDBStreamRecordModel):
         dynamodb: OrderDynamoDBChangeRecord
@@ -355,8 +355,8 @@ def transform_message_to_dict(cls, value: Dict[Literal["S"], str]):
             return json.loads(value)
 
     class OrderDynamoDBChangeRecord(DynamoDBStreamChangedRecordModel):
-        NewImage: Optional[OrderDynamoDB] = None
-        OldImage: Optional[OrderDynamoDB] = None
+        NewImage: OrderDynamoDB | None = None
+        OldImage: OrderDynamoDB | None = None
 
     class OrderDynamoDBRecord(DynamoDBStreamRecordModel):
         dynamodb: OrderDynamoDBChangeRecord
diff --git a/tests/functional/event_handler/_pydantic/test_bedrock_agent.py b/tests/functional/event_handler/_pydantic/test_bedrock_agent.py
index 4367a94f49d..90e9e69790b 100644
--- a/tests/functional/event_handler/_pydantic/test_bedrock_agent.py
+++ b/tests/functional/event_handler/_pydantic/test_bedrock_agent.py
@@ -1,6 +1,6 @@
 import json
 from functools import partial
-from typing import Any, Dict, Optional
+from typing import Any, Dict
 
 import pytest
 from typing_extensions import Annotated
@@ -192,7 +192,7 @@ def test_openapi_schema_for_pydanticv2(openapi30_schema):
 
     # WHEN we have a simple handler
     @app.get("/", description="Testing")
-    def handler() -> Optional[Dict]:
+    def handler() -> Dict | None:
         pass
 
     # WHEN we get the schema
@@ -336,7 +336,7 @@ def test_bedrock_resolver_with_openapi_extensions():
 
     # WHEN we have a simple handler with openapi extension
     @app.get("/", description="Testing", openapi_extensions={"x-requireConfirmation": "ENABLED"})
-    def handler() -> Optional[Dict]:
+    def handler() -> Dict | None:
         pass
 
     # WHEN we get the schema
diff --git a/tests/functional/event_handler/_pydantic/test_openapi_params.py b/tests/functional/event_handler/_pydantic/test_openapi_params.py
index 40722bb838b..b9426bf4da7 100644
--- a/tests/functional/event_handler/_pydantic/test_openapi_params.py
+++ b/tests/functional/event_handler/_pydantic/test_openapi_params.py
@@ -1,7 +1,7 @@
 import json
 from dataclasses import dataclass
 from datetime import datetime
-from typing import List, Literal, Optional, Tuple
+from typing import List, Literal, Tuple
 
 import pytest
 from pydantic import BaseModel, Field
@@ -34,7 +34,7 @@ def test_openapi_pydantic_query_params():
     class QueryParams(BaseModel):
         limit: int = Field(default=10, ge=1, le=100, description="Number of items to return")
         offset: int = Field(default=0, ge=0, description="Number of items to skip")
-        search: Optional[str] = Field(default=None, description="Search term")
+        search: str | None = Field(default=None, description="Search term")
 
     @app.get("/search")
     def search_handler(params: Annotated[QueryParams, Query()]):
@@ -82,7 +82,7 @@ def test_openapi_pydantic_header_params():
     class HeaderParams(BaseModel):
         authorization: str = Field(description="Authorization token")
         user_agent: str = Field(default="PowerTools/1.0", description="User agent")
-        language: Optional[str] = Field(default=None, alias="accept-language", description="Language preference")
+        language: str | None = Field(default=None, alias="accept-language", description="Language preference")
 
     @app.get("/protected")
     def protected_handler(headers: Annotated[HeaderParams, Header()]):
@@ -941,7 +941,7 @@ def test_openapi_form_parameter_edge_cases():
     @app.post("/form-edge-cases")
     def form_edge_cases(
         required_field: Annotated[str, Form(description="Required field")],
-        optional_field: Annotated[Optional[str], Form(description="Optional field")] = None,
+        optional_field: Annotated[str | None, Form(description="Optional field")] = None,
         field_with_default: Annotated[str, Form(description="Field with default")] = "default_value",
     ):
         return {"required": required_field, "optional": optional_field, "default": field_with_default}
@@ -1034,7 +1034,7 @@ def test_openapi_pydantic_required_vs_optional():
     class QueryParams(BaseModel):
         required_field: str = Field(description="Required field")
         optional_with_default: str = Field(default="default", description="Optional with default")
-        optional_nullable: Optional[str] = Field(default=None, description="Optional nullable")
+        optional_nullable: str | None = Field(default=None, description="Optional nullable")
 
     @app.get("/test")
     def test_handler(params: Annotated[QueryParams, Query()]):
diff --git a/tests/functional/event_handler/_pydantic/test_openapi_responses.py b/tests/functional/event_handler/_pydantic/test_openapi_responses.py
index dccfae3e28d..c00b4e00462 100644
--- a/tests/functional/event_handler/_pydantic/test_openapi_responses.py
+++ b/tests/functional/event_handler/_pydantic/test_openapi_responses.py
@@ -1,5 +1,5 @@
 from secrets import randbelow
-from typing import Optional, Union
+from typing import Union
 
 from pydantic import BaseModel
 
@@ -325,7 +325,7 @@ def test_openapi_response_examples_preserved_with_model():
     class UserResponse(BaseModel):
         id: int
         name: str
-        email: Optional[str] = None
+        email: str | None = None
 
     @app.get(
         "/",
diff --git a/tests/functional/event_handler/_pydantic/test_openapi_schema_pydantic_v2.py b/tests/functional/event_handler/_pydantic/test_openapi_schema_pydantic_v2.py
index d25811d24ae..6f4b89e47cc 100644
--- a/tests/functional/event_handler/_pydantic/test_openapi_schema_pydantic_v2.py
+++ b/tests/functional/event_handler/_pydantic/test_openapi_schema_pydantic_v2.py
@@ -1,6 +1,6 @@
 import json
 import warnings
-from typing import Literal, Optional
+from typing import Literal
 
 import pytest
 from pydantic import BaseModel, Field, computed_field
@@ -52,7 +52,7 @@ def test_openapi_3_1_complex_handler(openapi31_schema):
     # GIVEN a complex pydantic model
     class TodoAttributes(BaseModel):
         userId: int
-        id_: Optional[int] = Field(alias="id", default=None)
+        id_: int | None = Field(alias="id", default=None)
         title: str
         completed: bool
 
diff --git a/tests/functional/event_handler/_pydantic/test_openapi_serialization.py b/tests/functional/event_handler/_pydantic/test_openapi_serialization.py
index ef5c8ddd938..9bad2c61422 100644
--- a/tests/functional/event_handler/_pydantic/test_openapi_serialization.py
+++ b/tests/functional/event_handler/_pydantic/test_openapi_serialization.py
@@ -1,6 +1,6 @@
 import json
 from dataclasses import dataclass
-from typing import Dict, Optional, Set
+from typing import Dict, Set
 
 import pytest
 from pydantic import BaseModel
@@ -81,7 +81,7 @@ class Model(BaseModel):
         age: int
 
     @app.get("/valid_optional")
-    def handler_valid_optional() -> Optional[Model]:
+    def handler_valid_optional() -> Model | None:
         return Model(name="John", age=30)
 
     # WHEN returning a valid model for an Optional type
diff --git a/tests/functional/event_handler/_pydantic/test_openapi_validation_middleware.py b/tests/functional/event_handler/_pydantic/test_openapi_validation_middleware.py
index aee94e80b14..ec14c14fa08 100644
--- a/tests/functional/event_handler/_pydantic/test_openapi_validation_middleware.py
+++ b/tests/functional/event_handler/_pydantic/test_openapi_validation_middleware.py
@@ -5,7 +5,7 @@
 from dataclasses import dataclass
 from enum import Enum
 from pathlib import PurePath
-from typing import Any, Dict, List, Literal, Optional, Tuple, Union
+from typing import Any, Dict, List, Literal, Tuple, Union
 
 import pytest
 from pydantic import (
@@ -88,7 +88,7 @@ def test_validate_pydantic_query_params(gw_event):
 
     class QueryParams(BaseModel):
         limit: int = Field(default=10, ge=1, le=100, description="Number of items")
-        search: Optional[str] = Field(default=None, description="Search term")
+        search: str | None = Field(default=None, description="Search term")
 
     @app.get("/search")
     def search_handler(params: Annotated[QueryParams, Query()]):
@@ -1777,7 +1777,7 @@ class Model(BaseModel):
         age: int
 
     @app.get("/none_allowed")
-    def handler_none_allowed() -> Optional[Model]:
+    def handler_none_allowed() -> Model | None:
         return None
 
     # WHEN returning None for an Optional type
@@ -3123,15 +3123,15 @@ def _post_json(app, path, payload):
     return result["statusCode"], json.loads(result["body"])
 
 
-# ---------- Optional[List[Model]] ----------
+# ---------- List[Model] | None ----------
 
 
 def test_optional_list_body_with_list():
-    """Optional[List[Model]] must preserve the full list."""
+    """List[Model] | None must preserve the full list."""
     app = APIGatewayRestResolver(enable_validation=True)
 
     @app.post("/items")
-    def handler(items: Annotated[Optional[List[_Item]], Body()]) -> Dict[str, Any]:
+    def handler(items: Annotated[List[_Item] | None, Body()]) -> Dict[str, Any]:
         assert isinstance(items, list)
         return {"count": len(items)}
 
@@ -3141,11 +3141,11 @@ def handler(items: Annotated[Optional[List[_Item]], Body()]) -> Dict[str, Any]:
 
 
 def test_optional_list_body_with_none():
-    """Optional[List[Model]] must accept a null body gracefully."""
+    """List[Model] | None must accept a null body gracefully."""
     app = APIGatewayRestResolver(enable_validation=True)
 
     @app.post("/items")
-    def handler(items: Annotated[Optional[List[_Item]], Body()] = None) -> Dict[str, Any]:
+    def handler(items: Annotated[List[_Item] | None, Body()] = None) -> Dict[str, Any]:
         return {"received_none": items is None}
 
     status, body = _post_json(app, "/items", None)
@@ -3153,15 +3153,15 @@ def handler(items: Annotated[Optional[List[_Item]], Body()] = None) -> Dict[str,
     assert body["received_none"] is True
 
 
-# ---------- Optional[Union[Model, List[Model]]] ----------
+# ---------- Union[Model, List[Model]] | None ----------
 
 
 def test_optional_union_model_or_list_with_list():
-    """Optional[Union[Model, List[Model]]] — send list, get full list."""
+    """Union[Model, List[Model]] | None — send list, get full list."""
     app = APIGatewayRestResolver(enable_validation=True)
 
     @app.post("/items")
-    def handler(items: Annotated[Optional[Union[_Item, List[_Item]]], Body()]) -> Dict[str, Any]:
+    def handler(items: Annotated[Union[_Item, List[_Item]] | None, Body()]) -> Dict[str, Any]:
         assert isinstance(items, list)
         return {"count": len(items)}
 
@@ -3171,11 +3171,11 @@ def handler(items: Annotated[Optional[Union[_Item, List[_Item]]], Body()]) -> Di
 
 
 def test_optional_union_model_or_list_with_single():
-    """Optional[Union[Model, List[Model]]] — send single obj, get single obj."""
+    """Union[Model, List[Model]] | None — send single obj, get single obj."""
     app = APIGatewayRestResolver(enable_validation=True)
 
     @app.post("/items")
-    def handler(items: Annotated[Optional[Union[_Item, List[_Item]]], Body()]) -> Dict[str, Any]:
+    def handler(items: Annotated[Union[_Item, List[_Item]] | None, Body()]) -> Dict[str, Any]:
         assert not isinstance(items, list)
         return {"name": items.name}
 
@@ -3185,11 +3185,11 @@ def handler(items: Annotated[Optional[Union[_Item, List[_Item]]], Body()]) -> Di
 
 
 def test_optional_union_model_or_list_with_none():
-    """Optional[Union[Model, List[Model]]] — send null, get None."""
+    """Union[Model, List[Model]] | None — send null, get None."""
     app = APIGatewayRestResolver(enable_validation=True)
 
     @app.post("/items")
-    def handler(items: Annotated[Optional[Union[_Item, List[_Item]]], Body()] = None) -> Dict[str, Any]:
+    def handler(items: Annotated[Union[_Item, List[_Item]] | None, Body()] = None) -> Dict[str, Any]:
         return {"is_none": items is None}
 
     status, body = _post_json(app, "/items", None)
@@ -3288,11 +3288,11 @@ def handler(data: Annotated[Union[str, List[Dict[str, Any]]], Body()]) -> Dict[s
 
 
 def test_optional_rootmodel_list_body():
-    """Optional[RootModel[List[Model]]] — list must not be truncated."""
+    """RootModel[List[Model]] | None — list must not be truncated."""
     app = APIGatewayRestResolver(enable_validation=True)
 
     @app.post("/items")
-    def handler(items: Annotated[Optional[_ItemCollection], Body()]) -> Dict[str, Any]:
+    def handler(items: Annotated[_ItemCollection | None, Body()]) -> Dict[str, Any]:
         return {"count": len(items.root)}
 
     status, body = _post_json(app, "/items", _THREE_ITEMS)
diff --git a/tests/functional/idempotency/_boto3/test_idempotency.py b/tests/functional/idempotency/_boto3/test_idempotency.py
index e5916dba0fa..15af4eece21 100644
--- a/tests/functional/idempotency/_boto3/test_idempotency.py
+++ b/tests/functional/idempotency/_boto3/test_idempotency.py
@@ -2,7 +2,7 @@
 import dataclasses
 import datetime
 import warnings
-from typing import Any, Optional
+from typing import Any
 from unittest.mock import MagicMock, Mock
 
 import jmespath
@@ -2086,7 +2086,7 @@ class PaymentOutput:
         config=config,
         output_serializer=output_serializer,
     )
-    def collect_payment(payment: PaymentInput) -> Optional[PaymentOutput]:
+    def collect_payment(payment: PaymentInput) -> PaymentOutput | None:
         return PaymentOutput(**dataclasses.asdict(payment))
 
     # WHEN
diff --git a/tests/functional/idempotency/_pydantic/test_idempotency_with_pydantic.py b/tests/functional/idempotency/_pydantic/test_idempotency_with_pydantic.py
index f8e3debbc30..b5decebafbe 100644
--- a/tests/functional/idempotency/_pydantic/test_idempotency_with_pydantic.py
+++ b/tests/functional/idempotency/_pydantic/test_idempotency_with_pydantic.py
@@ -1,5 +1,3 @@
-from typing import Optional
-
 import pytest
 from pydantic import BaseModel
 
@@ -252,7 +250,7 @@ class PaymentOutput(BaseModel):
         config=config,
         output_serializer=output_serializer,
     )
-    def collect_payment(payment: PaymentInput) -> Optional[PaymentOutput]:
+    def collect_payment(payment: PaymentInput) -> PaymentOutput | None:
         return PaymentOutput(**payment.dict())
 
     # WHEN
diff --git a/tests/functional/idempotency/utils.py b/tests/functional/idempotency/utils.py
index 2e1ee4ab821..c6b3ee9b1a0 100644
--- a/tests/functional/idempotency/utils.py
+++ b/tests/functional/idempotency/utils.py
@@ -1,6 +1,6 @@
 import hashlib
 import json
-from typing import Any, Dict, Optional
+from typing import Any, Dict
 
 from botocore import stub
 from pytest import FixtureRequest
@@ -88,7 +88,7 @@ def build_idempotency_put_item_response_stub(
     expiration: int,
     status: str,
     request: FixtureRequest,
-    validation_data: Optional[Any],
+    validation_data: Any | None,
 ):
     response = {
         "Item": {
diff --git a/tests/unit/parser/_pydantic/schemas.py b/tests/unit/parser/_pydantic/schemas.py
index 0713924c486..2565d649ee9 100644
--- a/tests/unit/parser/_pydantic/schemas.py
+++ b/tests/unit/parser/_pydantic/schemas.py
@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import List
 
 from pydantic import BaseModel
 
@@ -21,8 +21,8 @@ class MyDynamoBusiness(BaseModel):
 
 
 class MyDynamoScheme(DynamoDBStreamChangedRecordModel):
-    NewImage: Optional[MyDynamoBusiness] = None
-    OldImage: Optional[MyDynamoBusiness] = None
+    NewImage: MyDynamoBusiness | None = None
+    OldImage: MyDynamoBusiness | None = None
 
 
 class MyDynamoDBStreamRecordModel(DynamoDBStreamRecordModel):