priductsrip

Author: pcrespov

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

@@ -17,7 +17,7 @@
 
 from ..basic_types import IDStr, NonNegativeDecimal
 from ..emails import LowerCaseEmailStr
-from ..products import ProductName, StripePriceID, StripeTaxRateID
+from ..products import ProductName
 from ._base import InputSchema, OutputSchema
 
 
@@ -43,28 +43,6 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
     )
 
 
-class ProductStripeInfoGet(BaseModel):
-    stripe_price_id: StripePriceID
-    stripe_tax_rate_id: StripeTaxRateID
-
-    @staticmethod
-    def _update_json_schema_extra(schema: JsonDict) -> None:
-        schema.update(
-            {
-                "examples": [
-                    {
-                        "stripe_price_id": "stripe-price-id",
-                        "stripe_tax_rate_id": "stripe-tax-rate-id",
-                    },
-                ]
-            }
-        )
-
-    model_config = ConfigDict(
-        json_schema_extra=_update_json_schema_extra,
-    )
-
-
 class CreditPriceGet(OutputSchema):
     product_name: str
     usd_per_credit: Annotated[

services/web/server/src/simcore_service_webserver/payments/_rpc_invoice.py

@@ -2,9 +2,6 @@
 
 from aiohttp import web
 from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
-from models_library.api_schemas_webserver.products import (
-    ProductStripeInfoGet,
-)
 from models_library.emails import LowerCaseEmailStr
 from models_library.payments import InvoiceDataGet, UserInvoiceAddress
 from models_library.products import ProductName
@@ -30,8 +27,8 @@ async def get_invoice_data(
     credit_result: CreditResultDict = await products_service.get_credit_amount(
         app, dollar_amount=dollar_amount, product_name=product_name
     )
-    product_stripe_info_get: ProductStripeInfoGet = (
-        await products_service.get_product_stripe_info(app, product_name=product_name)
+    product_stripe_info = await products_service.get_product_stripe_info(
+        app, product_name=product_name
     )
     user_invoice_address: UserInvoiceAddress = await get_user_invoice_address(
         app, user_id=user_id
@@ -40,8 +37,8 @@ async def get_invoice_data(
 
     return InvoiceDataGet(
         credit_amount=credit_result["credit_amount"],
-        stripe_price_id=product_stripe_info_get.stripe_price_id,
-        stripe_tax_rate_id=product_stripe_info_get.stripe_tax_rate_id,
+        stripe_price_id=product_stripe_info.stripe_price_id,
+        stripe_tax_rate_id=product_stripe_info.stripe_tax_rate_id,
         user_invoice_address=user_invoice_address,
         user_display_name=user_info.full_name,
         user_email=LowerCaseEmailStr(user_info.email),

services/web/server/src/simcore_service_webserver/products/_models.py

@@ -10,7 +10,7 @@
 )
 from models_library.basic_types import NonNegativeDecimal
 from models_library.emails import LowerCaseEmailStr
-from models_library.products import ProductName
+from models_library.products import ProductName, StripePriceID, StripeTaxRateID
 from models_library.utils.change_case import snake_to_camel
 from pydantic import (
     BaseModel,
@@ -44,6 +44,11 @@ class CreditResultDict(TypedDict):
     credit_amount: Decimal
 
 
+class ProductStripeInfo(NamedTuple):
+    stripe_price_id: StripePriceID
+    stripe_tax_rate_id: StripeTaxRateID
+
+
 class PaymentFieldsTuple(NamedTuple):
     enabled: bool
     credits_per_usd: Decimal | None

services/web/server/src/simcore_service_webserver/products/_repository.py

@@ -3,7 +3,6 @@
 from typing import Any
 
 import sqlalchemy as sa
-from models_library.api_schemas_webserver.products import ProductStripeInfoGet
 from models_library.groups import GroupID
 from models_library.products import ProductName
 from simcore_postgres_database.constants import QUANTIZE_EXP_ARG
@@ -28,7 +27,7 @@
 
 from ..constants import FRONTEND_APPS_AVAILABLE
 from ..db.base_repository import BaseRepository
-from ._models import PaymentFieldsTuple, Product
+from ._models import PaymentFieldsTuple, Product, ProductStripeInfo
 
 _logger = logging.getLogger(__name__)
 
@@ -159,7 +158,7 @@ async def get_product_latest_price_info_or_none(
 
     async def get_product_stripe_info_or_none(
         self, product_name: str, connection: AsyncConnection | None = None
-    ) -> ProductStripeInfoGet | None:
+    ) -> ProductStripeInfo | None:
         async with pass_or_acquire_connection(self.engine, connection) as conn:
             latest_stripe_info = await get_product_latest_stripe_info_or_none(
                 conn, product_name=product_name
@@ -168,7 +167,7 @@ async def get_product_stripe_info_or_none(
                 return None
 
             stripe_price_id, stripe_tax_rate_id = latest_stripe_info
-            return ProductStripeInfoGet(
+            return ProductStripeInfo(
                 stripe_price_id=stripe_price_id, stripe_tax_rate_id=stripe_tax_rate_id
             )
 

services/web/server/src/simcore_service_webserver/products/_service.py

@@ -2,17 +2,14 @@
 from typing import Any
 
 from aiohttp import web
-from models_library.api_schemas_webserver.products import (
-    ProductStripeInfoGet,
-)
 from models_library.groups import GroupID
 from models_library.products import ProductName
 from pydantic import ValidationError
 from servicelib.exceptions import InvalidConfig
 from simcore_postgres_database.utils_products_prices import ProductPriceInfo
 
 from ..constants import APP_PRODUCTS_KEY
-from ._models import CreditResultDict
+from ._models import CreditResultDict, ProductStripeInfo
 from ._repository import ProductRepository
 from .errors import (
     BelowMinimumPaymentError,
@@ -113,7 +110,7 @@ async def get_credit_amount(
 
 async def get_product_stripe_info(
     app: web.Application, *, product_name: ProductName
-) -> ProductStripeInfoGet:
+) -> ProductStripeInfo:
     repo = ProductRepository.create_from_app(app)
 
     product_stripe_info = await repo.get_product_stripe_info_or_none(product_name)

services/web/server/src/simcore_service_webserver/products/models.py

@@ -1,10 +1,11 @@
 from models_library.products import ProductName
 
-from ._models import CreditResultDict, Product
+from ._models import CreditResultDict, Product, ProductStripeInfo
 
 __all__: tuple[str, ...] = (
     "CreditResultDict",
     "Product",
     "ProductName",
+    "ProductStripeInfo",
 )
 # nopycln: file

services/web/server/tests/unit/with_dbs/04/products/test_products_repository.py

@@ -12,7 +12,6 @@
 import sqlalchemy as sa
 from aiohttp import web
 from aiohttp.test_utils import TestClient, make_mocked_request
-from models_library.api_schemas_webserver.products import ProductStripeInfoGet
 from models_library.products import ProductName
 from pytest_simcore.helpers.faker_factories import random_product, random_product_price
 from pytest_simcore.helpers.postgres_tools import sync_insert_and_get_row_lifespan
@@ -234,7 +233,7 @@ async def test_product_repository_get_product_stripe_info(
 ):
     product_name = "tis"
     stripe_info = await product_repository.get_product_stripe_info_or_none(product_name)
-    assert isinstance(stripe_info, ProductStripeInfoGet)
+    assert stripe_info
 
     product_name = "s4l"
     stripe_info = await product_repository.get_product_stripe_info_or_none(product_name)

services/web/server/tests/unit/with_dbs/04/products/test_products_service.py

@@ -9,13 +9,13 @@
 import pytest
 from aiohttp import web
 from aiohttp.test_utils import TestServer
-from models_library.api_schemas_webserver.products import ProductStripeInfoGet
 from models_library.products import ProductName
 from pydantic import TypeAdapter, ValidationError
 from pytest_mock import MockerFixture
 from servicelib.exceptions import InvalidConfig
 from simcore_postgres_database.utils_products_prices import ProductPriceInfo
 from simcore_service_webserver.products import _service, products_service
+from simcore_service_webserver.products._models import ProductStripeInfo
 from simcore_service_webserver.products._repository import ProductRepository
 from simcore_service_webserver.products.errors import (
     BelowMinimumPaymentError,
@@ -166,7 +166,7 @@ async def test_get_product_stripe_info_with_repo_faking_data(
     )
 
     # Test when stripe info is returned successfully
-    expected_stripe_info = ProductStripeInfoGet(
+    expected_stripe_info = ProductStripeInfo(
         stripe_price_id="price_id", stripe_tax_rate_id="tax_id"
     )