modmex-lambda 0.5.0__tar.gz → 0.5.2__tar.gz

{modmex_lambda-0.5.0 → modmex_lambda-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modmex-lambda
-Version: 0.5.0
+Version: 0.5.2
 Summary: Ultra-lightweight AWS Lambda utilities for API Gateway routing and event handling.
 Author: Modmex
 License: MIT
@@ -597,15 +597,17 @@ from modmex_lambda import Logger
 logger = Logger()
 
 
+@logger.inject_lambda_context(log_event=True)
 def lambda_handler(event, context):
-    logger.set_context(context=context, event=event)
     logger.append_keys(tenant_id="mx")
     logger.info("request received")
 ```
 
 The logger emits structured JSON, reads `LOG_LEVEL`, uses `SERVICE_NAME` or
 `AWS_LAMBDA_FUNCTION_NAME` when no service is passed, and can extract Lambda
-request IDs and API Gateway correlation IDs.
+request IDs and API Gateway correlation IDs. The `inject_lambda_context`
+decorator resets logger state by default for warm Lambda invocations, injects
+Lambda metadata, and can optionally log the incoming event.
 
 ## Tracing
 

{modmex_lambda-0.5.0 → modmex_lambda-0.5.2}/README.md

@@ -574,15 +574,17 @@ from modmex_lambda import Logger
 logger = Logger()
 
 
+@logger.inject_lambda_context(log_event=True)
 def lambda_handler(event, context):
-    logger.set_context(context=context, event=event)
     logger.append_keys(tenant_id="mx")
     logger.info("request received")
 ```
 
 The logger emits structured JSON, reads `LOG_LEVEL`, uses `SERVICE_NAME` or
 `AWS_LAMBDA_FUNCTION_NAME` when no service is passed, and can extract Lambda
-request IDs and API Gateway correlation IDs.
+request IDs and API Gateway correlation IDs. The `inject_lambda_context`
+decorator resets logger state by default for warm Lambda invocations, injects
+Lambda metadata, and can optionally log the incoming event.
 
 ## Tracing
 

{modmex_lambda-0.5.0 → modmex_lambda-0.5.2}/modmex_lambda/event_handler/gateway_response.py

@@ -20,8 +20,13 @@ class GatewayResponseBuilder:
         self.json_serializer = json_serializer
 
     def serialize(self, event: BaseProxyEvent, cors: CORSConfig | None = None) -> dict[str, Any]:
-        if self.response.is_json() and not isinstance(self.response.body, (str, bytes)):
-            self.response.body = self.json_serializer(self.response.body)
+        if self.response.body is None:
+            self.response.body = ""
+        elif self.response.is_json() and not isinstance(self.response.body, (str, bytes)):
+            if hasattr(self.response.body, "model_dump_json"):
+                self.response.body = self.response.body.model_dump_json()
+            else:
+                self.response.body = self.json_serializer(self.response.body)
 
         self._handle_route_configuration(event, cors)
 

{modmex_lambda-0.5.0 → modmex_lambda-0.5.2}/modmex_lambda/logging.py

@@ -7,6 +7,7 @@ import os
 import sys
 import traceback
 from datetime import datetime, timezone
+from functools import wraps
 from threading import RLock
 from typing import Any, Callable, TextIO
 
@@ -58,6 +59,28 @@ class Logger:
             self._context = context
             self._event = event
 
+    def inject_lambda_context(
+        self,
+        func: Callable[..., Any] | None = None,
+        *,
+        log_event: bool = False,
+    ) -> Callable[..., Any]:
+        def decorator(handler: Callable[..., Any]) -> Callable[..., Any]:
+            @wraps(handler)
+            def wrapper(event: dict[str, Any], context: object, *args: Any, **kwargs: Any) -> Any:
+                self.clear_state()
+                self.set_context(context=context, event=event)
+                self._append_lambda_context_keys(context)
+                if log_event:
+                    self.info("lambda event", event=event)
+                return handler(event, context, *args, **kwargs)
+
+            return wrapper
+
+        if func is None:
+            return decorator
+        return decorator(func)
+
     def append_keys(self, **kwargs: Any) -> None:
         with self._lock:
             self._persistent_keys.update(kwargs)
@@ -138,6 +161,18 @@ class Logger:
             return message % args
         return message
 
+    def _append_lambda_context_keys(self, context: object | None) -> None:
+        if context is None:
+            return
+
+        keys = {
+            "function_name": getattr(context, "function_name", None),
+            "function_memory_size": getattr(context, "memory_limit_in_mb", None),
+            "function_arn": getattr(context, "invoked_function_arn", None),
+            "function_request_id": getattr(context, "aws_request_id", None),
+        }
+        self.append_keys(**{key: value for key, value in keys.items() if value is not None})
+
     def _extract_request_id(self) -> str | None:
         if self._context is None:
             return None

{modmex_lambda-0.5.0 → modmex_lambda-0.5.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "modmex-lambda"
-version = "0.5.0"
+version = "0.5.2"
 description = "Ultra-lightweight AWS Lambda utilities for API Gateway routing and event handling."
 readme = "README.md"
 requires-python = ">=3.10,<4.0"

{modmex_lambda-0.5.0 → modmex_lambda-0.5.2}/tests/event_handler/test_api_gateway.py

@@ -58,6 +58,11 @@ class AuditService:
         return {"user_id": user_id, "tenant_id": self.tenant_id}
 
 
+class DumpJsonModel:
+    def model_dump_json(self) -> str:
+        return '{"ok":true}'
+
+
 def test_public_api_requires_explicit_api_gateway_resolver() -> None:
     assert modmex_lambda.APIGatewayHttpResolver is APIGatewayHttpResolver
     assert modmex_lambda.APIGatewayRestResolver is APIGatewayRestResolver
@@ -209,6 +214,34 @@ def test_http_resolver_serializes_cookies_in_http_api_shape() -> None:
     assert response_body(response) == {"ok": True}
 
 
+def test_http_resolver_serializes_model_dump_json_body_without_double_encoding() -> None:
+    app = APIGatewayHttpResolver()
+
+    @app.get("/model")
+    def model():
+        return DumpJsonModel()
+
+    response = app.resolve(http_v2_event("GET", "/model"), object())
+
+    assert response["headers"]["Content-Type"] == "application/json"
+    assert response["body"] == '{"ok":true}'
+    assert response_body(response) == {"ok": True}
+
+
+def test_http_resolver_serializes_no_content_response_with_empty_body() -> None:
+    app = APIGatewayHttpResolver()
+
+    @app.delete("/users/<user_id>", status_code=204)
+    def delete_user(user_id: str):
+        return None
+
+    response = app.resolve(http_v2_event("DELETE", "/users/42"), object())
+
+    assert response["statusCode"] == 204
+    assert response["body"] == ""
+    assert response_body(response) is None
+
+
 def test_static_dynamic_any_404_and_405_routing() -> None:
     app = APIGatewayHttpResolver()
 

{modmex_lambda-0.5.0 → modmex_lambda-0.5.2}/tests/event_handler/test_gateway_response.py

@@ -44,3 +44,28 @@ def test_gateway_response_builder_uses_first_origin_and_response_compression_ove
     assert payload["isBase64Encoded"] is False
     assert payload["multiValueHeaders"]["Access-Control-Allow-Origin"] == ["*"]
     assert "Content-Encoding" not in payload["multiValueHeaders"]
+
+
+def test_gateway_response_builder_serializes_none_body_as_empty_string() -> None:
+    event = APIGatewayProxyEvent(
+        {
+            "path": "/users/42",
+            "httpMethod": "DELETE",
+            "headers": {},
+            "multiValueHeaders": {},
+            "requestContext": {},
+        },
+    )
+    response = Response(
+        status_code=204,
+        body=None,
+        content_type=content_types.APPLICATION_JSON,
+    )
+
+    payload = GatewayResponseBuilder(
+        response=response,
+        route=None,
+        json_serializer=lambda value: "null",
+    ).serialize(event)
+
+    assert payload["body"] == ""

{modmex_lambda-0.5.0 → modmex_lambda-0.5.2}/tests/test_logging.py

@@ -11,6 +11,9 @@ from modmex_lambda.logging import Logger
 
 class Context:
     aws_request_id = "req-123"
+    function_name = "orders-handler"
+    memory_limit_in_mb = "256"
+    invoked_function_arn = "arn:aws:lambda:us-east-1:123456789012:function:orders-handler"
 
 
 class Status(Enum):
@@ -59,6 +62,47 @@ def test_logger_includes_request_id_and_correlation_id_from_context_and_event()
     assert payload["correlation_id"] == "corr-1"
 
 
+def test_logger_inject_lambda_context_sets_context_and_logs_event() -> None:
+    stream = io.StringIO()
+    logger = Logger(service="orders", stream=stream)
+
+    @logger.inject_lambda_context(log_event=True)
+    def handler(event, context):
+        logger.info("handled")
+        return {"ok": True}
+
+    result = handler({"headers": {"X-Correlation-Id": "corr-1"}, "order_id": "o-1"}, Context())
+
+    lines = [json.loads(line) for line in stream.getvalue().splitlines() if line.strip()]
+    assert result == {"ok": True}
+    assert lines[0]["message"] == "lambda event"
+    assert lines[0]["event"]["order_id"] == "o-1"
+    assert lines[0]["request_id"] == "req-123"
+    assert lines[0]["correlation_id"] == "corr-1"
+    assert lines[0]["function_name"] == "orders-handler"
+    assert lines[0]["function_memory_size"] == "256"
+    assert lines[0]["function_arn"] == "arn:aws:lambda:us-east-1:123456789012:function:orders-handler"
+    assert lines[0]["function_request_id"] == "req-123"
+    assert lines[1]["message"] == "handled"
+    assert lines[1]["request_id"] == "req-123"
+
+
+def test_logger_inject_lambda_context_clears_state_for_warm_starts() -> None:
+    stream = io.StringIO()
+    logger = Logger(service="orders", stream=stream)
+    logger.append_keys(tenant="stale")
+
+    @logger.inject_lambda_context
+    def handler(event, context):
+        logger.info("handled")
+
+    handler({"headers": {}}, Context())
+
+    payload = json.loads(stream.getvalue().strip())
+    assert "tenant" not in payload
+    assert payload["function_name"] == "orders-handler"
+
+
 def test_logger_append_keys_and_clear_state() -> None:
     stream = io.StringIO()
     logger = Logger(service="orders", stream=stream)