rest exceptions

Author: pcrespov

api/specs/web-server/_projects.py

@@ -31,13 +31,13 @@
 from models_library.rest_pagination import Page
 from pydantic import BaseModel
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.projects._common.exceptions_handlers import (
-    _TO_HTTP_ERROR_MAP,
-)
 from simcore_service_webserver.projects._common.models import ProjectPathParams
 from simcore_service_webserver.projects._controller._projects_rest import (
     ProjectCreateQueryParams,
 )
+from simcore_service_webserver.projects._controller._rest_exceptions import (
+    _TO_HTTP_ERROR_MAP,
+)
 from simcore_service_webserver.projects._crud_handlers_models import (
     ProjectActiveQueryParams,
     ProjectsListQueryParams,

api/specs/web-server/_trash.py

@@ -15,7 +15,7 @@
     FoldersPathParams,
     FolderTrashQueryParams,
 )
-from simcore_service_webserver.projects._common.exceptions_handlers import (
+from simcore_service_webserver.projects._controller._rest_exceptions import (
     _TO_HTTP_ERROR_MAP,
 )
 from simcore_service_webserver.projects._trash_rest import ProjectPathParams
@@ -37,8 +37,7 @@
     "/trash:empty",
     status_code=status.HTTP_204_NO_CONTENT,
 )
-def empty_trash():
-    ...
+def empty_trash(): ...
 
 
 _extra_tags: list[str | Enum] = ["projects"]
@@ -66,8 +65,7 @@ def empty_trash():
 def trash_project(
     _path: Annotated[ProjectPathParams, Depends()],
     _query: Annotated[RemoveQueryParams, Depends()],
-):
-    ...
+): ...
 
 
 @router.post(
@@ -77,8 +75,7 @@ def trash_project(
 )
 def untrash_project(
     _path: Annotated[ProjectPathParams, Depends()],
-):
-    ...
+): ...
 
 
 _extra_tags = ["folders"]
@@ -99,8 +96,7 @@ def untrash_project(
 def trash_folder(
     _path: Annotated[FoldersPathParams, Depends()],
     _query: Annotated[FolderTrashQueryParams, Depends()],
-):
-    ...
+): ...
 
 
 @router.post(
@@ -110,8 +106,7 @@ def trash_folder(
 )
 def untrash_folder(
     _path: Annotated[FoldersPathParams, Depends()],
-):
-    ...
+): ...
 
 
 _extra_tags = ["workspaces"]
@@ -132,8 +127,7 @@ def untrash_folder(
 def trash_workspace(
     _path: Annotated[WorkspacesPathParams, Depends()],
     _query: Annotated[WorkspaceTrashQueryParams, Depends()],
-):
-    ...
+): ...
 
 
 @router.post(
@@ -143,5 +137,4 @@ def trash_workspace(
 )
 def untrash_workspace(
     _path: Annotated[WorkspacesPathParams, Depends()],
-):
-    ...
+): ...

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

@@ -27,8 +27,8 @@
 from ..security.decorators import permission_required
 from ..utils_aiohttp import envelope_json_response
 from . import _comments_service, projects_service
-from ._common.exceptions_handlers import handle_plugin_requests_exceptions
 from ._common.models import RequestContext
+from ._controller._rest_exceptions import handle_plugin_requests_exceptions
 
 _logger = logging.getLogger(__name__)
 

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

@@ -12,8 +12,8 @@
 from ...login.decorators import login_required
 from ...security.decorators import permission_required
 from .. import _folders_service
-from .._common.exceptions_handlers import handle_plugin_requests_exceptions
 from .._common.models import RequestContext
+from ._rest_exceptions import handle_plugin_requests_exceptions
 
 _logger = logging.getLogger(__name__)
 

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

@@ -17,9 +17,9 @@
 from ...security.decorators import permission_required
 from ...utils_aiohttp import envelope_json_response
 from .. import _groups_service
-from .._common.exceptions_handlers import handle_plugin_requests_exceptions
 from .._common.models import ProjectPathParams, RequestContext
 from .._groups_service import ProjectGroupGet
+from ._rest_exceptions import handle_plugin_requests_exceptions
 
 _logger = logging.getLogger(__name__)
 

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

@@ -28,8 +28,8 @@
 from ...security.decorators import permission_required
 from ...utils_aiohttp import envelope_json_response
 from .. import _metadata_service
-from .._common.exceptions_handlers import handle_plugin_requests_exceptions
 from .._common.models import ProjectPathParams, RequestContext
+from ._rest_exceptions import handle_plugin_requests_exceptions
 
 routes = web.RouteTableDef()
 

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

@@ -68,7 +68,6 @@
 from .. import _access_rights_service as access_rights_service
 from .. import _nodes_service as _nodes_service
 from .. import nodes_utils, projects_service
-from .._common.exceptions_handlers import handle_plugin_requests_exceptions
 from .._common.models import ProjectPathParams, RequestContext
 from .._nodes_service import NodeScreenshot, get_node_screenshots
 from ..api import has_user_project_access_rights
@@ -77,6 +76,7 @@
     ProjectNodeResourcesInsufficientRightsError,
     ProjectNodeResourcesInvalidError,
 )
+from ._rest_exceptions import handle_plugin_requests_exceptions
 
 _logger = logging.getLogger(__name__)
 

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

@@ -31,10 +31,10 @@
 from ...utils_aiohttp import envelope_json_response
 from .. import _ports_service, projects_service
 from .._access_rights_service import check_user_project_permission
-from .._common.exceptions_handlers import handle_plugin_requests_exceptions
 from .._common.models import ProjectPathParams, RequestContext
 from ..db import ProjectDBAPI
 from ..models import ProjectDict
+from ._rest_exceptions import handle_plugin_requests_exceptions
 
 log = logging.getLogger(__name__)
 

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

@@ -17,10 +17,10 @@
 from ...security.decorators import permission_required
 from ...utils_aiohttp import envelope_json_response
 from .. import projects_service
-from .._common.exceptions_handlers import handle_plugin_requests_exceptions
 from .._common.models import RequestContext
 from ..db import ProjectDBAPI
 from ._nodes_rest import NodePathParams
+from ._rest_exceptions import handle_plugin_requests_exceptions
 
 _logger = logging.getLogger(__name__)
 

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

@@ -43,7 +43,6 @@
 from ...users.api import get_user_fullname
 from ...utils_aiohttp import envelope_json_response
 from .. import _crud_api_create, _crud_api_read, projects_service
-from .._common.exceptions_handlers import handle_plugin_requests_exceptions
 from .._common.models import ProjectPathParams, RequestContext
 from .._crud_handlers_models import (
     ProjectActiveQueryParams,
@@ -57,6 +56,7 @@
 from ..models import ProjectDict
 from ..utils import get_project_unavailable_services, project_uses_available_services
 from . import _projects_rest_utils
+from ._rest_exceptions import handle_plugin_requests_exceptions
 
 # When the user requests a project with a repo, the working copy might differ from
 # the repo project. A middleware in the meta module (if active) will resolve