udpates api

Author: pcrespov

services/api-server/src/simcore_service_api_server/services_rpc/catalog.py

@@ -3,6 +3,7 @@
 from models_library.rest_pagination import (
     DEFAULT_NUMBER_OF_ITEMS_PER_PAGE,
     PageLimitInt,
+    PageMetaInfoLimitOffset,
     PageOffsetInt,
 )
 from models_library.users import UserID
@@ -15,6 +16,12 @@
 _FAKE2: list[SolverPort] = [
     SolverPort.model_validate(SolverPort.model_json_schema()["example"]),
 ]
+# from models_library.api_schemas_catalog.services import (
+#     LatestServiceGet,
+#     MyServiceGet,
+#     ServiceGetV2,
+#     ServiceUpdateV2,
+# )
 
 
 async def list_latest_releases(
@@ -23,11 +30,15 @@ async def list_latest_releases(
     user_id: UserID,
     offset: PageOffsetInt = 0,
     limit: PageLimitInt = DEFAULT_NUMBER_OF_ITEMS_PER_PAGE,
-) -> list[Solver]:
+) -> tuple[list[Solver], PageMetaInfoLimitOffset]:
     assert product_name  # nosec
     assert user_id  # nosec
 
-    return _FAKE[offset : offset + limit]
+    data = _FAKE[offset : offset + limit]
+    meta = PageMetaInfoLimitOffset(
+        limit=limit, offset=offset, total=len(_FAKE), count=len(data)
+    )
+    return data, meta
 
 
 async def list_solver_releases(
@@ -37,13 +48,19 @@ async def list_solver_releases(
     solver_id: SolverKeyId,
     offset: PageOffsetInt = 0,
     limit: PageLimitInt = DEFAULT_NUMBER_OF_ITEMS_PER_PAGE,
-) -> list[Solver]:
+) -> tuple[list[Solver], PageMetaInfoLimitOffset]:
     assert product_name  # nosec
     assert user_id  # nosec
-    return [solver for solver in _FAKE if solver.id == solver_id][
+
+    data = [solver for solver in _FAKE if solver.id == solver_id][
         offset : offset + limit
     ]
 
+    meta = PageMetaInfoLimitOffset(
+        limit=limit, offset=offset, total=len(_FAKE), count=len(data)
+    )
+    return data, meta
+
 
 async def get_solver(
     *,
@@ -55,6 +72,16 @@ async def get_solver(
     assert product_name  # nosec
     assert user_id  # nosec
 
+    # service: ServiceGetV2 = await catalog_rpc.get_service(
+    #     get_rabbitmq_rpc_client(app),
+    #     product_name=product_name,
+    #     user_id=user_id,
+    #     service_key=solver_id,
+    #     service_version=solver_version,
+    # )
+
+    # solver = Solver(id=service.key, version=service.version, title=) ServiceGetV2)(service)
+
     return next(
         (
             solver

services/api-server/tests/unit/test_services_catalog.py

@@ -18,19 +18,21 @@ def product_name() -> ProductName:
 
 async def test_catalog_service_read_solvers(product_name: ProductName, user_id: UserID):
     # Step 1: List latest releases in a page
-    solver_releases_page: list[Solver] = await catalog_service.list_latest_releases(
+    solver_releases_page, meta = await catalog_service.list_latest_releases(
         product_name=product_name, user_id=user_id
     )
     assert solver_releases_page, "Releases page should not be empty"
+    assert meta.offset == 0
 
     # Step 2: Select one release and list solver releases
     selected_release = solver_releases_page[0]
-    solver_releases = await catalog_service.list_solver_releases(
+    solver_releases, meta = await catalog_service.list_solver_releases(
         product_name=product_name,
         user_id=user_id,
         solver_id=selected_release.id,
     )
     assert solver_releases, "Solver releases should not be empty"
+    assert meta.offset == 0
 
     # Step 3: Take the latest solver release and get solver details
     latest_solver_release = solver_releases[0]