clean up error mapping

Author: bisgaard-itis

services/api-server/src/simcore_service_api_server/exceptions/task_errors.py

@@ -3,35 +3,31 @@
 from .backend_errors import BaseBackEndError
 
 
-class TaskBaseError(BaseBackEndError):
-    pass
-
-
-class TaskSchedulerError(TaskBaseError):
+class TaskSchedulerError(BaseBackEndError):
     msg_template: str = "TaskScheduler error"
     status_code = status.HTTP_500_INTERNAL_SERVER_ERROR
 
 
-class TaskMissingError(TaskBaseError):
+class TaskMissingError(BaseBackEndError):
     msg_template: str = "Task {job_id} does not exist"
     status_code = status.HTTP_404_NOT_FOUND
 
 
-class TaskStatusError(TaskBaseError):
+class TaskStatusError(BaseBackEndError):
     msg_template: str = "Could not get status of task {job_id}"
     status_code = status.HTTP_404_NOT_FOUND
 
 
-class TaskNotDoneError(TaskBaseError):
+class TaskNotDoneError(BaseBackEndError):
     msg_template: str = "Task {job_id} not done"
     status_code = status.HTTP_409_CONFLICT
 
 
-class TaskCancelledError(TaskBaseError):
+class TaskCancelledError(BaseBackEndError):
     msg_template: str = "Task {job_id} cancelled"
     status_code = status.HTTP_409_CONFLICT
 
 
-class TaskError(TaskBaseError):
+class TaskError(BaseBackEndError):
     msg_template: str = "Task '{job_id}' failed"
     status_code = status.HTTP_500_INTERNAL_SERVER_ERROR

services/api-server/src/simcore_service_api_server/services_rpc/async_jobs.py

@@ -11,21 +11,17 @@
 from models_library.api_schemas_rpc_async_jobs.exceptions import (
     JobAbortedError,
     JobError,
-    JobMissingError,
     JobNotDoneError,
     JobSchedulerError,
-    JobStatusError,
 )
 from models_library.api_schemas_storage import STORAGE_RPC_NAMESPACE
-from servicelib.long_running_tasks.errors import TaskCancelledError
 from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 from servicelib.rabbitmq.rpc_interfaces.async_jobs import async_jobs
 from simcore_service_api_server.exceptions.task_errors import (
+    TaskCancelledError,
     TaskError,
-    TaskMissingError,
     TaskNotDoneError,
     TaskSchedulerError,
-    TaskStatusError,
 )
 
 from ..exceptions.service_errors_utils import service_exception_mapper
@@ -34,21 +30,16 @@
     service_exception_mapper, service_name="Async jobs"
 )
 
-_exception_map = {
-    JobSchedulerError: TaskSchedulerError,
-    JobMissingError: TaskMissingError,
-    JobStatusError: TaskStatusError,
-    JobNotDoneError: TaskNotDoneError,
-    JobAbortedError: TaskCancelledError,
-    JobError: TaskError,
-}
-
 
 @dataclass
 class AsyncJobClient:
     _rabbitmq_rpc_client: RabbitMQRPCClient
 
-    @_exception_mapper(rpc_exception_map=_exception_map)
+    @_exception_mapper(
+        rpc_exception_map={
+            JobSchedulerError: TaskSchedulerError,
+        }
+    )
     async def cancel(
         self, *, job_id: AsyncJobId, job_id_data: AsyncJobNameData
     ) -> None:
@@ -59,7 +50,11 @@ async def cancel(
             job_id_data=job_id_data,
         )
 
-    @_exception_mapper(rpc_exception_map=_exception_map)
+    @_exception_mapper(
+        rpc_exception_map={
+            JobSchedulerError: TaskSchedulerError,
+        }
+    )
     async def status(
         self, *, job_id: AsyncJobId, job_id_data: AsyncJobNameData
     ) -> AsyncJobStatus:
@@ -70,7 +65,14 @@ async def status(
             job_id_data=job_id_data,
         )
 
-    @_exception_mapper(rpc_exception_map=_exception_map)
+    @_exception_mapper(
+        rpc_exception_map={
+            JobSchedulerError: TaskSchedulerError,
+            JobNotDoneError: TaskNotDoneError,
+            JobAbortedError: TaskCancelledError,
+            JobError: TaskError,
+        }
+    )
     async def result(
         self, *, job_id: AsyncJobId, job_id_data: AsyncJobNameData
     ) -> AsyncJobResult:
@@ -81,7 +83,11 @@ async def result(
             job_id_data=job_id_data,
         )
 
-    @_exception_mapper(rpc_exception_map=_exception_map)
+    @_exception_mapper(
+        rpc_exception_map={
+            JobSchedulerError: TaskSchedulerError,
+        }
+    )
     async def list_jobs(
         self, *, filter_: str, job_id_data: AsyncJobNameData
     ) -> list[AsyncJobGet]: