aws-lambda-powertools 3.8.1a6__py3-none-any.whl → 3.8.1a8__py3-none-any.whl

aws_lambda_powertools/metrics/provider/datadog/datadog.py

@@ -14,7 +14,7 @@ from aws_lambda_powertools.metrics.functions import is_metrics_disabled
 from aws_lambda_powertools.metrics.provider import BaseProvider
 from aws_lambda_powertools.metrics.provider.datadog.warnings import DatadogDataValidationWarning
 from aws_lambda_powertools.shared import constants
-from aws_lambda_powertools.shared.functions import resolve_env_var_choice
+from aws_lambda_powertools.shared.functions import resolve_env_var_choice, strtobool
 
 if TYPE_CHECKING:
     from aws_lambda_powertools.shared.types import AnyCallableT
@@ -66,6 +66,9 @@ class DatadogProvider(BaseProvider):
         )
         self.default_tags = default_tags or {}
         self.flush_to_log = resolve_env_var_choice(choice=flush_to_log, env=os.getenv(constants.DATADOG_FLUSH_TO_LOG))
+        # When set as env var, the value is a string
+        if isinstance(self.flush_to_log, str):
+            self.flush_to_log = strtobool(self.flush_to_log)
 
     #  adding name,value,timestamp,tags
     def add_metric(

aws_lambda_powertools/shared/version.py

@@ -1,3 +1,3 @@
 """Exposes version constant to avoid circular dependencies."""
 
-VERSION = "3.8.1a6"
+VERSION = "3.8.1a8"

aws_lambda_powertools/utilities/data_classes/__init__.py

@@ -4,6 +4,7 @@ Event Source Data Classes utility provides classes self-describing Lambda event
 
 from .alb_event import ALBEvent
 from .api_gateway_proxy_event import APIGatewayProxyEvent, APIGatewayProxyEventV2
+from .api_gateway_websocket_event import APIGatewayWebSocketEvent
 from .appsync_resolver_event import AppSyncResolverEvent
 from .aws_config_rule_event import AWSConfigRuleEvent
 from .bedrock_agent_event import BedrockAgentEvent
@@ -51,6 +52,7 @@ from .vpc_lattice import VPCLatticeEvent, VPCLatticeEventV2
 __all__ = [
     "APIGatewayProxyEvent",
     "APIGatewayProxyEventV2",
+    "APIGatewayWebSocketEvent",
     "SecretsManagerEvent",
     "AppSyncResolverEvent",
     "ALBEvent",

aws_lambda_powertools/utilities/data_classes/alb_event.py

@@ -18,7 +18,7 @@ class ALBEventRequestContext(DictWrapper):
     @property
     def elb_target_group_arn(self) -> str:
         """Target group arn for your Lambda function"""
-        return self["requestContext"]["elb"]["targetGroupArn"]
+        return self["elb"]["targetGroupArn"]
 
 
 class ALBEvent(BaseProxyEvent):
@@ -32,11 +32,7 @@ class ALBEvent(BaseProxyEvent):
 
     @property
     def request_context(self) -> ALBEventRequestContext:
-        return ALBEventRequestContext(self._data)
-
-    @property
-    def multi_value_query_string_parameters(self) -> dict[str, list[str]]:
-        return self.get("multiValueQueryStringParameters") or {}
+        return ALBEventRequestContext(self["requestContext"])
 
     @property
     def resolved_query_string_parameters(self) -> dict[str, list[str]]:

aws_lambda_powertools/utilities/data_classes/api_gateway_authorizer_event.py

@@ -183,7 +183,7 @@ class APIGatewayAuthorizerRequestEvent(DictWrapper):
 
     @property
     def request_context(self) -> BaseRequestContext:
-        return BaseRequestContext(self._data)
+        return BaseRequestContext(self["requestContext"])
 
     @overload
     def get_header_value(
@@ -306,7 +306,7 @@ class APIGatewayAuthorizerEventV2(DictWrapper):
 
     @property
     def request_context(self) -> BaseRequestContextV2:
-        return BaseRequestContextV2(self._data)
+        return BaseRequestContextV2(self["requestContext"])
 
     @property
     def path_parameters(self) -> dict[str, str]:

aws_lambda_powertools/utilities/data_classes/api_gateway_proxy_event.py

@@ -61,42 +61,41 @@ class APIGatewayEventRequestContext(BaseRequestContext):
     @property
     def connected_at(self) -> int | None:
         """The Epoch-formatted connection time. (WebSocket API)"""
-        return self["requestContext"].get("connectedAt")
+        return self.get("connectedAt")
 
     @property
     def connection_id(self) -> str | None:
         """A unique ID for the connection that can be used to make a callback to the client. (WebSocket API)"""
-        return self["requestContext"].get("connectionId")
+        return self.get("connectionId")
 
     @property
     def event_type(self) -> str | None:
         """The event type: `CONNECT`, `MESSAGE`, or `DISCONNECT`. (WebSocket API)"""
-        return self["requestContext"].get("eventType")
+        return self.get("eventType")
 
     @property
     def message_direction(self) -> str | None:
         """Message direction (WebSocket API)"""
-        return self["requestContext"].get("messageDirection")
+        return self.get("messageDirection")
 
     @property
     def message_id(self) -> str | None:
         """A unique server-side ID for a message. Available only when the `eventType` is `MESSAGE`."""
-        return self["requestContext"].get("messageId")
+        return self.get("messageId")
 
     @property
     def operation_name(self) -> str | None:
         """The name of the operation being performed"""
-        return self["requestContext"].get("operationName")
+        return self.get("operationName")
 
     @property
     def route_key(self) -> str | None:
         """The selected route key."""
-        return self["requestContext"].get("routeKey")
+        return self.get("routeKey")
 
     @property
     def authorizer(self) -> APIGatewayEventAuthorizer:
-        authz_data = self._data.get("requestContext", {}).get("authorizer", {})
-        return APIGatewayEventAuthorizer(authz_data)
+        return APIGatewayEventAuthorizer(self.get("authorizer") or {})
 
 
 class APIGatewayProxyEvent(BaseProxyEvent):
@@ -119,16 +118,9 @@ class APIGatewayProxyEvent(BaseProxyEvent):
     def multi_value_headers(self) -> dict[str, list[str]]:
         return CaseInsensitiveDict(self.get("multiValueHeaders"))
 
-    @property
-    def multi_value_query_string_parameters(self) -> dict[str, list[str]]:
-        return self.get("multiValueQueryStringParameters") or {}  # key might exist but can be `null`
-
     @property
     def resolved_query_string_parameters(self) -> dict[str, list[str]]:
-        if self.multi_value_query_string_parameters:
-            return self.multi_value_query_string_parameters
-
-        return super().resolved_query_string_parameters
+        return self.multi_value_query_string_parameters or super().resolved_query_string_parameters
 
     @property
     def resolved_headers_field(self) -> dict[str, Any]:
@@ -136,7 +128,7 @@ class APIGatewayProxyEvent(BaseProxyEvent):
 
     @property
     def request_context(self) -> APIGatewayEventRequestContext:
-        return APIGatewayEventRequestContext(self._data)
+        return APIGatewayEventRequestContext(self["requestContext"])
 
     @property
     def path_parameters(self) -> dict[str, str]:
@@ -248,8 +240,7 @@ class RequestContextV2Authorizer(DictWrapper):
 class RequestContextV2(BaseRequestContextV2):
     @property
     def authorizer(self) -> RequestContextV2Authorizer:
-        ctx = self.get("requestContext") or {}  # key might exist but can be `null`
-        return RequestContextV2Authorizer(ctx.get("authorizer", {}))
+        return RequestContextV2Authorizer(self.get("authorizer") or {})
 
 
 class APIGatewayProxyEventV2(BaseProxyEvent):
@@ -291,7 +282,7 @@ class APIGatewayProxyEventV2(BaseProxyEvent):
 
     @property
     def request_context(self) -> RequestContextV2:
-        return RequestContextV2(self._data)
+        return RequestContextV2(self["requestContext"])
 
     @property
     def path_parameters(self) -> dict[str, str]:

aws_lambda_powertools/utilities/data_classes/api_gateway_websocket_event.py

@@ -0,0 +1,128 @@
+from __future__ import annotations
+
+import base64
+from functools import cached_property
+from typing import Any
+
+from aws_lambda_powertools.utilities.data_classes.common import (
+    CaseInsensitiveDict,
+    DictWrapper,
+)
+
+
+class APIGatewayWebSocketEventIdentity(DictWrapper):
+    @property
+    def source_ip(self) -> str:
+        return self["sourceIp"]
+
+    @property
+    def user_agent(self) -> str | None:
+        return self.get("userAgent")
+
+
+class APIGatewayWebSocketEventRequestContext(DictWrapper):
+    @property
+    def route_key(self) -> str:
+        return self["routeKey"]
+
+    @property
+    def disconnect_status_code(self) -> int | None:
+        return self.get("disconnectStatusCode")
+
+    @property
+    def message_id(self) -> str | None:
+        return self.get("messageId")
+
+    @property
+    def event_type(self) -> str:
+        return self["eventType"]
+
+    @property
+    def extended_request_id(self) -> str:
+        return self["extendedRequestId"]
+
+    @property
+    def request_time(self) -> str:
+        return self["requestTime"]
+
+    @property
+    def message_direction(self) -> str:
+        return self["messageDirection"]
+
+    @property
+    def disconnect_reason(self) -> str | None:
+        return self.get("disconnectReason")
+
+    @property
+    def stage(self) -> str:
+        return self["stage"]
+
+    @property
+    def connected_at(self) -> int:
+        return self["connectedAt"]
+
+    @property
+    def request_time_epoch(self) -> int:
+        return self["requestTimeEpoch"]
+
+    @property
+    def identity(self) -> APIGatewayWebSocketEventIdentity:
+        return APIGatewayWebSocketEventIdentity(self["identity"])
+
+    @property
+    def request_id(self) -> str:
+        return self["requestId"]
+
+    @property
+    def domain_name(self) -> str:
+        return self["domainName"]
+
+    @property
+    def connection_id(self) -> str:
+        return self["connectionId"]
+
+    @property
+    def api_id(self) -> str:
+        return self["apiId"]
+
+
+class APIGatewayWebSocketEvent(DictWrapper):
+    """AWS proxy integration event for WebSocket API
+
+    Documentation:
+    --------------
+    - https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-integration-requests.html
+    """
+
+    @property
+    def is_base64_encoded(self) -> bool:
+        return self["isBase64Encoded"]
+
+    @property
+    def body(self) -> str | None:
+        return self.get("body")
+
+    @cached_property
+    def decoded_body(self) -> str | None:
+        body = self.body
+        if self.is_base64_encoded and body:
+            return base64.b64decode(body.encode()).decode()
+        return body
+
+    @cached_property
+    def json_body(self) -> Any:
+        if self.decoded_body:
+            return self._json_deserializer(self.decoded_body)
+        return None
+
+    @property
+    def headers(self) -> dict[str, str]:
+        return CaseInsensitiveDict(self.get("headers"))
+
+    @property
+    def multi_value_headers(self) -> dict[str, list[str]]:
+        return CaseInsensitiveDict(self.get("multiValueHeaders"))
+
+    @property
+    def request_context(self) -> APIGatewayWebSocketEventRequestContext:
+        return APIGatewayWebSocketEventRequestContext(self["requestContext"])

aws_lambda_powertools/utilities/data_classes/appsync_authorizer_event.py

@@ -11,32 +11,32 @@ class AppSyncAuthorizerEventRequestContext(DictWrapper):
     @property
     def api_id(self) -> str:
         """AppSync API ID"""
-        return self["requestContext"]["apiId"]
+        return self["apiId"]
 
     @property
     def account_id(self) -> str:
         """AWS Account ID"""
-        return self["requestContext"]["accountId"]
+        return self["accountId"]
 
     @property
     def request_id(self) -> str:
         """Requestt ID"""
-        return self["requestContext"]["requestId"]
+        return self["requestId"]
 
     @property
     def query_string(self) -> str:
         """GraphQL query string"""
-        return self["requestContext"]["queryString"]
+        return self["queryString"]
 
     @property
     def operation_name(self) -> str | None:
         """GraphQL operation name, optional"""
-        return self["requestContext"].get("operationName")
+        return self.get("operationName")
 
     @property
     def variables(self) -> dict:
         """GraphQL variables"""
-        return self["requestContext"]["variables"]
+        return self["variables"]
 
 
 class AppSyncAuthorizerEvent(DictWrapper):
@@ -57,7 +57,7 @@ class AppSyncAuthorizerEvent(DictWrapper):
     @property
     def request_context(self) -> AppSyncAuthorizerEventRequestContext:
         """Request context"""
-        return AppSyncAuthorizerEventRequestContext(self._data)
+        return AppSyncAuthorizerEventRequestContext(self["requestContext"])
 
 
 class AppSyncAuthorizerResponse:

aws_lambda_powertools/utilities/data_classes/bedrock_agent_event.py

@@ -57,6 +57,8 @@ class BedrockAgentEvent(BaseProxyEvent):
     See https://docs.aws.amazon.com/bedrock/latest/userguide/agents-create.html
     """
 
+    # httpMethod is inherited from BaseProxyEvent class.
+
     @property
     def message_version(self) -> str:
         return self["messageVersion"]
@@ -77,10 +79,6 @@ class BedrockAgentEvent(BaseProxyEvent):
     def api_path(self) -> str:
         return self["apiPath"]
 
-    @property
-    def http_method(self) -> str:
-        return self["httpMethod"]
-
     @property
     def parameters(self) -> list[BedrockAgentProperty]:
         parameters = self.get("parameters") or []