removing vip mels

Author: matusdrobuliak66

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

@@ -1,14 +1,16 @@
 from datetime import datetime
-from typing import NamedTuple
+from typing import Any, NamedTuple
 
 from models_library.licensed_items import (
+    VIP_DETAILS_EXAMPLE,
     LicensedItemID,
     LicensedResourceType,
-    VipDetails,
 )
 from models_library.resource_tracker import PricingPlanId
-from pydantic import BaseModel, ConfigDict, PositiveInt
+from models_library.utils.common_validators import to_camel_recursive
+from pydantic import AfterValidator, BaseModel, ConfigDict, PositiveInt
 from pydantic.alias_generators import to_camel
+from typing_extensions import Annotated
 
 from ._base import OutputSchema
 
@@ -20,25 +22,24 @@ class LicensedItemRpcGet(BaseModel):
     display_name: str
     licensed_resource_type: LicensedResourceType
     pricing_plan_id: PricingPlanId
-    licensed_resource_type_details: VipDetails
+    licensed_resource_type_details: dict[str, Any]
     created_at: datetime
     modified_at: datetime
     model_config = ConfigDict(
+        alias_generator=to_camel,
         json_schema_extra={
             "examples": [
                 {
                     "licensed_item_id": "0362b88b-91f8-4b41-867c-35544ad1f7a1",
                     "display_name": "best-model",
                     "licensed_resource_type": f"{LicensedResourceType.VIP_MODEL}",
                     "pricing_plan_id": "15",
-                    "licensed_resource_type_details": VipDetails.model_config[
-                        "json_schema_extra"
-                    ]["examples"][0],
+                    "licensed_resource_type_details": VIP_DETAILS_EXAMPLE,
                     "created_at": "2024-12-12 09:59:26.422140",
                     "modified_at": "2024-12-12 09:59:26.422140",
                 }
             ]
-        }
+        },
     )
 
 
@@ -66,7 +67,9 @@ class LicensedItemRestGet(OutputSchema):
     display_name: str
     licensed_resource_type: LicensedResourceType
     pricing_plan_id: PricingPlanId
-    licensed_resource_type_details: VipDetails
+    licensed_resource_type_details: Annotated[
+        dict[str, Any], AfterValidator(to_camel_recursive)
+    ]
     created_at: datetime
     modified_at: datetime
     model_config = ConfigDict(
@@ -77,9 +80,7 @@ class LicensedItemRestGet(OutputSchema):
                     "display_name": "best-model",
                     "licensed_resource_type": f"{LicensedResourceType.VIP_MODEL}",
                     "pricing_plan_id": "15",
-                    "licensed_resource_type_details": VipDetails.model_config[
-                        "json_schema_extra"
-                    ]["examples"][0],
+                    "licensed_resource_type_details": VIP_DETAILS_EXAMPLE,
                     "created_at": "2024-12-12 09:59:26.422140",
                     "modified_at": "2024-12-12 09:59:26.422140",
                 }

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

@@ -1,10 +1,9 @@
 from datetime import datetime
 from enum import auto
-from typing import TypeAlias
+from typing import Any, TypeAlias
 from uuid import UUID
 
-from pydantic import AliasGenerator, BaseModel, ConfigDict, Field
-from pydantic.alias_generators import to_camel
+from pydantic import BaseModel, ConfigDict, Field
 
 from .products import ProductName
 from .resource_tracker import PricingPlanId
@@ -17,78 +16,31 @@ class LicensedResourceType(StrAutoEnum):
     VIP_MODEL = auto()
 
 
