@pcrespov use new exception handling system

Author: bisgaard-itis

services/web/server/src/simcore_service_webserver/catalog/_controller_rest.py

@@ -41,7 +41,7 @@
 from . import _service, _service_catalog_rest_client
 from ._exceptions import (
     DefaultPricingUnitForServiceNotFoundError,
-    reraise_catalog_exceptions_as_http_errors,
+    handle_plugin_requests_exceptions,
 )
 from .controller_rest_schemas import (
     CatalogRequestContext,
@@ -63,7 +63,7 @@
 )
 @login_required
 @permission_required("services.catalog.*")
-@reraise_catalog_exceptions_as_http_errors
+@handle_plugin_requests_exceptions
 async def list_services_latest(request: Request):
     request_ctx = CatalogRequestContext.create(request)
     query_params: ListServiceParams = parse_request_query_parameters_as(
@@ -101,7 +101,7 @@ async def list_services_latest(request: Request):
 )
 @login_required
 @permission_required("services.catalog.*")
-@reraise_catalog_exceptions_as_http_errors
+@handle_plugin_requests_exceptions
 async def get_service(request: Request):
     request_ctx = CatalogRequestContext.create(request)
     path_params = parse_request_path_parameters_as(ServicePathParams, request)
@@ -127,7 +127,7 @@ async def get_service(request: Request):
 )
 @login_required
 @permission_required("services.catalog.*")
-@reraise_catalog_exceptions_as_http_errors
+@handle_plugin_requests_exceptions
 async def update_service(request: Request):
     request_ctx = CatalogRequestContext.create(request)
     path_params = parse_request_path_parameters_as(ServicePathParams, request)
@@ -357,7 +357,7 @@ async def get_service_resources(request: Request):
 )
 @login_required
 @permission_required("services.catalog.*")
-@reraise_catalog_exceptions_as_http_errors
+@handle_plugin_requests_exceptions
 async def get_service_pricing_plan(request: Request):
     ctx = CatalogRequestContext.create(request)
     path_params = parse_request_path_parameters_as(ServicePathParams, request)

services/web/server/src/simcore_service_webserver/catalog/_exceptions.py

@@ -1,38 +1,21 @@
 """Defines the different exceptions that may arise in the catalog subpackage"""
 
-import functools
-
-from aiohttp import web
-from servicelib.aiohttp.typing_extension import Handler
+from servicelib.aiohttp import status
 from servicelib.rabbitmq.rpc_interfaces.catalog.errors import (
     CatalogForbiddenError,
     CatalogItemNotFoundError,
 )
 
 from ..errors import WebServerBaseError
+from ..exception_handling import (
+    ExceptionToHttpErrorMap,
+    HttpErrorInfo,
+    exception_handling_decorator,
+    to_exceptions_handlers_map,
+)
 from ..resource_usage.errors import DefaultPricingPlanNotFoundError
 
 
-def reraise_catalog_exceptions_as_http_errors(handler: Handler):
-    @functools.wraps(handler)
-    async def _wrapper(request: web.Request) -> web.StreamResponse:
-        try:
-
-            return await handler(request)
-
-        except (
-            CatalogItemNotFoundError,
-            DefaultPricingPlanNotFoundError,
-            DefaultPricingUnitForServiceNotFoundError,
-        ) as exc:
-            raise web.HTTPNotFound(reason=f"{exc}") from exc
-
-        except CatalogForbiddenError as exc:
-            raise web.HTTPForbidden(reason=f"{exc}") from exc
-
-    return _wrapper
-
-
 class BaseCatalogError(WebServerBaseError):
     msg_template = "Unexpected error occured in catalog submodule"
 
@@ -60,6 +43,28 @@ def __init__(self, *, service_key: str, service_version: str, **ctxs):
 assert CatalogItemNotFoundError  # nosec
 
 
+_TO_HTTP_ERROR_MAP: ExceptionToHttpErrorMap = {
+    CatalogItemNotFoundError: HttpErrorInfo(
+        status.HTTP_404_NOT_FOUND,
+        "Catalog item not found",
+    ),
+    DefaultPricingPlanNotFoundError: HttpErrorInfo(
+        status.HTTP_404_NOT_FOUND,
+        "Default pricing plan not found",
+    ),
+    DefaultPricingUnitForServiceNotFoundError: HttpErrorInfo(
+        status.HTTP_404_NOT_FOUND, "Default pricing unit not found"
+    ),
+    CatalogForbiddenError: HttpErrorInfo(
+        status.HTTP_403_FORBIDDEN, "Forbidden catalog access"
+    ),
+}
+
+handle_plugin_requests_exceptions = exception_handling_decorator(
+    to_exceptions_handlers_map(_TO_HTTP_ERROR_MAP)
+)
+
+
 __all__: tuple[str, ...] = (
     "CatalogForbiddenError",
     "CatalogItemNotFoundError",