webserver functionality

Author: matusdrobuliak66

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

@@ -48,5 +48,5 @@ class LicensedItemsUsagesPage(NamedTuple):
     total: PositiveInt
 
 
-class LicenseItemCheckoutGet(BaseModel):
+class LicenseCheckoutGet(BaseModel):
     checkout_id: LicenseCheckoutID  # This is a licensed_item_usage_id generated in the `resource_tracker_licensed_items_usages` table

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/licensed_items_usages.py

@@ -0,0 +1,32 @@
+from datetime import datetime
+from typing import NamedTuple
+
+from pydantic import BaseModel, PositiveInt
+
+from ..api_schemas_resource_usage_tracker.licensed_items_usages import LicenseCheckoutID
+from ..licensed_items import LicensedItemID
+from ..products import ProductName
+from ..resource_tracker_licensed_items_usages import LicensedItemUsageID
+from ..users import UserID
+from ..wallets import WalletID
+from ._base import OutputSchema
+
+
+class LicensedItemUsageGet(OutputSchema):
+    licensed_item_usage_id: LicensedItemUsageID
+    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[LicensedItemUsageGet]
+    total: PositiveInt
+
+
+class LicenseCheckoutGet(BaseModel):
+    checkout_id: LicenseCheckoutID

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

@@ -5,9 +5,9 @@
     RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
 )
 from models_library.api_schemas_resource_usage_tracker.licensed_items_usages import (
+    LicenseCheckoutGet,
     LicenseCheckoutID,
     LicensedItemUsageGet,
-    LicenseItemCheckoutGet,
 )
 from models_library.licensed_items import LicensedItemID
 from models_library.products import ProductName
@@ -81,8 +81,8 @@ async def checkout_licensed_item(
     service_run_id: ServiceRunId,
     user_id: UserID,
     user_email: str,
-) -> LicenseItemCheckoutGet:
-    result: LicenseItemCheckoutGet = await rabbitmq_rpc_client.request(
+) -> LicenseCheckoutGet:
+    result: LicenseCheckoutGet = 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,
@@ -94,7 +94,7 @@ async def checkout_licensed_item(
         user_email=user_email,
         timeout_s=_DEFAULT_TIMEOUT_S,
     )
-    assert isinstance(result, LicenseItemCheckoutGet)  # nosec
+    assert isinstance(result, LicenseCheckoutGet)  # nosec
     return result
 
 

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

@@ -1,8 +1,8 @@
 from fastapi import FastAPI
 from models_library.api_schemas_resource_usage_tracker.licensed_items_usages import (
+    LicenseCheckoutGet,
     LicenseCheckoutID,
     LicensedItemUsageGet,
-    LicenseItemCheckoutGet,
 )
 from models_library.licensed_items import LicensedItemID
 from models_library.products import ProductName
