Refactor handlers to be separate from core logic

mangum/__init__.py

@@ -1 +1,5 @@
+from .response import Response
+from .scope import Scope
 from .adapter import Mangum  # noqa: F401
+
+__all__ = ["Mangum", "Response", "Scope"]

mangum/adapter.py

@@ -2,11 +2,10 @@
 from contextlib import ExitStack
 from typing import Any, ContextManager, Dict, TYPE_CHECKING
 
-from mangum.exceptions import ConfigurationError
-from mangum.handlers import AbstractHandler
-from mangum.protocols.http import HTTPCycle
-from mangum.protocols.lifespan import LifespanCycle
-from mangum.types import ASGIApp
+from .exceptions import ConfigurationError
+from .handlers import AbstractHandler
+from .protocols import HTTPCycle, LifespanCycle
+from .types import ASGIApp
 
 if TYPE_CHECKING:  # pragma: no cover
     from awslambdaric.lambda_context import LambdaContext
@@ -65,7 +64,7 @@ def __call__(self, event: dict, context: "LambdaContext") -> dict:
             handler = AbstractHandler.from_trigger(
                 event, context, **self.handler_kwargs
             )
-            http_cycle = HTTPCycle(handler.scope.as_dict())
+            http_cycle = HTTPCycle(handler.scope)
             response = http_cycle(self.app, handler.body)
 
         return handler.transform_response(response)

mangum/handlers/abstract_handler.py

@@ -2,8 +2,7 @@
 from abc import ABCMeta, abstractmethod
 from typing import Dict, Any, TYPE_CHECKING, Tuple, List
 
-from mangum.response import Response
-from mangum.scope import Scope
+from .. import Response, Scope
 
 if TYPE_CHECKING:  # pragma: no cover
     from awslambdaric.lambda_context import LambdaContext

mangum/handlers/aws_alb.py

@@ -3,8 +3,7 @@
 from typing import Dict, Any
 
 from .abstract_handler import AbstractHandler
-from ..response import Response
-from ..scope import Scope
+from .. import Response, Scope
 
 
 class AwsAlb(AbstractHandler):

mangum/handlers/aws_api_gateway.py

@@ -3,8 +3,7 @@
 from typing import Dict, Any, TYPE_CHECKING
 
 from .abstract_handler import AbstractHandler
-from ..response import Response
-from ..scope import Scope
+from .. import Response, Scope
 
 if TYPE_CHECKING:  # pragma: no cover
     from awslambdaric.lambda_context import LambdaContext

mangum/handlers/aws_cf_lambda_at_edge.py

@@ -2,8 +2,7 @@
 from typing import Dict, Any, List
 
 from .abstract_handler import AbstractHandler
-from ..response import Response
-from ..scope import Scope
+from .. import Response, Scope
 
 
 class AwsCfLambdaAtEdge(AbstractHandler):

mangum/handlers/aws_http_gateway.py

@@ -3,8 +3,7 @@
 from typing import Dict, Any
 
 from .abstract_handler import AbstractHandler
-from ..response import Response
-from ..scope import Scope
+from .. import Response, Scope
 
 
 class AwsHttpGateway(AbstractHandler):

mangum/protocols/__init__.py

@@ -0,0 +1,8 @@
+from .http import HTTPCycle
+from .lifespan import LifespanCycleState, LifespanCycle
+
+__all__ = [
+    "HTTPCycle",
+    "LifespanCycleState",
+    "LifespanCycle",
+]

mangum/protocols/http.py

@@ -5,9 +5,9 @@
 from io import BytesIO
 from dataclasses import dataclass
 
-from mangum.response import Response
-from mangum.types import ASGIApp, Message, ScopeDict
-from mangum.exceptions import UnexpectedMessage
+from .. import Response, Scope
+from ..types import ASGIApp, Message
+from ..exceptions import UnexpectedMessage
 
 
 class HTTPCycleState(enum.Enum):
@@ -44,7 +44,7 @@ class HTTPCycle:
     * **response** - A dictionary containing the response data to return in AWS Lambda.
     """
 
-    scope: ScopeDict
+    scope: Scope
     state: HTTPCycleState = HTTPCycleState.REQUEST
     response: Optional[Response] = None
 
@@ -77,7 +77,7 @@ async def run(self, app: ASGIApp) -> None:
         Calls the application with the `http` connection scope.
         """
         try:
-            await app(self.scope, self.receive, self.send)
+            await app(self.scope.as_dict(), self.receive, self.send)
         except BaseException as exc:
             self.logger.error("Exception in 'http' protocol.", exc_info=exc)
             if self.state is HTTPCycleState.REQUEST:

mangum/protocols/lifespan.py

@@ -5,8 +5,8 @@
 import enum
 from dataclasses import dataclass
 
-from mangum.types import ASGIApp, Message
-from mangum.exceptions import LifespanUnsupported, LifespanFailure, UnexpectedMessage
+from ..types import ASGIApp, Message
+from ..exceptions import LifespanUnsupported, LifespanFailure, UnexpectedMessage
 
 
 class LifespanCycleState(enum.Enum):

mangum/scope.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass, field
 from typing import List, Tuple, Optional, Dict, Any, Union, TYPE_CHECKING
 
-from mangum.types import ScopeDict
+from .types import ScopeDict
 
 if TYPE_CHECKING:  # pragma: no cover
     from awslambdaric.lambda_context import LambdaContext