Changing examples

Author: leandrodamascena

aws_lambda_powertools/middleware_factory/factory.py

@@ -6,10 +6,10 @@
 import os
 from typing import Any, Callable
 
-from ..shared import constants
-from ..shared.functions import resolve_truthy_env_var_choice
-from ..tracing import Tracer
-from .exceptions import MiddlewareInvalidArgumentError
+from aws_lambda_powertools.middleware_factory.exceptions import MiddlewareInvalidArgumentError
+from aws_lambda_powertools.shared import constants
+from aws_lambda_powertools.shared.functions import resolve_truthy_env_var_choice
+from aws_lambda_powertools.tracing import Tracer
 
 logger = logging.getLogger(__name__)
 

docs/utilities/middleware_factory.md

@@ -30,7 +30,7 @@ You can create your own middleware using `lambda_handler_decorator`. The decorat
 ### Middleware with before logic
 
 === "getting_started_middleware_before_logic_function.py"
-    ```python hl_lines="5 26 27 36 37 39 44 45"
+    ```python hl_lines="7 27 28 37 38 40 43 44"
     --8<-- "examples/middleware_factory/src/getting_started_middleware_before_logic_function.py"
     ```
 
@@ -43,7 +43,7 @@ You can create your own middleware using `lambda_handler_decorator`. The decorat
 ### Middleware with after logic
 
 === "getting_started_middleware_after_logic_function.py"
-    ```python hl_lines="8 14 15 24-26 40 41"
+    ```python hl_lines="9 16 17 26-28 42 43"
     --8<-- "examples/middleware_factory/src/getting_started_middleware_after_logic_function.py"
     ```
 
@@ -58,7 +58,7 @@ You can create your own middleware using `lambda_handler_decorator`. The decorat
 You can also have your own keyword arguments after the mandatory arguments.
 
 === "getting_started_middleware_with_params_function.py"
-    ```python hl_lines="6 30 31 41 56 57"
+    ```python hl_lines="8 31 32 42 55 56"
     --8<-- "examples/middleware_factory/src/getting_started_middleware_with_params_function.py"
     ```
 
@@ -83,7 +83,7 @@ You can also use [`POWERTOOLS_TRACE_MIDDLEWARES`](#tracing-middleware-execution)
 For advanced use cases, you can instantiate [Tracer](../core/tracer.md){target="_blank"} inside your middleware, and add annotations as well as metadata for additional operational insights.
 
 === "advanced_middleware_tracer_function.py"
-    ```python hl_lines="7 9 12 16 17 22 28 45 46"
+    ```python hl_lines="9 11 18 19 28 30 47 48"
     --8<-- "examples/middleware_factory/src/advanced_middleware_tracer_function.py"
     ```
 
@@ -105,7 +105,7 @@ This makes use of an existing Tracer instance that you may have initialized anyw
     You must [enable Active Tracing](../core/tracer.md#permissions){target="_blank"} in your Lambda function when using this feature, otherwise Lambda cannot send traces to XRay.
 
 === "getting_started_middleware_tracer_function.py"
-    ```python hl_lines="8 14 15 39 40"
+    ```python hl_lines="10 16 17 41 42"
     --8<-- "examples/middleware_factory/src/getting_started_middleware_tracer_function.py"
     ```
 
@@ -134,7 +134,7 @@ In the example below, we create a Middleware with the following features:
 * Save execution history to a DynamoDB table
 
 === "combining_powertools_utilities_function.py"
-    ```python hl_lines="11 28 29 56 64 77 123"
+    ```python hl_lines="13 30 31 58 66 79 125"
     --8<-- "examples/middleware_factory/src/combining_powertools_utilities_function.py"
     ```
 

examples/middleware_factory/src/advanced_middleware_tracer_function.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import time
 from typing import Callable
 

examples/middleware_factory/src/combining_powertools_utilities_function.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 from typing import Callable
 
@@ -103,7 +105,7 @@ def get_comments():
 
         return {"comments": comments.json()[:10]}
     except Exception as exc:
-        raise InternalServerError(str(exc))
+        raise InternalServerError(str(exc)) from exc
 
 
 @app.get("/comments/<comment_id>")
@@ -115,7 +117,7 @@ def get_comments_by_id(comment_id: str):
 
         return {"comments": comments.json()}
     except Exception as exc:
-        raise InternalServerError(str(exc))
+        raise InternalServerError(str(exc)) from exc
 
 
 @middleware_custom

examples/middleware_factory/src/getting_started_middleware_after_logic_function.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import time
 from typing import Callable
 

examples/middleware_factory/src/getting_started_middleware_before_logic_function.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dataclasses import dataclass, field
 from typing import Callable
 from uuid import uuid4
@@ -35,9 +37,7 @@ def middleware_before(
     if "status_id" not in detail:
         event["detail"]["status_id"] = "pending"
 
-    response = handler(event, context)
-
-    return response
+    return handler(event, context)
 
 
 @middleware_before

examples/middleware_factory/src/getting_started_middleware_tracer_function.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import time
 from typing import Callable
 

examples/middleware_factory/src/getting_started_middleware_with_params_function.py

@@ -1,6 +1,8 @@
+from __future__ import annotations
+
 import base64
 from dataclasses import dataclass, field
-from typing import Any, Callable, List
+from typing import Any, Callable
 from uuid import uuid4
 
 from aws_lambda_powertools.middleware_factory import lambda_handler_decorator
@@ -31,7 +33,7 @@ def obfuscate_sensitive_data(
     handler: Callable[[dict, LambdaContext], dict],
     event: dict,
     context: LambdaContext,
-    fields: List,
+    fields: list,
 ) -> dict:
     # extracting payload from a EventBridge event
     detail: dict = query(data=event, envelope=envelopes.EVENTBRIDGE)
@@ -42,9 +44,7 @@ def obfuscate_sensitive_data(
         if guest_data.get(guest_field):
             event["detail"]["guest"][guest_field] = obfuscate_data(str(guest_data.get(guest_field)))
 
-    response = handler(event, context)
-
-    return response
+    return handler(event, context)
 
 
 def obfuscate_data(value: str) -> bytes: