error handling

Author: pcrespov

packages/common-library/src/common_library/errors_classes.py

@@ -66,7 +66,7 @@ def make_resource_error(
     resource: str,
     error_cls: type[OsparcErrorMixin],
     base_exception: type[Exception] = Exception,
-) -> type[OsparcErrorMixin]:
+) -> type[Exception]:
     class _ResourceError(error_cls, base_exception):
         def __init__(self, **ctx: Any):
             ctx.setdefault("resource", resource)

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

@@ -0,0 +1,17 @@
+from common_library.errors_classes import (
+    OsparcErrorMixin,
+)
+
+
+class WebServerRpcError(OsparcErrorMixin, Exception):
+    msg_template = "{details}"
+
+    @classmethod
+    def from_domain_error(cls, err: OsparcErrorMixin):
+        return cls(details=f"{err} [{err.__class__.__name__}]", **err.error_context())
+
+
+class ProjectNotFoundRpcError(WebServerRpcError): ...
+
+
+class ProjectForbiddenRpcError(WebServerRpcError): ...

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/projects.py

@@ -34,5 +34,6 @@ async def mark_project_as_job(
         user_id=user_id,
         project_uuid=project_uuid,
         job_parent_resource_name=job_parent_resource_name,
+        timeout_s=None,  # TODO: remove after testing
     )
     assert result is None

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

@@ -3,16 +3,27 @@
 from models_library.products import ProductName
 from models_library.projects import ProjectID
 from models_library.users import UserID
-from pydantic import validate_call
+from pydantic import ValidationError, validate_call
 from servicelib.rabbitmq import RPCRouter
+from servicelib.rabbitmq.rpc_interfaces.webserver.errors import (
+    ProjectForbiddenRpcError,
+    ProjectNotFoundRpcError,
+)
 
 from ...rabbitmq import get_rabbitmq_rpc_server
 from .. import _jobs_service
+from ..exceptions import ProjectInvalidRightsError
 
 router = RPCRouter()
 
 
-@router.expose()
+@router.expose(
+    reraise_if_error_type=(
+        ProjectForbiddenRpcError,
+        ProjectNotFoundRpcError,
+        ValidationError,
+    )
+)
 @validate_call(config={"arbitrary_types_allowed": True})
 async def mark_project_as_job(
     app: web.Application,
@@ -23,13 +34,17 @@ async def mark_project_as_job(
     job_parent_resource_name: str,
 ) -> None:
 
-    await _jobs_service.set_project_as_job(
-        app,
-        product_name=product_name,
-        user_id=user_id,
-        project_uuid=project_uuid,
-        job_parent_resource_name=job_parent_resource_name,
-    )
+    try:
+
+        await _jobs_service.set_project_as_job(
+            app,
+            product_name=product_name,
+            user_id=user_id,
+            project_uuid=project_uuid,
+            job_parent_resource_name=job_parent_resource_name,
+        )
+    except ProjectInvalidRightsError as err:
+        raise ProjectForbiddenRpcError.from_domain_error(err) from err
 
 
 async def register_rpc_routes_on_startup(app: web.Application):

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

@@ -24,7 +24,7 @@ async def set_project_as_job(
             stmt = (
                 pg_insert(projects_to_jobs)
                 .values(
-                    project_uuid=project_uuid,
+                    project_uuid=f"{project_uuid}",
                     job_parent_resource_name=job_parent_resource_name,
                 )
                 .on_conflict_do_update(

services/web/server/tests/unit/with_dbs/02/test_projects_rpc.py

@@ -17,6 +17,7 @@
 from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict
 from servicelib.rabbitmq import RabbitMQRPCClient
 from servicelib.rabbitmq.rpc_interfaces.webserver import projects as projects_rpc
+from servicelib.rabbitmq.rpc_interfaces.webserver.errors import ProjectForbiddenRpcError
 from settings_library.rabbit import RabbitSettings
 from simcore_service_webserver.application_settings import ApplicationSettings
 from simcore_service_webserver.projects.models import ProjectDict
@@ -101,7 +102,7 @@ async def test_rpc_client_mark_project_as_job(
         job_parent_resource_name="solvers/solver123/version/1.2.3",
     )
 
-    with pytest.raises(Exception, match="no access"):
+    with pytest.raises(ProjectForbiddenRpcError) as err_info:
         await projects_rpc.mark_project_as_job(
             rpc_client=rpc_client,
             product_name=product_name,
@@ -110,6 +111,8 @@ async def test_rpc_client_mark_project_as_job(
             job_parent_resource_name="solvers/solver123/version/1.2.3",
         )
 
+    assert err_info.value.error_context()["project_uuid"] == project_uuid
+
     with pytest.raises(Exception, match="not found"):
         await projects_rpc.mark_project_as_job(
             rpc_client=rpc_client,