-class VipFeatures(BaseModel):
-    name: str
-    version: str
-    sex: str
-    age: str
-    weight: str
-    height: str
-    data: str
-    ethnicity: str
-    functionality: str
-
-    model_config = ConfigDict(
-        alias_generator=AliasGenerator(
-            serialization_alias=to_camel,
-        ),
-        populate_by_name=True,
-        extra="allow",
-        json_schema_extra={
-            "examples": [
-                {
-                    "name": "Duke",
-                    "version": "V2.0",
-                    "sex": "Male",
-                    "age": "34 years",
-                    "weight": "70.2 Kg",
-                    "height": "1.77 m",
-                    "data": "2015-03-01",
-                    "ethnicity": "Caucasian",
-                    "functionality": "Static",
-                    "additional_field": "allowed",
-                }
-            ]
-        },
-    )
-
-
-class VipDetails(BaseModel):
-    id: int
-    description: str
-    thumbnail: str
-    features: VipFeatures
-    doi: str
-    license_key: str | None
-    license_version: str | None
-    protection: str
-    available_from_url: str
-
-    model_config = ConfigDict(
-        alias_generator=AliasGenerator(
-            serialization_alias=to_camel,
-        ),
-        populate_by_name=True,
-        extra="allow",
-        json_schema_extra={
-            "examples": [
-                {
-                    "id": 1,
-                    "description": "custom description",
-                    "thumbnail": "custom description",
-                    "features": VipFeatures.model_config["json_schema_extra"][
-                        "examples"
-                    ][0],
-                    "doi": "custom value",
-                    "license_key": "custom value",
-                    "license_version": "custom value",
-                    "protection": "custom value",
-                    "available_from_url": "custom value",
-                    "additional_field": "allowed",
-                }
-            ]
-        },
-    )
+VIP_FEAUTES_EXAMPLE = {
+    "name": "Duke",
+    "version": "V2.0",
+    "sex": "Male",
+    "age": "34 years",
+    "weight": "70.2 Kg",
+    "height": "1.77 m",
+    "data": "2015-03-01",
+    "ethnicity": "Caucasian",
+    "functionality": "Static",
+    "additional_field": "allowed",
+}
+
+VIP_DETAILS_EXAMPLE = {
+    "id": 1,
+    "description": "custom description",
+    "thumbnail": "custom description",
+    "features": VIP_FEAUTES_EXAMPLE,
+    "doi": "custom value",
+    "license_key": "custom value",
+    "license_version": "custom value",
+    "protection": "custom value",
+    "available_from_url": "custom value",
+    "additional_field": "allowed",
+}
 
 
 #
@@ -102,7 +54,7 @@ class LicensedItemDB(BaseModel):
     licensed_resource_type: LicensedResourceType
     pricing_plan_id: PricingPlanId
     product_name: ProductName
