test runs

Author: sanderegg

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

@@ -60,13 +60,13 @@ async def list_paths(
     page_params: Annotated[LimitOffsetParams, Depends()],
     dsm: Annotated[BaseDataManager, Depends(get_data_manager)],
 ):
-    data = await dsm.list_files_paginated(
+    items, total_number = await dsm.list_files_paginated(
         user_id=query_params.user_id,
         file_filter=query_params.file_filter,
         limit=page_params.limit,
         offset=page_params.offset,
     )
-    return create_page(data, total=20, params=page_params)
+    return create_page(items, total=total_number, params=page_params)
 
 
 @router.get(

services/storage/src/simcore_service_storage/datcore_dsm.py

@@ -15,7 +15,7 @@
 
 from .constants import DATCORE_ID, DATCORE_STR
 from .dsm_factory import BaseDataManager
-from .models import DatasetMetaData, FileMetaData, UploadLinks
+from .models import DatasetMetaData, FileMetaData, TotalNumber, UploadLinks
 from .modules.datcore_adapter import datcore_adapter
 from .modules.datcore_adapter.datcore_adapter_exceptions import (
     DatcoreAdapterMultipleFilesError,
@@ -65,9 +65,9 @@ async def list_files_paginated(
         file_filter: Path | None,
         limit: NonNegativeInt,
         offset: NonNegativeInt,
-    ) -> list[FileMetaData]:
+    ) -> tuple[list[FileMetaData], TotalNumber]:
         """returns a page of the file meta data a user has access to"""
-        return []
+        return [], 0
 
     async def list_files(
         self,

services/storage/src/simcore_service_storage/dsm_factory.py

@@ -11,7 +11,7 @@
 from models_library.users import UserID
 from pydantic import AnyUrl, ByteSize, NonNegativeInt
 
-from .models import DatasetMetaData, FileMetaData, UploadLinks
+from .models import DatasetMetaData, FileMetaData, TotalNumber, UploadLinks
 
 
 class BaseDataManager(ABC):
@@ -70,7 +70,7 @@ async def list_files_paginated(
         file_filter: Path | None,
         limit: NonNegativeInt,
         offset: NonNegativeInt,
-    ) -> list[FileMetaData]:
+    ) -> tuple[list[FileMetaData], TotalNumber]:
         """returns a page of the file meta data a user has access to"""
 
     @abstractmethod

services/storage/src/simcore_service_storage/models.py

@@ -2,7 +2,7 @@
 import urllib.parse
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Annotated, Any, Literal, NamedTuple
+from typing import Annotated, Any, Literal, NamedTuple, TypeAlias
 from uuid import UUID
 
 import arrow
@@ -37,6 +37,7 @@
     ByteSize,
     ConfigDict,
     Field,
+    NonNegativeInt,
     PlainSerializer,
     TypeAdapter,
     field_validator,
@@ -308,3 +309,6 @@ def all(cls) -> "AccessRights":
     @classmethod
     def none(cls) -> "AccessRights":
         return cls(read=False, write=False, delete=False)
+
+
+TotalNumber: TypeAlias = NonNegativeInt

services/storage/src/simcore_service_storage/simcore_s3_dsm.py

@@ -63,6 +63,7 @@
     DatasetMetaData,
     FileMetaData,
     FileMetaDataAtDB,
+    TotalNumber,
     UploadLinks,
     UserOrProjectFilter,
 )
@@ -143,9 +144,9 @@ async def list_files_paginated(
         file_filter: Path | None,
         limit: NonNegativeInt,
         offset: NonNegativeInt,
-    ) -> list[FileMetaData]:
+    ) -> tuple[list[FileMetaData], TotalNumber]:
         """returns a page of the file meta data a user has access to"""
-        return []
+        return [], 0
 
     async def list_files(  # noqa C901
         self,