errors in tags, trash, wallets and workspaces

Author: pcrespov

packages/common-library/tests/test_iter_tools.py

@@ -30,6 +30,7 @@
     ProjectOwnerNotFoundInTheProjectAccessRightsError,
     ProjectStartsTooManyDynamicNodesError,
     ProjectTooManyProjectOpenedError,
+    ProjectWalletPendingTransactionError,
     WrongTagIdsInQueryError,
 )
 
@@ -97,7 +98,7 @@
     ),
     UserDefaultWalletNotFoundError: HttpErrorInfo(
         status.HTTP_404_NOT_FOUND,
-        "User default wallet not found",
+        "Wallet not found: {reason}",
     ),
     DefaultPricingPlanNotFoundError: HttpErrorInfo(
         status.HTTP_404_NOT_FOUND,
@@ -123,6 +124,10 @@
         status.HTTP_409_CONFLICT,
         "The maximal amount of concurrently running dynamic services was reached. Please manually stop a service and retry.",
     ),
+    ProjectWalletPendingTransactionError: HttpErrorInfo(
+        status.HTTP_409_CONFLICT,
+        "Project has currently pending transactions. It is forbidden to change wallet.",
+    ),
     ClustersKeeperNotAvailableError: HttpErrorInfo(
         status.HTTP_503_SERVICE_UNAVAILABLE,
         "Clusters-keeper service is not available",

services/web/server/src/simcore_service_webserver/projects/_common/exception_handlers.py

@@ -13,6 +13,7 @@
 from ..login.decorators import login_required
 from ..security.decorators import permission_required
 from . import _tags_api as tags_api
+from ._common.exception_handlers import handle_plugin_requests_exceptions
 
 _logger = logging.getLogger(__name__)
 
@@ -25,6 +26,7 @@
 )
 @login_required
 @permission_required("project.tag.*")
+@handle_plugin_requests_exceptions
 async def add_project_tag(request: web.Request):
     user_id: int = request[RQT_USERID_KEY]
 
@@ -51,6 +53,7 @@ async def add_project_tag(request: web.Request):
 )
 @login_required
 @permission_required("project.tag.*")
+@handle_plugin_requests_exceptions
 async def remove_project_tag(request: web.Request):
     user_id: int = request[RQT_USERID_KEY]
 

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

@@ -18,13 +18,14 @@
 from ..products.api import get_product_name
 from ..security.decorators import permission_required
 from . import _trash_service
+from ._common.exception_handlers import handle_plugin_requests_exceptions
 from ._common.models import ProjectPathParams, RemoveQueryParams
 from .exceptions import ProjectRunningConflictError, ProjectStoppingError
 
 _logger = logging.getLogger(__name__)
 
 #
-# EXCEPTIONS HANDLING
+# LOCAL EXCEPTIONS HANDLING
 #
 
 
@@ -40,7 +41,7 @@
 }
 
 
