moving around stuff

Author: sanderegg

packages/models-library/src/models_library/api_schemas_storage/storage_schemas.py

@@ -9,7 +9,7 @@
 from datetime import datetime
 from enum import Enum
 from pathlib import Path
-from typing import Annotated, Any, Literal, Self, TypeAlias
+from typing import Annotated, Any, Final, Literal, Self, TypeAlias
 from uuid import UUID
 
 from pydantic import (
@@ -404,6 +404,10 @@ class SoftCopyBody(BaseModel):
     link_id: SimcoreS3FileID
 
 
+DEFAULT_NUMBER_OF_PATHS_PER_PAGE: Final[int] = 50
+MAX_NUMBER_OF_PATHS_PER_PAGE: Final[int] = 1000
+
+
 class PathMetaDataGet(BaseModel):
     path: Annotated[Path, Field(description="the path to the current path")]
     display_path: Annotated[

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

@@ -1,10 +1,11 @@
 from datetime import datetime
 from pathlib import Path
-from typing import Annotated, Any, Final, TypeAlias, TypeVar
+from typing import Annotated, Any
 
-from fastapi import Query
-from fastapi_pagination.cursor import CursorPage
-from fastapi_pagination.customization import CustomizedPage, UseParamsFields
+from models_library.api_schemas_storage.storage_schemas import (
+    DEFAULT_NUMBER_OF_PATHS_PER_PAGE,
+    MAX_NUMBER_OF_PATHS_PER_PAGE,
+)
 from pydantic import BaseModel, Field
 
 from ..api_schemas_rpc_async_jobs.async_jobs import (
@@ -21,23 +22,6 @@
 )
 from ._base import InputSchema, OutputSchema
 
-_T = TypeVar("_T")
-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(
-            DEFAULT_NUMBER_OF_PATHS_PER_PAGE,
-            ge=1,
-            le=MAX_NUMBER_OF_PATHS_PER_PAGE,
-            description="Page size",
-        )
-    ),
-]
-CustomizedPathsCursorPageParams: TypeAlias = CustomizedPathsCursorPage.__params_type__  # type: ignore
-
 
 class StorageLocationPathParams(BaseModel):
     location_id: LocationID

packages/service-library/src/servicelib/fastapi/rest_pagination.py

@@ -0,0 +1,28 @@
+from typing import TypeAlias, TypeVar
+
+from fastapi import Query
+from fastapi_pagination.cursor import CursorPage
+from fastapi_pagination.customization import (
+    CustomizedPage,
+    UseParamsFields,
+)
+from models_library.api_schemas_storage.storage_schemas import (
+    DEFAULT_NUMBER_OF_PATHS_PER_PAGE,
+    MAX_NUMBER_OF_PATHS_PER_PAGE,
+)
+
+_T = TypeVar("_T")
+
+CustomizedPathsCursorPage = CustomizedPage[
+    CursorPage[_T],
+    # Customizes the maximum value to fit frontend needs
+    UseParamsFields(
+        size=Query(
+            DEFAULT_NUMBER_OF_PATHS_PER_PAGE,
+            ge=1,
+            le=MAX_NUMBER_OF_PATHS_PER_PAGE,
+            description="Page size",
+        )
+    ),
+]
+CustomizedPathsCursorPageParams: TypeAlias = CustomizedPathsCursorPage.__params_type__  # type: ignore

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

@@ -5,11 +5,11 @@
 from fastapi import APIRouter, Depends
 from fastapi_pagination import create_page
 from models_library.api_schemas_storage.storage_schemas import PathMetaDataGet
-from models_library.api_schemas_webserver.storage import (
+from models_library.users import UserID
+from servicelib.fastapi.rest_pagination import (
     CustomizedPathsCursorPage,
     CustomizedPathsCursorPageParams,
 )
-from models_library.users import UserID
 
 from ...dsm_factory import BaseDataManager
 from .dependencies.dsm_prodiver import get_data_manager