🎨 adds memory cache to get_service

Author: pcrespov

services/web/server/src/simcore_service_webserver/catalog/_catalog_rest_client_service.py

@@ -2,10 +2,11 @@
 
 import logging
 import urllib.parse
-from collections.abc import Iterator
+from collections.abc import Callable, Iterator
 from contextlib import contextmanager
-from typing import Any
+from typing import Any, Final
 
+from aiocache import Cache, cached  # type: ignore[import-untyped]
 from aiohttp import ClientSession, ClientTimeout, web
 from aiohttp.client_exceptions import (
     ClientConnectionError,
@@ -15,7 +16,9 @@
 from models_library.api_schemas_catalog.service_access_rights import (
     ServiceAccessRightsGet,
 )
+from models_library.products import ProductName
 from models_library.services_resources import ServiceResourcesDict
+from models_library.services_types import ServiceKey, ServiceVersion
 from models_library.users import UserID
 from pydantic import TypeAdapter
 from servicelib.aiohttp import status
@@ -29,6 +32,16 @@
 
 _logger = logging.getLogger(__name__)
 
+# Cache settings
+_SECOND = 1  # in seconds
+_MINUTE = 60 * _SECOND
+_CACHE_TTL: Final = 1 * _MINUTE
+
+
+def _hash_service(_f: Callable[..., Any], *_args, **kw):
+    assert len(_args) == 1, f"Expected only app, got {_args}"  # nosec
+    return f"get_service_{kw['user_id']}_{kw['service_key']}_{kw['service_version']}_{kw['product_name']}"
+
 
 @contextmanager
 def _handle_client_exceptions(app: web.Application) -> Iterator[ClientSession]:
@@ -103,12 +116,18 @@ async def get_services_for_user_in_product(
             return body
 
 
+@cached(
+    ttl=_CACHE_TTL,
+    key_builder=_hash_service,
+    cache=Cache.MEMORY,
+)
 async def get_service(
     app: web.Application,
+    *,
     user_id: UserID,
-    service_key: str,
-    service_version: str,
-    product_name: str,
+    service_key: ServiceKey,
+    service_version: ServiceVersion,
+    product_name: ProductName,
 ) -> dict[str, Any]:
     settings: CatalogSettings = get_plugin_settings(app)
     url = URL(

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

@@ -173,7 +173,11 @@ async def list_service_inputs(
     service_key: ServiceKey, service_version: ServiceVersion, ctx: CatalogRequestContext
 ) -> list[ServiceInputGet]:
     service = await _catalog_rest_client_service.get_service(
-        ctx.app, ctx.user_id, service_key, service_version, ctx.product_name
+        ctx.app,
+        user_id=ctx.user_id,
+        service_key=service_key,
+        service_version=service_version,
+        product_name=ctx.product_name,
     )
     return [
         await ServiceInputGetFactory.from_catalog_service_api_model(
@@ -190,7 +194,11 @@ async def get_service_input(
     ctx: CatalogRequestContext,
 ) -> ServiceInputGet:
     service = await _catalog_rest_client_service.get_service(
-        ctx.app, ctx.user_id, service_key, service_version, ctx.product_name
+        ctx.app,
+        user_id=ctx.user_id,
+        service_key=service_key,
+        service_version=service_version,
+        product_name=ctx.product_name,
     )
     service_input: ServiceInputGet = (
         await ServiceInputGetFactory.from_catalog_service_api_model(
@@ -249,7 +257,11 @@ async def list_service_outputs(
     ctx: CatalogRequestContext,
 ) -> list[ServiceOutputGet]:
     service = await _catalog_rest_client_service.get_service(
-        ctx.app, ctx.user_id, service_key, service_version, ctx.product_name
+        ctx.app,
+        user_id=ctx.user_id,
+        service_key=service_key,
+        service_version=service_version,
+        product_name=ctx.product_name,
     )
     return [
         await ServiceOutputGetFactory.from_catalog_service_api_model(
@@ -266,7 +278,11 @@ async def get_service_output(
     ctx: CatalogRequestContext,
 ) -> ServiceOutputGet:
     service = await _catalog_rest_client_service.get_service(
-        ctx.app, ctx.user_id, service_key, service_version, ctx.product_name
+        ctx.app,
+        user_id=ctx.user_id,
+        service_key=service_key,
+        service_version=service_version,
+        product_name=ctx.product_name,
     )
     return cast(  # mypy -> aiocache is not typed.
         ServiceOutputGet,

services/web/server/src/simcore_service_webserver/projects/_projects_service.py

@@ -1682,7 +1682,11 @@ async def is_service_deprecated(
     product_name: str,
 ) -> bool:
     service = await catalog_service.get_service(
-        app, user_id, service_key, service_version, product_name
+        app,
+        user_id=user_id,
+        service_key=service_key,
+        service_version=service_version,
+        product_name=product_name,
     )
     if deprecation_date := service.get("deprecated"):
         deprecation_date_bool: bool = datetime.datetime.now(

services/web/server/src/simcore_service_webserver/resource_usage/_pricing_plans_admin_service.py

@@ -164,7 +164,11 @@ async def connect_service_to_pricing_plan(
 ) -> PricingPlanToServiceGet:
     # Check whether service key and version exists
     await catalog_service.get_service(
-        app, user_id, service_key, service_version, product_name
+        app,
+        user_id=user_id,
+        service_key=service_key,
+        service_version=service_version,
+        product_name=product_name,
     )
 
     rpc_client = get_rabbitmq_rpc_client(app)