Merge branch '1848-add-permission-rights-to-async-jobs' of github.com:bisgaard-itis/osparc-simcore into 1848-add-permission-rights-to-async-jobs

Author: bisgaard-itis

api/specs/web-server/_products.py

@@ -7,21 +7,17 @@
 
 from typing import Annotated
 
-from fastapi import APIRouter, Depends, status
+from fastapi import APIRouter, Depends
 from models_library.api_schemas_webserver.product import (
-    GenerateInvitation,
-    GetCreditPrice,
+    CreditPriceGet,
+    InvitationGenerate,
     InvitationGenerated,
     ProductGet,
     ProductUIGet,
-    UpdateProductTemplate,
 )
 from models_library.generics import Envelope
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.products._handlers import (
-    _ProductsRequestParams,
-    _ProductTemplateParams,
-)
+from simcore_service_webserver.products._rest_schemas import ProductsRequestParams
 
 router = APIRouter(
     prefix=f"/{API_VTAG}",
@@ -33,7 +29,7 @@
 
 @router.get(
     "/credits-price",
-    response_model=Envelope[GetCreditPrice],
+    response_model=Envelope[CreditPriceGet],
 )
 async def get_current_product_price():
     ...
@@ -47,7 +43,7 @@ async def get_current_product_price():
         "po",
     ],
 )
-async def get_product(_params: Annotated[_ProductsRequestParams, Depends()]):
+async def get_product(_params: Annotated[ProductsRequestParams, Depends()]):
     ...
 
 
@@ -59,25 +55,12 @@ async def get_current_product_ui():
     ...
 
 
-@router.put(
-    "/products/{product_name}/templates/{template_id}",
-    status_code=status.HTTP_204_NO_CONTENT,
-    tags=[
-        "po",
-    ],
-)
-async def update_product_template(
-    _params: Annotated[_ProductTemplateParams, Depends()], _body: UpdateProductTemplate
-):
-    ...
-
-
 @router.post(
     "/invitation:generate",
     response_model=Envelope[InvitationGenerated],
     tags=[
         "po",
     ],
 )
-async def generate_invitation(_body: GenerateInvitation):
+async def generate_invitation(_body: InvitationGenerate):
     ...

api/specs/web-server/_statics.py

@@ -8,7 +8,7 @@
 
 from fastapi import APIRouter
 from fastapi.responses import HTMLResponse
-from simcore_service_webserver._constants import INDEX_RESOURCE_NAME
+from simcore_service_webserver.constants import INDEX_RESOURCE_NAME
 from simcore_service_webserver.statics.settings import FrontEndInfoDict
 
 router = APIRouter(

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

@@ -2,23 +2,24 @@
 from decimal import Decimal
 from typing import NamedTuple
 
-from pydantic import BaseModel, ConfigDict, PositiveInt
+from pydantic import BaseModel, ConfigDict, PositiveInt, model_validator
 
 from ..resource_tracker import (
     HardwareInfo,
     PricingPlanClassification,
     PricingPlanId,
     PricingUnitCostId,
     PricingUnitId,
-    UnitExtraInfo,
+    UnitExtraInfoLicense,
+    UnitExtraInfoTier,
 )
 from ..services_types import ServiceKey, ServiceVersion
 
 
-class PricingUnitGet(BaseModel):
+class RutPricingUnitGet(BaseModel):
     pricing_unit_id: PricingUnitId
     unit_name: str
-    unit_extra_info: UnitExtraInfo
+    unit_extra_info: UnitExtraInfoTier | UnitExtraInfoLicense
     current_cost_per_unit: Decimal
     current_cost_per_unit_id: PricingUnitCostId
     default: bool
@@ -30,30 +31,68 @@ class PricingUnitGet(BaseModel):
                 {
                     "pricing_unit_id": 1,
                     "unit_name": "SMALL",
-                    "unit_extra_info": UnitExtraInfo.model_config["json_schema_extra"]["examples"][0],  # type: ignore [index]
+                    "unit_extra_info": UnitExtraInfoTier.model_config["json_schema_extra"]["examples"][0],  # type: ignore [index]
                     "current_cost_per_unit": 5.7,
                     "current_cost_per_unit_id": 1,
                     "default": True,
-                    "specific_info": hw_config_example,
-                }
-                for hw_config_example in HardwareInfo.model_config["json_schema_extra"][
-                    "examples"
-                ]  # type: ignore[index,union-attr]
+                    "specific_info": HardwareInfo.model_config["json_schema_extra"]["examples"][0],  # type: ignore [index]
+                },
+                {
+                    "pricing_unit_id": 1,
+                    "unit_name": "SMALL",
+                    "unit_extra_info": UnitExtraInfoTier.model_config["json_schema_extra"]["examples"][0],  # type: ignore [index]
+                    "current_cost_per_unit": 5.7,
+                    "current_cost_per_unit_id": 1,
+                    "default": True,
+                    "specific_info": HardwareInfo.model_config["json_schema_extra"]["examples"][1],  # type: ignore [index]
+                },
+                {
+                    "pricing_unit_id": 2,
+                    "unit_name": "5 seats",
+                    "unit_extra_info": UnitExtraInfoLicense.model_config["json_schema_extra"]["examples"][0],  # type: ignore [index]
+                    "current_cost_per_unit": 10.5,
+                    "current_cost_per_unit_id": 2,
+                    "default": False,
+                    "specific_info": HardwareInfo.model_config["json_schema_extra"]["examples"][1],  # type: ignore [index]
+                },
             ]
         }
     )
 
 
