catalog renaming

Author: pcrespov

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

@@ -252,8 +252,8 @@ async def list_my_service_history_latest_first(
         product_name=product_name,
         user_id=user_id,
         service_key=service_key,
-        limit=limit,
-        offset=offset,
+        pagination_limit=limit,
+        pagination_offset=offset,
         filters=TypeAdapter(ServiceDBFilters | None).validate_python(
             filters, from_attributes=True
         ),

services/catalog/src/simcore_service_catalog/repository/services.py

@@ -383,8 +383,8 @@ async def list_latest_services(
         product_name: ProductName,
         user_id: UserID,
         # list args: pagination
-        limit: int | None = None,
-        offset: int | None = None,
+        pagination_limit: int | None = None,
+        pagination_offset: int | None = None,
         filters: ServiceDBFilters | None = None,
     ) -> tuple[PositiveInt, list[ServiceWithHistoryDBGet]]:
 
@@ -399,8 +399,8 @@ async def list_latest_services(
             product_name=product_name,
             user_id=user_id,
             access_rights=AccessRightsClauses.can_read,
-            limit=limit,
-            offset=offset,
+            limit=pagination_limit,
+            offset=pagination_offset,
             filters=filters,
         )
 
@@ -475,8 +475,8 @@ async def get_service_history_page(
         # get args
         key: ServiceKey,
         # list args: pagination
-        limit: int | None = None,
-        offset: int | None = None,
+        pagination_limit: int | None = None,
+        pagination_offset: int | None = None,
         filters: ServiceDBFilters | None = None,
     ) -> tuple[PositiveInt, list[ReleaseDBGet]]:
 
@@ -540,8 +540,8 @@ async def get_service_history_page(
                 )
             )
             .order_by(sql.desc(_services_sql.by_version(services_meta_data.c.version)))
-            .offset(offset)
-            .limit(limit)
+            .offset(pagination_offset)
+            .limit(pagination_limit)
         )
 
         async with pass_or_acquire_connection(self.db_engine) as conn:

services/catalog/src/simcore_service_catalog/service/catalog_services.py

@@ -144,8 +144,8 @@ async def list_latest_catalog_services(
     total_count, services = await repo.list_latest_services(
         product_name=product_name,
         user_id=user_id,
-        limit=limit,
-        offset=offset,
+        pagination_limit=limit,
+        pagination_offset=offset,
         filters=filters,
     )
 
@@ -519,11 +519,11 @@ async def list_user_service_release_history(
     # target service
     service_key: ServiceKey,
     # pagination
-    limit: PageLimitInt | None = None,
-    offset: NonNegativeInt | None = None,
+    pagination_limit: PageLimitInt | None = None,
+    pagination_offset: NonNegativeInt | None = None,
     # filters
     filters: ServiceDBFilters | None = None,
-    # options
+    # result options
     include_compatibility: bool = False,
 ) -> tuple[PageTotalCount, list[ServiceRelease]]:
 
@@ -533,8 +533,8 @@ async def list_user_service_release_history(
         product_name=product_name,
         user_id=user_id,
         key=service_key,
-        limit=limit,
-        offset=offset,
+        pagination_limit=pagination_limit,
+        pagination_offset=pagination_offset,
         filters=filters,
     )
 

services/catalog/tests/unit/with_dbs/test_repositories.py

@@ -390,7 +390,7 @@ async def test_list_latest_services_with_pagination(
         assert service.version == expected_latest_version
 
     _, services_items = await services_repo.list_latest_services(
-        product_name=target_product, user_id=user_id, limit=2
+        product_name=target_product, user_id=user_id, pagination_limit=2
     )
     assert len(services_items) == 2
 
@@ -711,8 +711,8 @@ async def test_get_service_history_page(
         product_name=target_product,
         user_id=user_id,
         key=service_key,
-        limit=limit,
-        offset=offset,
+        pagination_limit=limit,
+        pagination_offset=offset,
     )
     assert total_count == num_versions
     assert len(paginated_history) == limit