wraps exceptions

Author: pcrespov

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

@@ -212,6 +212,6 @@ def _assert_duplicate():
 }
 
 
-handle_plugin_requests_exceptions = exception_handling_decorator(
+handle_rest_requests_exceptions = exception_handling_decorator(
     to_exceptions_handlers_map(_TO_HTTP_ERROR_MAP)
 )

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

@@ -25,7 +25,7 @@
 from ...security.decorators import permission_required
 from ...utils_aiohttp import envelope_json_response
 from .. import _comments_service, _projects_service
-from ._rest_exceptions import handle_plugin_requests_exceptions
+from ._rest_exceptions import handle_rest_requests_exceptions
 from ._rest_schemas import RequestContext
 
 _logger = logging.getLogger(__name__)
@@ -58,7 +58,7 @@ class _ProjectCommentsBodyParams(BaseModel):
 )
 @login_required
 @permission_required("project.read")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def create_project_comment(request: web.Request):
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(_ProjectCommentsPathParams, request)
@@ -98,7 +98,7 @@ class _ListProjectCommentsQueryParams(BaseModel):
 @routes.get(f"/{VTAG}/projects/{{project_uuid}}/comments", name="list_project_comments")
 @login_required
 @permission_required("project.read")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def list_project_comments(request: web.Request):
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(_ProjectCommentsPathParams, request)
@@ -147,7 +147,7 @@ async def list_project_comments(request: web.Request):
 )
 @login_required
 @permission_required("project.read")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def update_project_comment(request: web.Request):
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(
@@ -178,7 +178,7 @@ async def update_project_comment(request: web.Request):
 )
 @login_required
 @permission_required("project.read")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def delete_project_comment(request: web.Request):
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(
@@ -206,7 +206,7 @@ async def delete_project_comment(request: web.Request):
 )
 @login_required
 @permission_required("project.read")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def get_project_comment(request: web.Request):
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(

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

@@ -12,7 +12,7 @@
 from ...login.decorators import login_required
 from ...security.decorators import permission_required
 from .. import _folders_service
-from ._rest_exceptions import handle_plugin_requests_exceptions
+from ._rest_exceptions import handle_rest_requests_exceptions
 from ._rest_schemas import RequestContext
 
 _logger = logging.getLogger(__name__)
@@ -38,7 +38,7 @@ class _ProjectsFoldersPathParams(BaseModel):
 )
 @login_required
 @permission_required("project.folders.*")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def replace_project_folder(request: web.Request):
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(_ProjectsFoldersPathParams, request)

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

@@ -16,7 +16,7 @@
 from ...utils_aiohttp import envelope_json_response
 from .. import _groups_service
 from .._groups_service import ProjectGroupGet
-from ._rest_exceptions import handle_plugin_requests_exceptions
+from ._rest_exceptions import handle_rest_requests_exceptions
 from ._rest_schemas import ProjectPathParams, RequestContext
 
 _logger = logging.getLogger(__name__)
@@ -43,7 +43,7 @@ class _ProjectsGroupsBodyParams(BaseModel):
 )
 @login_required
 @permission_required("project.access_rights.update")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def create_project_group(request: web.Request):
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(_ProjectsGroupsPathParams, request)
@@ -66,7 +66,7 @@ async def create_project_group(request: web.Request):
 @routes.get(f"/{VTAG}/projects/{{project_id}}/groups", name="list_project_groups")
 @login_required
 @permission_required("project.read")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def list_project_groups(request: web.Request):
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(ProjectPathParams, request)
@@ -89,7 +89,7 @@ async def list_project_groups(request: web.Request):
 )
 @login_required
 @permission_required("project.access_rights.update")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def replace_project_group(request: web.Request):
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(_ProjectsGroupsPathParams, request)
@@ -113,7 +113,7 @@ async def replace_project_group(request: web.Request):
 )
 @login_required
 @permission_required("project.access_rights.update")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def delete_project_group(request: web.Request):
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(_ProjectsGroupsPathParams, request)

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

@@ -28,7 +28,7 @@
 from ...security.decorators import permission_required
 from ...utils_aiohttp import envelope_json_response
 from .. import _metadata_service
