fix: resolver circular dependencies

Author: rubenfonseca

aws_lambda_powertools/event_handler/__init__.py

@@ -8,12 +8,12 @@
     ApiGatewayResolver,
     APIGatewayRestResolver,
     CORSConfig,
-    Response,
 )
 from aws_lambda_powertools.event_handler.appsync import AppSyncResolver
 from aws_lambda_powertools.event_handler.lambda_function_url import (
     LambdaFunctionUrlResolver,
 )
+from aws_lambda_powertools.event_handler.response import Response
 from aws_lambda_powertools.event_handler.vpc_lattice import VPCLatticeResolver
 
 __all__ = [

aws_lambda_powertools/event_handler/api_gateway.py

@@ -32,6 +32,7 @@
 from aws_lambda_powertools.event_handler.openapi.dependant import get_dependant
 from aws_lambda_powertools.event_handler.openapi.models import Contact, License, OpenAPI, Server, Tag
 from aws_lambda_powertools.event_handler.openapi.utils import get_flat_params
+from aws_lambda_powertools.event_handler.response import Response
 from aws_lambda_powertools.event_handler.route import Route
 from aws_lambda_powertools.shared.cookies import Cookie
 from aws_lambda_powertools.shared.functions import powertools_dev_is_set

aws_lambda_powertools/event_handler/middlewares/base.py

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from typing import Generic
 
-from aws_lambda_powertools.event_handler.api_gateway import Response
+from aws_lambda_powertools.event_handler import Response
 from aws_lambda_powertools.event_handler.types import EventHandlerInstance
 from aws_lambda_powertools.shared.types import Protocol
 

aws_lambda_powertools/event_handler/middlewares/schema_validation.py

@@ -1,7 +1,7 @@
 import logging
 from typing import Dict, Optional
 
-from aws_lambda_powertools.event_handler.api_gateway import Response
+from aws_lambda_powertools.event_handler import Response
 from aws_lambda_powertools.event_handler.exceptions import BadRequestError, InternalServerError
 from aws_lambda_powertools.event_handler.middlewares import BaseMiddlewareHandler, NextMiddleware
 from aws_lambda_powertools.event_handler.types import EventHandlerInstance

aws_lambda_powertools/event_handler/response.py

@@ -0,0 +1,41 @@
+from typing import Dict, List, Optional, Union
+
+from aws_lambda_powertools.shared.cookies import Cookie
+
+
+class Response:
+    """Response data class that provides greater control over what is returned from the proxy event"""
+
+    def __init__(
+        self,
+        status_code: int,
+        content_type: Optional[str] = None,
+        body: Union[str, bytes, None] = None,
+        headers: Optional[Dict[str, Union[str, List[str]]]] = None,
+        cookies: Optional[List[Cookie]] = None,
+        compress: Optional[bool] = None,
+    ):
+        """
+
+        Parameters
+        ----------
+        status_code: int
+            Http status code, example 200
+        content_type: str
+            Optionally set the Content-Type header, example "application/json". Note this will be merged into any
+            provided http headers
+        body: Union[str, bytes, None]
+            Optionally set the response body. Note: bytes body will be automatically base64 encoded
+        headers: dict[str, Union[str, List[str]]]
+            Optionally set specific http headers. Setting "Content-Type" here would override the `content_type` value.
+        cookies: list[Cookie]
+            Optionally set cookies.
+        """
+        self.status_code = status_code
+        self.body = body
+        self.base64_encoded = False
+        self.headers: Dict[str, Union[str, List[str]]] = headers if headers else {}
+        self.cookies = cookies or []
+        self.compress = compress
+        if content_type:
+            self.headers.setdefault("Content-Type", content_type)

aws_lambda_powertools/event_handler/route.py

@@ -1,14 +1,16 @@
+import logging
 import warnings
 from re import Pattern
 from typing import Any, Callable, Dict, List, Optional, Sequence, Set, Tuple, Union, cast
 
 from pydantic.fields import ModelField
 from pydantic.schema import TypeModelOrEnum, field_schema
 
-from aws_lambda_powertools.event_handler import Response
-from aws_lambda_powertools.event_handler.api_gateway import logger
 from aws_lambda_powertools.event_handler.openapi.params import Dependant, Param
 from aws_lambda_powertools.event_handler.openapi.utils import get_flat_params
+from aws_lambda_powertools.event_handler.response import Response
+
+logger = logging.getLogger(__name__)
 
 
 class MiddlewareFrame:

examples/event_handler_rest/src/binary_responses.py

@@ -2,9 +2,9 @@
 from pathlib import Path
 
 from aws_lambda_powertools import Logger, Tracer
+from aws_lambda_powertools.event_handler import Response
 from aws_lambda_powertools.event_handler.api_gateway import (
     APIGatewayRestResolver,
-    Response,
 )
 from aws_lambda_powertools.logging import correlation_paths
 from aws_lambda_powertools.utilities.typing import LambdaContext