aws-lambda-powertools 3.28.0__tar.gz → 3.29.0__tar.gz

{aws_lambda_powertools-3.28.0 → aws_lambda_powertools-3.29.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aws_lambda_powertools
-Version: 3.28.0
+Version: 3.29.0
 Summary: Powertools for AWS Lambda (Python) is a developer toolkit to implement Serverless best practices and increase developer velocity.
 License: MIT
 Keywords: aws_lambda_powertools,aws,tracing,logging,lambda,powertools,feature_flags,idempotency,middleware
@@ -29,7 +29,7 @@ Provides-Extra: tracer
 Provides-Extra: validation
 Provides-Extra: valkey
 Requires-Dist: avro (>=1.12.0,<2.0.0) ; extra == "kafka-consumer-avro"
-Requires-Dist: aws-encryption-sdk (>=3.1.1,<5.0.0) ; extra == "all" or extra == "datamasking"
+Requires-Dist: aws-encryption-sdk (>=3.3.1,!=4.0.0,!=4.0.1,!=4.0.2,!=4.0.3,!=4.0.4,<5.0.0) ; extra == "all" or extra == "datamasking"
 Requires-Dist: aws-xray-sdk (>=2.8.0,<3.0.0) ; extra == "tracer" or extra == "all"
 Requires-Dist: boto3 (>=1.34.32,<2.0.0) ; extra == "aws-sdk"
 Requires-Dist: datadog-lambda (>=8.114.0,<9.0.0) ; extra == "datadog"

{aws_lambda_powertools-3.28.0 → aws_lambda_powertools-3.29.0}/aws_lambda_powertools/event_handler/api_gateway.py

@@ -613,6 +613,63 @@ class Route:
 
         self._middleware_stack_built = True
 
+    async def call_async(
+        self,
+        router_middlewares: list[Callable],
+        app: ApiGatewayResolver,
+        route_arguments: dict[str, str],
+    ) -> dict | tuple | Response:
+        from aws_lambda_powertools.event_handler.middlewares.async_utils import (
+            AsyncMiddlewareFrame,
+            _registered_api_adapter_async,
+        )
+
+        all_middlewares: list[Callable[..., Any]] = []
+
+        route_validation_enabled = (
+            self.enable_validation if self.enable_validation is not None else app._enable_validation
+        )
+
+        if route_validation_enabled and not hasattr(app, "_request_validation_middleware"):
+            from aws_lambda_powertools.event_handler.middlewares.openapi_validation import (
+                OpenAPIRequestValidationMiddleware,
+                OpenAPIResponseValidationMiddleware,
+            )
+
+            app._request_validation_middleware = OpenAPIRequestValidationMiddleware()
+            app._response_validation_middleware = OpenAPIResponseValidationMiddleware(
+                validation_serializer=app._serializer,
+                has_response_validation_error=app._has_response_validation_error,
+            )
+
+        if route_validation_enabled and hasattr(app, "_request_validation_middleware"):
+            all_middlewares.append(app._request_validation_middleware)
+
+        all_middlewares.extend(router_middlewares + self.middlewares)
+
+        if route_validation_enabled and hasattr(app, "_response_validation_middleware"):
+            all_middlewares.append(app._response_validation_middleware)
+
+        all_middlewares.append(_registered_api_adapter_async)
+
+        logger.debug(f"Building async middleware stack: {all_middlewares}")
+
+        if app._debug:
+            print(f"\nProcessing Route (async):::{self.func.__name__} ({app.context['_path']})")
+            print("\nAsync Middleware Stack:")
+            print("=================")
+            print("\n".join(getattr(item, "__name__", "Unknown") for item in all_middlewares))
+            print("=================")
+
+        app.append_context(_route_args=route_arguments)
+
+        # Build async chain from inside-out (not cached, avoids state conflicts with sync cache)
+        next_handler: Callable = self.func
+        for handler in reversed(all_middlewares):
+            next_handler = AsyncMiddlewareFrame(current_middleware=handler, next_middleware=next_handler)
+
+        return await next_handler(app)
+
     @property
     def dependant(self) -> Dependant:
         if self._dependant is None:
@@ -2509,6 +2566,154 @@ class ApiGatewayResolver(BaseRouter):
 
         return response
 
+    async def resolve_async(self, event: Mapping[str, Any], context: LambdaContext) -> dict[str, Any]:
+        """Async version of resolve() for native async handler support.
+
+        Use this method when your route handlers use async/await. The resolution
+        pipeline supports both sync and async handlers transparently.
+
+        Parameters
+        ----------
+        event: dict[str, Any]
+            Event
+        context: LambdaContext
+            Lambda context
+        Returns
+        -------
+        dict
+            Returns the dict response
+
+        Example
+        -------
+
+        ```python
+        import asyncio
+        from aws_lambda_powertools.event_handler import APIGatewayHttpResolver
+
+        app = APIGatewayHttpResolver()
+
+        @app.get("/async")
+        async def async_handler():
+            return {"message": "async works"}
+
+        def lambda_handler(event, context):
+            return asyncio.run(app.resolve_async(event, context))
+        ```
+        """
+        if isinstance(event, BaseProxyEvent):
+            warnings.warn(
+                "You don't need to serialize event to Event Source Data Class when using Event Handler; "
+                "see issue #1152",
+                stacklevel=2,
+            )
+            event = event.raw_event
+
+        if self._debug:
+            print(self._serializer(cast(dict, event)))
+
+        BaseRouter.current_event = self._to_proxy_event(cast(dict, event))
+        BaseRouter.lambda_context = context
+
+        response = (await self._resolve_async()).build(self.current_event, self._cors)
+
+        if self._debug:
+            print("\nProcessed Middlewares:")
+            print("======================")
+            print("\n".join(self.processed_stack_frames))
+            print("======================")
+
+        self.clear_context()
+
+        return response
+
+    async def _resolve_async(self) -> ResponseBuilder:
+        method = self.current_event.http_method.upper()
+        path = self._remove_prefix(self.current_event.path)
+
+        registered_routes = self._static_routes + self._dynamic_routes
+
+        for route in registered_routes:
+            if method != route.method:
+                continue
+            match_results: Match | None = route.rule.match(path)
+            if match_results:
+                logger.debug("Found a registered route. Calling async function")
+                self.append_context(_route=route, _path=path)
+
+                route_keys = self._convert_matches_into_route_keys(match_results)
+                return await self._call_route_async(route, route_keys)
+
+        return await self._handle_not_found_async(method=method, path=path)
+
+    async def _call_route_async(self, route: Route, route_arguments: dict[str, str]) -> ResponseBuilder:
+        try:
+            self._reset_processed_stack()
+
+            response = await route.call_async(
+                router_middlewares=self._router_middlewares,
+                app=self,
+                route_arguments=route_arguments,
+            )
+
+            return self._response_builder_class(
+                response=self._to_response(response),  # type: ignore[arg-type]
+                serializer=self._serializer,
+                route=route,
+            )
+        except Exception as exc:
+            response_builder = self._call_exception_handler(exc, route)
+            if response_builder:
+                return response_builder
+
+            logger.exception(exc)
+            if self._debug:
+                return self._response_builder_class(
+                    response=Response(
+                        status_code=500,
+                        content_type=content_types.TEXT_PLAIN,
+                        body="".join(traceback.format_exc()),
+                    ),
+                    serializer=self._serializer,
+                    route=route,
+                )
+
+            raise
+
+    async def _handle_not_found_async(self, method: str, path: str) -> ResponseBuilder:
+        logger.debug(f"No match found for path {path} and method {method}")
+
+        def not_found_handler():
+            _headers: dict[str, Any] = {}
+
+            if self._cors and method == "OPTIONS":
+                logger.debug("Pre-flight request detected. Returning CORS with empty response")
+                _headers["Access-Control-Allow-Methods"] = CORSConfig.build_allow_methods(self._cors_methods)
+                return Response(status_code=204, content_type=None, headers=_headers, body="")
+
+            custom_not_found_handler = self.exception_handler_manager.lookup_exception_handler(NotFoundError)
+            if custom_not_found_handler:
+                return custom_not_found_handler(NotFoundError())
+
+            return Response(
+                status_code=HTTPStatus.NOT_FOUND.value,
+                content_type=content_types.APPLICATION_JSON,
+                headers=_headers,
+                body={"statusCode": HTTPStatus.NOT_FOUND.value, "message": "Not found"},
+            )
+
+        route = Route(
+            rule=self._compile_regex(r".*"),
+            method=method,
+            path=path,
+            func=not_found_handler,
+            cors=self._cors_enabled,
+            compress=False,
+        )
+
+        self.append_context(_route=route, _path=path)
+
+        return await self._call_route_async(route=route, route_arguments={})
+
     def __call__(self, event, context) -> Any:
         return self.resolve(event, context)
 
@@ -3138,22 +3343,13 @@ class ALBResolver(ApiGatewayResolver):
         # ALB doesn't have a stage variable, so we just return an empty string
         return ""
 
-    # BedrockResponse is not used here but adding the same signature to keep strong typing
     @override
     def _to_response(self, result: dict | tuple | Response | BedrockResponse) -> Response | BedrockResponse:
         """Convert the route's result to a Response
 
         ALB requires a non-null body otherwise it converts as HTTP 5xx
-
-         3 main result types are supported:
-
-        - Dict[str, Any]: Rest api response with just the Dict to json stringify and content-type is set to
-          application/json
-        - Tuple[dict, int]: Same dict handling as above but with the option of including a status code
-        - Response: returned as is, and allows for more flexibility
         """
-
-        # NOTE: Minor override for early return on Response with null body for ALB
+        # ALB doesn't support null body - convert before building the final response
         if isinstance(result, Response) and result.body is None:
             logger.debug("ALB doesn't allow None responses; converting to empty string")
             result.body = ""

{aws_lambda_powertools-3.28.0 → aws_lambda_powertools-3.29.0}/aws_lambda_powertools/event_handler/http_resolver.py

@@ -1,9 +1,7 @@
 from __future__ import annotations
 
-import asyncio
 import base64
 import inspect
-import threading
 import warnings
 from typing import TYPE_CHECKING, Any, Callable
 from urllib.parse import parse_qs
@@ -15,6 +13,7 @@ from aws_lambda_powertools.event_handler.api_gateway import (
     Response,
     Route,
 )
+from aws_lambda_powertools.event_handler.middlewares.async_utils import wrap_middleware_async
 from aws_lambda_powertools.shared.headers_serializer import BaseHeadersSerializer
 from aws_lambda_powertools.utilities.data_classes.common import BaseProxyEvent
 
@@ -240,7 +239,7 @@ class HttpResolverLocal(ApiGatewayResolver):
         """Return the base path for HTTP resolver (no stage prefix)."""
         return ""
 
-    async def _resolve_async(self) -> dict:
+    async def _resolve_async(self) -> dict:  # type: ignore[override]
         """Async version of resolve that supports async handlers."""
         method = self.current_event.http_method.upper()
         path = self._remove_prefix(self.current_event.path)
@@ -259,7 +258,7 @@ class HttpResolverLocal(ApiGatewayResolver):
         # Handle not found
         return await self._handle_not_found_async()
 
-    async def _call_route_async(self, route: Route, route_arguments: dict[str, str]) -> dict:
+    async def _call_route_async(self, route: Route, route_arguments: dict[str, str]) -> dict:  # type: ignore[override]
         """Call route handler, supporting both sync and async handlers."""
         from aws_lambda_powertools.event_handler.api_gateway import ResponseBuilder
 
@@ -320,74 +319,11 @@ class HttpResolverLocal(ApiGatewayResolver):
         next_handler = final_handler
 
         for middleware in reversed(all_middlewares):
-            next_handler = self._wrap_middleware_async(middleware, next_handler)
+            next_handler = wrap_middleware_async(middleware, next_handler)
 
         return await next_handler(self)
 
-    def _wrap_middleware_async(self, middleware: Callable, next_handler: Callable) -> Callable:
-        """Wrap a middleware to work in async context.
-
-        For sync middlewares, we split execution into pre/post phases around the
-        call to next(). The sync middleware runs its pre-processing (e.g. request
-        validation), then we intercept the next() call, await the async handler,
-        and resume the middleware with the real response so post-processing
-        (e.g. response validation) sees the actual data.
-        """
-
-        async def wrapped(app):
-            if inspect.iscoroutinefunction(middleware):
-                return await middleware(app, next_handler)
-
-            # We use an Event to coordinate: the sync middleware runs in a thread,
-            # calls sync_next which signals us to resolve the async handler,
-            # then waits for the real response.
-            middleware_called_next = asyncio.Event()
-            next_app_holder: list = []
-            real_response_holder: list = []
-            middleware_result_holder: list = []
-            middleware_error_holder: list = []
-
-            def sync_next(app):
-                next_app_holder.append(app)
-                middleware_called_next.set()
-                # Block this thread until the real response is available
-                event = threading.Event()
-                next_app_holder.append(event)
-                event.wait()
-                return real_response_holder[0]
-
-            def run_middleware():
-                try:
-                    result = middleware(app, sync_next)
-                    middleware_result_holder.append(result)
-                except Exception as e:
-                    middleware_error_holder.append(e)
-
-            thread = threading.Thread(target=run_middleware, daemon=True)
-            thread.start()
-
-            # Wait for the middleware to call next()
-            await middleware_called_next.wait()
-
-            # Now resolve the async next_handler
-            real_response = await next_handler(next_app_holder[0])
-            real_response_holder.append(real_response)
-
-            # Signal the thread that the response is ready
-            threading_event = next_app_holder[1]
-            threading_event.set()
-
-            # Wait for the middleware thread to finish
-            thread.join()
-
-            if middleware_error_holder:
-                raise middleware_error_holder[0]
-
-            return middleware_result_holder[0]
-
-        return wrapped
-
-    async def _handle_not_found_async(self) -> dict:
+    async def _handle_not_found_async(self, method: str = "", path: str = "") -> dict:  # type: ignore[override]
         """Handle 404 responses, using custom not_found handler if registered."""
         from http import HTTPStatus
 

aws_lambda_powertools-3.29.0/aws_lambda_powertools/event_handler/middlewares/async_utils.py

@@ -0,0 +1,224 @@
+"""Async middleware utilities for bridging sync and async middleware execution."""
+
+from __future__ import annotations
+
+import asyncio
+import inspect
+import logging
+import threading
+from typing import TYPE_CHECKING, Any
+
+logger = logging.getLogger(__name__)
+
+if TYPE_CHECKING:
+    from collections.abc import Callable
+
+    from aws_lambda_powertools.event_handler.api_gateway import ApiGatewayResolver, BedrockResponse, Response
+
+
+def wrap_middleware_async(middleware: Callable, next_handler: Callable) -> Callable:
+    """Wrap a middleware to work in an async context.
+
+    For async middlewares, delegates directly with ``await``.
+
+    For sync middlewares, runs the middleware in a background thread and uses
+    ``asyncio.Event`` / ``threading.Event`` to coordinate the ``next()`` call
+    so the async handler can be awaited on the main event-loop while the sync
+    middleware blocks its own thread waiting for the result.
+
+    Parameters
+    ----------
+    middleware : Callable
+        A sync or async middleware ``(app, next_middleware) -> Response``.
+    next_handler : Callable
+        The next (async) handler in the chain.
+
+    Returns
+    -------
+    Callable
+        An async callable ``(app) -> Response`` that executes *middleware*
+        followed by *next_handler*.
+    """
+
+    async def wrapped(app: ApiGatewayResolver) -> Response:
+        if inspect.iscoroutinefunction(middleware):
+            return await middleware(app, next_handler)
+
+        return await _run_sync_middleware_in_thread(middleware, next_handler, app)
+
+    return wrapped
+
+
+async def _run_sync_middleware_in_thread(
+    middleware: Callable,
+    next_handler: Callable,
+    app: Any,
+) -> Any:
+    """Execute a **sync** middleware inside a daemon thread.
+
+    The sync middleware calls ``sync_next(app)`` which:
+
+    1. Signals the async side that the middleware is ready for the next handler.
+    2. Blocks the thread until the async handler has produced a response.
+    3. Returns the response so the middleware can do post-processing.
+
+    Meanwhile the async side awaits *next_handler*, feeds the response back,
+    and waits for the thread to finish.
+    """
+    middleware_called_next = asyncio.Event()
+    next_app_holder: list = []
+    real_response_holder: list = []
+    middleware_result_holder: list = []
+    middleware_error_holder: list = []
+
+    def sync_next(app: Any) -> Any:
+        next_app_holder.append(app)
+        middleware_called_next.set()
+        # Block this thread until the async handler resolves
+        event = threading.Event()
+        next_app_holder.append(event)
+        event.wait()
+        return real_response_holder[0]
+
+    def run_middleware() -> None:
+        try:
+            result = middleware(app, sync_next)
+            middleware_result_holder.append(result)
+        except Exception as e:
+            middleware_error_holder.append(e)
+        finally:
+            middleware_called_next.set()
+
+    thread = threading.Thread(target=run_middleware, daemon=True)
+    thread.start()
+
+    # Wait for the middleware to call next() or raise
+    await middleware_called_next.wait()
+
+    # If middleware raised before calling next, propagate immediately
+    if not next_app_holder:
+        thread.join()
+        raise middleware_error_holder[0]
+
+    # Resolve the async next_handler on the event-loop
+    real_response = await next_handler(next_app_holder[0])
+    real_response_holder.append(real_response)
+
+    # Unblock the middleware thread
+    threading_event = next_app_holder[1]
+    threading_event.set()
+
+    # Wait for the middleware thread to complete post-processing
+    thread.join()
+
+    if middleware_error_holder:
+        raise middleware_error_holder[0]
+
+    return middleware_result_holder[0]
+
+
+class AsyncMiddlewareFrame:
+    """Async version of MiddlewareFrame for the async middleware chain.
+
+    Each instance wraps a middleware (sync or async) and the next handler in the stack.
+    When called, it auto-detects whether the current middleware is sync or async:
+
+    - **Async middleware**: awaited directly with ``(app, next_middleware)``
+    - **Sync middleware**: executed in a background thread so the event loop is never blocked
+
+    Parameters
+    ----------
+    current_middleware : Callable
+        The current middleware function to be called as a request is processed.
+    next_middleware : Callable
+        The next middleware in the middleware stack.
+    """
+
+    def __init__(
+        self,
+        current_middleware: Callable[..., Any],
+        next_middleware: Callable[..., Any],
+    ) -> None:
+        self.current_middleware: Callable[..., Any] = current_middleware
+        self.next_middleware: Callable[..., Any] = next_middleware
+        self._next_middleware_name = next_middleware.__name__
+
+    @property
+    def __name__(self) -> str:  # noqa: A003
+        return self.current_middleware.__name__
+
+    def __str__(self) -> str:
+        middleware_name = self.__name__
+        return f"[{middleware_name}] next call chain is {middleware_name} -> {self._next_middleware_name}"
+
+    async def __call__(self, app: ApiGatewayResolver) -> dict | tuple | Response:
+        logger.debug("AsyncMiddlewareFrame: %s", self)
+        app._push_processed_stack_frame(str(self))
+
+        if inspect.iscoroutinefunction(self.current_middleware):
+            return await self.current_middleware(app, self.next_middleware)
+
+        loop = asyncio.get_running_loop()
+
+        def sync_next(app: ApiGatewayResolver) -> Any:
+            future = asyncio.run_coroutine_threadsafe(self.next_middleware(app), loop)
+            return future.result()
+
+        return await asyncio.to_thread(self.current_middleware, app, sync_next)
+
+
+async def _registered_api_adapter_async(
+    app: ApiGatewayResolver,
+    next_middleware: Callable[..., Any],
+) -> dict | tuple | Response | BedrockResponse:
+    """
+    Async version of _registered_api_adapter.
+
+    Detects if the route handler is a coroutine and awaits it.
+    _to_response() stays sync (CPU-bound — no async benefit).
+
+    IMPORTANT: This is an internal building block only.
+    Nothing calls it in the resolve chain yet. It will be used
+    by resolve_async() (see issue #8137).
+
+    Parameters
+    ----------
+    app: ApiGatewayResolver
+        The API Gateway resolver
+    next_middleware: Callable[..., Any]
+        The function to handle the API
+
+    Returns
+    -------
+    Response
+        The API Response Object
+    """
+    route_args: dict = app.context.get("_route_args", {})
+    logger.debug(f"Calling API Route Handler: {route_args}")
+
+    route = app.context.get("_route")
+    if route is not None:
+        if not route.request_param_name_checked:
+            from aws_lambda_powertools.event_handler.api_gateway import _find_request_param_name
+
+            route.request_param_name = _find_request_param_name(next_middleware)
+            route.request_param_name_checked = True
+        if route.request_param_name:
+            route_args = {**route_args, route.request_param_name: app.request}
+
+        if route.has_dependencies:
+            from aws_lambda_powertools.event_handler.depends import build_dependency_tree, solve_dependencies
+
+            dep_values = solve_dependencies(
+                dependant=build_dependency_tree(route.func),
+                request=app.request,
+                dependency_overrides=app.dependency_overrides or None,
+            )
+            route_args.update(dep_values)
+
+    # Call handler — detect if result is a coroutine and await it
+    result = next_middleware(**route_args)
+    if inspect.iscoroutine(result):
+        result = await result
+
+    return app._to_response(result)

{aws_lambda_powertools-3.28.0 → aws_lambda_powertools-3.29.0}/aws_lambda_powertools/event_handler/middlewares/openapi_validation.py

@@ -296,9 +296,13 @@ class OpenAPIResponseValidationMiddleware(BaseMiddlewareHandler):
                 # JSON serialize the body without validation
                 response.body = jsonable_encoder(response.body, custom_serializer=self._validation_serializer)
         else:
+            # ALB resolver converts None body to "" to prevent ALB 5xx errors,
+            # but the validation should still see it as None.
+            response_content = None if response.body == "" and field.type_ in (None, type(None)) else response.body
+
             response.body = self._serialize_response_with_validation(
                 field=field,
-                response_content=response.body,
+                response_content=response_content,
                 has_route_custom_response_validation=route.custom_response_validation_http_code is not None,
             )
 

{aws_lambda_powertools-3.28.0 → aws_lambda_powertools-3.29.0}/aws_lambda_powertools/event_handler/openapi/params.py

@@ -901,7 +901,7 @@ def analyze_param(
     if is_response_param:
         field_info.default = Required
 
-    field = _create_model_field(field_info, type_annotation, param_name, is_path_param)
+    field = _create_model_field(field_info, type_annotation, param_name, is_path_param, is_response_param)
     return field
 
 
@@ -1138,6 +1138,7 @@ def _create_model_field(
     type_annotation: Any,
     param_name: str,
     is_path_param: bool,
+    is_response_param: bool = False,
 ) -> ModelField | None:
     """
     Create a new ModelField from a FieldInfo and type annotation.
@@ -1164,4 +1165,5 @@ def _create_model_field(
         alias=field_info.alias,
         required=field_info.default in (Required, Undefined),
         field_info=field_info,
+        mode="serialization" if is_response_param else "validation",
     )

{aws_lambda_powertools-3.28.0 → aws_lambda_powertools-3.29.0}/aws_lambda_powertools/shared/version.py

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

{aws_lambda_powertools-3.28.0 → aws_lambda_powertools-3.29.0}/aws_lambda_powertools/utilities/idempotency/base.py

@@ -167,7 +167,7 @@ class IdempotencyHandler:
             # We give preference to ReturnValuesOnConditionCheckFailure because it is a faster and more cost-effective
             # way of retrieving the existing record after a failed conditional write operation.
             record = exc.old_data_record or self._get_idempotency_record()
-            if is_replay and record is not None and record.status == "INPROGRESS":
+            if is_replay and record is not None and record.status == STATUS_CONSTANTS["INPROGRESS"]:
                 return self._get_function_response()
             # If a record is found, handle it for status
             if record:
@@ -296,7 +296,7 @@ class IdempotencyHandler:
 
         else:
             try:
-                serialized_response: dict = self.output_serializer.to_dict(response) if response else None
+                serialized_response: dict = self.output_serializer.to_dict(response) if response is not None else None
                 self.persistence_store.save_success(data=self.data, result=serialized_response)
             except Exception as save_exception:
                 raise IdempotencyPersistenceLayerError(

{aws_lambda_powertools-3.28.0 → aws_lambda_powertools-3.29.0}/aws_lambda_powertools/utilities/idempotency/persistence/redis.py

@@ -332,8 +332,8 @@ class RedisCachePersistenceLayer(BasePersistenceLayer):
             idempotency_key=idempotency_key,
             status=item[self.status_attr],
             in_progress_expiry_timestamp=in_progress_expiry_timestamp,
-            response_data=str(item.get(self.data_attr)),
-            payload_hash=str(item.get(self.validation_key_attr)),
+            response_data=item.get(self.data_attr, ""),
+            payload_hash=item.get(self.validation_key_attr, ""),
             expiry_timestamp=item.get("expiration"),
         )