Merge branch 'develop' into fix/event-bridge-event-model

Author: leandrodamascena

CHANGELOG.md

@@ -5,12 +5,72 @@
 # Unreleased
 
 
+<a name="v3.31.0"></a>
+## [v3.31.0] - 2026-06-29
+## Features
+
+* **event_handler:** support any Pydantic Field annotation in parameter ([#8305](https://github.com/aws-powertools/powertools-lambda-python/issues/8305))
+
+## Maintenance
+
+* version bump
+
+
 <a name="v3.30.0"></a>
 ## [v3.30.0] - 2026-06-24
+## Bug Fixes
+
+* **batch:** add optional logger injection for BatchProcessors ([#7553](https://github.com/aws-powertools/powertools-lambda-python/issues/7553)) ([#8272](https://github.com/aws-powertools/powertools-lambda-python/issues/8272))
+* **docs:** update broken AWS Lambda Metadata Endpoint link ([#8209](https://github.com/aws-powertools/powertools-lambda-python/issues/8209))
+* **event-handler:** handle CORS preflight OPTIONS in HttpResolverLocal ([#8268](https://github.com/aws-powertools/powertools-lambda-python/issues/8268))
+* **event-handler:** fix ruff lint violations in event_handler module ([#8208](https://github.com/aws-powertools/powertools-lambda-python/issues/8208))
+
+## Code Refactoring
+
+* **event_handler:** promote HttpResolver to stable ([#8289](https://github.com/aws-powertools/powertools-lambda-python/issues/8289))
+
+## Documentation
+
+* **event-handler:** add import path gotcha for dependency_overrides testing ([#8269](https://github.com/aws-powertools/powertools-lambda-python/issues/8269))
+* **metadata:** fix broken Lambda Metadata Endpoint link ([#8212](https://github.com/aws-powertools/powertools-lambda-python/issues/8212))
+
+## Features
+
+* **event_handler:** allow custom serializer on BedrockAgentResolver ([#8271](https://github.com/aws-powertools/powertools-lambda-python/issues/8271))
+
 ## Maintenance
 
 * version bump
+* fix minor typos and grammar in docs and comments ([#8245](https://github.com/aws-powertools/powertools-lambda-python/issues/8245))
+* **deps:** bump the github-actions group across 1 directory with 5 updates ([#8256](https://github.com/aws-powertools/powertools-lambda-python/issues/8256))
+* **deps:** bump ujson from 5.12.1 to 5.13.0 ([#8298](https://github.com/aws-powertools/powertools-lambda-python/issues/8298))
+* **deps:** bump pydantic-settings from 2.14.1 to 2.14.2 ([#8299](https://github.com/aws-powertools/powertools-lambda-python/issues/8299))
+* **deps:** bump cryptography from 46.0.7 to 48.0.1 ([#8286](https://github.com/aws-powertools/powertools-lambda-python/issues/8286))
+* **deps:** consolidate Dependabot dependency updates ([#8285](https://github.com/aws-powertools/powertools-lambda-python/issues/8285))
+* **deps:** batch dependency updates ([#8207](https://github.com/aws-powertools/powertools-lambda-python/issues/8207))
+* **deps:** bump gitpython from 3.1.47 to 3.1.50 in /docs ([#8213](https://github.com/aws-powertools/powertools-lambda-python/issues/8213))
+* **deps:** bump urllib3 from 2.6.3 to 2.7.0 in /docs ([#8216](https://github.com/aws-powertools/powertools-lambda-python/issues/8216))
+* **deps:** consolidate dependabot updates (13052026) ([#8228](https://github.com/aws-powertools/powertools-lambda-python/issues/8228))
+* **deps:** bump the github-actions group with 3 updates ([#8221](https://github.com/aws-powertools/powertools-lambda-python/issues/8221))
+* **deps:** bump codecov/codecov-action from 6.0.1 to 7.0.0 in the github-actions group ([#8260](https://github.com/aws-powertools/powertools-lambda-python/issues/8260))
+* **deps:** consolidate all open Dependabot updates ([#8241](https://github.com/aws-powertools/powertools-lambda-python/issues/8241))
+* **deps:** bump the github-actions group with 2 updates ([#8292](https://github.com/aws-powertools/powertools-lambda-python/issues/8292))
+* **deps:** bump pydantic from 2.12.5 to 2.13.4 ([#8252](https://github.com/aws-powertools/powertools-lambda-python/issues/8252))
+* **deps:** update requests requirement from >=2.33.1 to >=2.34.2 in /examples/event_handler_graphql/src ([#8254](https://github.com/aws-powertools/powertools-lambda-python/issues/8254))
+* **deps-dev:** bump aws-cdk from 2.1127.0 to 2.1128.1 in the aws-cdk group ([#8290](https://github.com/aws-powertools/powertools-lambda-python/issues/8290))
+* **deps-dev:** bump the dev-dependencies group across 1 directory with 2 updates ([#8242](https://github.com/aws-powertools/powertools-lambda-python/issues/8242))
+* **deps-dev:** bump aws-cdk from 2.1122.0 to 2.1124.1 in the aws-cdk group across 1 directory ([#8234](https://github.com/aws-powertools/powertools-lambda-python/issues/8234))
+* **deps-dev:** bump boto3-stubs from 1.43.3 to 1.43.24 ([#8265](https://github.com/aws-powertools/powertools-lambda-python/issues/8265))
+* **deps-dev:** bump aws-cdk from 2.1124.1 to 2.1126.0 in the aws-cdk group across 1 directory ([#8255](https://github.com/aws-powertools/powertools-lambda-python/issues/8255))
+* **deps-dev:** bump the dev-dependencies group with 3 updates ([#8261](https://github.com/aws-powertools/powertools-lambda-python/issues/8261))
+* **deps-dev:** bump urllib3 from 2.6.3 to 2.7.0 in /layer_v3 ([#8218](https://github.com/aws-powertools/powertools-lambda-python/issues/8218))
+* **deps-dev:** bump urllib3 from 2.6.3 to 2.7.0 ([#8217](https://github.com/aws-powertools/powertools-lambda-python/issues/8217))
+* **deps-dev:** bump aws-cdk-aws-lambda-python-alpha from 2.251.0a0 to 2.259.0a0 ([#8262](https://github.com/aws-powertools/powertools-lambda-python/issues/8262))
+* **deps-dev:** bump sentry-sdk from 2.57.0 to 2.62.0 ([#8263](https://github.com/aws-powertools/powertools-lambda-python/issues/8263))
+* **deps-dev:** bump gitpython from 3.1.47 to 3.1.50 ([#8214](https://github.com/aws-powertools/powertools-lambda-python/issues/8214))
+* **deps-dev:** bump the dev-dependencies group across 1 directory with 2 updates ([#8276](https://github.com/aws-powertools/powertools-lambda-python/issues/8276))
 * **deps-dev:** bump aws-cdk-lib from 2.259.0 to 2.260.0 ([#8294](https://github.com/aws-powertools/powertools-lambda-python/issues/8294))
+* **deps-dev:** bump the dev-dependencies group across 1 directory with 3 updates ([#8293](https://github.com/aws-powertools/powertools-lambda-python/issues/8293))
 
 
 <a name="v3.29.0"></a>
@@ -7699,7 +7759,8 @@
 * Merge pull request [#5](https://github.com/aws-powertools/powertools-lambda-python/issues/5) from jfuss/feat/python38
 
 
-[Unreleased]: https://github.com/aws-powertools/powertools-lambda-python/compare/v3.30.0...HEAD
+[Unreleased]: https://github.com/aws-powertools/powertools-lambda-python/compare/v3.31.0...HEAD
+[v3.31.0]: https://github.com/aws-powertools/powertools-lambda-python/compare/v3.30.0...v3.31.0
 [v3.30.0]: https://github.com/aws-powertools/powertools-lambda-python/compare/v3.29.0...v3.30.0
 [v3.29.0]: https://github.com/aws-powertools/powertools-lambda-python/compare/v3.28.0...v3.29.0
 [v3.28.0]: https://github.com/aws-powertools/powertools-lambda-python/compare/v3.27.0...v3.28.0

aws_lambda_powertools/event_handler/openapi/params.py

@@ -953,54 +953,52 @@ def get_field_info_response_type(annotation, value) -> tuple[FieldInfo | None, A
     return get_field_info_and_type_annotation(inner_type, value, False, True)
 
 
-def _has_discriminator(field_info: FieldInfo) -> bool:
-    """Check if a FieldInfo has a discriminator."""
-    return hasattr(field_info, "discriminator") and field_info.discriminator is not None
-
-
-def _handle_discriminator_with_param(
+def _split_location_marker_and_field(
     annotations: list[FieldInfo],
-    annotation: Any,
-) -> tuple[FieldInfo | None, Any, bool]:
+) -> tuple[FieldInfo, FieldInfo]:
     """
-    Handle the special case of Field(discriminator) + Body() combination.
+    Split a pair of FieldInfo into the Powertools location marker and the plain Pydantic Field.
+
+    A parameter like ``Annotated[str, Field(gt=0), Query()]`` flattens to two FieldInfo: the
+    location marker (``Path``/``Query``/``Header``/``Body``, a ``Param`` or ``Body`` subclass) and
+    a plain Pydantic ``Field`` carrying constraints. We keep them apart so the location marker
+    drives where the value comes from, while the ``Field``'s constraints/metadata still apply.
 
     Returns:
-        tuple of (powertools_annotation, type_annotation, has_discriminator_with_body)
+        tuple of (location_marker, plain_field)
     """
-    field_obj = None
-    body_obj = None
+    location_marker: FieldInfo | None = None
+    plain_field: FieldInfo | None = None
 
     for ann in annotations:
-        if isinstance(ann, Body):
-            body_obj = ann
-        elif _has_discriminator(ann):
-            field_obj = ann
+        if isinstance(ann, (Param, Body)):
+            location_marker = ann
+        else:
+            plain_field = ann
 
-    if field_obj and body_obj:
-        # Use Body as the primary annotation, preserve full annotation for validation
-        return body_obj, annotation, True
+    if location_marker is None or plain_field is None:
+        raise AssertionError("Only one FieldInfo can be used per parameter")
 
-    raise AssertionError("Only one FieldInfo can be used per parameter")
+    return location_marker, plain_field
 
 
 def _create_field_info(
     powertools_annotation: FieldInfo,
     type_annotation: Any,
-    has_discriminator_with_body: bool,
+    preserve_full_annotation: bool,
 ) -> FieldInfo:
     """Create or copy FieldInfo based on the annotation type."""
-    field_info: FieldInfo
-    if has_discriminator_with_body:
-        # For discriminator + Body case, create a new Body instance directly
-        field_info = Body()
+    # Copy field_info because we mutate field_info.default later.
+    field_info = copy_field_info(
+        field_info=powertools_annotation,
+        annotation=type_annotation,
+    )
+    if preserve_full_annotation:
+        # The location marker is paired with a plain Field (constraints or discriminator).
+        # copy_field_info strips the Pydantic Field out of the metadata, so re-attach the full
+        # Annotated type here, that's what makes the Field's metadata flow into the TypeAdapter
+        # that ModelField builds for validation.
         field_info.annotation = type_annotation
-    else:
-        # Copy field_info because we mutate field_info.default later
-        field_info = copy_field_info(
-            field_info=powertools_annotation,
-            annotation=type_annotation,
-        )
     return field_info
 
 
@@ -1043,32 +1041,36 @@ def get_field_info_annotated_type(annotation, value, is_path_param: bool) -> tup
 
     # Determine which annotation to use
     powertools_annotation: FieldInfo | None = None
-    has_discriminator_with_param = False
+    # When a plain Pydantic Field is paired with a location marker (e.g. Field(gt=0) + Query),
+    # we keep the full Annotated type as the annotation so the Field's metadata still validates.
+    preserve_full_annotation = False
 
     if len(powertools_annotations) == 2:
-        powertools_annotation, type_annotation, has_discriminator_with_param = _handle_discriminator_with_param(
-            powertools_annotations,
-            annotation,
-        )
+        # A location marker (Path/Query/Header/Body) plus a plain Pydantic Field carrying
+        # constraints, a discriminator, or any other Field setting. The marker says where the
+        # value comes from; the Field says how to validate it.
+        powertools_annotation, _ = _split_location_marker_and_field(powertools_annotations)
+        preserve_full_annotation = True
     elif len(powertools_annotations) > 1:
         raise AssertionError("Only one FieldInfo can be used per parameter")
     else:
         powertools_annotation = next(iter(powertools_annotations), None)
 
     # Reconstruct type_annotation with non-FieldInfo metadata if present
     # This ensures constraints like Interval are preserved
-    if other_metadata and not has_discriminator_with_param:
+    if other_metadata and not preserve_full_annotation:
         type_annotation = Annotated[(type_annotation, *other_metadata)]
 
     # Process the annotation if it exists
     field_info: FieldInfo | None = None
-    if isinstance(powertools_annotation, FieldInfo):  # pragma: no cover
-        field_info = _create_field_info(powertools_annotation, type_annotation, has_discriminator_with_param)
+    if isinstance(powertools_annotation, FieldInfo):
+        # When pairing a location marker with a plain Field, hand the full Annotated[...] to the
+        # field so the Field's constraints/discriminator flow into the validating TypeAdapter.
+        field_annotation = annotation if preserve_full_annotation else type_annotation
+        field_info = _create_field_info(powertools_annotation, field_annotation, preserve_full_annotation)
         _set_field_default(field_info, value, is_path_param)
-
-        # Preserve full annotated type for discriminated unions
-        if _has_discriminator(powertools_annotation):  # pragma: no cover
-            type_annotation = annotation  # pragma: no cover
+        if preserve_full_annotation:
+            type_annotation = annotation
 
     return field_info, type_annotation
 

aws_lambda_powertools/shared/version.py

@@ -1,3 +1,3 @@
 """Exposes version constant to avoid circular dependencies."""
 
-VERSION = "3.30.0"
+VERSION = "3.31.0"