updates errors

Author: pcrespov

packages/postgres-database/src/simcore_postgres_database/utils_tags.py

@@ -3,6 +3,7 @@
 
 from typing import TypedDict
 
+from common_library.errors_classes import OsparcErrorMixin
 from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine
 
 from .utils_repos import pass_or_acquire_connection, transaction_context
@@ -20,15 +21,15 @@
 #
 # Errors
 #
-class BaseTagError(Exception):
+class _BaseTagError(ValueError, OsparcErrorMixin):
     pass
 
 
-class TagNotFoundError(BaseTagError):
+class TagNotFoundError(_BaseTagError):
     pass
 
 
-class TagOperationNotAllowedError(BaseTagError):  # maps to AccessForbidden
+class TagOperationNotAllowedError(_BaseTagError):  # maps to AccessForbidden
     pass
 
 
@@ -163,8 +164,7 @@ async def get(
             result = await conn.execute(stmt_get)
             row = result.first()
             if not row:
-                msg = f"{tag_id=} not found: either no access or does not exists"
-                raise TagNotFoundError(msg)
+                raise TagNotFoundError(operation="get", tag_id=tag_id, user_id=user_id)
             return TagDict(
                 id=row.id,
                 name=row.name,
@@ -198,8 +198,9 @@ async def update(
             result = await conn.execute(update_stmt)
             row = result.first()
             if not row:
-                msg = f"{tag_id=} not updated: either no access or not found"
-                raise TagOperationNotAllowedError(msg)
+                raise TagOperationNotAllowedError(
+                    operation="update", tag_id=tag_id, user_id=user_id
+                )
 
             return TagDict(
                 id=row.id,
@@ -222,8 +223,9 @@ async def delete(
         async with transaction_context(self.engine, connection) as conn:
             deleted = await conn.scalar(stmt_delete)
             if not deleted:
-                msg = f"Could not delete {tag_id=}. Not found or insuficient access."
-                raise TagOperationNotAllowedError(msg)
+                raise TagOperationNotAllowedError(
+                    operation="delete", tag_id=tag_id, user_id=user_id
+                )
 
     #
     # ACCESS RIGHTS

services/web/server/src/simcore_service_webserver/tags/_rest.py

@@ -1,20 +1,23 @@
-import functools
-
 from aiohttp import web
 from pydantic import TypeAdapter
 from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import (
     parse_request_body_as,
     parse_request_path_parameters_as,
 )
-from servicelib.aiohttp.typing_extension import Handler
 from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
 from simcore_postgres_database.utils_tags import (
     TagNotFoundError,
     TagOperationNotAllowedError,
 )
 
 from .._meta import API_VTAG as VTAG
+from ..exception_handling import (
+    ExceptionToHttpErrorMap,
+    HttpErrorInfo,
+    exception_handling_decorator,
+    to_exceptions_handlers_map,
+)
 from ..login.decorators import login_required
 from ..security.decorators import permission_required
 from ..utils_aiohttp import envelope_json_response
@@ -29,20 +32,20 @@
     TagUpdate,
 )
 
-
-def _handle_tags_exceptions(handler: Handler):
-    @functools.wraps(handler)
-    async def wrapper(request: web.Request) -> web.StreamResponse:
-        try:
-            return await handler(request)
-
-        except TagNotFoundError as exc:
-            raise web.HTTPNotFound(reason=f"{exc}") from exc
-
-        except TagOperationNotAllowedError as exc:
-            raise web.HTTPForbidden(reason=f"{exc}") from exc
-
-    return wrapper
+_TO_HTTP_ERROR_MAP: ExceptionToHttpErrorMap = {
+    TagNotFoundError: HttpErrorInfo(
+        status.HTTP_404_NOT_FOUND,
+        "Tag {tag_id} not found: either no access or does not exists",
+    ),
+    TagOperationNotAllowedError: HttpErrorInfo(
+        status.HTTP_403_FORBIDDEN,
+        "Could not {operation} tag {tag_id}. Not found or insuficient access.",
+    ),
+}
+
+_handle_tags_exceptions = exception_handling_decorator(
+    to_exceptions_handlers_map(_TO_HTTP_ERROR_MAP)
+)
 
 
 routes = web.RouteTableDef()