move error models to servicelib

Author: bisgaard-itis

packages/models-library/src/models_library/api_schemas_directorv2/errors.py

@@ -1,7 +1,6 @@
 from typing import Annotated
 
 from pydantic import BaseModel, Field
-from servicelib.rabbitmq import RPCInterfaceError
 
 
 class Error(BaseModel):
@@ -16,11 +15,3 @@ class ErrorType(BaseModel):
 
 class ErrorEnveloped(BaseModel):
     error: ErrorType
-
-
-class BaseRpcError(RPCInterfaceError):
-    pass
-
-
-class ComputationalTaskMissingError(BaseRpcError):
-    msg_template = "Computational run not found for project {project_id}"

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/director_v2/errors.py

@@ -0,0 +1,9 @@
+from ..._errors import RPCInterfaceError
+
+
+class BaseRpcError(RPCInterfaceError):
+    pass
+
+
+class ComputationalTaskMissingError(BaseRpcError):
+    msg_template = "Computational run not found for project {project_id}"

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

@@ -1,10 +1,12 @@
 from dataclasses import dataclass
 from functools import partial
 
-from models_library.api_schemas_directorv2.errors import ComputationalTaskMissingError
 from models_library.projects import ProjectID
 from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 from servicelib.rabbitmq.rpc_interfaces.director_v2 import computations_tasks
+from servicelib.rabbitmq.rpc_interfaces.director_v2.errors import (
+    ComputationalTaskMissingError,
+)
 
 from ..exceptions.backend_errors import JobNotFoundError
 from ..exceptions.service_errors_utils import service_exception_mapper

services/director-v2/src/simcore_service_director_v2/api/rpc/_computations_tasks.py

@@ -2,9 +2,11 @@
 
 from fastapi import FastAPI
 from models_library.api_schemas_directorv2.computations import TaskLogFileIdGet
-from models_library.api_schemas_directorv2.errors import ComputationalTaskMissingError
 from models_library.projects import ProjectID
 from servicelib.rabbitmq import RPCRouter
+from servicelib.rabbitmq.rpc_interfaces.director_v2.errors import (
+    ComputationalTaskMissingError,
+)
 from simcore_sdk.node_ports_common import data_items_utils
 
 from ...core.errors import PipelineNotFoundError

services/director-v2/tests/unit/with_dbs/comp_scheduler/test_api_rpc_computations_tasks.py

@@ -4,13 +4,15 @@
 import pytest
 from faker import Faker
 from models_library.api_schemas_directorv2.computations import TaskLogFileIdGet
-from models_library.api_schemas_directorv2.errors import ComputationalTaskMissingError
 from models_library.projects import ProjectAtDB, ProjectID
 from models_library.projects_state import RunningState
 from servicelib.rabbitmq import RabbitMQRPCClient
 from servicelib.rabbitmq.rpc_interfaces.director_v2 import (
     computations_tasks as rpc_computations_tasks,
 )
+from servicelib.rabbitmq.rpc_interfaces.director_v2.errors import (
+    ComputationalTaskMissingError,
+)
 from simcore_postgres_database.models.comp_pipeline import StateType
 from simcore_service_director_v2.models.comp_pipelines import CompPipelineAtDB
 from simcore_service_director_v2.models.comp_runs import CompRunsAtDB