mypy

Author: pcrespov

services/web/server/src/simcore_service_webserver/exception_handling_base.py

@@ -112,7 +112,7 @@ async def __aexit__(
             return True  # suppress
         return False  # reraise
 
-    def get_response(self):
+    def get_response(self) -> web.Response | None:
         return self._response
 
 
@@ -126,7 +126,7 @@ def exception_handling_decorator(
 
     def _decorator(handler: WebHandler):
         @functools.wraps(handler)
-        async def _wrapper(request: web.Request) -> web.StreamResponse:
+        async def _wrapper(request: web.Request):
             cm = ExceptionHandlingContextManager(
                 exception_handlers_map, request=request
             )

services/web/server/src/simcore_service_webserver/exception_handling_factory.py

@@ -4,7 +4,6 @@
 from aiohttp import web
 from common_library.error_codes import create_error_code
 from common_library.json_serialization import json_dumps
-from models_library.basic_types import IDStr
 from models_library.rest_error import ErrorGet
 from servicelib.aiohttp.web_exceptions_extension import get_all_aiohttp_http_exceptions
 from servicelib.logging_errors import create_troubleshotting_log_kwargs
@@ -81,7 +80,7 @@ async def _exception_handler(
             _DefaultDict(getattr(exception, "__dict__", {}))
         )
 
-        error = ErrorGet(message=user_msg)
+        error = ErrorGet.model_construct(message=user_msg)
 
         if is_5xx_server_error(status_code):
             oec = create_error_code(exception)
@@ -98,7 +97,7 @@ async def _exception_handler(
                     },
                 )
             )
-            error = ErrorGet(message=user_msg, support_id=IDStr(oec))
+            error = ErrorGet.model_construct(message=user_msg, support_id=oec)
 
         return create_error_response(error, status_code=status_code)
 

services/web/server/tests/unit/isolated/test_exception_handling.py

@@ -17,6 +17,9 @@
     exception_handling_decorator,
     to_exceptions_handlers_map,
 )
+from simcore_service_webserver.exception_handling_base import (
+    exception_handling_middleware,
+)
 
 
 @pytest.fixture
@@ -114,3 +117,42 @@ async def _handler(request: web.Request):
     # undhandled HTTPSuccess
     resp = await client.get("/HTTPOk")
     assert resp.status == status.HTTP_200_OK
+
+
+@pytest.mark.parametrize("build_method", ["custom", "http_map"])
+async def test_handling_exceptions_with_middelware(
+    aiohttp_client: Callable,
+    exception_handlers_map: ExceptionHandlersMap,
+    build_method: str,
+):
+    # adding new routes
+    routes = web.RouteTableDef()
+
+    @routes.get("/{what}")  # NO decorantor now
+    async def _handler(request: web.Request):
+        match request.match_info["what"]:
+            case "ValueError":
+                raise ValueError  # handled
+        return web.Response()
+
+    app = web.Application()
+    app.add_routes(routes)
+
+    # 1. create & install middleware
+    exc_handling = exception_handling_middleware(exception_handlers_map)
+    app.middlewares.append(exc_handling)
+
+    # 2. testing from the client side
+    client = await aiohttp_client(app)
+
+    # success
+    resp = await client.get("/ok")
+    assert resp.status == status.HTTP_200_OK
+
+    # handled non-HTTPException exception
+    resp = await client.get("/ValueError")
+    assert resp.status == status.HTTP_422_UNPROCESSABLE_ENTITY
+    if build_method == "http_map":
+        body = await resp.json()
+        error = ErrorGet.model_validate(body["error"])
+        assert error.message == f"{build_method=}"