Changing highlights + import

Author: leandrodamascena

docs/utilities/parser.md

@@ -42,7 +42,7 @@ The `@event_parser` decorator automatically parses the incoming event into the s
 
 === "getting_started_with_parser.py"
 
-    ```python hl_lines="3 10"
+    ```python hl_lines="3 11"
     --8<-- "examples/parser/src/getting_started_with_parser.py"
     ```
 
@@ -58,7 +58,7 @@ You can use the `parse()` function when you need to have flexibility with differ
 
 === "parser_function.py"
 
-    ```python hl_lines="3 14"
+    ```python hl_lines="3 15"
     --8<-- "examples/parser/src/parser_function.py"
     ```
 
@@ -144,7 +144,7 @@ Use the model to validate and extract relevant information from the incoming eve
 
 === "Custom data model"
 
-    ```python hl_lines="4 8 16"
+    ```python hl_lines="4 8 17"
     --8<-- "examples/parser/src/custom_data_model_with_eventbridge.py"
     ```
 
@@ -164,7 +164,7 @@ Envelopes can be used via `envelope` parameter available in both `parse` functio
 
 === "Envelopes using event parser decorator"
 
-    ```python hl_lines="3 6-10 12"
+    ```python hl_lines="3 7-10 13"
     --8<-- "examples/parser/src/envelope_with_event_parser.py"
     ```
 
@@ -203,7 +203,7 @@ Here's a snippet of how the EventBridge envelope we demonstrated previously is i
 
 === "Bring your own envelope with Event Bridge"
 
-    ```python hl_lines="6 12-18"
+    ```python hl_lines="6 13-19"
     --8<-- "examples/parser/src/bring_your_own_envelope.py"
     ```
 
@@ -269,7 +269,7 @@ Wrap these fields with [Pydantic&#39;s Json Type](https://pydantic-docs.helpmanu
 
 === "Validate string fields containing JSON data"
 
-    ```python hl_lines="3 14"
+    ```python hl_lines="5 24"
     --8<-- "examples/parser/src/string_fields_contain_json.py"
     ```
 
