modification of rest part

Author: matusdrobuliak66

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

@@ -61,21 +61,28 @@ class _ItisVipRestData(OutputSchema):
 
 
 class _ItisVipResourceRestData(OutputSchema):
-    category_id: IDStr
-    category_display: str
-    category_icon: HttpUrl | None = None  # NOTE: Placeholder until provide @odeimaiz
+    # category_id: IDStr
+    # category_display: str
+    # category_icon: HttpUrl | None = None  # NOTE: Placeholder until provide @odeimaiz
     source: _ItisVipRestData
-    terms_of_use_url: HttpUrl | None = None  # NOTE: Placeholder until provided @mguidon
+    # terms_of_use_url: HttpUrl | None = None  # NOTE: Placeholder until provided @mguidon
 
 
 class LicensedItemRestGet(OutputSchema):
     licensed_item_id: LicensedItemID
+    key: str
+    version: str
+
     display_name: str
-    # NOTE: to put here a discriminator we have to embed it one more layer
     licensed_resource_type: LicensedResourceType
-    licensed_resource_data: _ItisVipResourceRestData
+    licensed_resources: list[_ItisVipResourceRestData]
     pricing_plan_id: PricingPlanId
 
+    category_id: IDStr
+    category_display: str
+    category_icon: HttpUrl | None = None  # NOTE: Placeholder until provide @odeimaiz
+    terms_of_use_url: HttpUrl | None = None  # NOTE: Placeholder until provided @mguidon
+
     created_at: datetime
     modified_at: datetime
 
@@ -86,17 +93,21 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
                 "examples": [
                     {
                         "licensedItemId": "0362b88b-91f8-4b41-867c-35544ad1f7a1",
+                        "key": "Duke",
+                        "version": "1.0.0",
                         "displayName": "my best model",
                         "licensedResourceType": f"{LicensedResourceType.VIP_MODEL}",
-                        "licensedResourceData": cast(
-                            JsonDict,
-                            {
-                                "categoryId": "HumanWholeBody",
-                                "categoryDisplay": "Humans",
-                                "source": {**VIP_DETAILS_EXAMPLE, "doi": doi},
-                            },
-                        ),
+                        "licensedResources": [
+                            cast(
+                                JsonDict,
+                                {
+                                    "source": {**VIP_DETAILS_EXAMPLE, "doi": doi},
+                                },
+                            )
+                        ],
                         "pricingPlanId": "15",
+                        "categoryId": "HumanWholeBody",
+                        "categoryDisplay": "Humans",
                         "createdAt": "2024-12-12 09:59:26.422140",
                         "modifiedAt": "2024-12-12 09:59:26.422140",
                     }
@@ -114,6 +125,8 @@ def from_domain_model(cls, item: LicensedItem) -> Self:
                 **item.model_dump(
                     include={
                         "licensed_item_id",
+                        "key",
+                        "version",
                         "display_name",
                         "licensed_resource_type",
                         "pricing_plan_id",
@@ -122,9 +135,14 @@ def from_domain_model(cls, item: LicensedItem) -> Self:
                     },
                     exclude_unset=True,
                 ),
-                "licensed_resource_data": {
-                    **item.licensed_resource_data,
-                },
+                "licensed_resources": [
+                    _ItisVipResourceRestData(**x)
+                    for x in item.array_of_licensed_resource_data
+                ],
+                "category_id": item.array_of_licensed_resource_data[0]["category_id"],
+                "category_display": item.array_of_licensed_resource_data[0][
+                    "category_display"
+                ],
             }
         )
 

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

@@ -56,6 +56,8 @@ class LicensedItemCheckoutRpcGetPage(NamedTuple):
 class LicensedItemCheckoutRestGet(OutputSchema):
     licensed_item_checkout_id: LicensedItemCheckoutID
     licensed_item_id: LicensedItemID
+    key: str
+    version: str
     wallet_id: WalletID
     user_id: UserID
     user_email: LowerCaseEmailStr

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

