Fixed wrong use of ASGI app args

Author: eadwinCode

ellar/core/context/factory.py

@@ -5,7 +5,7 @@
 from ellar.di import injectable
 from ellar.di.exceptions import ServiceUnavailable
 from ellar.services import Reflector
-from ellar.types import T
+from ellar.types import T, TReceive, TScope, TSend
 
 from .exceptions import HostContextException
 from .execution import ExecutionContext
@@ -97,13 +97,18 @@ class ExecutionContextFactory(IExecutionContextFactory):
     def __init__(self, reflector: Reflector) -> None:
         self.reflector = reflector
 
-    def create_context(self, operation: "RouteOperationBase") -> IExecutionContext:
+    def create_context(
+        self,
+        operation: "RouteOperationBase",
+        scope: TScope,
+        receive: TReceive,
+        send: TSend,
+    ) -> IExecutionContext:
         scoped_request_args = ASGI_CONTEXT_VAR.get()
 
         if not scoped_request_args:
             raise ServiceUnavailable()
 
-        scope, receive, send = scoped_request_args.get_args()
         i_execution_context = ExecutionContext(
             scope=scope,
             receive=receive,

ellar/core/context/interface.py

@@ -81,5 +81,11 @@ def create_context(self) -> IHostContext:
 
 class IExecutionContextFactory(ABC):
     @abstractmethod
-    def create_context(self, operation: "RouteOperationBase") -> IExecutionContext:
+    def create_context(
+        self,
+        operation: "RouteOperationBase",
+        scope: TScope,
+        receive: TReceive,
+        send: TSend,
+    ) -> IExecutionContext:
         pass

ellar/core/middleware/exceptions.py

@@ -2,12 +2,13 @@
 
 from starlette.exceptions import HTTPException
 
-from ellar.core.connection import HTTPConnection
-from ellar.core.context import HostContext, IHostContext
+from ellar.constants import SCOPE_SERVICE_PROVIDER
+from ellar.core.context import IHostContext
 from ellar.types import ASGIApp, TMessage, TReceive, TScope, TSend
 
 if t.TYPE_CHECKING:  # pragma: no cover
     from ellar.core.exceptions.service import ExceptionMiddlewareService
+    from ellar.di import EllarInjector
 
 
 class ExceptionMiddleware:
@@ -34,6 +35,7 @@ async def sender(message: TMessage) -> None:
             if message["type"] == "http.response.start":
                 response_started = True
             await send(message)
+            return
 
         try:
             await self.app(scope, receive, sender)
@@ -57,15 +59,17 @@ async def sender(message: TMessage) -> None:
                 msg = "Caught handled exception, but response already started."
                 raise RuntimeError(msg) from exc
 
-            connection = HTTPConnection(scope, receive)
+            service_provider: "EllarInjector" = t.cast(
+                "EllarInjector", scope[SCOPE_SERVICE_PROVIDER]
+            )
 
-            if not connection.service_provider:  # pragma: no cover
-                context = HostContext(scope=scope, receive=receive, send=send)
-            else:
-                context = connection.service_provider.get(IHostContext)
+            context = service_provider.get(IHostContext)
 
             if context.get_type() == "http":
                 response = await handler.catch(context, exc)
+                if not response and not response_started:
+                    msg = "HTTP ExceptionHandler must return a response."
+                    raise RuntimeError(msg) from exc
                 await response(scope, receive, sender)
             elif context.get_type() == "websocket":
                 await handler.catch(context, exc)

ellar/core/routing/base.py

@@ -62,7 +62,9 @@ async def app(self, scope: TScope, receive: TReceive, send: TSend) -> None:
         service_provider = t.cast(EllarInjector, scope[SCOPE_SERVICE_PROVIDER])
 
         execution_context_factory = service_provider.get(IExecutionContextFactory)
-        context = execution_context_factory.create_context(operation=self)
+        context = execution_context_factory.create_context(
+            operation=self, scope=scope, receive=receive, send=send
+        )
 
         await self.run_route_guards(context=context)
         await self._handle_request(context=context)

tests/test_application/test_replacing_app_services.py

@@ -42,13 +42,12 @@ class NewExecutionHostFactory(IExecutionContextFactory):
     def __init__(self, reflector: Reflector):
         self.reflector = reflector
 
-    def create_context(self, operation) -> IExecutionContext:
+    def create_context(self, operation, scope, receive, send) -> IExecutionContext:
         scoped_request_args = ASGI_CONTEXT_VAR.get()
 
         if not scoped_request_args:
             raise ServiceUnavailable()
 
-        scope, receive, send = scoped_request_args.get_args()
         i_execution_context = NewExecutionContext(
             scope=scope,
             receive=receive,

tests/test_exceptions/test_custom_exceptions.py

@@ -49,6 +49,15 @@ async def catch(
         return JSONResponse({"detail": "HttpException Override"}, status_code=400)
 
 
+class RuntimeHTTPException(IExceptionHandler):
+    exception_type_or_code = HTTPException
+
+    async def catch(
+        self, ctx: IHostContext, exc: t.Union[t.Any, Exception]
+    ) -> t.Union[Response, t.Any]:
+        return None
+
+
 class ServerErrorHandler(IExceptionHandler):
     exception_type_or_code = 500
 
@@ -234,6 +243,20 @@ def homepage():
     assert res.json() == {"detail": "HttpException Override"}
 
 
+def test_application_http_exception_handler_raise_exception_for_returning_none():
+    @get()
+    def homepage():
+        raise HTTPException(detail="Bad Request", status_code=400)
+
+    tm = TestClientFactory.create_test_module()
+    tm.app.router.append(homepage)
+    tm.app.add_exception_handler(RuntimeHTTPException())
+    with pytest.raises(
+        RuntimeError, match="HTTP ExceptionHandler must return a response."
+    ):
+        tm.get_client().get("/")
+
+
 def test_application_adding_same_exception_twice():
     tm = TestClientFactory.create_test_module()
     with patch.object(