renaming

Author: matusdrobuliak66

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

@@ -1,6 +1,5 @@
 from datetime import datetime
-from typing import NamedTuple, TypeAlias
-from uuid import UUID
+from typing import NamedTuple
 
 from models_library.licensed_items import LicensedItemID
 from models_library.products import ProductName
@@ -12,8 +11,6 @@
 from models_library.wallets import WalletID
 from pydantic import BaseModel, ConfigDict, PositiveInt
 
-LicenseCheckoutID: TypeAlias = UUID
-
 
 class LicensedItemCheckoutGet(BaseModel):
     licensed_item_checkout_id: LicensedItemCheckoutID
@@ -48,7 +45,3 @@ class LicensedItemCheckoutGet(BaseModel):
 class LicensedItemsCheckoutsPage(NamedTuple):
     items: list[LicensedItemCheckoutGet]
     total: PositiveInt
-
-
-class LicenseCheckoutGet(BaseModel):
-    checkout_id: LicenseCheckoutID  # This is a licensed_item_checkout_id generated in the `resource_tracker_licensed_items_checkouts` table

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

@@ -1,11 +1,8 @@
 from datetime import datetime
 from typing import NamedTuple
 
-from pydantic import BaseModel, PositiveInt
+from pydantic import PositiveInt
 
-from ..api_schemas_resource_usage_tracker.licensed_items_checkouts import (
-    LicenseCheckoutID,
-)
 from ..licensed_items import LicensedItemID
 from ..products import ProductName
 from ..resource_tracker_licensed_items_checkouts import LicensedItemCheckoutID
@@ -28,7 +25,3 @@ class LicensedItemCheckoutGet(OutputSchema):
 class LicensedItemUsageGetPage(NamedTuple):
     items: list[LicensedItemCheckoutGet]
     total: PositiveInt
-
-
-class LicenseCheckoutGet(BaseModel):
-    checkout_id: LicenseCheckoutID

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/resource_usage_tracker/licensed_items_checkouts.py

@@ -5,8 +5,6 @@
     RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
 )
 from models_library.api_schemas_resource_usage_tracker.licensed_items_checkouts import (
-    LicenseCheckoutGet,
-    LicenseCheckoutID,
     LicensedItemCheckoutGet,
     LicensedItemsCheckoutsPage,
 )
@@ -93,8 +91,8 @@ async def checkout_licensed_item(
     service_run_id: ServiceRunId,
     user_id: UserID,
     user_email: str,
-) -> LicenseCheckoutGet:
-    result: LicenseCheckoutGet = await rabbitmq_rpc_client.request(
+) -> LicensedItemCheckoutGet:
+    result: LicensedItemCheckoutGet = await rabbitmq_rpc_client.request(
         RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
         _RPC_METHOD_NAME_ADAPTER.validate_python("checkout_licensed_item"),
         licensed_item_id=licensed_item_id,
@@ -106,21 +104,21 @@ async def checkout_licensed_item(
         user_email=user_email,
         timeout_s=_DEFAULT_TIMEOUT_S,
     )
-    assert isinstance(result, LicenseCheckoutGet)  # nosec
+    assert isinstance(result, LicensedItemCheckoutGet)  # nosec
     return result
 
 
 @log_decorator(_logger, level=logging.DEBUG)
 async def release_licensed_item(
     rabbitmq_rpc_client: RabbitMQRPCClient,
     *,
-    checkout_id: LicenseCheckoutID,
+    licensed_item_checkout_id: LicensedItemCheckoutID,
     product_name: ProductName,
 ) -> LicensedItemCheckoutGet:
     result: LicensedItemCheckoutGet = await rabbitmq_rpc_client.request(
         RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
         _RPC_METHOD_NAME_ADAPTER.validate_python("release_licensed_item"),
-        checkout_id=checkout_id,
+        licensed_item_checkout_id=licensed_item_checkout_id,
         product_name=product_name,
         timeout_s=_DEFAULT_TIMEOUT_S,
     )

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/licenses/licensed_items.py

@@ -7,7 +7,6 @@
 )
 from models_library.api_schemas_webserver.licensed_items_checkouts import (
     LicenseCheckoutGet,
-    LicenseCheckoutID,
     LicensedItemCheckoutGet,
 )
 from models_library.licensed_items import LicensedItemID
