better naming

Author: sanderegg

api/specs/web-server/_storage.py

@@ -20,8 +20,8 @@
     PresignedLink,
 )
 from models_library.api_schemas_webserver.storage import (
+    CustomizedPathsCursorPage,
     DataExportPost,
-    LargeLimitedPage,
     ListPathsQueryParams,
     StorageAsyncJobGet,
     StorageAsyncJobResult,
@@ -59,7 +59,7 @@ async def list_storage_locations():
 
 @router.get(
     "/storage/locations/{location_id}/paths",
-    response_model=LargeLimitedPage[PathMetaDataGet],
+    response_model=CustomizedPathsCursorPage[PathMetaDataGet],
 )
 async def list_storage_paths(
     _path: Annotated[StorageLocationPathParams, Depends()],

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

@@ -1,6 +1,6 @@
 from datetime import datetime
 from pathlib import Path
-from typing import Annotated, Any, TypeVar
+from typing import Annotated, Any, Final, TypeVar
 
 from fastapi import Query
 from fastapi_pagination.cursor import CursorPage
@@ -22,15 +22,16 @@
 from ._base import InputSchema, OutputSchema
 
 _T = TypeVar("_T")
-
-LargeLimitedPage = CustomizedPage[
+DEFAULT_NUMBER_OF_PATHS_PER_PAGE: Final[int] = 50
+MAX_NUMBER_OF_PATHS_PER_PAGE: Final[int] = 1000
+CustomizedPathsCursorPage = CustomizedPage[
     CursorPage[_T],
     # Customizes the maximum value to fit frontend needs
     UseParamsFields(
         size=Query(
-            50,
+            DEFAULT_NUMBER_OF_PATHS_PER_PAGE,
             ge=1,
-            le=1000,
+            le=MAX_NUMBER_OF_PATHS_PER_PAGE,
             description="Page size",
         )
     ),

services/storage/src/simcore_service_storage/api/rest/_paths.py

@@ -5,7 +5,7 @@
 from fastapi import APIRouter, Depends
 from fastapi_pagination import create_page, resolve_params
 from models_library.api_schemas_storage.storage_schemas import PathMetaDataGet
-from models_library.api_schemas_webserver.storage import LargeLimitedPage
+from models_library.api_schemas_webserver.storage import CustomizedPathsCursorPage
 from models_library.users import UserID
 
 from ...dsm_factory import BaseDataManager
@@ -22,14 +22,14 @@
 
 @router.get(
     "/locations/{location_id}/paths",
-    response_model=LargeLimitedPage[PathMetaDataGet],
+    response_model=CustomizedPathsCursorPage[PathMetaDataGet],
 )
 async def list_paths(
-    page_params: Annotated[LargeLimitedPage.__params_type__, Depends()],
+    page_params: Annotated[CustomizedPathsCursorPage.__params_type__, Depends()],
     dsm: Annotated[BaseDataManager, Depends(get_data_manager)],
     user_id: UserID,
     file_filter: Path | None = None,
-) -> LargeLimitedPage[PathMetaDataGet]:
+) -> CustomizedPathsCursorPage[PathMetaDataGet]:
     """Returns one level of files (paginated)"""
     page_params = resolve_params()
     items, next_cursor, total_number = await dsm.list_paths(