Merge remote-tracking branch 'upstream/master' into pr-osparc-deflate64-zip

Author: Andrei Neagu

.codecov.yml

@@ -10,10 +10,10 @@ flag_management:
     statuses:
     - type: project
       target: auto
-      threshold: 2%
+      threshold: 5%
     - type: patch
       target: auto
-      threshold: 2%
+      threshold: 5%
 
 
 component_management:
@@ -22,7 +22,7 @@ component_management:
     statuses:
       - type: project
         target: auto
-        threshold: 2%
+        threshold: 5%
         branches:
           - "!master"
   individual_components:
@@ -116,12 +116,12 @@ coverage:
     project:
       default:
         informational: true
-        threshold: 2%
+        threshold: 5%
 
     patch:
       default:
         informational: true
-        threshold: 2%
+        threshold: 5%
 
 comment:
   layout: "header,diff,flags,components,footer"

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

@@ -0,0 +1,47 @@
+from datetime import datetime
+from typing import NamedTuple
+
+from models_library.licensed_items import LicensedItemID
+from models_library.products import ProductName
+from models_library.resource_tracker_licensed_items_checkouts import (
+    LicensedItemCheckoutID,
+)
+from models_library.services_types import ServiceRunID
+from models_library.users import UserID
+from models_library.wallets import WalletID
+from pydantic import BaseModel, ConfigDict, PositiveInt
+
+
+class LicensedItemCheckoutGet(BaseModel):
+    licensed_item_checkout_id: LicensedItemCheckoutID
+    licensed_item_id: LicensedItemID
+    wallet_id: WalletID
+    user_id: UserID
+    product_name: ProductName
+    service_run_id: ServiceRunID
+    started_at: datetime
+    stopped_at: datetime | None
+    num_of_seats: int
+
+    model_config = ConfigDict(
+        json_schema_extra={
+            "examples": [
+                {
+                    "licensed_item_checkout_id": "beb16d18-d57d-44aa-a638-9727fa4a72ef",
+                    "licensed_item_id": "303942ef-6d31-4ba8-afbe-dbb1fce2a953",
+                    "wallet_id": 1,
+                    "user_id": 1,
+                    "product_name": "osparc",
+                    "service_run_id": "run_1",
+                    "started_at": "2023-01-11 13:11:47.293595",
+                    "stopped_at": "2023-01-11 13:11:47.293595",
+                    "num_of_seats": 1,
+                }
+            ]
+        }
+    )
+
+
+class LicensedItemsCheckoutsPage(NamedTuple):
+    items: list[LicensedItemCheckoutGet]
+    total: PositiveInt

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

@@ -6,14 +6,15 @@
 
 from ..projects import ProjectID
 from ..projects_nodes_io import NodeID
-from ..resource_tracker import CreditTransactionStatus, ServiceRunId, ServiceRunStatus
+from ..resource_tracker import CreditTransactionStatus, ServiceRunStatus
 from ..services import ServiceKey, ServiceVersion
+from ..services_types import ServiceRunID
 from ..users import UserID
 from ..wallets import WalletID
 
 
 class ServiceRunGet(BaseModel):
-    service_run_id: ServiceRunId
+    service_run_id: ServiceRunID
     wallet_id: WalletID | None
     wallet_name: str | None
     user_id: UserID

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

@@ -11,6 +11,7 @@
 class LicensedItemGet(OutputSchema):
     licensed_item_id: LicensedItemID
     name: str
+    license_key: str | None
     licensed_resource_type: LicensedResourceType
     pricing_plan_id: PricingPlanId
     created_at: datetime
