aws-lambda-powertools 2.16.2__tar.gz → 2.17.0__tar.gz

{aws_lambda_powertools-2.16.2 → aws_lambda_powertools-2.17.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aws-lambda-powertools
-Version: 2.16.2
+Version: 2.17.0
 Summary: Powertools for AWS Lambda (Python) is a developer toolkit to implement Serverless best practices and increase developer velocity.
 Home-page: https://github.com/awslabs/aws-lambda-powertools-python
 License: MIT
@@ -37,7 +37,7 @@ Description-Content-Type: text/markdown
 <!-- markdownlint-disable MD013 MD041 MD043  -->
 # Powertools for AWS Lambda (Python)
 
-[![Build](https://github.com/awslabs/aws-lambda-powertools-python/actions/workflows/python_build.yml/badge.svg)](https://github.com/awslabs/aws-lambda-powertools-python/actions/workflows/python_build.yml)
+[![Build](https://github.com/awslabs/aws-lambda-powertools-python/actions/workflows/quality_check.yml/badge.svg)](https://github.com/awslabs/aws-lambda-powertools-python/actions/workflows/python_build.yml)
 [![codecov.io](https://codecov.io/github/awslabs/aws-lambda-powertools-python/branch/develop/graphs/badge.svg)](https://app.codecov.io/gh/awslabs/aws-lambda-powertools-python)
 ![PythonSupport](https://img.shields.io/static/v1?label=python&message=%203.7|%203.8|%203.9|%203.10&color=blue?style=flat-square&logo=python) ![PyPI version](https://badge.fury.io/py/aws-lambda-powertools.svg) ![PyPi monthly downloads](https://img.shields.io/pypi/dm/aws-lambda-powertools) [![Join our Discord](https://dcbadge.vercel.app/api/server/B8zZKbbyET)](https://discord.gg/B8zZKbbyET)
 

{aws_lambda_powertools-2.16.2 → aws_lambda_powertools-2.17.0}/README.md

@@ -1,7 +1,7 @@
 <!-- markdownlint-disable MD013 MD041 MD043  -->
 # Powertools for AWS Lambda (Python)
 
-[![Build](https://github.com/awslabs/aws-lambda-powertools-python/actions/workflows/python_build.yml/badge.svg)](https://github.com/awslabs/aws-lambda-powertools-python/actions/workflows/python_build.yml)
+[![Build](https://github.com/awslabs/aws-lambda-powertools-python/actions/workflows/quality_check.yml/badge.svg)](https://github.com/awslabs/aws-lambda-powertools-python/actions/workflows/python_build.yml)
 [![codecov.io](https://codecov.io/github/awslabs/aws-lambda-powertools-python/branch/develop/graphs/badge.svg)](https://app.codecov.io/gh/awslabs/aws-lambda-powertools-python)
 ![PythonSupport](https://img.shields.io/static/v1?label=python&message=%203.7|%203.8|%203.9|%203.10&color=blue?style=flat-square&logo=python) ![PyPI version](https://badge.fury.io/py/aws-lambda-powertools.svg) ![PyPi monthly downloads](https://img.shields.io/pypi/dm/aws-lambda-powertools) [![Join our Discord](https://dcbadge.vercel.app/api/server/B8zZKbbyET)](https://discord.gg/B8zZKbbyET)
 

{aws_lambda_powertools-2.16.2 → aws_lambda_powertools-2.17.0}/aws_lambda_powertools/event_handler/api_gateway.py

@@ -483,7 +483,8 @@ class ApiGatewayResolver(BaseRouter):
             with api gateways with multiple custom mappings.
         """
         self._proxy_type = proxy_type
-        self._routes: List[Route] = []
+        self._dynamic_routes: List[Route] = []
+        self._static_routes: List[Route] = []
         self._route_keys: List[str] = []
         self._exception_handlers: Dict[Type, Callable] = {}
         self._cors = cors
@@ -515,7 +516,17 @@ class ApiGatewayResolver(BaseRouter):
                 cors_enabled = cors
 
             for item in methods:
-                self._routes.append(Route(item, self._compile_regex(rule), func, cors_enabled, compress, cache_control))
+                _route = Route(item, self._compile_regex(rule), func, cors_enabled, compress, cache_control)
+
+                # The more specific route wins.
+                # We store dynamic (/studies/{studyid}) and static routes (/studies/fetch) separately.
+                # Then attempt a match for static routes before dynamic routes.
+                # This ensures that the most specific route is prioritized and processed first (studies/fetch).
+                if _route.rule.groups > 0:
+                    self._dynamic_routes.append(_route)
+                else:
+                    self._static_routes.append(_route)
+
                 route_key = item + rule
                 if route_key in self._route_keys:
                     warnings.warn(
@@ -624,7 +635,7 @@ class ApiGatewayResolver(BaseRouter):
         """Resolves the response or return the not found response"""
         method = self.current_event.http_method.upper()
         path = self._remove_prefix(self.current_event.path)
-        for route in self._routes:
+        for route in self._static_routes + self._dynamic_routes:
             if method != route.method:
                 continue
             match_results: Optional[Match] = route.rule.match(path)

{aws_lambda_powertools-2.16.2 → aws_lambda_powertools-2.17.0}/aws_lambda_powertools/logging/formatter.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import inspect
 import json
 import logging
@@ -8,8 +10,9 @@ from datetime import datetime, timezone
 from functools import partial
 from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Union
 
-from ..shared import constants
-from ..shared.functions import powertools_dev_is_set
+from aws_lambda_powertools.logging.types import LogRecord
+from aws_lambda_powertools.shared import constants
+from aws_lambda_powertools.shared.functions import powertools_dev_is_set
 
 RESERVED_LOG_ATTRS = (
     "name",
@@ -66,12 +69,12 @@ class LambdaPowertoolsFormatter(BasePowertoolsFormatter):
 
     def __init__(
         self,
-        json_serializer: Optional[Callable[[Dict], str]] = None,
-        json_deserializer: Optional[Callable[[Union[Dict, str, bool, int, float]], str]] = None,
-        json_default: Optional[Callable[[Any], Any]] = None,
-        datefmt: Optional[str] = None,
+        json_serializer: Callable[[LogRecord], str] | None = None,
+        json_deserializer: Callable[[Dict | str | bool | int | float], str] | None = None,
+        json_default: Callable[[Any], Any] | None = None,
+        datefmt: str | None = None,
         use_datetime_directive: bool = False,
-        log_record_order: Optional[List[str]] = None,
+        log_record_order: List[str] | None = None,
         utc: bool = False,
         use_rfc3339: bool = False,
         **kwargs,
@@ -144,7 +147,7 @@ class LambdaPowertoolsFormatter(BasePowertoolsFormatter):
 
         super().__init__(datefmt=self.datefmt)
 
-    def serialize(self, log: Dict) -> str:
+    def serialize(self, log: LogRecord) -> str:
         """Serialize structured log dict to JSON str"""
         return self.json_serializer(log)
 

{aws_lambda_powertools-2.16.2 → aws_lambda_powertools-2.17.0}/aws_lambda_powertools/logging/formatters/datadog.py

@@ -1,15 +1,16 @@
 from __future__ import annotations
 
-from typing import Any, Callable
+from typing import Any, Callable, Dict
 
 from aws_lambda_powertools.logging.formatter import LambdaPowertoolsFormatter
+from aws_lambda_powertools.logging.types import LogRecord
 
 
 class DatadogLogFormatter(LambdaPowertoolsFormatter):
     def __init__(
         self,
-        json_serializer: Callable[[dict], str] | None = None,
-        json_deserializer: Callable[[dict | str | bool | int | float], str] | None = None,
+        json_serializer: Callable[[LogRecord], str] | None = None,
+        json_deserializer: Callable[[Dict | str | bool | int | float], str] | None = None,
         json_default: Callable[[Any], Any] | None = None,
         datefmt: str | None = None,
         use_datetime_directive: bool = False,

aws_lambda_powertools-2.17.0/aws_lambda_powertools/logging/types.py

@@ -0,0 +1,50 @@
+from __future__ import annotations
+
+import sys
+
+if sys.version_info >= (3, 11):
+    from typing import NotRequired
+else:
+    from typing_extensions import NotRequired
+
+if sys.version_info >= (3, 8):
+    from typing import TypedDict
+else:
+    from typing_extensions import TypedDict
+
+if sys.version_info >= (3, 10):
+    from typing import TypeAlias
+else:
+    from typing_extensions import TypeAlias
+
+from typing import Any, Dict, List, Union
+
+LogRecord: TypeAlias = Union[Dict[str, Any], "PowertoolsLogRecord"]
+
+
+class PowertoolsLogRecord(TypedDict):
+    # Base fields (required)
+    level: str
+    location: str
+    message: Dict[str, Any] | str | bool | List[Any]
+    timestamp: str | int
+    service: str
+
+    # Fields from logger.inject_lambda_context
+    cold_start: NotRequired[bool]
+    function_name: NotRequired[str]
+    function_memory_size: NotRequired[int]
+    function_arn: NotRequired[str]
+    function_request_id: NotRequired[str]
+    # From logger.inject_lambda_context if AWS X-Ray is enabled
+    xray_trace_id: NotRequired[str]
+
+    # If sample_rate is defined
+    sampling_rate: NotRequired[float]
+
+    # From logger.set_correlation_id
+    correlation_id: NotRequired[str]
+
+    # Fields from logger.exception
+    exception_name: NotRequired[str]
+    exception: NotRequired[str]

{aws_lambda_powertools-2.16.2 → aws_lambda_powertools-2.17.0}/aws_lambda_powertools/shared/version.py

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

{aws_lambda_powertools-2.16.2 → aws_lambda_powertools-2.17.0}/aws_lambda_powertools/utilities/data_classes/__init__.py

@@ -5,6 +5,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 .appsync_resolver_event import AppSyncResolverEvent
+from .aws_config_rule_event import AWSConfigRuleEvent
 from .cloud_watch_custom_widget_event import CloudWatchDashboardCustomWidgetEvent
 from .cloud_watch_logs_event import CloudWatchLogsEvent
 from .code_pipeline_job_event import CodePipelineJobEvent
@@ -20,6 +21,7 @@ from .s3_event import S3Event, S3EventBridgeNotificationEvent
 from .ses_event import SESEvent
 from .sns_event import SNSEvent
 from .sqs_event import SQSEvent
+from .vpc_lattice import VPCLatticeEvent
 
 __all__ = [
     "APIGatewayProxyEvent",
@@ -42,4 +44,6 @@ __all__ = [
     "SNSEvent",
     "SQSEvent",
     "event_source",
+    "AWSConfigRuleEvent",
+    "VPCLatticeEvent",
 ]

aws_lambda_powertools-2.17.0/aws_lambda_powertools/utilities/data_classes/aws_config_rule_event.py

@@ -0,0 +1,361 @@
+from __future__ import annotations
+
+import json
+from typing import Any, Dict, List, Optional
+
+from aws_lambda_powertools.utilities.data_classes.common import DictWrapper
+
+
+def get_invoke_event(
+    invoking_event: dict,
+) -> AWSConfigConfigurationChanged | AWSConfigScheduledNotification | AWSConfigOversizedConfiguration:
+    """
+    Returns the corresponding event object based on the messageType in the invoking event.
+
+    Parameters
+    ----------
+    invoking_event: dict
+        The invoking event received.
+
+    Returns
+    -------
+    AWSConfigConfigurationChanged | AWSConfigScheduledNotification | AWSConfigOversizedConfiguration:
+        The event object based on the messageType in the invoking event.
+    """
+
+    message_type = invoking_event.get("messageType")
+
+    if message_type == "ScheduledNotification":
+        return AWSConfigScheduledNotification(invoking_event)
+
+    if message_type == "OversizedConfigurationItemChangeNotification":
+        return AWSConfigOversizedConfiguration(invoking_event)
+
+    # Default return is AWSConfigConfigurationChanged event
+    return AWSConfigConfigurationChanged(invoking_event)
+
+
+class AWSConfigConfigurationChanged(DictWrapper):
+    @property
+    def configuration_item_diff(self) -> Dict:
+        """The configuration item diff of the ConfigurationItemChangeNotification event."""
+        return self["configurationItemDiff"]
+
+    @property
+    def configuration_item(self) -> AWSConfigConfigurationItemChanged:
+        """The configuration item of the ConfigurationItemChangeNotification event."""
+        return AWSConfigConfigurationItemChanged(self["configurationItem"])
+
+    @property
+    def raw_configuration_item(self) -> Dict:
+        """The raw configuration item of the ConfigurationItemChangeNotification event."""
+        return self["configurationItem"]
+
+    @property
+    def record_version(self) -> str:
+        """The record version of the ConfigurationItemChangeNotification event."""
+        return self["recordVersion"]
+
+    @property
+    def message_type(self) -> str:
+        """The message type of the ConfigurationItemChangeNotification event."""
+        return self["messageType"]
+
+    @property
+    def notification_creation_time(self) -> str:
+        """The notification creation time of the ConfigurationItemChangeNotification event."""
+        return self["notificationCreationTime"]
+
+
+class AWSConfigConfigurationItemChanged(DictWrapper):
+    @property
+    def related_events(self) -> List:
+        """The related events of the ConfigurationItemChangeNotification event."""
+        return self["relatedEvents"]
+
+    @property
+    def relationships(self) -> List:
+        """The relationships of the ConfigurationItemChangeNotification event."""
+        return self["relationships"]
+
+    @property
+    def configuration(self) -> Dict:
+        """The configuration of the ConfigurationItemChangeNotification event."""
+        return self["configuration"]
+
+    @property
+    def supplementary_configuration(self) -> Dict:
+        """The supplementary configuration of the ConfigurationItemChangeNotification event."""
+        return self["supplementaryConfiguration"]
+
+    @property
+    def tags(self) -> Dict:
+        """The tags of the ConfigurationItemChangeNotification event."""
+        return self["tags"]
+
+    @property
+    def configuration_item_version(self) -> str:
+        """The configuration item version of the ConfigurationItemChangeNotification event."""
+        return self["configurationItemVersion"]
+
+    @property
+    def configuration_item_capture_time(self) -> str:
+        """The configuration item capture time of the ConfigurationItemChangeNotification event."""
+        return self["configurationItemCaptureTime"]
+
+    @property
+    def configuration_state_id(self) -> str:
+        """The configuration state id of the ConfigurationItemChangeNotification event."""
+        return self["configurationStateId"]
+
+    @property
+    def accountid(self) -> str:
+        """The accountid of the ConfigurationItemChangeNotification event."""
+        return self["awsAccountId"]
+
+    @property
+    def configuration_item_status(self) -> str:
+        """The configuration item status of the ConfigurationItemChangeNotification event."""
+        return self["configurationItemStatus"]
+
+    @property
+    def resource_type(self) -> str:
+        """The resource type of the ConfigurationItemChangeNotification event."""
+        return self["resourceType"]
+
+    @property
+    def resource_id(self) -> str:
+        """The resource id of the ConfigurationItemChangeNotification event."""
+        return self["resourceId"]
+
+    @property
+    def resource_name(self) -> str:
+        """The resource name of the ConfigurationItemChangeNotification event."""
+        return self["resourceName"]
+
+    @property
+    def resource_arn(self) -> str:
+        """The resource arn of the ConfigurationItemChangeNotification event."""
+        return self["ARN"]
+
+    @property
+    def region(self) -> str:
+        """The region of the ConfigurationItemChangeNotification event."""
+        return self["awsRegion"]
+
+    @property
+    def availability_zone(self) -> str:
+        """The availability zone of the ConfigurationItemChangeNotification event."""
+        return self["availabilityZone"]
+
+    @property
+    def configuration_state_md5_hash(self) -> str:
+        """The md5 hash of the state of the ConfigurationItemChangeNotification event."""
+        return self["configurationStateMd5Hash"]
+
+    @property
+    def resource_creation_time(self) -> str:
+        """The resource creation time of the ConfigurationItemChangeNotification event."""
+        return self["resourceCreationTime"]
+
+
+class AWSConfigScheduledNotification(DictWrapper):
+    @property
+    def accountid(self) -> str:
+        """The accountid of the ScheduledNotification event."""
+        return self["awsAccountId"]
+
+    @property
+    def notification_creation_time(self) -> str:
+        """The notification creation time of the ScheduledNotification event."""
+        return self["notificationCreationTime"]
+
+    @property
+    def record_version(self) -> str:
+        """The record version of the ScheduledNotification event."""
+        return self["recordVersion"]
+
+    @property
+    def message_type(self) -> str:
+        """The message type of the ScheduledNotification event."""
+        return self["messageType"]
+
+
+class AWSConfigOversizedConfiguration(DictWrapper):
+    @property
+    def configuration_item_summary(self) -> AWSConfigOversizedConfigurationItemSummary:
+        """The configuration item summary of the OversizedConfiguration event."""
+        return AWSConfigOversizedConfigurationItemSummary(self["configurationItemSummary"])
+
+    @property
+    def raw_configuration_item_summary(self) -> str:
+        """The raw configuration item summary of the OversizedConfiguration event."""
+        return self["configurationItemSummary"]
+
+    @property
+    def message_type(self) -> str:
+        """The message type of the OversizedConfiguration event."""
+        return self["messageType"]
+
+    @property
+    def notification_creation_time(self) -> str:
+        """The notification creation time of the OversizedConfiguration event."""
+        return self["notificationCreationTime"]
+
+    @property
+    def record_version(self) -> str:
+        """The record version of the OversizedConfiguration event."""
+        return self["recordVersion"]
+
+
+class AWSConfigOversizedConfigurationItemSummary(DictWrapper):
+    @property
+    def change_type(self) -> str:
+        """The change type of the OversizedConfiguration event."""
+        return self["changeType"]
+
+    @property
+    def configuration_item_version(self) -> str:
+        """The configuration item version of the OversizedConfiguration event."""
+        return self["configurationItemVersion"]
+
+    @property
+    def configuration_item_capture_time(self) -> str:
+        """The configuration item capture time of the OversizedConfiguration event."""
+        return self["configurationItemCaptureTime"]
+
+    @property
+    def configuration_state_id(self) -> str:
+        """The configuration state id of the OversizedConfiguration event."""
+        return self["configurationStateId"]
+
+    @property
+    def accountid(self) -> str:
+        """The accountid of the OversizedConfiguration event."""
+        return self["awsAccountId"]
+
+    @property
+    def configuration_item_status(self) -> str:
+        """The configuration item status of the OversizedConfiguration event."""
+        return self["configurationItemStatus"]
+
+    @property
+    def resource_type(self) -> str:
+        """The resource type of the OversizedConfiguration event."""
+        return self["resourceType"]
+
+    @property
+    def resource_id(self) -> str:
+        """The resource id of the OversizedConfiguration event."""
+        return self["resourceId"]
+
+    @property
+    def resource_name(self) -> str:
+        """The resource name of the OversizedConfiguration event."""
+        return self["resourceName"]
+
+    @property
+    def resource_arn(self) -> str:
+        """The resource arn of the OversizedConfiguration event."""
+        return self["ARN"]
+
+    @property
+    def region(self) -> str:
+        """The region of the OversizedConfiguration event."""
+        return self["awsRegion"]
+
+    @property
+    def availability_zone(self) -> str:
+        """The availability zone of the OversizedConfiguration event."""
+        return self["availabilityZone"]
+
+    @property
+    def configuration_state_md5_hash(self) -> str:
+        """The state md5 hash  of the OversizedConfiguration event."""
+        return self["configurationStateMd5Hash"]
+
+    @property
+    def resource_creation_time(self) -> str:
+        """The resource creation time of the OversizedConfiguration event."""
+        return self["resourceCreationTime"]
+
+
+class AWSConfigRuleEvent(DictWrapper):
+    """Events for AWS Config Rules
+    Documentation:
+    --------------
+    - https://docs.aws.amazon.com/config/latest/developerguide/evaluate-config_develop-rules_lambda-functions.html
+    """
+
+    def __init__(self, data: Dict[str, Any]):
+        super().__init__(data)
+        self._invoking_event: Optional[Any] = None
+        self._rule_parameters: Optional[Any] = None
+
+    @property
+    def version(self) -> str:
+        """The version of the event."""
+        return self["version"]
+
+    @property
+    def invoking_event(
+        self,
+    ) -> AWSConfigConfigurationChanged | AWSConfigScheduledNotification | AWSConfigOversizedConfiguration:
+        """The invoking payload of the event."""
+        if self._invoking_event is None:
+            self._invoking_event = self["invokingEvent"]
+
+        return get_invoke_event(json.loads(self._invoking_event))
+
+    @property
+    def raw_invoking_event(self) -> str:
+        """The raw invoking payload of the event."""
+        return self["invokingEvent"]
+
+    @property
+    def rule_parameters(self) -> Dict:
+        """The parameters of the event."""
+        if self._rule_parameters is None:
+            self._rule_parameters = self["ruleParameters"]
+
+        return json.loads(self._rule_parameters)
+
+    @property
+    def result_token(self) -> str:
+        """The result token of the event."""
+        return self["resultToken"]
+
+    @property
+    def event_left_scope(self) -> bool:
+        """The left scope of the event."""
+        return self["eventLeftScope"]
+
+    @property
+    def execution_role_arn(self) -> str:
+        """The execution role arn of the event."""
+        return self["executionRoleArn"]
+
+    @property
+    def config_rule_arn(self) -> str:
+        """The arn of the rule of the event."""
+        return self["configRuleArn"]
+
+    @property
+    def config_rule_name(self) -> str:
+        """The name of the rule of the event."""
+        return self["configRuleName"]
+
+    @property
+    def config_rule_id(self) -> str:
+        """The id of the rule of the event."""
+        return self["configRuleId"]
+
+    @property
+    def accountid(self) -> str:
+        """The accountid of the event."""
+        return self["accountId"]
+
+    @property
+    def evalution_mode(self) -> Optional[str]:
+        """The evalution mode of the event."""
+        return self.get("evaluationMode")

{aws_lambda_powertools-2.16.2 → aws_lambda_powertools-2.17.0}/aws_lambda_powertools/utilities/data_classes/common.py

@@ -16,7 +16,7 @@ class DictWrapper(Mapping):
         data : Dict[str, Any]
             Lambda Event Source Event payload
         json_deserializer : Callable, optional
-            function to deserialize `str`, `bytes`, bytearray` containing a JSON document to a Python `obj`,
+            function to deserialize `str`, `bytes`, `bytearray` containing a JSON document to a Python `obj`,
             by default json.loads
         """
         self._data = data

{aws_lambda_powertools-2.16.2 → aws_lambda_powertools-2.17.0}/aws_lambda_powertools/utilities/data_classes/dynamo_db_stream_event.py

@@ -39,7 +39,7 @@ class TypeDeserializer:
             --------                                ------
             {'NULL': True}                          None
             {'BOOL': True/False}                    True/False
-            {'N': str(value)}                       str(value)
+            {'N': Decimal(value)}                   Decimal(value)
             {'S': string}                           string
             {'B': bytes}                            bytes
             {'NS': [str(value)]}                    set([str(value)])