@@ -27,7 +27,7 @@ async def checkout_licensed_item(
     service_run_id: ServiceRunId,
     user_id: UserID,
     user_email: str,
-) -> LicenseItemCheckoutGet:
+) -> LicenseCheckoutGet:
     return await licensed_items_usages.checkout_licensed_item(
         db_engine=app.state.engine,
         licensed_item_id=licensed_item_id,

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

@@ -3,10 +3,10 @@
 
 from fastapi import Depends
 from models_library.api_schemas_resource_usage_tracker.licensed_items_usages import (
+    LicenseCheckoutGet,
     LicenseCheckoutID,
     LicensedItemsUsagesPage,
     LicensedItemUsageGet,
-    LicenseItemCheckoutGet,
 )
 from models_library.licensed_items import LicensedItemID
 from models_library.products import ProductName
@@ -100,7 +100,7 @@ async def checkout_licensed_item(
     service_run_id: ServiceRunId,
     user_id: UserID,
     user_email: str,
-) -> LicenseItemCheckoutGet:
+) -> LicenseCheckoutGet:
 
     _active_purchased_seats: int = await licensed_items_purchases_db.get_active_purchased_seats_for_item_and_wallet(
         db_engine,
@@ -150,9 +150,7 @@ async def checkout_licensed_item(
     )
 
     # Return checkout ID
-    return LicenseItemCheckoutGet(
-        checkout_id=license_item_usage_db.licensed_item_usage_id
-    )
+    return LicenseCheckoutGet(checkout_id=license_item_usage_db.licensed_item_usage_id)
 
 
 async def release_licensed_item(

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

@@ -0,0 +1,94 @@
+from aiohttp import web
+from models_library.api_schemas_resource_usage_tracker import (
+    licensed_items_usages as rut_licensed_items_usages,
+)
+from models_library.api_schemas_webserver import (
+    licensed_items_usages as webserver_licensed_items_usages,
+)
+from models_library.licensed_items import LicensedItemID
+from models_library.products import ProductName
+from models_library.resource_tracker import ServiceRunId
+from models_library.users import UserID
+from models_library.wallets import WalletID
+from servicelib.rabbitmq.rpc_interfaces.resource_usage_tracker import (
+    licensed_items_usages,
+)
+
+from ..rabbitmq import get_rabbitmq_rpc_client
+from ..wallets.api import get_wallet_by_user
+
+
+async def checkout_licensed_item_for_wallet(
+    app: web.Application,
+    licensed_item_id: LicensedItemID,
+    wallet_id: WalletID,
+    product_name: ProductName,
+    num_of_seats: int,
+    service_run_id: ServiceRunId,
+    user_id: UserID,
+    user_email: str,
+) -> webserver_licensed_items_usages.LicenseCheckoutGet:
+    # Check whether user has access to the wallet
+    await get_wallet_by_user(
+        app,
+        user_id=user_id,
+        wallet_id=wallet_id,
+        product_name=product_name,
+    )
+
+    rpc_client = get_rabbitmq_rpc_client(app)
+    license_checkout_get: rut_licensed_items_usages.LicenseCheckoutGet = (
+        await licensed_items_usages.checkout_licensed_item(
+            rpc_client,
+            licensed_item_id=licensed_item_id,
+            wallet_id=wallet_id,
+            product_name=product_name,
+            num_of_seats=num_of_seats,
+            service_run_id=service_run_id,
+            user_id=user_id,
+            user_email=user_email,
+        )
+    )
+
+    return webserver_licensed_items_usages.LicenseCheckoutGet(
+        checkout_id=license_checkout_get.checkout_id
+    )
+
+
+async def release_licensed_item_for_wallet(
+    app: web.Application,
+    product_name: ProductName,
+    user_id: UserID,
+    checkout_id: rut_licensed_items_usages.LicenseCheckoutID,
+) -> webserver_licensed_items_usages.LicensedItemUsageGet:
+    rpc_client = get_rabbitmq_rpc_client(app)
+    licensed_item_get: rut_licensed_items_usages.LicensedItemUsageGet = (
+        await licensed_items_usages.release_licensed_item(
+            rpc_client,
+            product_name=product_name,
+            checkout_id=checkout_id,
+        )
+    )
+
+    # Check whether user has access to the wallet
+    await get_wallet_by_user(
+        app,
+        user_id=user_id,
+        wallet_id=licensed_item_get.wallet_id,
+        product_name=product_name,
+    )
+
+    return webserver_licensed_items_usages.LicensedItemUsageGet(
+        licensed_item_purchase_id=licensed_item_get.licensed_item_purchase_id,
+        product_name=licensed_item_get.product_name,
+        licensed_item_id=licensed_item_get.licensed_item_id,
+        wallet_id=licensed_item_get.wallet_id,
+        pricing_unit_cost_id=licensed_item_get.pricing_unit_cost_id,
+        pricing_unit_cost=licensed_item_get.pricing_unit_cost,
+        start_at=licensed_item_get.start_at,
+        expire_at=licensed_item_get.expire_at,
+        num_of_seats=licensed_item_get.num_of_seats,
+        purchased_by_user=licensed_item_get.purchased_by_user,
+        purchased_at=licensed_item_get.purchased_at,
+        modified_at=licensed_item_get.modified,
+    )