adjst batch_get in database

Author: pcrespov

services/catalog/src/simcore_service_catalog/api/rest/_services.py

@@ -154,7 +154,7 @@ async def cached_registry_services() -> dict[str, Any]:
         services_owner_emails,
     ) = await asyncio.gather(
         cached_registry_services(),
-        services_repo.batch_get_services_access_rights(
+        services_repo.batch_get_services_access_rights_or_none(
             key_versions=services_in_db,
             product_name=x_simcore_products_name,
         ),
@@ -163,6 +163,8 @@ async def cached_registry_services() -> dict[str, Any]:
         ),
     )
 
+    services_access_rights = services_access_rights or {}
+
     # NOTE: for the details of the services:
     # 1. we get all the services from the director-v0 (TODO: move the registry to the catalog)
     # 2. we filter the services using the visible ones from the db
@@ -176,7 +178,7 @@ async def cached_registry_services() -> dict[str, Any]:
                 _compose_service_details,
                 s,
                 services_in_db[s["key"], s["version"]],
-                services_access_rights[s["key"], s["version"]],
+                services_access_rights.get((s["key"], s["version"])) or [],
                 services_owner_emails.get(
                     services_in_db[s["key"], s["version"]].owner or 0
                 ),

services/catalog/src/simcore_service_catalog/repository/services.py

@@ -657,12 +657,14 @@ async def get_service_access_rights(
                 async for row in await conn.stream(query)
             ]
 
-    async def batch_get_services_access_rights(
+    async def batch_get_services_access_rights_or_none(
         self,
         key_versions: Iterable[tuple[str, str]],
         product_name: str | None = None,
-    ) -> dict[tuple[str, str], list[ServiceAccessRightsDB]]:
-        """Batch version of get_service_access_rights"""
+    ) -> dict[tuple[str, str], list[ServiceAccessRightsDB]] | None:
+        """
+        Returns only found. If None found, then None
+        """
         service_to_access_rights = defaultdict(list)
         query = (
             sa.select(services_access_rights)
@@ -681,7 +683,7 @@ async def batch_get_services_access_rights(
                 service_to_access_rights[(row.key, row.version)].append(
                     ServiceAccessRightsDB.model_validate(row)
                 )
-        return service_to_access_rights
+        return service_to_access_rights or None
 
     async def upsert_service_access_rights(
         self, new_access_rights: list[ServiceAccessRightsDB]

services/catalog/src/simcore_service_catalog/service/catalog_services.py

@@ -174,7 +174,7 @@ async def _get_services_with_access_rights(
         return {}
 
     # Inject access-rights
-    access_rights = await repo.batch_get_services_access_rights(
+    access_rights = await repo.batch_get_services_access_rights_or_none(
         ((sc.key, sc.version) for sc in services), product_name=product_name
     )
     if not access_rights:
@@ -610,10 +610,15 @@ async def batch_get_user_services(
     """
     unique_service_identifiers = _BatchIdsValidator.validate_python(ids)
 
-    # FIXME: implement partial fail
-    services_access_rights = await repo.batch_get_services_access_rights(
+    services_access_rights = await repo.batch_get_services_access_rights_or_none(
         key_versions=unique_service_identifiers, product_name=product_name
     )
+    if not services_access_rights:
+        raise CatalogServiceNotFoundError(
+            missing_services=unique_service_identifiers,
+            user_id=user_id,
+            product_name=product_name,
+        )
 
     user_groups = await groups_repo.list_user_groups(user_id=user_id)
     my_group_ids = {g.gid for g in user_groups}