updates licenserRpcAPI

Author: pcrespov

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/v1/_base.py

@@ -30,3 +30,10 @@ async def _request(
             user_id=user_id,
             **kwargs
         )
+
+    async def _request_without_authentication(
+        self, method_name: RPCMethodName, *, product_name: ProductName, **kwargs: Any
+    ) -> Any:
+        return await self._rpc_client.request(
+            self._namespace, method_name, product_name=product_name, **kwargs
+        )

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/v1/licenses.py

@@ -2,28 +2,56 @@
 
 from typing import Any
 
+from models_library.api_schemas_webserver.licensed_items import LicensedItemRpcGetPage
+from models_library.api_schemas_webserver.licensed_items_checkouts import (
+    LicensedItemCheckoutRpcGet,
+)
+from models_library.licenses import LicensedItemID
 from models_library.products import ProductName
+from models_library.resource_tracker_licensed_items_checkouts import (
+    LicensedItemCheckoutID,
+)
+from models_library.services_types import ServiceRunID
 from models_library.users import UserID
+from models_library.wallets import WalletID
 
 from ._base import BaseRpcApi
 
 
 class LicensesRpcApi(BaseRpcApi):
     """RPC client for license-related operations."""
 
-    async def get_licensed_items_for_wallet(
+    async def get_licensed_items(
         self,
         *,
         product_name: ProductName,
+        offset: int = 0,
+        limit: int = 20,
+    ) -> LicensedItemRpcGetPage:
+        return await self._request_without_authentication(
+            "get_licensed_items",
+            product_name=product_name,
+            offset=offset,
+            limit=limit,
+        )
+
+    async def get_available_licensed_items_for_wallet(
+        self,
+        *,
+        product_name: ProductName,
+        wallet_id: WalletID,
         user_id: UserID,
-        wallet_id: int | None = None,
-    ) -> list[dict[str, Any]]:
+        offset: int = 0,
+        limit: int = 20,
+    ) -> LicensedItemRpcGetPage:
         """Get licensed items for a wallet."""
         return await self._request(
-            "get_licensed_items_for_wallet",
+            "get_available_licensed_items_for_wallet",
             product_name=product_name,
             user_id=user_id,
             wallet_id=wallet_id,
+            offset=offset,
+            limit=limit,
         )
 
     async def get_licensed_items_checkouts_for_wallet(
@@ -46,18 +74,18 @@ async def checkout_licensed_item_for_wallet(
         *,
         product_name: ProductName,
         user_id: UserID,
-        licensed_item_id: str,
-        wallet_id: int,
+        wallet_id: WalletID,
+        licensed_item_id: LicensedItemID,
         num_of_seats: int,
-        service_run_id: str,
-    ) -> dict[str, Any]:
+        service_run_id: ServiceRunID,
+    ) -> LicensedItemCheckoutRpcGet:
         """Checkout a licensed item for a wallet."""
         return await self._request(
             "checkout_licensed_item_for_wallet",
             product_name=product_name,
             user_id=user_id,
-            licensed_item_id=licensed_item_id,
             wallet_id=wallet_id,
+            licensed_item_id=licensed_item_id,
             num_of_seats=num_of_seats,
             service_run_id=service_run_id,
         )
@@ -67,14 +95,12 @@ async def release_licensed_item_for_wallet(
         *,
         product_name: ProductName,
         user_id: UserID,
-        licensed_item_checkout_id: str,
-        wallet_id: int,
-    ) -> None:
+        licensed_item_checkout_id: LicensedItemCheckoutID,
+    ) -> LicensedItemCheckoutRpcGet:
         """Release a licensed item checkout for a wallet."""
         return await self._request(
             "release_licensed_item_for_wallet",
             product_name=product_name,
             user_id=user_id,
             licensed_item_checkout_id=licensed_item_checkout_id,
-            wallet_id=wallet_id,
         )