remove redundant webserver schemas

Author: bisgaard-itis

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

@@ -1,25 +1,18 @@
 from pathlib import Path
-from typing import Annotated, Any
+from typing import Annotated
 
 from pydantic import BaseModel, Field
 
-from ..api_schemas_rpc_async_jobs.async_jobs import (
-    AsyncJobGet,
-    AsyncJobId,
-    AsyncJobResult,
-    AsyncJobStatus,
-)
 from ..api_schemas_storage.data_export_async_jobs import DataExportTaskStartInput
 from ..api_schemas_storage.storage_schemas import (
     DEFAULT_NUMBER_OF_PATHS_PER_PAGE,
     MAX_NUMBER_OF_PATHS_PER_PAGE,
 )
-from ..progress_bar import ProgressReport
 from ..projects_nodes_io import LocationID, StorageFileID
 from ..rest_pagination import (
     CursorQueryParameters,
 )
-from ._base import InputSchema, OutputSchema
+from ._base import InputSchema
 
 
 class StorageLocationPathParams(BaseModel):
@@ -51,48 +44,3 @@ def to_rpc_schema(self, location_id: LocationID) -> DataExportTaskStartInput:
             file_and_folder_ids=self.paths,
             location_id=location_id,
         )
-
-
-class AsyncJobLinks(OutputSchema):
-    status_href: str
-    abort_href: str
-    result_href: str
-
-
-class StorageAsyncJobGet(OutputSchema):
-    job_id: AsyncJobId
-    links: AsyncJobLinks
-
-    @classmethod
-    def from_rpc_schema(
-        cls, *, async_job_rpc_get: AsyncJobGet, links: AsyncJobLinks
-    ) -> "StorageAsyncJobGet":
-        return StorageAsyncJobGet(job_id=async_job_rpc_get.job_id, links=links)
-
-
-class StorageAsyncJobStatus(OutputSchema):
-    job_id: AsyncJobId
-    progress: ProgressReport
-    done: bool
-    links: AsyncJobLinks
-
-    @classmethod
-    def from_rpc_schema(
-        cls, *, async_job_rpc_status: AsyncJobStatus, links: AsyncJobLinks
-    ) -> "StorageAsyncJobStatus":
-        return StorageAsyncJobStatus(
-            job_id=async_job_rpc_status.job_id,
-            progress=async_job_rpc_status.progress,
-            done=async_job_rpc_status.done,
-            links=links,
-        )
-
-
-class StorageAsyncJobResult(OutputSchema):
-    result: Any | None
-
-    @classmethod
-    def from_rpc_schema(
-        cls, async_job_rpc_result: AsyncJobResult
-    ) -> "StorageAsyncJobResult":
-        return StorageAsyncJobResult(result=async_job_rpc_result.result)

services/web/server/tests/unit/with_dbs/01/storage/test_storage.py

@@ -11,6 +11,7 @@
 from aiohttp.test_utils import TestClient
 from faker import Faker
 from fastapi_pagination.cursor import CursorPage
+from models_library.api_schemas_long_running_tasks.tasks import TaskGet
 from models_library.api_schemas_rpc_async_jobs.async_jobs import AsyncJobGet, AsyncJobId
 from models_library.api_schemas_storage.storage_schemas import (
     DatasetMetaDataGet,
@@ -19,7 +20,6 @@
     FileUploadSchema,
     PathMetaDataGet,
 )
-from models_library.api_schemas_webserver.storage import StorageAsyncJobGet
 from models_library.projects_nodes_io import LocationID, StorageFileID
 from pydantic import TypeAdapter
 from pytest_mock import MockerFixture
@@ -146,7 +146,7 @@ async def test_compute_path_size(
     resp = await client.post(f"{url}")
     data, error = await assert_status(resp, expected)
     if not error:
-        TypeAdapter(StorageAsyncJobGet).validate_python(data)
+        TypeAdapter(TaskGet).validate_python(data)
 
 
 @pytest.mark.parametrize(

services/web/server/tests/unit/with_dbs/01/storage/test_storage_rpc.py

@@ -32,9 +32,7 @@
 )
 from models_library.api_schemas_webserver._base import OutputSchema
 from models_library.api_schemas_webserver.storage import (
-    AsyncJobLinks,
     DataExportPost,
-    StorageAsyncJobGet,
 )
 from models_library.generics import Envelope
 from models_library.progress_bar import ProgressReport
@@ -236,13 +234,8 @@ async def test_get_async_job_result(
     [
         (
             [
-                StorageAsyncJobGet(
+                AsyncJobGet(
                     job_id=AsyncJobId(_faker.uuid4()),
-                    links=AsyncJobLinks(
-                        status_href=_faker.uri(),
-                        abort_href=_faker.uri(),
-                        result_href=_faker.uri(),
-                    ),
                 )
             ],
             status.HTTP_200_OK,