ensure api servers price model is independent

Author: bisgaard-itis

services/api-server/src/simcore_service_api_server/api/routes/credits.py

@@ -2,7 +2,7 @@
 
 from fastapi import APIRouter, Depends, status
 
-from ...models.schemas.backwards_compatibility import GetCreditPriceApiServer
+from ...models.schemas.backwards_compatibility import GetCreditPrice
 from ..dependencies.webserver import AuthSession, get_webserver_session
 from ._constants import FMSG_CHANGELOG_NEW_IN_VERSION
 
@@ -12,7 +12,7 @@
 @router.get(
     "/price",
     status_code=status.HTTP_200_OK,
-    response_model=GetCreditPriceApiServer,
+    response_model=GetCreditPrice,
     description=FMSG_CHANGELOG_NEW_IN_VERSION.format("0.6.0"),
 )
 async def get_credits_price(

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

@@ -2,12 +2,16 @@
 
 from typing import Annotated
 
-from models_library.api_schemas_webserver.product import GetCreditPrice
+from models_library.api_schemas_webserver._base import OutputSchema
+from models_library.api_schemas_webserver.product import (
+    GetCreditPrice as _GetCreditPrice,
+)
 from models_library.basic_types import NonNegativeDecimal
-from pydantic import Field, NonNegativeFloat, PlainSerializer
+from pydantic import Field, NonNegativeFloat, NonNegativeInt, PlainSerializer
 
 
-class GetCreditPriceApiServer(GetCreditPrice):
+class GetCreditPrice(OutputSchema):
+    product_name: str
     usd_per_credit: Annotated[
         NonNegativeDecimal,
         PlainSerializer(float, return_type=NonNegativeFloat, when_used="json"),
@@ -16,3 +20,13 @@ class GetCreditPriceApiServer(GetCreditPrice):
         description="Price of a credit in USD. "
         "If None, then this product's price is UNDEFINED",
     )
+    min_payment_amount_usd: NonNegativeInt | None = Field(
+        ...,
+        description="Minimum amount (included) in USD that can be paid for this product"
+        "Can be None if this product's price is UNDEFINED",
+    )
+
+
+assert set(GetCreditPrice.model_fields.keys()) == set(
+    _GetCreditPrice.model_fields.keys()
+)

services/api-server/src/simcore_service_api_server/services/webserver.py

@@ -64,7 +64,7 @@
     WalletNotFoundError,
 )
 from simcore_service_api_server.models.schemas.backwards_compatibility import (
-    GetCreditPriceApiServer,
+    GetCreditPrice,
 )
 from tenacity import TryAgain
 from tenacity.asyncio import AsyncRetrying
@@ -575,13 +575,13 @@ async def get_project_wallet(self, *, project_id: ProjectID) -> WalletGet:
     # PRODUCTS -------------------------------------------------
 
     @_exception_mapper({status.HTTP_404_NOT_FOUND: ProductPriceNotFoundError})
-    async def get_product_price(self) -> GetCreditPriceApiServer:
+    async def get_product_price(self) -> GetCreditPrice:
         response = await self.client.get(
             "/credits-price",
             cookies=self.session_cookies,
         )
         response.raise_for_status()
-        data = Envelope[GetCreditPriceApiServer].model_validate_json(response.text).data
+        data = Envelope[GetCreditPrice].model_validate_json(response.text).data
         assert data is not None  # nosec
         return data