@@ -19,6 +18,7 @@
 from pydantic import TypeAdapter
 from servicelib.logging_utils import log_decorator
 from servicelib.rabbitmq import RabbitMQRPCClient
+from simcore_service_webserver.licenses._rpc import LicensedItemCheckoutID
 
 _logger = logging.getLogger(__name__)
 
@@ -98,14 +98,14 @@ async def release_licensed_item_for_wallet(
     *,
     product_name: ProductName,
     user_id: UserID,
-    checkout_id: LicenseCheckoutID,
+    licensed_item_checkout_id: LicensedItemCheckoutID,
 ) -> LicensedItemCheckoutGet:
     result = await rabbitmq_rpc_client.request(
         WEBSERVER_RPC_NAMESPACE,
         TypeAdapter(RPCMethodName).validate_python("release_licensed_item_for_wallet"),
         product_name=product_name,
         user_id=user_id,
-        checkout_id=checkout_id,
+        licensed_item_checkout_id=licensed_item_checkout_id,
     )
     assert isinstance(result, LicensedItemCheckoutGet)  # nosec
     return result

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/api/rpc/_licensed_items_checkouts.py

@@ -1,7 +1,5 @@
 from fastapi import FastAPI
 from models_library.api_schemas_resource_usage_tracker.licensed_items_checkouts import (
-    LicenseCheckoutGet,
-    LicenseCheckoutID,
     LicensedItemCheckoutGet,
     LicensedItemsCheckoutsPage,
 )
