draft 3

Author: pcrespov

services/catalog/src/simcore_service_catalog/services/compatibility.py

@@ -96,9 +96,13 @@ async def evaluate_service_compatibility_map(
     user_id: UserID,
     service_release_history: list[ReleaseDBGet],
 ) -> dict[ServiceVersion, Compatibility | None]:
-    released_versions = _convert_to_versions(service_release_history)
-    result: dict[ServiceVersion, Compatibility | None] = {}
+    """
+    Evaluates the compatibility among a list of service releases for a given product and user.
 
+    """
+    compatibility_map: dict[ServiceVersion, Compatibility | None] = {}
+
+    released_versions = _convert_to_versions(service_release_history)
     for release in service_release_history:
         compatibility = None
         if release.compatibility_policy:
@@ -108,7 +112,7 @@ async def evaluate_service_compatibility_map(
                 repo=repo,
                 target_version=release.version,
                 released_versions=released_versions,
-                compatibility_policy={**release.compatibility_policy},
+                compatibility_policy=dict(release.compatibility_policy),
             )
         elif latest_version := _get_latest_compatible_version(
             release.version,
@@ -117,6 +121,6 @@ async def evaluate_service_compatibility_map(
             compatibility = Compatibility(
                 can_update_to=CompatibleService(version=f"{latest_version}")
             )
-        result[release.version] = compatibility
+        compatibility_map[release.version] = compatibility
 
-    return result
+    return compatibility_map

services/catalog/src/simcore_service_catalog/services/services_api.py

@@ -5,6 +5,7 @@
     ServiceGetV2,
     ServiceUpdateV2,
 )
+from models_library.groups import GroupID
 from models_library.products import ProductName
 from models_library.rest_pagination import PageLimitInt
 from models_library.services_access import ServiceGroupAccessRightsV2
@@ -363,62 +364,67 @@ async def batch_get_my_services(
 
     my_services = []
     for service_key, service_version in ids:
-        access_rights = services_access_rights.get((service_key, service_version), [])
-
-        my_access_rights = {
-            "execute": False,
-            "write": False,
-        }
 
+        # Evaluate user's access-rights to this service key:version
+        access_rights = services_access_rights.get((service_key, service_version), [])
+        my_access_rights = ServiceGroupAccessRightsV2(execute=False, write=False)
         for ar in access_rights:
             if ar.gid in my_group_ids:
-                my_access_rights["execute"] |= ar.execute_access
-                my_access_rights["write"] |= ar.write_access
+                my_access_rights.execute |= ar.execute_access
+                my_access_rights.write |= ar.write_access
 
+        # Get service metadata
         service_db = await repo.get_service(
             product_name=product_name,
             key=service_key,
             version=service_version,
         )
         assert service_db  # nosec
 
-        owner = service_db.owner
+        # Find service owner
+        owner: GroupID | None = service_db.owner
         if not owner:
-            # TODO: raise error to indicate that no owner is registered for a given service
+            # NOTE can be more than one. Just get first.
             owner = next(
                 ar.gid for ar in access_rights if ar.write_access and ar.execute_access
             )
 
+        # TODO: raise error to indicate that no owner is registered for a given service
         assert owner is not None  # nosec
 
-        compatibility_map = {}
-        if my_access_rights != {"execute": False, "write": False}:
+        # Evaluate `compatibility`
+        compatibility: Compatibility | None = None
+        if my_access_rights.execute or my_access_rights.write:
+            # TODO: add cache to this section that evals compatibility_map based on service_key
+
+            # NOTE: that the service history might be different for each user
+            # since access rights are defined on a k:v basis
             history = await repo.get_service_history(
                 product_name=product_name, user_id=user_id, key=service_key
             )
-            if history:
-                compatibility_map = await evaluate_service_compatibility_map(
-                    repo,
-                    product_name=product_name,
-                    user_id=user_id,
-                    service_release_history=history,
-                )
+            assert history  # nosec
+
+            compatibility_map = await evaluate_service_compatibility_map(
+                repo,
+                product_name=product_name,
+                user_id=user_id,
+                service_release_history=history,
+            )
+            compatibility = compatibility_map.get(service_db.version)
 
         my_services.append(
             MyServiceGet(
                 key=service_db.key,
-                release=ServiceRelease.model_construct(
+                release=ServiceRelease(
                     version=service_db.version,
                     version_display=service_db.version_display,
                     released=service_db.created,
                     retired=service_db.deprecated,
-                    compatibility=compatibility_map.get(service_db.version),
+                    compatibility=compatibility,
                 ),
                 owner=owner,
                 my_access_rights=my_access_rights,
             )
         )
 
-        # TODO: else error
-
     return my_services

services/catalog/tests/unit/with_dbs/test_services_services_api.py

@@ -11,6 +11,7 @@
 from models_library.users import UserID
 from respx.router import MockRouter
 from simcore_service_catalog.api.dependencies.director import get_director_api
+from simcore_service_catalog.db.repositories.groups import GroupsRepository
 from simcore_service_catalog.db.repositories.services import ServicesRepository
 from simcore_service_catalog.services import manifest, services_api
 from simcore_service_catalog.services.director import DirectorApi
@@ -29,6 +30,11 @@ def services_repo(sqlalchemy_async_engine: AsyncEngine):
     return ServicesRepository(sqlalchemy_async_engine)
 
 
+@pytest.fixture
+def groups_repo(sqlalchemy_async_engine: AsyncEngine):
+    return GroupsRepository(sqlalchemy_async_engine)
+
+
 @pytest.fixture
 def num_services() -> int:
     return 5
@@ -151,8 +157,8 @@ async def test_batch_get_my_services(
     mocked_director_service_api: MockRouter,
     target_product: ProductName,
     services_repo: ServicesRepository,
+    groups_repo: GroupsRepository,
     user_id: UserID,
-    director_client: DirectorApi,
     create_fake_service_data: Callable,
     services_db_tables_injector: Callable,
 ):
@@ -197,7 +203,7 @@ async def test_batch_get_my_services(
 
     my_services = await services_api.batch_get_my_services(
         services_repo,
-        director_client,
+        groups_repo,
         product_name=target_product,
         user_id=user_id,
         ids=ids,