-    licensed_resource_type_details: VipDetails
+    licensed_resource_type_details: dict[str, Any]
     created: datetime = Field(
         ...,
         description="Timestamp on creation",

packages/models-library/src/models_library/utils/common_validators.py

@@ -23,6 +23,7 @@ class MyModel(BaseModel):
 from common_library.json_serialization import json_loads
 from orjson import JSONDecodeError
 from pydantic import BaseModel
+from pydantic.alias_generators import to_camel
 
 
 def empty_str_to_none_pre_validator(value: Any):
@@ -120,3 +121,23 @@ def _validator(cls: type[BaseModel], values):
         return values
 
     return _validator
+
+
+def to_camel_recursive(data: dict[str, Any]) -> dict[str, Any]:
+    """Recursively convert dictionary keys to camelCase"""
+    if not isinstance(data, dict):
+        return data  # Return as-is if it's not a dictionary
+
+    new_dict = {}
+    for key, value in data.items():
+        new_key = to_camel(key)  # Convert key to camelCase
+        if isinstance(value, dict):
+            new_dict[new_key] = to_camel_recursive(value)  # Recursive call for dicts
+        elif isinstance(value, list):
+            new_dict[new_key] = [
+                to_camel_recursive(item) if isinstance(item, dict) else item
+                for item in value
+            ]
+        else:
+            new_dict[new_key] = value
+    return new_dict

services/api-server/src/simcore_service_api_server/models/schemas/model_adapter.py

@@ -2,7 +2,7 @@
 
 from datetime import datetime
 from decimal import Decimal
-from typing import Annotated
+from typing import Annotated, Any
 
 from models_library.api_schemas_api_server.pricing_plans import (
     ServicePricingPlanGet as _ServicePricingPlanGet,
@@ -24,11 +24,7 @@
 )
 from models_library.basic_types import IDStr, NonNegativeDecimal
 from models_library.groups import GroupID
-from models_library.licensed_items import (
-    LicensedItemID,
-    LicensedResourceType,
-    VipDetails,
-)
+from models_library.licensed_items import LicensedItemID, LicensedResourceType
 from models_library.products import ProductName
 from models_library.resource_tracker import (
     PricingPlanClassification,
@@ -144,7 +140,7 @@ class LicensedItemGet(BaseModel):
     display_name: Annotated[str, Field(alias="display_name")]
     licensed_resource_type: LicensedResourceType
     pricing_plan_id: PricingPlanId
-    licensed_resource_type_details: VipDetails
+    licensed_resource_type_details: dict[str, Any]
     created_at: datetime
     modified_at: datetime
     model_config = ConfigDict(

services/web/server/src/simcore_service_webserver/licenses/_common/models.py

@@ -1,12 +1,12 @@
 import logging
 from datetime import datetime
-from typing import NamedTuple
+from typing import Any, NamedTuple
 
 from models_library.basic_types import IDStr
 from models_library.licensed_items import (
+    VIP_DETAILS_EXAMPLE,
     LicensedItemID,
     LicensedResourceType,
-    VipDetails,
 )
 from models_library.resource_tracker import PricingPlanId, PricingUnitId
 from models_library.resource_tracker_licensed_items_purchases import (
@@ -34,7 +34,7 @@ class LicensedItem(BaseModel):
     display_name: str
     licensed_resource_type: LicensedResourceType
     pricing_plan_id: PricingPlanId
-    licensed_resource_type_details: VipDetails
+    licensed_resource_type_details: dict[str, Any]
     created_at: datetime
     modified_at: datetime
     model_config = ConfigDict(
@@ -45,9 +45,7 @@ class LicensedItem(BaseModel):
                     "display_name": "best-model",
                     "licensed_resource_type": f"{LicensedResourceType.VIP_MODEL}",
                     "pricing_plan_id": "15",
-                    "licensed_resource_type_details": VipDetails.model_config[
-                        "json_schema_extra"
-                    ]["examples"][0],
+                    "licensed_resource_type_details": VIP_DETAILS_EXAMPLE,
                     "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_repository.py

@@ -5,15 +5,14 @@
 """
 
 import logging
-from typing import cast
+from typing import Any, cast
 
 from aiohttp import web
 from models_library.licensed_items import (
     LicensedItemDB,
     LicensedItemID,
     LicensedItemUpdateDB,
     LicensedResourceType,
-    VipDetails,
 )
 from models_library.products import ProductName
 from models_library.resource_tracker import PricingPlanId
@@ -56,7 +55,7 @@ async def create(
     display_name: str,
     licensed_resource_type: LicensedResourceType,
     pricing_plan_id: PricingPlanId,
-    licensed_resource_type_details: VipDetails,
+    licensed_resource_type_details: dict[str, Any],
 ) -> LicensedItemDB:
     async with transaction_context(get_asyncpg_engine(app), connection) as conn:
         result = await conn.stream(

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

@@ -8,10 +8,10 @@
 import pytest
 from aiohttp.test_utils import TestClient
 from models_library.licensed_items import (
+    VIP_DETAILS_EXAMPLE,
     LicensedItemDB,
     LicensedItemUpdateDB,
     LicensedResourceType,
-    VipDetails,
 )
 from models_library.rest_ordering import OrderBy
 from pytest_simcore.helpers.webserver_login import UserInfoDict
@@ -48,9 +48,7 @@ async def test_licensed_items_db_crud(
         display_name="Model A",
         licensed_resource_type=LicensedResourceType.VIP_MODEL,
         pricing_plan_id=pricing_plan_id,
-        licensed_resource_type_details=VipDetails.model_config["json_schema_extra"][
-            "examples"
-        ][0],
+        licensed_resource_type_details=VIP_DETAILS_EXAMPLE,
     )
     _licensed_item_id = licensed_item_db.licensed_item_id
 
@@ -69,7 +67,7 @@ async def test_licensed_items_db_crud(
         product_name=osparc_product_name,
     )
     assert licensed_item_db.display_name == "Model A"
-    assert isinstance(licensed_item_db.licensed_resource_type_details, VipDetails)
+    assert isinstance(licensed_item_db.licensed_resource_type_details, dict)
 
     await _licensed_items_repository.update(
         client.app,

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

@@ -12,7 +12,7 @@
 )
 from models_library.api_schemas_webserver.licensed_items import LicensedItemRestGet
 from models_library.api_schemas_webserver.wallets import WalletGetWithAvailableCredits
-from models_library.licensed_items import LicensedResourceType, VipDetails
+from models_library.licensed_items import VIP_DETAILS_EXAMPLE, LicensedResourceType
 from pytest_mock.plugin import MockerFixture
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.webserver_login import UserInfoDict
@@ -45,9 +45,7 @@ async def test_licensed_items_listing(
         display_name="Model A",
         licensed_resource_type=LicensedResourceType.VIP_MODEL,
         pricing_plan_id=pricing_plan_id,
-        licensed_resource_type_details=VipDetails.model_config["json_schema_extra"][
-            "examples"
-        ][0],
+        licensed_resource_type_details=VIP_DETAILS_EXAMPLE,
     )
     _licensed_item_id = licensed_item_db.licensed_item_id
 
@@ -115,9 +113,7 @@ async def test_licensed_items_purchase(
         display_name="Model A",
         licensed_resource_type=LicensedResourceType.VIP_MODEL,
         pricing_plan_id=pricing_plan_id,
-        licensed_resource_type_details=VipDetails.model_config["json_schema_extra"][
-            "examples"
-        ][0],
+        licensed_resource_type_details=VIP_DETAILS_EXAMPLE,
     )
     _licensed_item_id = licensed_item_db.licensed_item_id