-class PricingPlanGet(BaseModel):
+class RutPricingPlanGet(BaseModel):
     pricing_plan_id: PricingPlanId
     display_name: str
     description: str
     classification: PricingPlanClassification
     created_at: datetime
     pricing_plan_key: str
-    pricing_units: list[PricingUnitGet] | None
+    pricing_units: list[RutPricingUnitGet] | None
     is_active: bool
 
+    @model_validator(mode="after")
+    def ensure_classification_matches_extra_info(self):
+        """Enforce that all PricingUnitGet.unit_extra_info match the plan's classification."""
+        if not self.pricing_units:
+            return self  # No units to check
+
+        for unit in self.pricing_units:
+            if (
+                self.classification == PricingPlanClassification.TIER
+                and not isinstance(unit.unit_extra_info, UnitExtraInfoTier)
+            ):
+                error_message = (
+                    "For TIER classification, unit_extra_info must be UnitExtraInfoTier"
+                )
+                raise ValueError(error_message)
+            if (
+                self.classification == PricingPlanClassification.LICENSE
+                and not isinstance(unit.unit_extra_info, UnitExtraInfoLicense)
+            ):
+                error_message = "For LICENSE classification, unit_extra_info must be UnitExtraInfoLicense"
+                raise ValueError(error_message)
+        return self
+
     model_config = ConfigDict(
         json_schema_extra={
             "examples": [
@@ -64,21 +103,48 @@ class PricingPlanGet(BaseModel):
                     "classification": "TIER",
                     "created_at": "2023-01-11 13:11:47.293595",
                     "pricing_plan_key": "pricing-plan-sleeper",
-                    "pricing_units": [pricing_unit_get_example],
+                    "pricing_units": [
+                        RutPricingUnitGet.model_config["json_schema_extra"]["examples"][  # type: ignore [index]
+                            0  # type: ignore [index]
+                        ]
+                    ],
                     "is_active": True,
-                }
-                for pricing_unit_get_example in PricingUnitGet.model_config[
-                    "json_schema_extra"
-                ][
-                    "examples"
-                ]  # type: ignore[index,union-attr]
+                },
+                {
+                    "pricing_plan_id": 1,
+                    "display_name": "Pricing Plan for Sleeper",
+                    "description": "Special Pricing Plan for Sleeper",
+                    "classification": "TIER",
+                    "created_at": "2023-01-11 13:11:47.293595",
+                    "pricing_plan_key": "pricing-plan-sleeper",
+                    "pricing_units": [
+                        RutPricingUnitGet.model_config["json_schema_extra"]["examples"][  # type: ignore [index]
+                            1  # type: ignore [index]
+                        ]
+                    ],
+                    "is_active": True,
+                },
+                {
+                    "pricing_plan_id": 2,
+                    "display_name": "VIP model A",
+                    "description": "Special Pricing Plan for VIP",
+                    "classification": "LICENSE",
+                    "created_at": "2023-01-11 13:11:47.293595",
+                    "pricing_plan_key": "vip-model-a",
+                    "pricing_units": [
+                        RutPricingUnitGet.model_config["json_schema_extra"]["examples"][  # type: ignore [index]
+                            2  # type: ignore [index]
+                        ]
+                    ],
+                    "is_active": True,
+                },
             ]
         }
     )
 
 
