refactor: streamline exception handling and improve service retrieval logic

Author: pcrespov

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

@@ -37,7 +37,6 @@
 from ..utils_aiohttp import envelope_json_response
 from . import _catalog_rest_client_service, _service
 from ._controller_rest_exceptions import (
-    DefaultPricingUnitForServiceNotFoundError,
     handle_plugin_requests_exceptions,
 )
 from ._controller_rest_schemas import (
@@ -50,6 +49,7 @@
     ServiceTagPathParams,
     ToServiceInputsQueryParams,
 )
+from .errors import DefaultPricingUnitForServiceNotFoundError
 
 _logger = logging.getLogger(__name__)
 

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

@@ -105,19 +105,12 @@ async def _handler_catalog_client_errors(
 }
 
 
-_exceptions_handlers_map: ExceptionHandlersMap = {
+catalog_exceptions_handlers_map: ExceptionHandlersMap = {
     CatalogResponseError: _handler_catalog_client_errors,
     CatalogConnectionError: _handler_catalog_client_errors,
 }
-_exceptions_handlers_map.update(to_exceptions_handlers_map(_TO_HTTP_ERROR_MAP))
+catalog_exceptions_handlers_map.update(to_exceptions_handlers_map(_TO_HTTP_ERROR_MAP))
 
 handle_plugin_requests_exceptions = exception_handling_decorator(
-    _exceptions_handlers_map
-)
-
-
-__all__: tuple[str, ...] = (
-    "CatalogForbiddenError",
-    "CatalogItemNotFoundError",
-    "DefaultPricingUnitForServiceNotFoundError",
+    catalog_exceptions_handlers_map
 )

services/web/server/src/simcore_service_webserver/projects/_controller/_rest_exceptions.py

@@ -8,7 +8,9 @@
     CatalogItemNotFoundError,
     CatalogNotAvailableError,
 )
+from simcore_service_webserver.exception_handling._base import ExceptionHandlersMap
 
+from ...catalog._controller_rest_exceptions import catalog_exceptions_handlers_map
 from ...conversations.errors import (
     ConversationErrorNotFoundError,
     ConversationMessageErrorNotFoundError,
@@ -239,6 +241,9 @@ def _assert_duplicate():
 }
 
 
-handle_plugin_requests_exceptions = exception_handling_decorator(
-    to_exceptions_handlers_map(_TO_HTTP_ERROR_MAP)
-)
+_handlers: ExceptionHandlersMap = {
+    **catalog_exceptions_handlers_map,
+    **to_exceptions_handlers_map(_TO_HTTP_ERROR_MAP),
+}
+
+handle_plugin_requests_exceptions = exception_handling_decorator(_handlers)

services/web/server/src/simcore_service_webserver/projects/_crud_api_read.py

@@ -120,10 +120,8 @@ async def list_projects(  # pylint: disable=too-many-arguments
 ) -> tuple[list[ProjectDict], int]:
     db = ProjectDBAPI.get_from_app_context(app)
 
-    user_available_services: list[ServiceKeyVersionDict] = (
-        await catalog_service.get_services_for_user_in_product(
-            app, user_id=user_id, product_name=product_name
-        )
+    user_available_services = await catalog_service.get_services_for_user_in_product(
+        app, user_id=user_id, product_name=product_name
     )
 
     workspace_is_private = True
@@ -204,10 +202,8 @@ async def list_projects_full_depth(
 ) -> tuple[list[ProjectDict], int]:
     db = ProjectDBAPI.get_from_app_context(app)
 
-    user_available_services: list[ServiceKeyVersionDict] = (
-        await catalog_service.get_services_for_user_in_product(
-            app, user_id=user_id, product_name=product_name
-        )
+    user_available_services = await catalog_service.get_services_for_user_in_product(
+        app, user_id=user_id, product_name=product_name
     )
 
     db_projects, db_project_types, total_number_projects = await db.list_projects_dicts(