refactor: update licensed items RPC client usage in wb_api_server

Author: pcrespov

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

@@ -1,4 +1,5 @@
 import logging
+import warnings
 
 from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
 from models_library.api_schemas_webserver.licensed_items import LicensedItemRpcGetPage
@@ -21,6 +22,13 @@
 
 _logger = logging.getLogger(__name__)
 
+warnings.warn(
+    f"The '{__name__}' module is deprecated and will be removed in a future release. "
+    "Please use 'rpc_interfaces.webserver.v1' instead.",
+    DeprecationWarning,
+    stacklevel=2,
+)
+
 
 @log_decorator(_logger, level=logging.DEBUG)
 async def get_licensed_items(

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

@@ -69,7 +69,6 @@
     ProjectForbiddenRpcError,
     ProjectNotFoundRpcError,
 )
-from servicelib.rabbitmq.rpc_interfaces.webserver.licenses import licensed_items
 from servicelib.rabbitmq.rpc_interfaces.webserver.v1 import WebServerRpcClient
 from simcore_service_api_server.models.basic_types import NameValueTuple
 
@@ -132,8 +131,7 @@ class WbApiRpcClient(SingletonInAppStateMixin):
     async def get_licensed_items(
         self, *, product_name: ProductName, page_params: PaginationParams
     ) -> Page[LicensedItemGet]:
-        licensed_items_page = await licensed_items.get_licensed_items(
-            rabbitmq_rpc_client=self._client,
+        licensed_items_page = await self._rpc_client.licenses.get_licensed_items(
             product_name=product_name,
             offset=page_params.offset,
             limit=page_params.limit,
@@ -152,8 +150,7 @@ async def get_available_licensed_items_for_wallet(
         page_params: PaginationParams,
     ) -> Page[LicensedItemGet]:
         licensed_items_page = (
-            await licensed_items.get_available_licensed_items_for_wallet(
-                rabbitmq_rpc_client=self._client,
+            await self._rpc_client.licenses.get_available_licensed_items_for_wallet(
                 product_name=product_name,
                 wallet_id=wallet_id,
                 user_id=user_id,
@@ -184,8 +181,7 @@ async def checkout_licensed_item_for_wallet(
         service_run_id: ServiceRunID,
     ) -> LicensedItemCheckoutGet:
         licensed_item_checkout_get = (
-            await licensed_items.checkout_licensed_item_for_wallet(
-                self._client,
+            await self._rpc_client.licenses.checkout_licensed_item_for_wallet(
                 product_name=product_name,
                 user_id=user_id,
                 wallet_id=wallet_id,
@@ -220,8 +216,7 @@ async def release_licensed_item_for_wallet(
         licensed_item_checkout_id: LicensedItemCheckoutID,
     ) -> LicensedItemCheckoutGet:
         licensed_item_checkout_get = (
-            await licensed_items.release_licensed_item_for_wallet(
-                self._client,
+            await self._rpc_client.licenses.release_licensed_item_for_wallet(
                 product_name=product_name,
                 user_id=user_id,
                 licensed_item_checkout_id=licensed_item_checkout_id,