-class PricingPlanPage(NamedTuple):
-    items: list[PricingPlanGet]
+class RutPricingPlanPage(NamedTuple):
+    items: list[RutPricingPlanGet]
     total: PositiveInt
 
 

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

@@ -19,16 +19,20 @@
 from ._base import InputSchema, OutputSchema
 
 
-class GetCreditPrice(OutputSchema):
+class CreditPriceGet(OutputSchema):
     product_name: str
     usd_per_credit: Annotated[
-        NonNegativeDecimal,
-        PlainSerializer(float, return_type=NonNegativeFloat, when_used="json"),
-    ] | None = Field(
-        ...,
-        description="Price of a credit in USD. "
-        "If None, then this product's price is UNDEFINED",
-    )
+        Annotated[
+            NonNegativeDecimal,
+            PlainSerializer(float, return_type=NonNegativeFloat, when_used="json"),
+        ]
+        | None,
+        Field(
+            description="Price of a credit in USD. "
+            "If None, then this product's price is UNDEFINED",
+        ),
+    ]
+
     min_payment_amount_usd: Annotated[
         NonNegativeInt | None,
         Field(
@@ -61,15 +65,11 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
     )
 
 
-class GetProductTemplate(OutputSchema):
+class ProductTemplateGet(OutputSchema):
     id_: Annotated[IDStr, Field(alias="id")]
     content: str
 
 
-class UpdateProductTemplate(InputSchema):
-    content: str
-
-
 class ProductGet(OutputSchema):
     name: ProductName
     display_name: str
@@ -92,7 +92,7 @@ class ProductGet(OutputSchema):
     credits_per_usd: NonNegativeDecimal | None
 
     templates: Annotated[
-        list[GetProductTemplate],
+        list[ProductTemplateGet],
         Field(
             description="List of templates available to this product for communications (e.g. emails, sms, etc)",
             default_factory=list,
@@ -111,7 +111,7 @@ class ProductUIGet(OutputSchema):
 ExtraCreditsUsdRangeInt: TypeAlias = Annotated[int, Field(ge=0, lt=500)]
 
 
-class GenerateInvitation(InputSchema):
+class InvitationGenerate(InputSchema):
     guest: LowerCaseEmailStr
     trial_account_days: PositiveInt | None = None
     extra_credits_in_usd: ExtraCreditsUsdRangeInt | None = None

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

@@ -13,7 +13,8 @@
     PricingUnitId,
     ServiceRunStatus,
     SpecificInfo,
-    UnitExtraInfo,
+    UnitExtraInfoLicense,
+    UnitExtraInfoTier,
 )
 from ..services import ServiceKey, ServiceVersion
 from ..services_types import ServiceRunID
@@ -48,7 +49,7 @@ class ServiceRunGet(
 class PricingUnitGet(OutputSchema):
     pricing_unit_id: PricingUnitId
     unit_name: str
-    unit_extra_info: UnitExtraInfo
+    unit_extra_info: UnitExtraInfoTier | UnitExtraInfoLicense
     current_cost_per_unit: Decimal
     default: bool
 
@@ -114,7 +115,7 @@ class UpdatePricingPlanBodyParams(InputSchema):
 
 class CreatePricingUnitBodyParams(InputSchema):
     unit_name: str
-    unit_extra_info: UnitExtraInfo
+    unit_extra_info: UnitExtraInfoTier | UnitExtraInfoLicense
     default: bool
     specific_info: SpecificInfo
     cost_per_unit: Decimal
@@ -128,7 +129,7 @@ class CreatePricingUnitBodyParams(InputSchema):
 
 class UpdatePricingUnitBodyParams(InputSchema):
     unit_name: str
-    unit_extra_info: UnitExtraInfo
+    unit_extra_info: UnitExtraInfoTier | UnitExtraInfoLicense
     default: bool
     specific_info: SpecificInfo
     pricing_unit_cost_update: PricingUnitCostUpdate | None = Field(default=None)