total not anymore optional

Author: sanderegg

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

@@ -16,7 +16,7 @@
 from faker import Faker
 from fastapi import APIRouter, Depends, FastAPI, Request, status
 from fastapi_pagination import add_pagination, create_page
-from fastapi_pagination.cursor import CursorPage, CursorParams
+from fastapi_pagination.cursor import CursorParams
 from models_library.api_schemas_storage.storage_schemas import (
     DatasetMetaDataGet,
     FileLocation,
@@ -35,6 +35,7 @@
 from pydantic import AnyUrl, TypeAdapter
 from pytest_simcore.helpers.logging_tools import log_context
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
+from servicelib.fastapi.rest_pagination import CustomizedPathsCursorPage
 from servicelib.utils import unused_port
 from yarl import URL
 
@@ -74,7 +75,7 @@ async def _list_storage_locations(user_id: UserID, request: Request):
 
     @router.get(
         "/locations/{location_id}/paths",
-        response_model=CursorPage[PathMetaDataGet],
+        response_model=CustomizedPathsCursorPage[PathMetaDataGet],
     )
     async def _list_paths(
         page_params: Annotated[CursorParams, Depends()],

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

@@ -11,7 +11,6 @@
 import pytest
 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,
     TaskResult,
@@ -56,6 +55,7 @@
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.webserver_users import UserInfoDict
 from servicelib.aiohttp import status
+from servicelib.fastapi.rest_pagination import CustomizedPathsCursorPage
 from servicelib.rabbitmq.rpc_interfaces.async_jobs import async_jobs
 from servicelib.rabbitmq.rpc_interfaces.async_jobs.async_jobs import (
     submit,
@@ -138,7 +138,7 @@ async def test_list_storage_paths(
     resp = await client.get(f"{url}")
     data, error = await assert_status(resp, expected)
     if not error:
-        TypeAdapter(CursorPage[PathMetaDataGet]).validate_python(data)
+        TypeAdapter(CustomizedPathsCursorPage[PathMetaDataGet]).validate_python(data)
 
 
 _faker = Faker()
@@ -485,7 +485,7 @@ async def test_export_data(
     )
 
     _body = DataExportPost(
-        paths=[f"{faker.uuid4()}/{faker.uuid4()}/{faker.file_name()}"]
+        paths=[Path(f"{faker.uuid4()}/{faker.uuid4()}/{faker.file_name()}")]
     )
     response = await client.post(
         f"/{API_VERSION}/storage/locations/0/export-data", data=_body.model_dump_json()