@@ -21,6 +22,7 @@ class LicensedItemGet(OutputSchema):
                 {
                     "licensed_item_id": "0362b88b-91f8-4b41-867c-35544ad1f7a1",
                     "name": "best-model",
+                    "license_key": "license-specific-key",
                     "licensed_resource_type": f"{LicensedResourceType.VIP_MODEL}",
                     "pricing_plan_id": "15",
                     "created_at": "2024-12-12 09:59:26.422140",

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

@@ -0,0 +1,27 @@
+from datetime import datetime
+from typing import NamedTuple
+
+from pydantic import PositiveInt
+
+from ..licensed_items import LicensedItemID
+from ..products import ProductName
+from ..resource_tracker_licensed_items_checkouts import LicensedItemCheckoutID
+from ..users import UserID
+from ..wallets import WalletID
+from ._base import OutputSchema
+
+
+class LicensedItemCheckoutGet(OutputSchema):
+    licensed_item_checkout_id: LicensedItemCheckoutID
+    licensed_item_id: LicensedItemID
+    wallet_id: WalletID
+    user_id: UserID
+    product_name: ProductName
+    started_at: datetime
+    stopped_at: datetime | None
+    num_of_seats: int
+
+
+class LicensedItemUsageGetPage(NamedTuple):
+    items: list[LicensedItemCheckoutGet]
+    total: PositiveInt

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

@@ -2,16 +2,14 @@
 from decimal import Decimal
 from typing import NamedTuple
 
-from models_library.licensed_items import LicensedItemID
-from models_library.products import ProductName
-from models_library.resource_tracker import PricingUnitCostId
-from models_library.resource_tracker_licensed_items_purchases import (
-    LicensedItemPurchaseID,
-)
-from models_library.users import UserID
-from models_library.wallets import WalletID
 from pydantic import PositiveInt
 
+from ..licensed_items import LicensedItemID
+from ..products import ProductName
+from ..resource_tracker import PricingUnitCostId
+from ..resource_tracker_licensed_items_purchases import LicensedItemPurchaseID
+from ..users import UserID
+from ..wallets import WalletID
 from ._base import OutputSchema
 
 

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

@@ -11,12 +11,12 @@
     PricingPlanId,
     PricingUnitCostUpdate,
     PricingUnitId,
-    ServiceRunId,
     ServiceRunStatus,
     SpecificInfo,
     UnitExtraInfo,
 )
 from ..services import ServiceKey, ServiceVersion
+from ..services_types import ServiceRunID
 from ..users import UserID
 from ..wallets import WalletID
 from ._base import InputSchema, OutputSchema
@@ -27,7 +27,7 @@
 class ServiceRunGet(
     BaseModel
 ):  # NOTE: this is already in use so I didnt modidy inheritance from OutputSchema
-    service_run_id: ServiceRunId
+    service_run_id: ServiceRunID
     wallet_id: WalletID | None
     wallet_name: str | None
     user_id: UserID

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

@@ -24,6 +24,7 @@ class LicensedResourceType(StrAutoEnum):
 class LicensedItemDB(BaseModel):
     licensed_item_id: LicensedItemID
     name: str
+    license_key: str | None
     licensed_resource_type: LicensedResourceType
     pricing_plan_id: PricingPlanId
     product_name: ProductName

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

@@ -15,6 +15,7 @@
 from .projects_state import RunningState
 from .services import ServiceKey, ServiceType, ServiceVersion
 from .services_resources import ServiceResourcesDict
+from .services_types import ServiceRunID
 from .users import UserID
 from .utils.enums import StrAutoEnum
 from .wallets import WalletID
@@ -178,7 +179,7 @@ class RabbitResourceTrackingMessageType(StrAutoEnum):
 class RabbitResourceTrackingBaseMessage(RabbitMessageBase):
     channel_name: Literal["io.simcore.service.tracking"] = "io.simcore.service.tracking"
 
-    service_run_id: str = Field(
+    service_run_id: ServiceRunID = Field(
         ..., description="uniquely identitifies the service run"
     )
     created_at: datetime.datetime = Field(

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

@@ -20,7 +20,6 @@
 
 _logger = logging.getLogger(__name__)
 
-ServiceRunId: TypeAlias = str
 PricingPlanId: TypeAlias = PositiveInt
 PricingUnitId: TypeAlias = PositiveInt
 PricingUnitCostId: TypeAlias = PositiveInt