add exception handling in CatalogService

Author: bisgaard-itis

services/api-server/src/simcore_service_api_server/exceptions/backend_errors.py

@@ -17,6 +17,11 @@ def named_fields(cls) -> set[str]:
         )
 
 
+class InvalidInputError(BaseBackEndError):
+    msg_template = "Invalid input"
+    status_code = status.HTTP_422_UNPROCESSABLE_ENTITY
+
+
 class ListSolversOrStudiesError(BaseBackEndError):
     msg_template = "Cannot list solvers/studies"
     status_code = status.HTTP_404_NOT_FOUND
@@ -37,11 +42,16 @@ class ProfileNotFoundError(BaseBackEndError):
     status_code = status.HTTP_404_NOT_FOUND
 
 
-class SolverOrStudyNotFoundError(BaseBackEndError):
-    msg_template = "Could not get solver/study {name}:{version}"
+class ProgramOrSolverOrStudyNotFoundError(BaseBackEndError):
+    msg_template = "Could not get program/solver/study {name}:{version}"
     status_code = status.HTTP_404_NOT_FOUND
 
 
+class ServiceForbiddenAccessError(BaseBackEndError):
+    msg_template = "Forbidden access to program/solver/study {name}:{version}"
+    status_code = status.HTTP_403_FORBIDDEN
+
+
 class JobNotFoundError(BaseBackEndError):
     msg_template = "Could not get solver/study job {project_id}"
     status_code = status.HTTP_404_NOT_FOUND

services/api-server/src/simcore_service_api_server/services_http/catalog.py

@@ -17,7 +17,7 @@
 
 from ..exceptions.backend_errors import (
     ListSolversOrStudiesError,
-    SolverOrStudyNotFoundError,
+    ProgramOrSolverOrStudyNotFoundError,
 )
 from ..exceptions.service_errors_utils import service_exception_mapper
 from ..models.basic_types import VersionStr
@@ -145,7 +145,7 @@ async def list_services(
         return services
 
     @_exception_mapper(
-        http_status_map={status.HTTP_404_NOT_FOUND: SolverOrStudyNotFoundError}
+        http_status_map={status.HTTP_404_NOT_FOUND: ProgramOrSolverOrStudyNotFoundError}
     )
     async def get_service_ports(
         self,

services/api-server/src/simcore_service_api_server/services_rpc/catalog.py

@@ -1,3 +1,4 @@
+from functools import partial
 from typing import Annotated
 
 from fastapi import Depends
@@ -12,10 +13,23 @@
 from models_library.services_history import ServiceRelease
 from models_library.services_types import ServiceKey, ServiceVersion
 from models_library.users import UserID
+from pydantic import ValidationError
 from servicelib.rabbitmq import RabbitMQRPCClient
 from servicelib.rabbitmq.rpc_interfaces.catalog import services as catalog_rpc
+from servicelib.rabbitmq.rpc_interfaces.catalog.errors import (
+    CatalogForbiddenError,
+    CatalogItemNotFoundError,
+)
+from simcore_service_api_server.exceptions.backend_errors import (
+    InvalidInputError,
+    ProgramOrSolverOrStudyNotFoundError,
+    ServiceForbiddenAccessError,
+)
 
 from ..api.dependencies.rabbitmq import get_rabbitmq_rpc_client
+from ..exceptions.service_errors_utils import service_exception_mapper
+
+_exception_mapper = partial(service_exception_mapper, service_name="CatalogService")
 
 
 class CatalogService:
@@ -76,6 +90,13 @@ async def list_release_history(
         )
         return page.data, meta
 
+    @_exception_mapper(
+        rpc_exception_map={
+            CatalogItemNotFoundError: ProgramOrSolverOrStudyNotFoundError,
+            CatalogForbiddenError: ServiceForbiddenAccessError,
+            ValidationError: InvalidInputError,
+        }
+    )
     async def get(
         self,
         *,