-_handle_exceptions = exception_handling_decorator(
+_handle_local_request_exceptions = exception_handling_decorator(
     to_exceptions_handlers_map(_TO_HTTP_ERROR_MAP)
 )
 
@@ -55,7 +56,8 @@
 @routes.post(f"/{VTAG}/projects/{{project_id}}:trash", name="trash_project")
 @login_required
 @permission_required("project.delete")
-@_handle_exceptions
+@handle_plugin_requests_exceptions
+@_handle_local_request_exceptions
 async def trash_project(request: web.Request):
     user_id = get_user_id(request)
     product_name = get_product_name(request)
@@ -79,7 +81,8 @@ async def trash_project(request: web.Request):
 @routes.post(f"/{VTAG}/projects/{{project_id}}:untrash", name="untrash_project")
 @login_required
 @permission_required("project.delete")
-@_handle_exceptions
+@handle_plugin_requests_exceptions
+@_handle_local_request_exceptions
 async def untrash_project(request: web.Request):
     user_id = get_user_id(request)
     product_name = get_product_name(request)

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

@@ -2,7 +2,6 @@
 
 """
 
-import functools
 import logging
 from decimal import Decimal
 from typing import Annotated
@@ -17,58 +16,26 @@
     parse_request_body_as,
     parse_request_path_parameters_as,
 )
-from servicelib.aiohttp.typing_extension import Handler
 from simcore_service_webserver.utils_aiohttp import envelope_json_response
 
 from .._meta import API_VTAG
 from ..login.decorators import login_required
 from ..security.decorators import permission_required
-from ..wallets.errors import WalletAccessForbiddenError, WalletNotFoundError
 from . import _wallets_api as wallets_api
 from . import projects_service
+from ._common.exception_handlers import handle_plugin_requests_exceptions
 from ._common.models import ProjectPathParams, RequestContext
-from .exceptions import (
-    ProjectInDebtCanNotChangeWalletError,
-    ProjectInvalidRightsError,
-    ProjectNotFoundError,
-    ProjectWalletPendingTransactionError,
-)
 
 _logger = logging.getLogger(__name__)
 
 
-def _handle_project_wallet_exceptions(handler: Handler):
-    @functools.wraps(handler)
-    async def wrapper(request: web.Request) -> web.StreamResponse:
-        try:
-            return await handler(request)
-
-        except ProjectNotFoundError as exc:
-            raise web.HTTPNotFound(reason=f"{exc}") from exc
-
-        except WalletNotFoundError as exc:
-            raise web.HTTPNotFound(reason=f"{exc}") from exc
-
-        except ProjectInDebtCanNotChangeWalletError as exc:
-            raise web.HTTPPaymentRequired(reason=f"{exc}") from exc
-
-        except (
-            WalletAccessForbiddenError,
-            ProjectInvalidRightsError,
-            ProjectWalletPendingTransactionError,
-        ) as exc:
-            raise web.HTTPForbidden(reason=f"{exc}") from exc
-
-    return wrapper
-
-
 routes = web.RouteTableDef()
 
 
 @routes.get(f"/{API_VTAG}/projects/{{project_id}}/wallet", name="get_project_wallet")
 @login_required
 @permission_required("project.wallet.*")
-@_handle_project_wallet_exceptions
+@handle_plugin_requests_exceptions
 async def get_project_wallet(request: web.Request):
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(ProjectPathParams, request)
@@ -99,7 +66,7 @@ class _ProjectWalletPathParams(BaseModel):
 )
 @login_required
 @permission_required("project.wallet.*")
-@_handle_project_wallet_exceptions
+@handle_plugin_requests_exceptions
 async def connect_wallet_to_project(request: web.Request):
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(_ProjectWalletPathParams, request)
@@ -134,7 +101,7 @@ class _PayProjectDebtBody(BaseModel):
 )
 @login_required
 @permission_required("project.wallet.*")
-@_handle_project_wallet_exceptions
+@handle_plugin_requests_exceptions
 async def pay_project_debt(request: web.Request):
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(_ProjectWalletPathParams, request)

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

@@ -1,4 +1,3 @@
-import functools
 import logging
 from typing import Annotated
 
@@ -9,43 +8,17 @@
 from pydantic import BaseModel, BeforeValidator, ConfigDict, Field
 from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import parse_request_path_parameters_as
-from servicelib.aiohttp.typing_extension import Handler
 
 from .._meta import api_version_prefix as VTAG
-from ..folders.errors import FolderAccessForbiddenError, FolderNotFoundError
 from ..login.decorators import login_required
 from ..security.decorators import permission_required
-from ..workspaces.errors import WorkspaceAccessForbiddenError, WorkspaceNotFoundError
 from . import _workspaces_api
+from ._common.exception_handlers import handle_plugin_requests_exceptions
 from ._common.models import RequestContext
-from .exceptions import ProjectInvalidRightsError, ProjectNotFoundError
 
 _logger = logging.getLogger(__name__)
 
 
-def _handle_projects_workspaces_exceptions(handler: Handler):
-    @functools.wraps(handler)
-    async def wrapper(request: web.Request) -> web.StreamResponse:
-        try:
-            return await handler(request)
-
-        except (
-            ProjectNotFoundError,
-            FolderNotFoundError,
-            WorkspaceNotFoundError,
-        ) as exc:
-            raise web.HTTPNotFound(reason=f"{exc}") from exc
-
-        except (
-            ProjectInvalidRightsError,
-            FolderAccessForbiddenError,
-            WorkspaceAccessForbiddenError,
-        ) as exc:
-            raise web.HTTPForbidden(reason=f"{exc}") from exc
-
-    return wrapper
-
-
 routes = web.RouteTableDef()
 
 
@@ -64,7 +37,7 @@ class _ProjectWorkspacesPathParams(BaseModel):
 )
 @login_required
 @permission_required("project.workspaces.*")
-@_handle_projects_workspaces_exceptions
+@handle_plugin_requests_exceptions
 async def move_project_to_workspace(request: web.Request):
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(