adapting catalog

Author: pcrespov

services/catalog/src/simcore_service_catalog/api/rpc/_services.py

@@ -237,9 +237,24 @@ async def get_my_service_history(
 ) -> PageRpcServiceRelease:
     assert app.state.engine  # nosec
 
-    history = await services_api.get_service_history(
+    total_count, items = await services_api.get_service_history(
         repo=ServicesRepository(app.state.engine),
         product_name=product_name,
         user_id=user_id,
         service_key=service_key,
+        limit=limit,
+        offset=offset,
+    )
+
+    assert len(items) <= total_count  # nosec
+    assert len(items) <= limit  # nosec
+
+    return cast(
+        PageRpcServiceRelease,
+        PageRpcServiceRelease.create(
+            items,
+            total=total_count,
+            limit=limit,
+            offset=offset,
+        ),
     )

services/catalog/src/simcore_service_catalog/db/repositories/_services_sql.py

@@ -111,7 +111,7 @@ def _has_access_rights(
     )
 
 
-def total_count_stmt(
+def latest_services_total_count_stmt(
     *,
     product_name: ProductName,
     user_id: UserID,
@@ -312,7 +312,11 @@ def get_service_history_stmt(
     user_id: UserID,
     access_rights: sa.sql.ClauseElement,
     service_key: ServiceKey,
+    limit: int | None,
+    offset: int | None,
 ):
+    assert offset is None, "UNDER DEV"
+    assert limit is None, "UNDER DEV"
 
     _sq = (
         sa.select(

services/catalog/src/simcore_service_catalog/db/repositories/services.py

@@ -38,9 +38,9 @@
     can_get_service_stmt,
     get_service_history_stmt,
     get_service_stmt,
+    latest_services_total_count_stmt,
     list_latest_services_stmt,
     list_services_stmt,
-    total_count_stmt,
 )
 
 _logger = logging.getLogger(__name__)
@@ -340,6 +340,8 @@ async def get_service_with_history(
                 user_id=user_id,
                 access_rights=AccessRightsClauses.can_read,
                 service_key=key,
+                limit=None,
+                offset=None,
             )
             async with self.db_engine.begin() as conn:
                 result = await conn.execute(stmt_history)
@@ -381,7 +383,7 @@ async def list_latest_services(
     ) -> tuple[PositiveInt, list[ServiceWithHistoryDBGet]]:
 
         # get page
-        stmt_total = total_count_stmt(
+        stmt_total = latest_services_total_count_stmt(
             product_name=product_name,
             user_id=user_id,
             access_rights=AccessRightsClauses.can_read,
@@ -438,24 +440,32 @@ async def get_service_history(
         user_id: UserID,
         # get args
         key: ServiceKey,
-    ) -> list[ReleaseDBGet] | None:
+        # list args: pagination
+        limit: int | None = None,
+        offset: int | None = None,
+    ) -> tuple[PositiveInt, list[ReleaseDBGet]]:
 
-        stmt_history = get_service_history_stmt(
+        stmt_total, stmt_history = get_service_history_stmt(
             product_name=product_name,
             user_id=user_id,
             access_rights=AccessRightsClauses.can_read,
             service_key=key,
+            offset=offset,
+            limit=limit,
         )
         async with self.db_engine.connect() as conn:
+            result = await conn.execute(stmt_total)
+            total_count = result.scalar() or 0
+
             result = await conn.execute(stmt_history)
             row = result.one_or_none()
 
-        return (
-            TypeAdapter(list[ReleaseDBGet]).validate_python(row.history)
-            if row
-            else None
+        items = (
+            TypeAdapter(list[ReleaseDBGet]).validate_python(row.history) if row else []
         )
 
+        return total_count, items
+
     # Service Access Rights ----
 
     async def get_service_access_rights(

services/catalog/src/simcore_service_catalog/services/services_api.py

@@ -9,7 +9,7 @@
 )
 from models_library.groups import GroupID
 from models_library.products import ProductName
-from models_library.rest_pagination import PageLimitInt
+from models_library.rest_pagination import PageLimitInt, PageTotalCount
 from models_library.services_access import ServiceGroupAccessRightsV2
 from models_library.services_history import Compatibility, ServiceRelease
 from models_library.services_metadata_published import ServiceMetaDataPublished
@@ -125,7 +125,7 @@ async def list_latest_services(
     user_id: UserID,
     limit: PageLimitInt | None,
     offset: NonNegativeInt = 0,
-) -> tuple[NonNegativeInt, list[LatestServiceGet]]:
+) -> tuple[PageTotalCount, list[LatestServiceGet]]:
 
     # defines the order
     total_count, services = await repo.list_latest_services(
@@ -472,26 +472,26 @@ async def get_service_history(
     product_name: ProductName,
     user_id: UserID,
     service_key: ServiceKey,
+    limit: PageLimitInt | None = None,
+    offset: NonNegativeInt | None = None,
     include_compatibility: bool = False,
-) -> list[ServiceRelease]:
-
-    history = (
-        await repo.get_service_history(
-            # NOTE: that the service history might be different for each user
-            # since access-rights are defined on a k:v basis
-            product_name=product_name,
-            user_id=user_id,
-            key=service_key,
-        )
-        or []
-    )
+) -> tuple[PageTotalCount, list[ServiceRelease]]:
+    total_count, history = await repo.get_service_history(
+        # NOTE: that the service history might be different for each user
+        # since access-rights are defined on a k:v basis
+        product_name=product_name,
+        user_id=user_id,
+        key=service_key,
+        limit=limit,
+        offset=offset,
+    ) or (0, [])
 
     compatibility_map = {}
     if include_compatibility:
         msg = "This operation is heavy and for the moment is not necessary"
         raise NotImplementedError(msg)
 
-    return [
+    items = [
         # domain -> domain
         ServiceRelease.model_construct(
             version=h.version,
@@ -502,3 +502,5 @@ async def get_service_history(
         )
         for h in history
     ]
+
+    return total_count, items

services/catalog/tests/unit/test_db_repositories_services_sql.py

@@ -9,8 +9,8 @@
     can_get_service_stmt,
     get_service_history_stmt,
     get_service_stmt,
+    latest_services_total_count_stmt,
     list_latest_services_stmt,
-    total_count_stmt,
 )
 
 
@@ -70,7 +70,7 @@ def _check(func_smt, **kwargs):
     )
 
     _check(
-        total_count_stmt,
+        latest_services_total_count_stmt,
         product_name=product_name,
         user_id=user_id,
         access_rights=AccessRightsClauses.can_read,