drops history from listing in catalog

Author: pcrespov

packages/models-library/src/models_library/api_schemas_catalog/services.py

@@ -202,8 +202,15 @@ class _BaseServiceGetV2(CatalogOutputSchema):
 
     access_rights: dict[GroupID, ServiceGroupAccessRightsV2] | None
 
-    classifiers: list[str] | None = []
-    quality: dict[str, Any] = {}
+    classifiers: Annotated[
+        list[str] | None,
+        Field(default_factory=list),
+    ] = DEFAULT_FACTORY
+
+    quality: Annotated[
+        dict[str, Any],
+        Field(default_factory=dict),
+    ] = DEFAULT_FACTORY
 
     model_config = ConfigDict(
         extra="forbid",
@@ -212,6 +219,9 @@ class _BaseServiceGetV2(CatalogOutputSchema):
     )
 
 
+class LatestServiceGet(_BaseServiceGetV2): ...
+
+
 class ServiceGetV2(_BaseServiceGetV2):
     # Model used in catalog's rpc and rest interfaces
     history: Annotated[
@@ -288,21 +298,9 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
     )
 
 
-class ServiceListItem(_BaseServiceGetV2):
-    history: Annotated[
-        list[ServiceRelease],
-        Field(
-            default_factory=list,
-            deprecated=True,
-            description="History will be replaced by current 'release' instead",
-            json_schema_extra={"default": []},
-        ),
-    ] = DEFAULT_FACTORY
-
-
 PageRpcServicesGetV2: TypeAlias = PageRpc[
     # WARNING: keep this definition in models_library and not in the RPC interface
-    ServiceListItem
+    LatestServiceGet
 ]
 
 ServiceResourcesGet: TypeAlias = ServiceResourcesDict

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/catalog/services.py

@@ -5,9 +5,9 @@
 
 from models_library.api_schemas_catalog import CATALOG_RPC_NAMESPACE
 from models_library.api_schemas_catalog.services import (
+    LatestServiceGet,
     MyServiceGet,
     ServiceGetV2,
-    ServiceListItem,
     ServiceUpdateV2,
 )
 from models_library.products import ProductName