@@ -287,7 +287,7 @@ Pydantic's definition of _serialization_ is broader than usual. It includes conv
 
 Read more at [Serialization for Pydantic documentation](https://docs.pydantic.dev/latest/concepts/serialization/#model_copy){target="_blank" rel="nofollow"}.
 
-```python title="serialization_parser.py" hl_lines="39-40"
+```python title="serialization_parser.py" hl_lines="36-37"
 --8<-- "examples/parser/src/serialization_parser.py"
 ```
 

examples/parser/src/field_validator_all_values.py

@@ -1,26 +1,27 @@
-from aws_lambda_powertools.utilities.parser import parse, BaseModel
-from aws_lambda_powertools.utilities.parser import field_validator
+from aws_lambda_powertools.utilities.parser import BaseModel, field_validator, parse
 from aws_lambda_powertools.utilities.typing import LambdaContext
 
+
 class HelloWorldModel(BaseModel):
     message: str
     sender: str
 
-    @field_validator('*')
+    @field_validator("*")
     def has_whitespace(cls, v):
-        if ' ' not in v:
+        if " " not in v:
             raise ValueError("Must have whitespace...")
         return v
 
+
 def lambda_handler(event: dict, context: LambdaContext):
     try:
         parsed_event = parse(model=HelloWorldModel, event=event)
         return {
             "statusCode": 200,
-            "body": f"Received message: {parsed_event.message}"
+            "body": f"Received message: {parsed_event.message}",
         }
     except ValueError as e:
         return {
             "statusCode": 400,
-            "body": str(e)
-        }
+            "body": str(e),
+        }

examples/parser/src/sqs_model_event.py

@@ -3,13 +3,15 @@
 from aws_lambda_powertools.utilities.typing import LambdaContext
 
 
-def lambda_handler(event: dict, context: LambdaContext) -> None:
+def lambda_handler(event: dict, context: LambdaContext) -> list:
     parsed_event = parse(model=SqsModel, event=event)
 
     results = []
     for record in parsed_event.Records:
-        results.append({
-            'Message ID':record.messageId, 
-            'body':record.body
-            })
-    return results
+        results.append(
+            {
+                "message_id": record.messageId,
+                "body": record.body,
+            },
+        )
+    return results

examples/parser/src/string_fields_contain_json.py

@@ -1,10 +1,19 @@
-from typing import Any, Type
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any
 
 from pydantic import BaseModel, Json
 
 from aws_lambda_powertools.utilities.parser import BaseEnvelope, event_parser
+from aws_lambda_powertools.utilities.parser.functions import (
+    _parse_and_validate_event,
+    _retrieve_or_set_model_from_cache,
+)
 from aws_lambda_powertools.utilities.typing import LambdaContext
 
+if TYPE_CHECKING:
+    from aws_lambda_powertools.utilities.parser.types import T
+
 
 class CancelOrder(BaseModel):
     order_id: int
@@ -16,8 +25,9 @@ class CancelOrderModel(BaseModel):
 
 
 class CustomEnvelope(BaseEnvelope):
-    def parse(self, data: dict, model: Type[BaseModel]) -> Any:
-        return model.model_validate({"body": data.get("body", {})})
+    def parse(self, data: dict[str, Any] | Any | None, model: type[T]):
+        adapter = _retrieve_or_set_model_from_cache(model=model)
+        return _parse_and_validate_event(data=data, adapter=adapter)
 
 
 @event_parser(model=CancelOrderModel, envelope=CustomEnvelope)

examples/parser/src/string_fields_contain_json_pydantic_validator.py

@@ -1,25 +1,38 @@
+from __future__ import annotations
+
 import json
-from typing import Any, Type
-from aws_lambda_powertools.utilities.parser import event_parser, BaseEnvelope, BaseModel
-from aws_lambda_powertools.utilities.validation import validator
+from typing import TYPE_CHECKING, Any
+
+from aws_lambda_powertools.utilities.parser import BaseEnvelope, BaseModel, event_parser
+from aws_lambda_powertools.utilities.parser.functions import (
+    _parse_and_validate_event,
+    _retrieve_or_set_model_from_cache,
+)
 from aws_lambda_powertools.utilities.typing import LambdaContext
+from aws_lambda_powertools.utilities.validation import validator
+
+if TYPE_CHECKING:
+    from aws_lambda_powertools.utilities.parser.types import T
+
 
 class CancelOrder(BaseModel):
     order_id: int
     reason: str
 
+
 class CancelOrderModel(BaseModel):
     body: CancelOrder
 
     @validator("body", pre=True)
     def transform_body_to_dict(cls, value):
-        if isinstance(value, str):
-            return json.loads(value)
-        return value
+        return json.loads(value) if isinstance(value, str) else value
+
 
 class CustomEnvelope(BaseEnvelope):
-    def parse(self, data: dict, model: Type[BaseModel]) -> Any:
-        return model.model_validate({"body": data.get("body", {})})
+    def parse(self, data: dict[str, Any] | Any | None, model: type[T]):
+        adapter = _retrieve_or_set_model_from_cache(model=model)
+        return _parse_and_validate_event(data=data, adapter=adapter)
+
 
 @event_parser(model=CancelOrderModel, envelope=CustomEnvelope)
 def lambda_handler(event: CancelOrderModel, context: LambdaContext):
@@ -32,5 +45,5 @@ def lambda_handler(event: CancelOrderModel, context: LambdaContext):
 
     return {
         "statusCode": 200,
-        "body": json.dumps({"message": f"Order {cancel_order.order_id} cancelled successfully"})
-    }
+        "body": json.dumps({"message": f"Order {cancel_order.order_id} cancelled successfully"}),
+    }