revert rename

Author: pcrespov

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

@@ -98,10 +98,13 @@ def to_backend_service(rel_url: URL, origin: URL, version_prefix: str) -> URL:
     key_builder=lambda _f, *_args, **kw: f"get_services_for_user_in_product_{kw['user_id']}_{kw['product_name']}",
     cache=Cache.MEMORY,
 )
-async def list_user_services_with_versions(
+async def get_services_for_user_in_product(
     app: web.Application, *, user_id: UserID, product_name: str
 ) -> list[ServiceKeyVersionDict]:
-
+    """
+    DEPRECATED: see instead RPC interface.
+    SEE https://github.com/ITISFoundation/osparc-simcore/issues/7838
+    """
     settings: CatalogSettings = get_plugin_settings(app)
     only_key_versions = True
 
@@ -143,6 +146,10 @@ async def get_service(
     service_version: ServiceVersion,
     product_name: ProductName,
 ) -> dict[str, Any]:
+    """
+    DEPRECATED: see instead RPC interface.
+    SEE https://github.com/ITISFoundation/osparc-simcore/issues/7838
+    """
     settings: CatalogSettings = get_plugin_settings(app)
     url = URL(
         f"{settings.api_base_url}/services/{urllib.parse.quote_plus(service_key)}/{service_version}",
@@ -154,8 +161,8 @@ async def get_service(
             url, headers={X_PRODUCT_NAME_HEADER: product_name}
         ) as response:
             response.raise_for_status()
-            body: dict[str, Any] = await response.json()
-            return body
+            service: dict[str, Any] = await response.json()
+            return service
 
 
 async def get_service_resources(

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

@@ -2,8 +2,8 @@
     get_service,
     get_service_access_rights,
     get_service_resources,
+    get_services_for_user_in_product,
     is_catalog_service_responsive,
-    list_user_services_with_versions,
     to_backend_service,
 )
 from ._models import ServiceKeyVersionDict
@@ -14,7 +14,7 @@
     "get_service",
     "get_service_access_rights",
     "get_service_resources",
-    "list_user_services_with_versions",
+    "get_services_for_user_in_product",
     "is_catalog_service_responsive",
     "to_backend_service",
     "ServiceKeyVersionDict",

services/web/server/src/simcore_service_webserver/projects/_controller/projects_rest.py

@@ -271,7 +271,7 @@ async def get_project(request: web.Request):
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(ProjectPathParams, request)
 
-    user_available_services = await catalog_service.list_user_services_with_versions(
+    user_available_services = await catalog_service.get_services_for_user_in_product(
         request.app, user_id=req_ctx.user_id, product_name=req_ctx.product_name
     )
 

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

@@ -121,7 +121,7 @@ async def list_projects(  # pylint: disable=too-many-arguments
     db = ProjectDBAPI.get_from_app_context(app)
 
     user_available_services: list[ServiceKeyVersionDict] = (
-        await catalog_service.list_user_services_with_versions(
+        await catalog_service.get_services_for_user_in_product(
             app, user_id=user_id, product_name=product_name
         )
     )
@@ -205,7 +205,7 @@ async def list_projects_full_depth(
     db = ProjectDBAPI.get_from_app_context(app)
 
     user_available_services: list[ServiceKeyVersionDict] = (
-        await catalog_service.list_user_services_with_versions(
+        await catalog_service.get_services_for_user_in_product(
             app, user_id=user_id, product_name=product_name
         )
     )

services/web/server/tests/unit/with_dbs/01/test_catalog_rest_client.py

@@ -15,8 +15,8 @@
 )
 from simcore_service_webserver.catalog.catalog_service import (
     get_service_access_rights,
+    get_services_for_user_in_product,
     is_catalog_service_responsive,
-    list_user_services_with_versions,
 )
 
 
@@ -62,7 +62,8 @@ async def test_get_services_for_user_in_product(
         status=backend_status_code,
     )
     assert client.app
-    await list_user_services_with_versions(
+    # tests it does not raise an exception
+    await get_services_for_user_in_product(
         app=client.app,
         user_id=logged_user["id"],
         product_name="osparc",