review @pcrespov @sanderegg

Author: matusdrobuliak66

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

@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import NamedTuple
 
-from models_library.licenses import LicensedItemID
+from models_library.licenses import LicensedItemID, LicensedItemKey, LicensedItemVersion
 from models_library.products import ProductName
 from models_library.resource_tracker_licensed_items_checkouts import (
     LicensedItemCheckoutID,
@@ -15,8 +15,8 @@
 class LicensedItemCheckoutGet(BaseModel):
     licensed_item_checkout_id: LicensedItemCheckoutID
     licensed_item_id: LicensedItemID
-    key: str
-    version: str
+    key: LicensedItemKey
+    version: LicensedItemVersion
     wallet_id: WalletID
     user_id: UserID
     user_email: str

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

@@ -2,7 +2,7 @@
 from decimal import Decimal
 from typing import NamedTuple
 
-from models_library.licenses import LicensedItemID
+from models_library.licenses import LicensedItemID, LicensedItemKey, LicensedItemVersion
 from models_library.products import ProductName
 from models_library.resource_tracker import PricingUnitCostId
 from models_library.resource_tracker_licensed_items_purchases import (
@@ -17,8 +17,8 @@ class LicensedItemPurchaseGet(BaseModel):
     licensed_item_purchase_id: LicensedItemPurchaseID
     product_name: ProductName
     licensed_item_id: LicensedItemID
-    key: str
-    version: str
+    key: LicensedItemKey
+    version: LicensedItemVersion
     wallet_id: WalletID
     wallet_name: str
     pricing_unit_cost_id: PricingUnitCostId

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

@@ -11,6 +11,8 @@
     FeaturesDict,
     LicensedItem,
     LicensedItemID,
+    LicensedItemKey,
+    LicensedItemVersion,
     LicensedResourceType,
 )
 from ._base import OutputSchema
@@ -71,8 +73,8 @@ class _ItisVipResourceRestData(OutputSchema):
 
 class LicensedItemRestGet(OutputSchema):
     licensed_item_id: LicensedItemID
-    key: str
-    version: str
+    key: LicensedItemKey
+    version: LicensedItemVersion
 
     display_name: str
     licensed_resource_type: LicensedResourceType

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

@@ -4,7 +4,7 @@
 from models_library.emails import LowerCaseEmailStr
 from pydantic import BaseModel, ConfigDict, PositiveInt
 
-from ..licenses import LicensedItemID
+from ..licenses import LicensedItemID, LicensedItemKey, LicensedItemVersion
 from ..products import ProductName
 from ..resource_tracker_licensed_items_checkouts import LicensedItemCheckoutID
 from ..users import UserID
@@ -17,8 +17,8 @@
 class LicensedItemCheckoutRpcGet(BaseModel):
     licensed_item_checkout_id: LicensedItemCheckoutID
     licensed_item_id: LicensedItemID
-    key: str
-    version: str
+    key: LicensedItemKey
+    version: LicensedItemVersion
     wallet_id: WalletID
     user_id: UserID
     product_name: ProductName

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

@@ -5,7 +5,7 @@
 from models_library.emails import LowerCaseEmailStr
 from pydantic import PositiveInt
 
-from ..licenses import LicensedItemID
+from ..licenses import LicensedItemID, LicensedItemKey, LicensedItemVersion
 from ..products import ProductName
 from ..resource_tracker import PricingUnitCostId
 from ..resource_tracker_licensed_items_purchases import LicensedItemPurchaseID
@@ -18,8 +18,8 @@ class LicensedItemPurchaseGet(OutputSchema):
     licensed_item_purchase_id: LicensedItemPurchaseID
     product_name: ProductName
     licensed_item_id: LicensedItemID
-    key: str
-    version: str
+    key: LicensedItemKey
+    version: LicensedItemVersion
     wallet_id: WalletID
     pricing_unit_cost_id: PricingUnitCostId
     pricing_unit_cost: Decimal

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

@@ -1,6 +1,6 @@
 from datetime import datetime
 from enum import auto
-from typing import Any, NamedTuple, NotRequired, TypeAlias, cast
+from typing import Any, NamedTuple, NewType, NotRequired, TypeAlias, cast
 from uuid import UUID
 
 from models_library.resource_tracker import PricingPlanId
@@ -15,6 +15,9 @@
 LicensedItemID: TypeAlias = UUID
 LicensedResourceID: TypeAlias = UUID
 
+LicensedItemKey = NewType("LicensedItemKey", str)
+LicensedItemVersion = NewType("LicensedItemVersion", str)
+
 
 class LicensedResourceType(StrAutoEnum):
     VIP_MODEL = auto()
@@ -69,8 +72,8 @@ class LicensedItemDB(BaseModel):
     licensed_item_id: LicensedItemID
     display_name: str
 
-    key: str
-    version: str
+    key: LicensedItemKey
+    version: LicensedItemVersion
     licensed_resource_type: LicensedResourceType
 
     pricing_plan_id: PricingPlanId
@@ -88,10 +91,6 @@ class LicensedItemPatchDB(BaseModel):
     pricing_plan_id: PricingPlanId | None = None
 
 
-class LicensedResourcePatchDB(BaseModel):
-    trash: bool | None = None
-
-
 class LicensedResourceDB(BaseModel):
     licensed_resource_id: LicensedResourceID
     display_name: str
@@ -116,8 +115,8 @@ class LicensedResourcePatchDB(BaseModel):
 
 class LicensedItem(BaseModel):
     licensed_item_id: LicensedItemID
-    key: str
-    version: str
+    key: LicensedItemKey
+    version: LicensedItemVersion
     display_name: str
     licensed_resource_type: LicensedResourceType
     licensed_resources: list[dict[str, Any]]

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

@@ -5,7 +5,7 @@
 
 from pydantic import BaseModel, ConfigDict
 
-from .licenses import LicensedItemID
+from .licenses import LicensedItemID, LicensedItemKey, LicensedItemVersion
 from .products import ProductName
 from .resource_tracker import PricingPlanId, PricingUnitCostId, PricingUnitId
 from .users import UserID
@@ -17,8 +17,8 @@
 class LicensedItemsPurchasesCreate(BaseModel):
     product_name: ProductName
     licensed_item_id: LicensedItemID
-    key: str
-    version: str
+    key: LicensedItemKey
+    version: LicensedItemVersion
     wallet_id: WalletID
     wallet_name: str
     pricing_plan_id: PricingPlanId

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

@@ -24,7 +24,12 @@
 )
 from models_library.basic_types import IDStr, NonNegativeDecimal
 from models_library.groups import GroupID
