test fixes

Author: sanderegg

services/datcore-adapter/src/simcore_service_datcore_adapter/api/rest/datasets.py

@@ -3,7 +3,7 @@
 
 from aiocache import cached  # type: ignore[import-untyped]
 from fastapi import APIRouter, Depends, Header, Query, Request
-from fastapi_pagination import Page, Params
+from fastapi_pagination import LimitOffsetPage, Params
 from fastapi_pagination.api import create_page, resolve_params
 from fastapi_pagination.bases import RawParams
 from fastapi_pagination.customization import CustomizedPage, UseParamsFields
@@ -32,9 +32,9 @@
 
 _T = TypeVar("_T")
 _CustomPage = CustomizedPage[
-    Page[_T],
+    LimitOffsetPage[_T],
     UseParamsFields(
-        size=Query(
+        limit=Query(
             DEFAULT_NUMBER_OF_PATHS_PER_PAGE, ge=1, le=MAX_NUMBER_OF_PATHS_PER_PAGE
         ),
     ),

services/datcore-adapter/tests/unit/test_route_datasets.py

@@ -5,7 +5,7 @@
 
 import httpx
 import respx
-from fastapi_pagination import Page
+from fastapi_pagination import LimitOffsetPage
 from models_library.api_schemas_datcore_adapter.datasets import (
     DatasetMetaData,
     FileMetaData,
@@ -44,7 +44,7 @@ async def test_list_datasets_entrypoint(
     assert response.status_code == status.HTTP_200_OK
     data = response.json()
     assert data
-    TypeAdapter(Page[DatasetMetaData]).validate_python(data)
+    TypeAdapter(LimitOffsetPage[DatasetMetaData]).validate_python(data)
 
 
 async def test_list_dataset_files_legacy_entrypoint(
@@ -80,7 +80,7 @@ async def test_list_dataset_top_level_files_entrypoint(
     assert response.status_code == status.HTTP_200_OK
     data = response.json()
     assert data
-    TypeAdapter(Page[FileMetaData]).validate_python(data)
+    TypeAdapter(LimitOffsetPage[FileMetaData]).validate_python(data)
 
 
 async def test_list_dataset_collection_files_entrypoint(
@@ -100,4 +100,4 @@ async def test_list_dataset_collection_files_entrypoint(
     assert response.status_code == status.HTTP_200_OK
     data = response.json()
     assert data
-    TypeAdapter(Page[FileMetaData]).validate_python(data)
+    TypeAdapter(LimitOffsetPage[FileMetaData]).validate_python(data)