add endpoint for releasing a checked out item

Author: bisgaard-itis

services/api-server/src/simcore_service_api_server/api/dependencies/resource_usage_tracker_rpc.py

@@ -0,0 +1,13 @@
+from typing import Annotated, cast
+
+from fastapi import Depends, FastAPI
+from servicelib.fastapi.dependencies import get_app
+
+from ...services_rpc.resource_usage_tracker import ResourceUsageTrackerClient
+
+
+async def get_resource_usage_tracker_client(
+    app: Annotated[FastAPI, Depends(get_app)]
+) -> ResourceUsageTrackerClient:
+    assert app.state.resource_usage_tracker_rpc_client  # nosec
+    return cast(ResourceUsageTrackerClient, app.state.resource_usage_tracker_rpc_client)

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

@@ -1,14 +1,21 @@
 from typing import Annotated, Any
 
-from fastapi import APIRouter, Depends, status
+from fastapi import APIRouter, Depends, HTTPException, status
 from models_library.licensed_items import LicensedItemID
+from models_library.resource_tracker_licensed_items_checkouts import (
+    LicensedItemCheckoutID,
+)
 from pydantic import PositiveInt
+from simcore_service_api_server.api.dependencies.resource_usage_tracker_rpc import (
+    get_resource_usage_tracker_client,
+)
 
 from ...api.dependencies.authentication import get_current_user_id, get_product_name
 from ...api.dependencies.webserver_rpc import get_wb_api_rpc_client
 from ...exceptions.service_errors_utils import DEFAULT_BACKEND_SERVICE_STATUS_CODES
 from ...models.pagination import Page, PaginationParams
 from ...models.schemas.model_adapter import LicensedItemCheckoutGet, LicensedItemGet
+from ...services_rpc.resource_usage_tracker import ResourceUsageTrackerClient
 from ...services_rpc.wb_api_server import WbApiRpcClient
 
 router = APIRouter()
@@ -37,7 +44,7 @@ async def get_licensed_items(
 
 
 @router.post(
-    "{licensed_item_id}/release",
+    "{licensed_item_id}/checked_out_items/{licensed_item_checkout_id}/release",
     response_model=LicensedItemCheckoutGet,
     status_code=status.HTTP_200_OK,
     responses=_LICENSE_ITEMS_STATUS_CODES,
@@ -46,12 +53,24 @@ async def get_licensed_items(
 )
 async def release_licensed_item(
     web_api_rpc: Annotated[WbApiRpcClient, Depends(get_wb_api_rpc_client)],
+    rut_rpc: Annotated[
+        ResourceUsageTrackerClient, Depends(get_resource_usage_tracker_client)
+    ],
     product_name: Annotated[str, Depends(get_product_name)],
     user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
     licensed_item_id: LicensedItemID,
+    licensed_item_checkout_id: LicensedItemCheckoutID,
 ):
+    _licensed_item_checkout = await rut_rpc.get_licensed_item_checkout(
+        product_name=product_name, licensed_item_checkout_id=licensed_item_checkout_id
+    )
+    if _licensed_item_checkout.licensed_item_id != licensed_item_id:
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            detail=f"{licensed_item_id} is not the license_item_id associated with the checked out item {licensed_item_checkout_id}",
+        )
     return await web_api_rpc.release_licensed_item_for_wallet(
         product_name=product_name,
         user_id=user_id,
-        licensed_item_checkout_id=licensed_item_id,
+        licensed_item_checkout_id=licensed_item_checkout_id,
     )

services/api-server/src/simcore_service_api_server/services_http/rabbitmq.py

@@ -4,11 +4,11 @@
 from servicelib.rabbitmq import RabbitMQClient, wait_till_rabbitmq_responsive
 from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 from settings_library.rabbit import RabbitSettings
-from simcore_service_api_server.api.dependencies.rabbitmq import get_rabbitmq_rpc_client
-from simcore_service_api_server.services_rpc import wb_api_server
 
+from ..api.dependencies.rabbitmq import get_rabbitmq_rpc_client
 from ..core.health_checker import ApiServerHealthChecker
 from ..services_http.log_streaming import LogDistributor
+from ..services_rpc import resource_usage_tracker, wb_api_server
 
 _logger = logging.getLogger(__name__)
 
@@ -39,6 +39,7 @@ async def _on_startup() -> None:
             app.state.settings.API_SERVER_HEALTH_CHECK_TASK_PERIOD_SECONDS
         )
         wb_api_server.setup(app, get_rabbitmq_rpc_client(app))
+        resource_usage_tracker.setup(app, get_rabbitmq_rpc_client(app))
 
     async def _on_shutdown() -> None:
         if app.state.health_checker:

services/api-server/src/simcore_service_api_server/services_rpc/resource_usage_tracket.py renamed to services/api-server/src/simcore_service_api_server/services_rpc/resource_usage_tracker.py

@@ -44,6 +44,6 @@ async def get_licensed_item_checkout(
 
 
 def setup(app: FastAPI, rabbitmq_rmp_client: RabbitMQRPCClient):
-    app.state.wb_api_rpc_client = ResourceUsageTrackerClient(
+    app.state.resource_usage_tracker_rpc_client = ResourceUsageTrackerClient(
         _client=rabbitmq_rmp_client
     )