ongoing

Author: sanderegg

api/specs/web-server/_storage.py

@@ -8,7 +8,6 @@
 from uuid import UUID
 
 from fastapi import APIRouter, Depends, Query, status
-from fastapi_pagination.cursor import CursorPage
 from models_library.api_schemas_storage.storage_schemas import (
     FileLocation,
     FileMetaDataGet,
@@ -22,6 +21,7 @@
 )
 from models_library.api_schemas_webserver.storage import (
     DataExportPost,
+    LargeLimitedPage,
     ListPathsQueryParams,
     StorageAsyncJobGet,
     StorageAsyncJobResult,
@@ -59,7 +59,7 @@ async def list_storage_locations():
 
 @router.get(
     "/storage/locations/{location_id}/paths",
-    response_model=CursorPage[PathMetaDataGet],
+    response_model=LargeLimitedPage[PathMetaDataGet],
 )
 async def list_storage_paths(
     _path: Annotated[StorageLocationPathParams, Depends()],

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

@@ -1,7 +1,10 @@
 from datetime import datetime
 from pathlib import Path
-from typing import Any
+from typing import Any, TypeVar
 
+from fastapi import Query
+from fastapi_pagination.cursor import CursorPage
+from fastapi_pagination.customization import CustomizedPage, UseParamsFields
 from pydantic import BaseModel
 
 from ..api_schemas_rpc_async_jobs.async_jobs import (
@@ -16,6 +19,21 @@
 from ..rest_pagination import CursorQueryParameters
 from ._base import InputSchema, OutputSchema
 
+_T = TypeVar("_T")
+
+LargeLimitedPage = CustomizedPage[
+    CursorPage[_T],
+    # Customizes the maximum value to fit frontend needs
+    UseParamsFields(
+        size=Query(
+            50,
+            ge=1,
+            le=1000,
+            description="Page size",
+        )
+    ),
+]
+
 
 class StorageLocationPathParams(BaseModel):
     location_id: LocationID

services/storage/openapi.json

@@ -1060,7 +1060,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/CursorPage__T_Customized_PathMetaDataGet_"
+                  "$ref": "#/components/schemas/CursorPage___T_Customized_PathMetaDataGet_"
                 }
               }
             }
@@ -1419,7 +1419,7 @@
         ],
         "title": "AppStatusCheck"
       },
-      "CursorPage__T_Customized_PathMetaDataGet_": {
+      "CursorPage___T_Customized_PathMetaDataGet_": {
         "properties": {
           "items": {
             "items": {
@@ -1493,7 +1493,7 @@
         "required": [
           "items"
         ],
-        "title": "CursorPage[~T]Customized[PathMetaDataGet]"
+        "title": "CursorPage[~_T]Customized[PathMetaDataGet]"
       },
       "DatasetMetaDataGet": {
         "properties": {

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

@@ -1,12 +1,11 @@
 import logging
 from pathlib import Path
-from typing import Annotated, TypeVar
+from typing import Annotated
 
-from fastapi import APIRouter, Depends, Query
+from fastapi import APIRouter, Depends
 from fastapi_pagination import create_page, resolve_params
-from fastapi_pagination.cursor import CursorPage
-from fastapi_pagination.customization import CustomizedPage, UseParamsFields
 from models_library.api_schemas_storage.storage_schemas import PathMetaDataGet
+from models_library.api_schemas_webserver.storage import LargeLimitedPage
 from models_library.users import UserID
 
 from ...dsm_factory import BaseDataManager
@@ -20,32 +19,17 @@
     ],
 )
 
-T = TypeVar("T")
-
-Page = CustomizedPage[
-    CursorPage[T],
-    # Customizes the maximum value to fit frontend needs
-    UseParamsFields(
-        size=Query(
-            50,
-            ge=1,
-            le=1000,
-            description="Page size",
-        )
-    ),
-]
-
 
 @router.get(
     "/locations/{location_id}/paths",
-    response_model=Page[PathMetaDataGet],
+    response_model=LargeLimitedPage[PathMetaDataGet],
 )
 async def list_paths(
-    page_params: Annotated[Page.__params_type__, Depends()],
+    page_params: Annotated[LargeLimitedPage.__params_type__, Depends()],
     dsm: Annotated[BaseDataManager, Depends(get_data_manager)],
     user_id: UserID,
     file_filter: Path | None = None,
-) -> Page[PathMetaDataGet]:
+) -> LargeLimitedPage[PathMetaDataGet]:
     """Returns one level of files (paginated)"""
     page_params = resolve_params()
     items, next_cursor, total_number = await dsm.list_paths(

services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml

@@ -6035,7 +6035,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/CursorPage_PathMetaDataGet_'
+                $ref: '#/components/schemas/CursorPage___T_Customized_PathMetaDataGet_'
   /v0/storage/locations/{location_id}/datasets:
     get:
       tags:
@@ -8404,7 +8404,7 @@ components:
       - usdPerCredit
       - minPaymentAmountUsd
       title: CreditPriceGet
-    CursorPage_PathMetaDataGet_:
+    CursorPage___T_Customized_PathMetaDataGet_:
       properties:
         items:
           items:
@@ -8444,7 +8444,7 @@ components:
       type: object
       required:
       - items
-      title: CursorPage[PathMetaDataGet]
+      title: CursorPage[~_T]Customized[PathMetaDataGet]
     DatCoreFileLink:
       properties:
         store: