Fix KeyError raised when annotating a view with return annotations

starlite/request.py

@@ -6,6 +6,7 @@
 from pydantic.error_wrappers import ValidationError
 from pydantic.fields import ModelField
 from starlette.requests import Request
+from starlette.responses import Response as StarletteResponse
 
 from starlite.controller import Controller
 from starlite.enums import HttpMethod, MediaType
@@ -74,6 +75,11 @@ class Config(BaseConfig):
         signature = Signature.from_callable(fn)
         field_definitions: Dict[str, Tuple[Any, Any]] = {}
         for key, value in getfullargspec(fn).annotations.items():
+
+            # discard return annotations
+            if key == "return":
+                continue
+
             parameter = signature.parameters[key]
             if parameter.default is not signature.empty:
                 field_definitions[key] = (value, parameter.default)
@@ -132,6 +138,9 @@ async def handle_request(route_handler: "RouteHandler", request: Request) -> Res
     if isawaitable(data):
         data = await data
 
+    if isinstance(data, StarletteResponse):
+        return data
+
     media_type = route_handler.media_type or response_class.media_type or MediaType.JSON
     return response_class(
         content=data,

tests/test_request.py

@@ -7,7 +7,14 @@
 from pydantic.fields import ModelField
 from starlette.requests import Request
 
-from starlite import HttpMethod, ImproperlyConfiguredException, Provide, get, route
+from starlite import (
+    HttpMethod,
+    ImproperlyConfiguredException,
+    Provide,
+    Response,
+    get,
+    route,
+)
 from starlite.request import (
     create_function_signature_model,
     get_kwargs_from_request,
@@ -93,3 +100,25 @@ async def test_function(data: Person):
 
     response = await handle_request(route_handler=cast(Any, test_function), request=request)
     assert response.body.decode("utf-8") == person_instance.json()
+
+
+@pytest.mark.asyncio
+async def test_handle_return_annotation():
+    @get(path="/health", status_code=204)
+    async def health_check() -> None:
+        return
+
+    r = create_function_signature_model(health_check.fn)
+    assert r().dict() == {}
+
+
+@pytest.mark.asyncio
+async def test_handle_request_with_response():
+    @get(path="/health")
+    async def health_check():
+        return Response(status_code=204)
+
+    request = create_test_request(content=None, http_method=HttpMethod.GET)
+    response = await handle_request(route_handler=cast(Any, health_check), request=request)
+    assert response.status_code == 204
+    assert not hasattr(response, "content")