@@ -35,7 +35,7 @@ async def list_services_paginated(  # pylint: disable=too-many-arguments
     user_id: UserID,
     limit: PageLimitInt = DEFAULT_NUMBER_OF_ITEMS_PER_PAGE,
     offset: NonNegativeInt = 0,
-) -> PageRpc[ServiceListItem]:
+) -> PageRpc[LatestServiceGet]:
     """
     Raises:
         ValidationError: on invalid arguments
@@ -63,9 +63,9 @@ async def _call(
         product_name=product_name, user_id=user_id, limit=limit, offset=offset
     )
     assert (  # nosec
-        TypeAdapter(PageRpc[ServiceListItem]).validate_python(result) is not None
+        TypeAdapter(PageRpc[LatestServiceGet]).validate_python(result) is not None
     )
-    return cast(PageRpc[ServiceListItem], result)
+    return cast(PageRpc[LatestServiceGet], result)
 
 
 @log_decorator(_logger, level=logging.DEBUG)

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

@@ -66,7 +66,7 @@ async def list_services_paginated(
 ) -> PageRpcServicesGetV2:
     assert app.state.engine  # nosec
 
-    total_count, items = await services_api.list_services_paginated(
+    total_count, items = await services_api.list_latest_services(
         repo=ServicesRepository(app.state.engine),
         director_api=get_director_api(app),
         product_name=product_name,

services/catalog/src/simcore_service_catalog/db/repositories/_services_sql.py

@@ -32,7 +32,7 @@ def list_services_stmt(
     combine_access_with_and: bool | None = True,
     product_name: str | None = None,
 ) -> Select:
-    stmt = sa.select(SERVICES_META_DATA_COLS)
+    stmt = sa.select(*SERVICES_META_DATA_COLS)
     if gids or execute_access or write_access:
         conditions: list[Any] = []
 
@@ -135,7 +135,7 @@ def total_count_stmt(
     )
 
 
-def list_latest_services_with_history_stmt(
+def list_latest_services_stmt(
     *,
     product_name: ProductName,
     user_id: UserID,
@@ -174,7 +174,7 @@ def list_latest_services_with_history_stmt(
     )
 
     # get all information of latest's services listed in CTE
-    latest_query = (
+    latest_stmt = (
         sa.select(
             services_meta_data.c.key,
             services_meta_data.c.version,
@@ -206,126 +206,26 @@ def list_latest_services_with_history_stmt(
         .subquery("latest_sq")
     )
 
-    # get history for every unique service-key in CTE
-    _accessible_sq = (
-        sa.select(
-            services_meta_data.c.key,
-            services_meta_data.c.version,
-        )
-        .distinct()
-        .select_from(
-            services_meta_data.join(
-                cte,
-                services_meta_data.c.key == cte.c.key,
-            )
-            # joins because access-rights might change per version
-            .join(
-                services_access_rights,
-                (services_meta_data.c.key == services_access_rights.c.key)
-                & (services_meta_data.c.version == services_access_rights.c.version)
-                & (services_access_rights.c.product_name == product_name),
-            )
-            .join(
-                user_to_groups,
-                (user_to_groups.c.gid == services_access_rights.c.gid)
-                & (user_to_groups.c.uid == user_id),
-            )
-            .outerjoin(
-                services_compatibility,
-                (services_meta_data.c.key == services_compatibility.c.key)
-                & (services_meta_data.c.version == services_compatibility.c.version),
-            )
-        )
-        .where(access_rights)
-        .subquery("accessible_sq")
-    )
-
-    history_subquery = (
-        sa.select(
-            services_meta_data.c.key,
-            services_meta_data.c.version,
-            services_meta_data.c.version_display,
-            services_meta_data.c.deprecated,
-            services_meta_data.c.created,
-            services_compatibility.c.custom_policy,  # CompatiblePolicyDict | None
-        )
-        .select_from(
-            services_meta_data.join(
-                _accessible_sq,
-                (services_meta_data.c.key == _accessible_sq.c.key)
-                & (services_meta_data.c.version == _accessible_sq.c.version),
-            ).outerjoin(
-                services_compatibility,
-                (services_meta_data.c.key == services_compatibility.c.key)
-                & (services_meta_data.c.version == services_compatibility.c.version),
-            )
-        )
-        .order_by(
-            services_meta_data.c.key,
-            sa.desc(_version(services_meta_data.c.version)),  # latest version first
-        )
-        .subquery("history_sq")
-    )
-
-    return (
-        sa.select(
-            latest_query.c.key,
-            latest_query.c.version,
-            # display
-            latest_query.c.name,
-            latest_query.c.description,
-            latest_query.c.description_ui,
-            latest_query.c.thumbnail,
-            latest_query.c.icon,
-            latest_query.c.version_display,
-            # ownership
-            latest_query.c.owner_email,
-            # tags
-            latest_query.c.classifiers,
-            latest_query.c.quality,
-            # lifetime
-            latest_query.c.created,
-            latest_query.c.modified,
-            latest_query.c.deprecated,
-            # releases (NOTE: at some points we should limit this list?)
-            array_agg(
-                func.json_build_object(
-                    "version",
-                    history_subquery.c.version,
-                    "version_display",
-                    history_subquery.c.version_display,
-                    "deprecated",
-                    history_subquery.c.deprecated,
-                    "created",
-                    history_subquery.c.created,
-                    "compatibility_policy",  # NOTE: this is the `policy`
-                    history_subquery.c.custom_policy,
-                )
-            ).label("history"),
-        )
-        .join(
-            history_subquery,
-            latest_query.c.key == history_subquery.c.key,
-        )
-        .group_by(
-            history_subquery.c.key,
-            latest_query.c.key,
-            latest_query.c.version,
-            latest_query.c.owner_email,
-            latest_query.c.name,
-            latest_query.c.description,
-            latest_query.c.description_ui,
-            latest_query.c.thumbnail,
-            latest_query.c.icon,
-            latest_query.c.version_display,
-            latest_query.c.classifiers,
-            latest_query.c.created,
-            latest_query.c.modified,
-            latest_query.c.deprecated,
-            latest_query.c.quality,
-        )
-        .order_by(history_subquery.c.key)
-    )
+    return sa.select(
+        latest_stmt.c.key,
+        latest_stmt.c.version,
+        # display
+        latest_stmt.c.name,
+        latest_stmt.c.description,
+        latest_stmt.c.description_ui,
+        latest_stmt.c.thumbnail,
+        latest_stmt.c.icon,
+        latest_stmt.c.version_display,
+        # ownership
+        latest_stmt.c.owner_email,
+        # tags
+        latest_stmt.c.classifiers,
+        latest_stmt.c.quality,
+        # lifetime
+        latest_stmt.c.created,
+        latest_stmt.c.modified,
+        latest_stmt.c.deprecated,
+    ).order_by(latest_stmt.c.key)
 
 
 def can_get_service_stmt(

services/catalog/src/simcore_service_catalog/db/repositories/services.py

@@ -38,7 +38,7 @@
     can_get_service_stmt,
     get_service_history_stmt,
     get_service_stmt,
-    list_latest_services_with_history_stmt,
+    list_latest_services_stmt,
     list_services_stmt,
     total_count_stmt,
 )
@@ -126,7 +126,7 @@ async def list_service_releases(
                 search_condition &= services_meta_data.c.version.like(f"{major}.%")
 
         query = (
-            sa.select(SERVICES_META_DATA_COLS)
+            sa.select(*SERVICES_META_DATA_COLS)
             .where(search_condition)
             .order_by(sa.desc(services_meta_data.c.version))
         )
@@ -386,15 +386,15 @@ async def list_latest_services(
             user_id=user_id,
             access_rights=AccessRightsClauses.can_read,
         )
-        stmt_page = list_latest_services_with_history_stmt(
+        stmt_page = list_latest_services_stmt(
             product_name=product_name,
             user_id=user_id,
             access_rights=AccessRightsClauses.can_read,
             limit=limit,
             offset=offset,
         )
 
-        async with self.db_engine.begin() as conn:
+        async with self.db_engine.connect() as conn:
             result = await conn.execute(stmt_total)
             total_count = result.scalar() or 0
 
@@ -424,7 +424,7 @@ async def list_latest_services(
                 modified=r.modified,
                 deprecated=r.deprecated,
                 # releases
-                history=r.history,
+                history=[],  # NOTE: for listing we will not add history. Only get service will produce history
             )
             for r in rows
         ]
@@ -446,7 +446,7 @@ async def get_service_history(
             access_rights=AccessRightsClauses.can_read,
             service_key=key,
         )
-        async with self.db_engine.begin() as conn:
+        async with self.db_engine.connect() as conn:
             result = await conn.execute(stmt_history)
             row = result.one_or_none()
 

services/catalog/src/simcore_service_catalog/services/function_services.py

@@ -20,9 +20,9 @@ def _as_dict(model_instance: ServiceMetaDataPublished) -> dict[str, Any]:
 def get_function_service(key, version) -> ServiceMetaDataPublished:
     try:
         return next(
-            s
-            for s in iter_service_docker_data()
-            if s.key == key and s.version == version
+            sc
+            for sc in iter_service_docker_data()
+            if sc.key == key and sc.version == version
         )
     except StopIteration as err:
         raise HTTPException(

services/catalog/src/simcore_service_catalog/services/manifest.py

@@ -1,4 +1,4 @@
-""" Services Manifest API Documentation
+"""Services Manifest API Documentation
 
 The `services.manifest` module provides a read-only API to access the services catalog. The term "Manifest" refers to a detailed, finalized list,
 traditionally used to denote items that are recorded as part of an official inventory or log, emphasizing the immutable nature of the data.
@@ -60,7 +60,7 @@ async def get_services_map(
 
     # NOTE: functional-services are services w/o associated image
     services: ServiceMetaDataPublishedDict = {
-        (s.key, s.version): s for s in iter_service_docker_data()
+        (sc.key, sc.version): sc for sc in iter_service_docker_data()
     }
     for service in services_in_registry:
         try: