@pcrespov streamline to_rpc_schema methods

Author: bisgaard-itis

packages/models-library/src/models_library/api_schemas_storage/rpc/data_export_async_jobs.py

@@ -16,17 +16,17 @@ class DataExportTaskStartInput(BaseModel):
 ### Exceptions
 
 
-class StorageRpcErrors(OsparcErrorMixin, RuntimeError):
+class StorageRpcError(OsparcErrorMixin, RuntimeError):
     pass
 
 
-class InvalidFileIdentifierError(StorageRpcErrors):
+class InvalidFileIdentifierError(StorageRpcError):
     msg_template: str = "Could not find the file {file_id}"
 
 
-class AccessRightError(StorageRpcErrors):
+class AccessRightError(StorageRpcError):
     msg_template: str = "User {user_id} does not have access to file {file_id}"
 
 
-class DataExportError(StorageRpcErrors):
+class DataExportError(StorageRpcError):
     msg_template: str = "Could not complete data export job with id {job_id}"

packages/models-library/src/models_library/api_schemas_webserver/storage.py

@@ -2,8 +2,6 @@
 from pathlib import Path
 from typing import Any
 
-from pydantic import BaseModel
-
 from ..api_schemas_rpc_async_jobs.async_jobs import (
     AsyncJobGet,
     AsyncJobId,
@@ -14,38 +12,37 @@
 from ..progress_bar import ProgressReport
 from ..projects_nodes_io import LocationID
 from ..users import UserID
+from ._base import InputSchema, OutputSchema
 
 
-class DataExportPost(BaseModel):
+class DataExportPost(InputSchema):
     paths: list[Path]
 
-    def to_storage_model(
+    def to_rpc_schema(
         self, user_id: UserID, location_id: LocationID
     ) -> DataExportTaskStartInput:
         return DataExportTaskStartInput(
             paths=self.paths, user_id=user_id, location_id=location_id
         )
 
 
-class StorageAsyncJobGet(BaseModel):
+class StorageAsyncJobGet(OutputSchema):
     job_id: AsyncJobId
 
     @classmethod
-    def from_async_job_rpc_get(
-        cls, async_job_rpc_get: AsyncJobGet
-    ) -> "StorageAsyncJobGet":
+    def from_rpc_schema(cls, async_job_rpc_get: AsyncJobGet) -> "StorageAsyncJobGet":
         return StorageAsyncJobGet(job_id=async_job_rpc_get.job_id)
 
 
-class StorageAsyncJobStatus(BaseModel):
+class StorageAsyncJobStatus(OutputSchema):
     job_id: AsyncJobId
     progress: ProgressReport
     done: bool
     started: datetime
     stopped: datetime | None
 
     @classmethod
-    def from_async_job_rpc_status(
+    def from_rpc_schema(
         cls, async_job_rpc_status: AsyncJobStatus
     ) -> "StorageAsyncJobStatus":
         return StorageAsyncJobStatus(
@@ -57,12 +54,12 @@ def from_async_job_rpc_status(
         )
 
 
-class StorageAsyncJobResult(BaseModel):
+class StorageAsyncJobResult(OutputSchema):
     result: Any | None
     error: Any | None
 
     @classmethod
-    def from_async_job_rpc_result(
+    def from_rpc_schema(
         cls, async_job_rpc_result: AsyncJobResult
     ) -> "StorageAsyncJobResult":
         return StorageAsyncJobResult(

services/web/server/src/simcore_service_webserver/storage/_rest.py

@@ -402,12 +402,12 @@ class _PathParams(BaseModel):
     )
     async_job_rpc_get = await start_data_export(
         rabbitmq_rpc_client=rabbitmq_rpc_client,
-        paths=data_export_post.to_storage_model(
+        paths=data_export_post.to_rpc_schema(
             user_id=_req_ctx.user_id, location_id=_path_params.location_id
         ),
     )
     return create_data_response(
-        StorageAsyncJobGet.from_async_job_rpc_get(async_job_rpc_get),
+        StorageAsyncJobGet.from_rpc_schema(async_job_rpc_get),
         status=status.HTTP_202_ACCEPTED,
     )
 
@@ -429,7 +429,7 @@ async def get_async_job_status(request: web.Request) -> web.Response:
         job_id=async_job_get.job_id,
     )
     return create_data_response(
-        StorageAsyncJobStatus.from_async_job_rpc_status(async_job_rpc_status),
+        StorageAsyncJobStatus.from_rpc_schema(async_job_rpc_status),
         status=status.HTTP_200_OK,
     )
 
@@ -472,6 +472,6 @@ async def get_async_job_result(request: web.Request) -> web.Response:
         job_id=async_job_get.job_id,
     )
     return create_data_response(
-        StorageAsyncJobResult.from_async_job_rpc_result(async_job_rpc_result),
+        StorageAsyncJobResult.from_rpc_schema(async_job_rpc_result),
         status=status.HTTP_200_OK,
     )