@@ -66,7 +64,7 @@ async def checkout_licensed_item(
     service_run_id: ServiceRunId,
     user_id: UserID,
     user_email: str,
-) -> LicenseCheckoutGet:
+) -> LicensedItemCheckoutGet:
     return await licensed_items_checkouts.checkout_licensed_item(
         db_engine=app.state.engine,
         licensed_item_id=licensed_item_id,
@@ -81,8 +79,13 @@ async def checkout_licensed_item(
 
 @router.expose(reraise_if_error_type=())
 async def release_licensed_item(
-    app: FastAPI, *, checkout_id: LicenseCheckoutID, product_name: ProductName
+    app: FastAPI,
+    *,
+    licensed_item_checkout_id: LicensedItemCheckoutID,
+    product_name: ProductName,
 ) -> LicensedItemCheckoutGet:
     return await licensed_items_checkouts.release_licensed_item(
-        db_engine=app.state.engine, checkout_id=checkout_id, product_name=product_name
+        db_engine=app.state.engine,
+        licensed_item_checkout_id=licensed_item_checkout_id,
+        product_name=product_name,
     )

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

@@ -3,8 +3,6 @@
 
 from fastapi import Depends
 from models_library.api_schemas_resource_usage_tracker.licensed_items_checkouts import (
-    LicenseCheckoutGet,
-    LicenseCheckoutID,
     LicensedItemCheckoutGet,
     LicensedItemsCheckoutsPage,
 )
@@ -104,7 +102,7 @@ async def checkout_licensed_item(
     service_run_id: ServiceRunId,
     user_id: UserID,
     user_email: str,
-) -> LicenseCheckoutGet:
+) -> LicensedItemCheckoutGet:
 
     _active_purchased_seats: int = await licensed_items_purchases_db.get_active_purchased_seats_for_item_and_wallet(
         db_engine,
@@ -149,27 +147,35 @@ async def checkout_licensed_item(
         started_at=datetime.now(tz=UTC),
         num_of_seats=num_of_seats,
     )
-    license_item_checkout_db = await licensed_items_checkouts_db.create(
+    licensed_item_checkout_db = await licensed_items_checkouts_db.create(
         db_engine, data=_create_item_checkout
     )
 
     # Return checkout ID
-    return LicenseCheckoutGet(
-        checkout_id=license_item_checkout_db.licensed_item_checkout_id
+    return LicensedItemCheckoutGet(
+        licensed_item_checkout_id=licensed_item_checkout_db.licensed_item_checkout_id,
+        licensed_item_id=licensed_item_checkout_db.licensed_item_id,
+        wallet_id=licensed_item_checkout_db.wallet_id,
+        user_id=licensed_item_checkout_db.user_id,
+        product_name=licensed_item_checkout_db.product_name,
+        service_run_id=licensed_item_checkout_db.service_run_id,
+        started_at=licensed_item_checkout_db.started_at,
+        stopped_at=licensed_item_checkout_db.stopped_at,
+        num_of_seats=licensed_item_checkout_db.num_of_seats,
     )
 
 
 async def release_licensed_item(
     db_engine: Annotated[AsyncEngine, Depends(get_resource_tracker_db_engine)],
     *,
-    checkout_id: LicenseCheckoutID,
+    licensed_item_checkout_id: LicensedItemCheckoutID,
     product_name: ProductName,
 ) -> LicensedItemCheckoutGet:
 
     licensed_item_checkout_db: LicensedItemCheckoutDB = (
         await licensed_items_checkouts_db.update(
             db_engine,
-            licensed_item_checkout_id=checkout_id,
+            licensed_item_checkout_id=licensed_item_checkout_id,
             product_name=product_name,
             stopped_at=datetime.now(tz=UTC),
         )

services/resource-usage-tracker/tests/unit/with_dbs/test_api_licensed_items_checkouts.py

@@ -131,7 +131,9 @@ async def test_rpc_licensed_items_checkouts_workflow(
 
     # Release num of seats
     license_item_checkout = await licensed_items_checkouts.release_licensed_item(
-        rpc_client, checkout_id=checkout.checkout_id, product_name="osparc"
+        rpc_client,
+        licensed_item_checkout_id=checkout.licensed_item_checkout_id,
+        product_name="osparc",
     )
     assert license_item_checkout
     assert isinstance(license_item_checkout.stopped_at, datetime)

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

@@ -27,7 +27,7 @@ async def checkout_licensed_item_for_wallet(
     num_of_seats: int,
     service_run_id: ServiceRunId,
     user_id: UserID,
-) -> webserver_licensed_items_checkouts.LicenseCheckoutGet:
+) -> webserver_licensed_items_checkouts.LicensedItemCheckoutGet:
     # Check whether user has access to the wallet
     await get_wallet_by_user(
         app,
@@ -39,7 +39,7 @@ async def checkout_licensed_item_for_wallet(
     user = await get_user(app, user_id=user_id)
 
     rpc_client = get_rabbitmq_rpc_client(app)
-    license_checkout_get: rut_licensed_items_checkouts.LicenseCheckoutGet = (
+    licensed_item_get: rut_licensed_items_checkouts.LicensedItemCheckoutGet = (
         await licensed_items_checkouts.checkout_licensed_item(
             rpc_client,
             licensed_item_id=licensed_item_id,
@@ -52,21 +52,30 @@ async def checkout_licensed_item_for_wallet(
         )
     )
 
-    return webserver_licensed_items_checkouts.LicenseCheckoutGet(
-        checkout_id=license_checkout_get.checkout_id
+    return webserver_licensed_items_checkouts.LicensedItemCheckoutGet(
+        licensed_item_checkout_id=licensed_item_get.licensed_item_checkout_id,
+        licensed_item_id=licensed_item_get.licensed_item_id,
+        wallet_id=licensed_item_get.wallet_id,
+        user_id=licensed_item_get.user_id,
+        product_name=licensed_item_get.product_name,
+        started_at=licensed_item_get.started_at,
+        stopped_at=licensed_item_get.stopped_at,
+        num_of_seats=licensed_item_get.num_of_seats,
     )
 
 
 async def release_licensed_item_for_wallet(
     app: web.Application,
     product_name: ProductName,
     user_id: UserID,
-    checkout_id: rut_licensed_items_checkouts.LicenseCheckoutID,
+    licensed_item_checkout_id: rut_licensed_items_checkouts.LicensedItemCheckoutID,
 ) -> webserver_licensed_items_checkouts.LicensedItemCheckoutGet:
     rpc_client = get_rabbitmq_rpc_client(app)
 
     checkout_item = await licensed_items_checkouts.get_licensed_item_checkout(
-        rpc_client, product_name=product_name, licensed_item_checkout_id=checkout_id
+        rpc_client,
+        product_name=product_name,
+        licensed_item_checkout_id=licensed_item_checkout_id,
     )
 
     # Check whether user has access to the wallet
@@ -81,7 +90,7 @@ async def release_licensed_item_for_wallet(
         await licensed_items_checkouts.release_licensed_item(
             rpc_client,
             product_name=product_name,
-            checkout_id=checkout_id,
+            licensed_item_checkout_id=licensed_item_checkout_id,
         )
     )
 

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

@@ -1,9 +1,10 @@
 from aiohttp import web
+from models_library.api_schemas_resource_usage_tracker.licensed_items_checkouts import (
+    LicensedItemCheckoutID,
+)
 from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
 from models_library.api_schemas_webserver.licensed_items import LicensedItemGetPage
 from models_library.api_schemas_webserver.licensed_items_checkouts import (
-    LicenseCheckoutGet,
-    LicenseCheckoutID,
     LicensedItemCheckoutGet,
 )
 from models_library.basic_types import IDStr
@@ -64,7 +65,7 @@ async def checkout_licensed_item_for_wallet(
     licensed_item_id: LicensedItemID,
     num_of_seats: int,
     service_run_id: ServiceRunId,
-) -> LicenseCheckoutGet:
+) -> LicensedItemCheckoutGet:
     return await _licensed_checkouts_api.checkout_licensed_item_for_wallet(
         app,
         licensed_item_id=licensed_item_id,
@@ -82,10 +83,13 @@ async def release_licensed_item_for_wallet(
     *,
     product_name: ProductName,
     user_id: UserID,
-    checkout_id: LicenseCheckoutID,
+    licensed_item_checkout_id: LicensedItemCheckoutID,
 ) -> LicensedItemCheckoutGet:
     return await _licensed_checkouts_api.release_licensed_item_for_wallet(
-        app, product_name=product_name, user_id=user_id, checkout_id=checkout_id
+        app,
+        product_name=product_name,
+        user_id=user_id,
+        licensed_item_checkout_id=licensed_item_checkout_id,
     )
 
 

services/web/server/tests/unit/with_dbs/04/licenses/test_licenses_rpc.py

@@ -8,7 +8,6 @@
 import pytest
 from aiohttp.test_utils import TestClient
 from models_library.api_schemas_resource_usage_tracker.licensed_items_checkouts import (
-    LicenseCheckoutGet,
     LicensedItemCheckoutGet,
 )
 from models_library.licensed_items import LicensedResourceType
@@ -79,10 +78,8 @@ def mock_get_wallet_by_user(mocker: MockerFixture) -> tuple:
     )
 
 
-_LICENSE_CHECKOUT_GET = LicenseCheckoutGet.model_validate(
-    {
-        "checkout_id": "beb16d18-d57d-44aa-a638-9727fa4a72ef",
-    }
+_LICENSED_ITEM_CHECKOUT_GET = LicensedItemCheckoutGet.model_validate(
+    LicensedItemCheckoutGet.model_config["json_schema_extra"]["examples"][0]
 )
 
 
@@ -91,15 +88,10 @@ def mock_checkout_licensed_item(mocker: MockerFixture) -> tuple:
     return mocker.patch(
         "simcore_service_webserver.licenses._licensed_checkouts_api.licensed_items_checkouts.checkout_licensed_item",
         spec=True,
-        return_value=_LICENSE_CHECKOUT_GET,
+        return_value=_LICENSED_ITEM_CHECKOUT_GET,
     )
 
 
-_LICENSED_ITEM_CHECKOUT_GET = LicensedItemCheckoutGet.model_validate(
-    LicensedItemCheckoutGet.model_config["json_schema_extra"]["examples"][0]
-)
-
-
 @pytest.fixture
 def mock_get_licensed_item_checkout(mocker: MockerFixture) -> tuple:
     return mocker.patch(