🐛 refactor: rename service availability check functions for clarity

Author: pcrespov

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

@@ -2,6 +2,7 @@
 
 from aiohttp import web
 from common_library.json_serialization import json_dumps
+from models_library.api_schemas_catalog.services import MyServiceGet
 from models_library.api_schemas_webserver.projects import (
     EmptyModel,
     ProjectCopyOverride,
@@ -39,7 +40,6 @@
 from .. import _crud_api_create, _crud_api_read, _projects_service
 from .._permalink_service import update_or_pop_permalink_in_project
 from ..models import ProjectDict
-from ..utils import get_project_unavailable_services, project_uses_available_services
 from . import _rest_utils
 from ._rest_exceptions import handle_plugin_requests_exceptions
 from ._rest_schemas import (
@@ -277,25 +277,31 @@ 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: list[dict] = (
-        await catalog_service.get_services_for_user_in_product(
-            request.app, req_ctx.user_id, req_ctx.product_name, only_key_versions=True
-        )
-    )
-
     project = await _projects_service.get_project_for_user(
         request.app,
         project_uuid=f"{path_params.project_id}",
         user_id=req_ctx.user_id,
         include_state=True,
         include_trashed_by_primary_gid=True,
     )
-    if not await project_uses_available_services(project, user_available_services):
-        unavilable_services = get_project_unavailable_services(
-            project, user_available_services
-        )
+
+    services_in_project = {
+        (srv["key"], srv["version"]) for _, srv in project.get("workbench", {}).items()
+    }
+
+    my_services: list[MyServiceGet] = await catalog_service.batch_get_my_services(
+        request.app,
+        product_name=req_ctx.product_name,
+        user_id=req_ctx.user_id,
+        services_ids=list(services_in_project),
+    )
+    not_my_services = services_in_project.difference(
+        {(srv.key, srv.release.version) for srv in my_services}
+    )
+
+    if not_my_services:
         formatted_services = ", ".join(
-            f"{service}:{version}" for service, version in unavilable_services
+            f"{service}:{version}" for service, version in not_my_services
         )
         # TODO: lack of permissions should be notified with https://httpstatuses.com/403 web.HTTPForbidden
         raise web.HTTPNotFound(

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

@@ -32,7 +32,7 @@
     ProjectNotFoundError,
 )
 from .models import ProjectDict
-from .utils import find_changed_node_keys, project_uses_available_services
+from .utils import are_project_services_available, find_changed_node_keys
 
 logger = logging.getLogger(__name__)
 
@@ -222,7 +222,7 @@ async def _execute_without_permission_check(
                 filter_by_services is not None
                 # This checks only old projects that are not in the projects_to_products table.
                 and row[projects_to_products.c.product_name] is None
-                and not await project_uses_available_services(prj, filter_by_services)
+                and not are_project_services_available(prj, filter_by_services)
             ):
                 logger.warning(
                     "Project %s will not be listed for user %s since it has no access rights"

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

@@ -189,20 +189,21 @@ def is_graph_equal(
     return True
 
 
-async def project_uses_available_services(
+def are_project_services_available(
     project: dict[str, Any], available_services: list[dict[str, Any]]
 ) -> bool:
     if not project["workbench"]:
         # empty project
         return True
-    # get project services
-    needed_services: set[tuple[str, str]] = {
-        (s["key"], s["version"]) for _, s in project["workbench"].items()
+
+    # list services in project
+    needed_services = {
+        (srv["key"], srv["version"]) for _, srv in project["workbench"].items()
     }
 
-    # get available services
-    available_services_set: set[tuple[str, str]] = {
-        (s["key"], s["version"]) for s in available_services
+    # list available services
+    available_services_set = {
+        (srv["key"], srv["version"]) for srv in available_services
     }
 
     return needed_services.issubset(available_services_set)