-from ._rest_exceptions import handle_plugin_requests_exceptions
+from ._rest_exceptions import handle_rest_requests_exceptions
 from ._rest_schemas import ProjectPathParams, RequestContext
 
 routes = web.RouteTableDef()
@@ -42,7 +42,7 @@
 )
 @login_required
 @permission_required("project.read")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def get_project_metadata(request: web.Request) -> web.Response:
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(ProjectPathParams, request)
@@ -62,7 +62,7 @@ async def get_project_metadata(request: web.Request) -> web.Response:
 )
 @login_required
 @permission_required("project.update")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def update_project_metadata(request: web.Request) -> web.Response:
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(ProjectPathParams, request)

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

@@ -16,7 +16,7 @@
 from ...utils_aiohttp import envelope_json_response
 from .. import _projects_service
 from .._projects_repository_legacy import ProjectDBAPI
-from ._rest_exceptions import handle_plugin_requests_exceptions
+from ._rest_exceptions import handle_rest_requests_exceptions
 from ._rest_schemas import RequestContext
 from .nodes_rest import NodePathParams
 
@@ -39,7 +39,7 @@ class PricingUnitNotFoundError(PricingUnitError):
 )
 @login_required
 @permission_required("project.wallet.*")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def get_project_node_pricing_unit(request: web.Request):
     db: ProjectDBAPI = ProjectDBAPI.get_from_app_context(request.app)
     req_ctx = RequestContext.model_validate(request)
@@ -86,7 +86,7 @@ class _ProjectNodePricingUnitPathParams(BaseModel):
 )
 @login_required
 @permission_required("project.wallet.*")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def connect_pricing_unit_to_project_node(request: web.Request):
     db: ProjectDBAPI = ProjectDBAPI.get_from_app_context(request.app)
     req_ctx = RequestContext.model_validate(request)

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

@@ -72,7 +72,7 @@
     ProjectNodeResourcesInsufficientRightsError,
     ProjectNodeResourcesInvalidError,
 )
-from ._rest_exceptions import handle_plugin_requests_exceptions
+from ._rest_exceptions import handle_rest_requests_exceptions
 from ._rest_schemas import ProjectPathParams, RequestContext
 
 _logger = logging.getLogger(__name__)
@@ -92,7 +92,7 @@ class NodePathParams(ProjectPathParams):
 @routes.post(f"/{VTAG}/projects/{{project_id}}/nodes", name="create_node")
 @login_required
 @permission_required("project.node.create")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def create_node(request: web.Request) -> web.Response:
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(ProjectPathParams, request)
@@ -134,7 +134,7 @@ async def create_node(request: web.Request) -> web.Response:
 @routes.get(f"/{VTAG}/projects/{{project_id}}/nodes/{{node_id}}", name="get_node")
 @login_required
 @permission_required("project.node.read")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 # NOTE: Careful, this endpoint is actually "get_node_state," and it doesn't return a Node resource.
 async def get_node(request: web.Request) -> web.Response:
     req_ctx = RequestContext.model_validate(request)
@@ -173,7 +173,7 @@ async def get_node(request: web.Request) -> web.Response:
 )
 @login_required
 @permission_required("project.node.update")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def patch_project_node(request: web.Request) -> web.Response:
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(NodePathParams, request)
@@ -194,7 +194,7 @@ async def patch_project_node(request: web.Request) -> web.Response:
 @routes.delete(f"/{VTAG}/projects/{{project_id}}/nodes/{{node_id}}", name="delete_node")
 @login_required
 @permission_required("project.node.delete")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def delete_node(request: web.Request) -> web.Response:
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(NodePathParams, request)
@@ -222,7 +222,7 @@ async def delete_node(request: web.Request) -> web.Response:
 )
 @login_required
 @permission_required("project.node.read")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def retrieve_node(request: web.Request) -> web.Response:
     """Has only effect on nodes associated to dynamic services"""
     path_params = parse_request_path_parameters_as(NodePathParams, request)
@@ -242,7 +242,7 @@ async def retrieve_node(request: web.Request) -> web.Response:
 )
 @login_required
 @permission_required("project.node.update")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def update_node_outputs(request: web.Request) -> web.Response:
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(NodePathParams, request)
@@ -269,7 +269,7 @@ async def update_node_outputs(request: web.Request) -> web.Response:
 )
 @login_required
 @permission_required("project.update")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def start_node(request: web.Request) -> web.Response:
     """Has only effect on nodes associated to dynamic services"""
     req_ctx = RequestContext.model_validate(request)
