@pcrespov use SingletonInAppStateMixin

Author: bisgaard-itis

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

@@ -1,4 +1,4 @@
-from typing import Annotated, cast
+from typing import Annotated
 
 from fastapi import Depends, FastAPI
 from servicelib.fastapi.dependencies import get_app
@@ -9,5 +9,4 @@
 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)
+    return ResourceUsageTrackerClient.get_from_app_state(app=app)

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

@@ -1,4 +1,4 @@
-from typing import Annotated, cast
+from typing import Annotated
 
 from fastapi import Depends, FastAPI
 from servicelib.fastapi.dependencies import get_app
@@ -9,5 +9,4 @@
 async def get_wb_api_rpc_client(
     app: Annotated[FastAPI, Depends(get_app)]
 ) -> WbApiRpcClient:
-    assert app.state.wb_api_rpc_client  # nosec
-    return cast(WbApiRpcClient, app.state.wb_api_rpc_client)
+    return WbApiRpcClient.get_from_app_state(app=app)

services/api-server/src/simcore_service_api_server/services_rpc/resource_usage_tracker.py

@@ -5,6 +5,7 @@
 from models_library.resource_tracker_licensed_items_checkouts import (
     LicensedItemCheckoutID,
 )
+from servicelib.fastapi.app_state import SingletonInAppStateMixin
 from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 from servicelib.rabbitmq.rpc_interfaces.resource_usage_tracker.errors import (
     LicensedItemCheckoutNotFoundError as _LicensedItemCheckoutNotFoundError,
@@ -23,7 +24,8 @@
 
 
 @dataclass
-class ResourceUsageTrackerClient:
+class ResourceUsageTrackerClient(SingletonInAppStateMixin):
+    app_state_name = "resource_usage_tracker_rpc_client"
     _client: RabbitMQRPCClient
 
     @_exception_mapper(
@@ -51,7 +53,8 @@ async def get_licensed_item_checkout(
         )
 
 
-def setup(app: FastAPI, rabbitmq_rmp_client: RabbitMQRPCClient):
-    app.state.resource_usage_tracker_rpc_client = ResourceUsageTrackerClient(
-        _client=rabbitmq_rmp_client
+def setup(app: FastAPI, rabbitmq_rpc_client: RabbitMQRPCClient):
+    resource_usage_tracker_rpc_client = ResourceUsageTrackerClient(
+        _client=rabbitmq_rpc_client
     )
+    resource_usage_tracker_rpc_client.set_to_app_state(app=app)

services/api-server/src/simcore_service_api_server/services_rpc/wb_api_server.py

@@ -11,6 +11,7 @@
 from models_library.services_types import ServiceRunID
 from models_library.users import UserID
 from models_library.wallets import WalletID
+from servicelib.fastapi.app_state import SingletonInAppStateMixin
 from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 from servicelib.rabbitmq.rpc_interfaces.resource_usage_tracker.errors import (
     CanNotCheckoutNotEnoughAvailableSeatsError,
@@ -72,7 +73,8 @@ def _create_licensed_items_get_page(
 
 
 @dataclass
-class WbApiRpcClient:
+class WbApiRpcClient(SingletonInAppStateMixin):
+    app_state_name = "wb_api_rpc_client"
     _client: RabbitMQRPCClient
 
     @_exception_mapper(rpc_exception_map={})
@@ -178,4 +180,5 @@ async def release_licensed_item_for_wallet(
 
 
 def setup(app: FastAPI, rabbitmq_rmp_client: RabbitMQRPCClient):
-    app.state.wb_api_rpc_client = WbApiRpcClient(_client=rabbitmq_rmp_client)
+    wb_api_rpc_client = WbApiRpcClient(_client=rabbitmq_rmp_client)
+    wb_api_rpc_client.set_to_app_state(app=app)