@@ -18,6 +18,8 @@ class LicensedItemPurchaseGet(OutputSchema):
     licensed_item_purchase_id: LicensedItemPurchaseID
     product_name: ProductName
     licensed_item_id: LicensedItemID
+    key: str
+    version: str
     wallet_id: WalletID
     pricing_unit_cost_id: PricingUnitCostId
     pricing_unit_cost: Decimal

packages/models-library/src/models_library/licenses.py

@@ -112,10 +112,11 @@ class LicensedResourcePatchDB(BaseModel):
 
 class LicensedItem(BaseModel):
     licensed_item_id: LicensedItemID
+    key: str
+    version: str
     display_name: str
-    licensed_resource_name: str
     licensed_resource_type: LicensedResourceType
-    licensed_resource_data: dict[str, Any]
+    array_of_licensed_resource_data: list[dict[str, Any]]
     pricing_plan_id: PricingPlanId
     created_at: datetime
     modified_at: datetime
@@ -127,17 +128,20 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
                 "examples": [
                     {
                         "licensed_item_id": "0362b88b-91f8-4b41-867c-35544ad1f7a1",
+                        "key": "Duke",
+                        "version": "1.0.0",
                         "display_name": "my best model",
-                        "licensed_resource_name": "best-model",
                         "licensed_resource_type": f"{LicensedResourceType.VIP_MODEL}",
-                        "licensed_resource_data": cast(
-                            JsonDict,
-                            {
-                                "category_id": "HumanWholeBody",
-                                "category_display": "Humans",
-                                "source": VIP_DETAILS_EXAMPLE,
-                            },
-                        ),
+                        "array_of_licensed_resource_data": [
+                            cast(
+                                JsonDict,
+                                {
+                                    "category_id": "HumanWholeBody",
+                                    "category_display": "Humans",
+                                    "source": 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",

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

@@ -60,6 +60,8 @@ async def list_licensed_items_checkouts_for_wallet(
             LicensedItemCheckoutGet.model_construct(
                 licensed_item_checkout_id=checkout_item.licensed_item_checkout_id,
                 licensed_item_id=checkout_item.licensed_item_id,
+                key=checkout_item.key,
+                version=checkout_item.version,
                 wallet_id=checkout_item.wallet_id,
                 user_id=checkout_item.user_id,
                 user_email=checkout_item.user_email,
@@ -100,6 +102,8 @@ async def get_licensed_item_checkout(
     return LicensedItemCheckoutGet.model_construct(
         licensed_item_checkout_id=checkout_item.licensed_item_checkout_id,
         licensed_item_id=checkout_item.licensed_item_id,
+        key=checkout_item.key,
+        version=checkout_item.version,
         wallet_id=checkout_item.wallet_id,
         user_id=checkout_item.user_id,
         user_email=checkout_item.user_email,
@@ -153,6 +157,8 @@ async def checkout_licensed_item_for_wallet(
     return LicensedItemCheckoutGet.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,
         user_email=licensed_item_get.user_email,
@@ -199,6 +205,8 @@ async def release_licensed_item_for_wallet(
     return LicensedItemCheckoutGet.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,
         user_email=licensed_item_get.user_email,

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

@@ -58,6 +58,8 @@ async def list_licensed_items_purchases(
                 licensed_item_purchase_id=item.licensed_item_purchase_id,
                 product_name=item.product_name,
                 licensed_item_id=item.licensed_item_id,
+                key=item.key,
+                version=item.version,
                 wallet_id=item.wallet_id,
                 pricing_unit_cost_id=item.pricing_unit_cost_id,
                 pricing_unit_cost=item.pricing_unit_cost,
@@ -102,6 +104,8 @@ async def get_licensed_item_purchase(
         licensed_item_purchase_id=licensed_item_get.licensed_item_purchase_id,
         product_name=licensed_item_get.product_name,
         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,
         pricing_unit_cost_id=licensed_item_get.pricing_unit_cost_id,
         pricing_unit_cost=licensed_item_get.pricing_unit_cost,