fix RPC on webserver side

Author: matusdrobuliak66

packages/models-library/src/models_library/api_schemas_webserver/licensed_items.py

@@ -20,9 +20,11 @@
 
 class LicensedItemRpcGet(BaseModel):
     licensed_item_id: LicensedItemID
+    key: str
+    version: str
     display_name: str
     licensed_resource_type: LicensedResourceType
-    licensed_resource_data: dict[str, Any]
+    licensed_resources: list[dict[str, Any]]
     pricing_plan_id: PricingPlanId
     created_at: datetime
     modified_at: datetime
@@ -32,9 +34,11 @@ class LicensedItemRpcGet(BaseModel):
             "examples": [
                 {
                     "licensed_item_id": "0362b88b-91f8-4b41-867c-35544ad1f7a1",
+                    "key": "Duke",
+                    "version": "1.0.0",
                     "display_name": "best-model",
                     "licensed_resource_type": f"{LicensedResourceType.VIP_MODEL}",
-                    "licensed_resource_data": cast(JsonDict, VIP_DETAILS_EXAMPLE),
+                    "licensed_resources": [cast(JsonDict, VIP_DETAILS_EXAMPLE)],
                     "pricing_plan_id": "15",
                     "created_at": "2024-12-12 09:59:26.422140",
                     "modified_at": "2024-12-12 09:59:26.422140",
@@ -58,6 +62,7 @@ class _ItisVipRestData(OutputSchema):
     thumbnail: str
     features: FeaturesDict  # NOTE: here there is a bit of coupling with domain model
     doi: str | None
+    license_version: str
 
 
 class _ItisVipResourceRestData(OutputSchema):

packages/postgres-database/src/simcore_postgres_database/migration/versions/68777fdf9539_add_licensed_resources.py

@@ -17,7 +17,6 @@
 
 
 # Reuse the existing Enum type
-# existing_enum = sa.Enum("VIP_MODEL", name="licensedresourcetype", native_enum=False)
 licensed_resource_type = postgresql.ENUM(
     "VIP_MODEL", name="licensedresourcetype", create_type=False
 )

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

@@ -5,7 +5,6 @@
 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.rabbitmq_basic_types import RPCMethodName
 from models_library.resource_tracker_licensed_items_checkouts import (
@@ -72,17 +71,19 @@ async def checkout_licensed_item_for_wallet(
     product_name: ProductName,
     user_id: UserID,
     wallet_id: WalletID,
-    licensed_item_id: LicensedItemID,
+    key: str,
+    version: str,
     num_of_seats: int,
     service_run_id: ServiceRunID,
 ) -> LicensedItemCheckoutRpcGet:
     result = await rabbitmq_rpc_client.request(
         WEBSERVER_RPC_NAMESPACE,
         TypeAdapter(RPCMethodName).validate_python("checkout_licensed_item_for_wallet"),
+        key=key,
+        version=version,
         product_name=product_name,
         user_id=user_id,
         wallet_id=wallet_id,
-        licensed_item_id=licensed_item_id,
         num_of_seats=num_of_seats,
         service_run_id=service_run_id,
     )

services/api-server/src/simcore_service_api_server/api/routes/wallets.py

@@ -8,12 +8,10 @@
 from ...api.dependencies.authentication import get_current_user_id, get_product_name
 from ...api.dependencies.webserver_rpc import get_wb_api_rpc_client
 from ...exceptions.service_errors_utils import DEFAULT_BACKEND_SERVICE_STATUS_CODES
-from ...models.pagination import Page, PaginationParams
 from ...models.schemas.errors import ErrorGet
 from ...models.schemas.licensed_items import LicensedItemCheckoutData
 from ...models.schemas.model_adapter import (
     LicensedItemCheckoutGet,
-    LicensedItemGet,
     WalletGetWithAvailableCreditsLegacy,
 )
 from ...services_rpc.wb_api_server import WbApiRpcClient
@@ -62,26 +60,26 @@ async def get_wallet(
     return await webserver_api.get_wallet(wallet_id=wallet_id)
 
 
-@router.get(
-    "/{wallet_id}/licensed-items",
-    response_model=Page[LicensedItemGet],
-    status_code=status.HTTP_200_OK,
-    responses=WALLET_STATUS_CODES,
-    description="Get all available licensed items for a given wallet",
-)
-async def get_available_licensed_items_for_wallet(
-    wallet_id: int,
-    page_params: Annotated[PaginationParams, Depends()],
-    web_api_rpc: Annotated[WbApiRpcClient, Depends(get_wb_api_rpc_client)],
-    product_name: Annotated[str, Depends(get_product_name)],
-    user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
-):
-    return await web_api_rpc.get_available_licensed_items_for_wallet(
-        product_name=product_name,
-        wallet_id=wallet_id,
-        user_id=user_id,
-        page_params=page_params,
-    )
+# @router.get(
+#     "/{wallet_id}/licensed-items",
+#     response_model=Page[LicensedItemGet],
+#     status_code=status.HTTP_200_OK,
+#     responses=WALLET_STATUS_CODES,
+#     description="Get all available licensed items for a given wallet",
+# )
+# async def get_available_licensed_items_for_wallet(
+#     wallet_id: int,
+#     page_params: Annotated[PaginationParams, Depends()],
+#     web_api_rpc: Annotated[WbApiRpcClient, Depends(get_wb_api_rpc_client)],
+#     product_name: Annotated[str, Depends(get_product_name)],
+#     user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
+# ):
+#     return await web_api_rpc.get_available_licensed_items_for_wallet(
+#         product_name=product_name,
+#         wallet_id=wallet_id,
+#         user_id=user_id,
+#         page_params=page_params,
+#     )
 
 
 @router.post(

services/web/server/src/simcore_service_webserver/licenses/_licensed_items_checkouts_service.py

@@ -2,7 +2,6 @@
 from models_library.api_schemas_resource_usage_tracker import (
     licensed_items_checkouts as rut_licensed_items_checkouts,
 )
-from models_library.licenses import LicensedItemID
 from models_library.products import ProductName
 from models_library.resource_tracker_licensed_items_checkouts import (
     LicensedItemCheckoutID,
@@ -18,6 +17,7 @@
 from ..rabbitmq import get_rabbitmq_rpc_client
 from ..users.api import get_user
 from ..wallets.api import get_wallet_by_user
+from . import _licensed_items_repository
 from ._licensed_items_checkouts_models import (
     LicensedItemCheckoutGet,
     LicensedItemCheckoutGetPage,
@@ -122,7 +122,6 @@ async def checkout_licensed_item_for_wallet(
     wallet_id: WalletID,
     user_id: UserID,
     # checkout args
-    licensed_item_id: LicensedItemID,
     key: str,
     version: str,
     num_of_seats: int,
@@ -138,11 +137,15 @@ async def checkout_licensed_item_for_wallet(
 
     user = await get_user(app, user_id=user_id)
 
+    licensed_item = await _licensed_items_repository.get_licensed_item_by_key_version(
+        app, key=key, version=version, product_name=product_name
+    )
+
     rpc_client = get_rabbitmq_rpc_client(app)
     licensed_item_get: rut_licensed_items_checkouts.LicensedItemCheckoutGet = (
         await licensed_items_checkouts.checkout_licensed_item(
             rpc_client,
-            licensed_item_id=licensed_item_id,
+            licensed_item_id=licensed_item.licensed_item_id,
             key=key,
             version=version,
             wallet_id=wallet_id,

services/web/server/src/simcore_service_webserver/licenses/_rpc.py

@@ -8,7 +8,7 @@
     LicensedItemCheckoutRpcGet,
 )
 from models_library.basic_types import IDStr
-from models_library.licenses import LicensedItemID, LicensedItemPage
+from models_library.licenses import LicensedItemPage
 from models_library.products import ProductName
 from models_library.resource_tracker_licensed_items_checkouts import (
     LicensedItemCheckoutID,
@@ -46,17 +46,19 @@ async def get_licensed_items(
             product_name=product_name,
             offset=offset,
             limit=limit,
-            order_by=OrderBy(field=IDStr("licensed_resource_name")),
+            order_by=OrderBy(field=IDStr("display_name")),
         )
     )
 
     licensed_item_get_page: LicensedItemRpcGetPage = LicensedItemRpcGetPage(
         items=[
             LicensedItemRpcGet.model_construct(
                 licensed_item_id=licensed_item.licensed_item_id,
+                key=licensed_item.key,
+                version=licensed_item.version,
                 display_name=licensed_item.display_name,
                 licensed_resource_type=licensed_item.licensed_resource_type,
-                licensed_resource_data=licensed_item.licensed_resource_data,
+                licensed_resources=licensed_item.array_of_licensed_resource_data,
                 pricing_plan_id=licensed_item.pricing_plan_id,
                 created_at=licensed_item.created_at,
                 modified_at=licensed_item.modified_at,
@@ -94,7 +96,6 @@ async def checkout_licensed_item_for_wallet(
     product_name: ProductName,
     user_id: UserID,
     wallet_id: WalletID,
-    licensed_item_id: LicensedItemID,
     key: str,
     version: str,
     num_of_seats: int,
@@ -103,7 +104,6 @@ async def checkout_licensed_item_for_wallet(
     licensed_item_get = (
         await _licensed_items_checkouts_service.checkout_licensed_item_for_wallet(
             app,
-            licensed_item_id=licensed_item_id,
             key=key,
             version=version,
             wallet_id=wallet_id,
@@ -146,6 +146,8 @@ async def release_licensed_item_for_wallet(
     return LicensedItemCheckoutRpcGet.model_construct(
         licensed_item_checkout_id=licensed_item_get.licensed_item_checkout_id,
         licensed_item_id=licensed_item_get.licensed_item_id,
+        key=licensed_item_get.key,
+        version=licensed_item_get.version,
         wallet_id=licensed_item_get.wallet_id,
         user_id=licensed_item_get.user_id,
         product_name=licensed_item_get.product_name,

services/web/server/tests/unit/with_dbs/04/licenses/test_licenses_rpc.py

@@ -25,9 +25,17 @@
     release_licensed_item_for_wallet,
 )
 from settings_library.rabbit import RabbitSettings
+from simcore_postgres_database.models.licensed_item_to_resource import (
+    licensed_item_to_resource,
+)
 from simcore_postgres_database.models.users import UserRole
+from simcore_postgres_database.utils_repos import transaction_context
 from simcore_service_webserver.application_settings import ApplicationSettings
-from simcore_service_webserver.licenses import _licensed_items_repository
+from simcore_service_webserver.db.plugin import get_asyncpg_engine
+from simcore_service_webserver.licenses import (
+    _licensed_items_repository,
+    _licensed_resources_repository,
+)
 
 pytest_simcore_core_services_selection = [
     "rabbit",
@@ -133,15 +141,39 @@ async def test_license_checkout_workflow(
     assert len(result.items) == 0
     assert result.total == 0
 
-    license_item_db = await _licensed_items_repository.create(
+    licensed_item_db = await _licensed_items_repository.create(
         client.app,
+        key="Duke",
+        version="1.0.0",
         product_name=osparc_product_name,
         display_name="Model A display name",
-        licensed_resource_name="Model A",
         licensed_resource_type=LicensedResourceType.VIP_MODEL,
         pricing_plan_id=pricing_plan_id,
-        licensed_resource_data=VIP_DETAILS_EXAMPLE,
     )
+    _licensed_item_id = licensed_item_db.licensed_item_id
+
+    got_licensed_resource_duke = (
+        await _licensed_resources_repository.create_if_not_exists(
+            client.app,
+            display_name="Duke",
+            licensed_resource_name="Duke",
+            licensed_resource_type=LicensedResourceType.VIP_MODEL,
+            licensed_resource_data={
+                "category_id": "HumanWholeBody",
+                "category_display": "Humans",
+                "source": VIP_DETAILS_EXAMPLE,
+            },
+        )
+    )
+
+    # Connect them via licensed_item_to_resorce DB table
+    async with transaction_context(get_asyncpg_engine(client.app)) as conn:
+        await conn.execute(
+            licensed_item_to_resource.insert().values(
+                licensed_item_id=_licensed_item_id,
+                licensed_resource_id=got_licensed_resource_duke.licensed_resource_id,
+            )
+        )
 
     result = await get_licensed_items(
         rpc_client, product_name=osparc_product_name, offset=0, limit=20
@@ -160,10 +192,11 @@ async def test_license_checkout_workflow(
 
     checkout = await checkout_licensed_item_for_wallet(
         rpc_client,
+        key=licensed_item_db.key,
+        version=licensed_item_db.version,
         product_name=osparc_product_name,
         user_id=logged_user["id"],
         wallet_id=1,
-        licensed_item_id=license_item_db.licensed_item_id,
         num_of_seats=1,
         service_run_id="run_1",
     )