@@ -313,7 +313,7 @@ async def _stop_dynamic_service_task(
 )
 @login_required
 @permission_required("project.update")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def stop_node(request: web.Request) -> web.Response:
     """Has only effect on nodes associated to dynamic services"""
     req_ctx = RequestContext.model_validate(request)
@@ -355,7 +355,7 @@ async def stop_node(request: web.Request) -> web.Response:
 )
 @login_required
 @permission_required("project.node.read")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def restart_node(request: web.Request) -> web.Response:
     """Has only effect on nodes associated to dynamic services"""
 
@@ -379,7 +379,7 @@ async def restart_node(request: web.Request) -> web.Response:
 )
 @login_required
 @permission_required("project.node.read")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def get_node_resources(request: web.Request) -> web.Response:
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(NodePathParams, request)
@@ -414,7 +414,7 @@ async def get_node_resources(request: web.Request) -> web.Response:
 )
 @login_required
 @permission_required("project.node.update")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def replace_node_resources(request: web.Request) -> web.Response:
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(NodePathParams, request)
@@ -473,7 +473,7 @@ class _ProjectGroupAccess(BaseModel):
 )
 @login_required
 @permission_required("project.read")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def get_project_services(request: web.Request) -> web.Response:
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(ProjectPathParams, request)
@@ -516,7 +516,7 @@ async def get_project_services(request: web.Request) -> web.Response:
 )
 @login_required
 @permission_required("project.read")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def get_project_services_access_for_gid(request: web.Request) -> web.Response:
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(ProjectPathParams, request)
@@ -634,7 +634,7 @@ class _ProjectNodePreview(BaseModel):
 )
 @login_required
 @permission_required("project.read")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def list_project_nodes_previews(request: web.Request) -> web.Response:
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(ProjectPathParams, request)
@@ -674,7 +674,7 @@ async def list_project_nodes_previews(request: web.Request) -> web.Response:
 )
 @login_required
 @permission_required("project.read")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def get_project_node_preview(request: web.Request) -> web.Response:
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(NodePathParams, request)

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

@@ -28,7 +28,7 @@
 from .._access_rights_service import check_user_project_permission
 from .._projects_repository_legacy import ProjectDBAPI
 from ..models import ProjectDict
-from ._rest_exceptions import handle_plugin_requests_exceptions
+from ._rest_exceptions import handle_rest_requests_exceptions
 from ._rest_schemas import ProjectPathParams, RequestContext
 
 log = logging.getLogger(__name__)
@@ -57,7 +57,7 @@ async def _get_validated_workbench_model(
 @routes.get(f"/{VTAG}/projects/{{project_id}}/inputs", name="get_project_inputs")
 @login_required
 @permission_required("project.read")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def get_project_inputs(request: web.Request) -> web.Response:
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(ProjectPathParams, request)
@@ -82,7 +82,7 @@ async def get_project_inputs(request: web.Request) -> web.Response:
 @routes.patch(f"/{VTAG}/projects/{{project_id}}/inputs", name="update_project_inputs")
 @login_required
 @permission_required("project.update")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def update_project_inputs(request: web.Request) -> web.Response:
     db: ProjectDBAPI = ProjectDBAPI.get_from_app_context(request.app)
     req_ctx = RequestContext.model_validate(request)
@@ -148,7 +148,7 @@ async def update_project_inputs(request: web.Request) -> web.Response:
 @routes.get(f"/{VTAG}/projects/{{project_id}}/outputs", name="get_project_outputs")
 @login_required
 @permission_required("project.read")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def get_project_outputs(request: web.Request) -> web.Response:
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(ProjectPathParams, request)
@@ -195,7 +195,7 @@ class ProjectMetadataPortGet(BaseModel):
 )
 @login_required
 @permission_required("project.read")
-@handle_plugin_requests_exceptions
+@handle_rest_requests_exceptions
 async def list_project_metadata_ports(request: web.Request) -> web.Response:
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(ProjectPathParams, request)