using new functions

Author: pcrespov

services/web/server/src/simcore_service_webserver/exceptions_handlers.py

@@ -1,15 +1,15 @@
-from .exceptions_handlers_base import create_decorator_from_exception_handler
+from .exceptions_handlers_base import async_try_except_decorator
 from .exceptions_handlers_http_error_map import (
     ExceptionToHttpErrorMap,
     HttpErrorInfo,
-    create_exception_handler_from_http_error_map,
+    to_exceptions_handlers_map,
 )
 
 __all__: tuple[str, ...] = (
     "ExceptionToHttpErrorMap",
     "HttpErrorInfo",
-    "create_decorator_from_exception_handler",
-    "create_exception_handler_from_http_error_map",
+    "async_try_except_decorator",
+    "to_exceptions_handlers_map",
 )
 
 # nopycln: file

services/web/server/src/simcore_service_webserver/folders/_exceptions_handlers.py

@@ -5,19 +5,14 @@
 from ..exceptions_handlers import (
     ExceptionToHttpErrorMap,
     HttpErrorInfo,
-    create_decorator_from_exception_handler,
-    create_exception_handler_from_http_error_map,
-)
-from ..projects.exceptions import (
-    BaseProjectError,
-    ProjectRunningConflictError,
-    ProjectStoppingError,
+    async_try_except_decorator,
+    to_exceptions_handlers_map,
 )
+from ..projects.exceptions import ProjectRunningConflictError, ProjectStoppingError
 from ..workspaces.errors import (
     WorkspaceAccessForbiddenError,
     WorkspaceFolderInconsistencyError,
     WorkspaceNotFoundError,
-    WorkspacesValueError,
 )
 from .errors import (
     FolderAccessForbiddenError,
@@ -70,8 +65,7 @@
 }
 
 
-handle_plugin_requests_exceptions = create_decorator_from_exception_handler(
-    exception_types=(BaseProjectError, FoldersValueError, WorkspacesValueError),
-    exception_handler=create_exception_handler_from_http_error_map(_TO_HTTP_ERROR_MAP),
+handle_plugin_requests_exceptions = async_try_except_decorator(
+    to_exceptions_handlers_map(_TO_HTTP_ERROR_MAP)
 )
 # this is one decorator with a single exception handler

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

@@ -12,20 +12,16 @@
 from ..exceptions_handlers import (
     ExceptionToHttpErrorMap,
     HttpErrorInfo,
-    create_decorator_from_exception_handler,
-    create_exception_handler_from_http_error_map,
+    async_try_except_decorator,
+    to_exceptions_handlers_map,
 )
 from ..login.decorators import get_user_id, login_required
 from ..products.api import get_product_name
 from ..projects._common_models import ProjectPathParams
 from ..security.decorators import permission_required
 from . import _trash_api
 from ._common_models import RemoveQueryParams
-from .exceptions import (
-    ProjectRunningConflictError,
-    ProjectStoppingError,
-    ProjectTrashError,
-)
+from .exceptions import ProjectRunningConflictError, ProjectStoppingError
 
 _logger = logging.getLogger(__name__)
 
@@ -46,9 +42,8 @@
 }
 
 
-_handle_exceptions = create_decorator_from_exception_handler(
-    exception_types=ProjectTrashError,
-    exception_handler=create_exception_handler_from_http_error_map(_TO_HTTP_ERROR_MAP),
+_handle_exceptions = async_try_except_decorator(
+    to_exceptions_handlers_map(_TO_HTTP_ERROR_MAP)
 )
 
 

services/web/server/src/simcore_service_webserver/workspaces/_exceptions_handlers.py

@@ -5,27 +5,19 @@
 from ..exceptions_handlers import (
     ExceptionToHttpErrorMap,
     HttpErrorInfo,
-    create_exception_handlers_decorator,
-)
-from ..projects.exceptions import (
-    BaseProjectError,
-    ProjectRunningConflictError,
-    ProjectStoppingError,
+    async_try_except_decorator,
+    to_exceptions_handlers_map,
 )
+from ..projects.exceptions import ProjectRunningConflictError, ProjectStoppingError
 from .errors import (
     WorkspaceAccessForbiddenError,
     WorkspaceGroupNotFoundError,
     WorkspaceNotFoundError,
-    WorkspacesValueError,
 )
 
 _logger = logging.getLogger(__name__)
 
 
-def tr(msg) -> str:
-    return msg
-
-
 _TO_HTTP_ERROR_MAP: ExceptionToHttpErrorMap = {
     WorkspaceGroupNotFoundError: HttpErrorInfo(
         status.HTTP_404_NOT_FOUND,
@@ -51,7 +43,6 @@ def tr(msg) -> str:
 }
 
 
-handle_plugin_requests_exceptions = create_exception_handlers_decorator(
-    exceptions_catch=(BaseProjectError, WorkspacesValueError),
-    exc_to_status_map=_TO_HTTP_ERROR_MAP,
+handle_plugin_requests_exceptions = async_try_except_decorator(
+    to_exceptions_handlers_map(_TO_HTTP_ERROR_MAP)
 )

services/web/server/tests/unit/isolated/test_exceptions_handlers.py

@@ -104,7 +104,7 @@ async def _concrete_exc_handler(request, exception):
 
 
 @pytest.mark.parametrize("exception_cls", [OneError, OtherError])
-async def test_create_decorator_from_exception_handler(exception_cls: type[Exception]):
+async def test_async_try_except_decorator(exception_cls: type[Exception]):
     expected_request = make_mocked_request("GET", "/foo")
     expected_exception = exception_cls()
     expected_response = web.Response(reason=f"suppressed {exception_cls}")