-from models_library.licenses import LicensedItemID, LicensedResourceType
+from models_library.licenses import (
+    LicensedItemID,
+    LicensedItemKey,
+    LicensedItemVersion,
+    LicensedResourceType,
+)
 from models_library.products import ProductName
 from models_library.resource_tracker import (
     PricingPlanClassification,
@@ -137,8 +142,8 @@ class ServicePricingPlanGetLegacy(BaseModel):
 
 class LicensedItemGet(BaseModel):
     licensed_item_id: LicensedItemID
-    key: str
-    version: str
+    key: LicensedItemKey
+    version: LicensedItemVersion
     display_name: str
     licensed_resource_type: LicensedResourceType
     licensed_resources: list[dict[str, Any]]

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/licensed_items_checkouts.py

@@ -107,7 +107,7 @@ async def get_licensed_item_checkout(
 async def checkout_licensed_item(
     db_engine: Annotated[AsyncEngine, Depends(get_resource_tracker_db_engine)],
     *,
-    licensed_item_id: LicensedItemID,  # MD: maybe not needed?
+    licensed_item_id: LicensedItemID,
     key: str,
     version: str,
     wallet_id: WalletID,

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

@@ -6,7 +6,9 @@
     LicensedItem,
     LicensedItemDB,
     LicensedItemID,
+    LicensedItemKey,
     LicensedItemPatchDB,
+    LicensedItemVersion,
     LicensedResourceType,
 )
 from models_library.products import ProductName
@@ -39,8 +41,8 @@
 
 def _create_insert_query(
     display_name: str,
-    key: str,
-    version: str,
+    key: LicensedItemKey,
+    version: LicensedItemVersion,
     licensed_resource_type: LicensedResourceType,
     product_name: ProductName,
     pricing_plan_id: PricingPlanId,
@@ -65,8 +67,8 @@ async def create(
     app: web.Application,
     connection: AsyncConnection | None = None,
     *,
-    key: str,
-    version: str,
+    key: LicensedItemKey,
+    version: LicensedItemVersion,
     display_name: str,
     licensed_resource_type: LicensedResourceType,
     product_name: ProductName,
@@ -231,8 +233,8 @@ async def get_licensed_item_by_key_version(
     app: web.Application,
     connection: AsyncConnection | None = None,
     *,
-    key: str,
-    version: str,
+    key: LicensedItemKey,
+    version: LicensedItemVersion,
     product_name: ProductName,
 ) -> LicensedItem: