refactor: rename ServiceFiltersDB to ServiceDBFilters and update usages

Author: pcrespov

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

@@ -17,7 +17,7 @@
 from models_library.rpc_pagination import DEFAULT_NUMBER_OF_ITEMS_PER_PAGE, PageLimitInt
 from models_library.services_types import ServiceKey, ServiceVersion
 from models_library.users import UserID
-from pydantic import ValidationError, validate_call
+from pydantic import TypeAdapter, ValidationError, validate_call
 from pyinstrument import Profiler
 from servicelib.logging_utils import log_decorator
 from servicelib.rabbitmq import RPCRouter
@@ -26,7 +26,7 @@
     CatalogItemNotFoundError,
 )
 
-from ...models.services_db import ServiceFiltersDB
+from ...models.services_db import ServiceDBFilters
 from ...repository.groups import GroupsRepository
 from ...repository.services import ServicesRepository
 from ...service import catalog_services
@@ -58,16 +58,6 @@ async def _wrapper(app: FastAPI, **kwargs):
     return _wrapper
 
 
-def _type_adapter_to_domain(
-    filters: ServiceListFilters | None,
-) -> ServiceFiltersDB | None:
-    return (
-        ServiceFiltersDB.model_validate(filters, from_attributes=True)
-        if filters
-        else None
-    )
-
-
 @router.expose(reraise_if_error_type=(CatalogForbiddenError, ValidationError))
 @_profile_rpc_call
 @validate_call(config={"arbitrary_types_allowed": True})
@@ -89,7 +79,7 @@ async def list_services_paginated(
         user_id=user_id,
         limit=limit,
         offset=offset,
-        filters=_type_adapter_to_domain(filters),
+        filters=TypeAdapter(ServiceDBFilters | None).validate_python(filters),
     )
 
     assert len(items) <= total_count  # nosec
@@ -262,7 +252,7 @@ async def list_my_service_history_latest_first(
         service_key=service_key,
         limit=limit,
         offset=offset,
-        filters=_type_adapter_to_domain(filters),
+        filters=TypeAdapter(ServiceDBFilters | None).validate_python(filters),
     )
 
     assert len(items) <= total_count  # nosec

services/catalog/src/simcore_service_catalog/models/services_db.py

@@ -248,7 +248,7 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
     )
 
 
-class ServiceFiltersDB(Filters):
+class ServiceDBFilters(Filters):
     service_type: ServiceType | None = None
     service_key_pattern: str | None = None
     version_display_pattern: str | None = None

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

@@ -22,7 +22,7 @@
 from sqlalchemy.sql.expression import func
 from sqlalchemy.sql.selectable import Select
 
-from ..models.services_db import ServiceFiltersDB, ServiceMetaDataDBGet
+from ..models.services_db import ServiceDBFilters, ServiceMetaDataDBGet
 
 SERVICES_META_DATA_COLS = get_columns_from_db_model(
     services_meta_data, ServiceMetaDataDBGet
@@ -118,7 +118,7 @@ def _has_access_rights(
 
 def apply_services_filters(
     stmt: sa.sql.Select,
-    filters: ServiceFiltersDB,
+    filters: ServiceDBFilters,
 ) -> sa.sql.Select:
     conditions = []
 
@@ -160,7 +160,7 @@ def latest_services_total_count_stmt(
     product_name: ProductName,
     user_id: UserID,
     access_rights: sa.sql.ClauseElement,
-    filters: ServiceFiltersDB | None = None,
+    filters: ServiceDBFilters | None = None,
 ):
     stmt = (
         sa.select(func.count(sa.distinct(services_meta_data.c.key)))
@@ -192,7 +192,7 @@ def list_latest_services_stmt(
     access_rights: sa.sql.ClauseElement,
     limit: int | None,
     offset: int | None,
-    filters: ServiceFiltersDB | None = None,
+    filters: ServiceDBFilters | None = None,
 ):
     # get all distinct services key fitting a page
     # and its corresponding latest version

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

@@ -36,7 +36,7 @@
 from ..models.services_db import (
     ReleaseDBGet,
     ServiceAccessRightsAtDB,
-    ServiceFiltersDB,
+    ServiceDBFilters,
     ServiceMetaDataDBCreate,
     ServiceMetaDataDBGet,
     ServiceMetaDataDBPatch,
@@ -385,7 +385,7 @@ async def list_latest_services(
         # list args: pagination
         limit: int | None = None,
         offset: int | None = None,
-        filters: ServiceFiltersDB | None = None,
+        filters: ServiceDBFilters | None = None,
     ) -> tuple[PositiveInt, list[ServiceWithHistoryDBGet]]:
 
         # get page
@@ -477,7 +477,7 @@ async def get_service_history_page(
         # list args: pagination
         limit: int | None = None,
         offset: int | None = None,
-        filters: ServiceFiltersDB | None = None,
+        filters: ServiceDBFilters | None = None,
     ) -> tuple[PositiveInt, list[ReleaseDBGet]]:
 
         base_stmt = (

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

@@ -33,7 +33,7 @@
 from ..clients.director import DirectorClient
 from ..models.services_db import (
     ServiceAccessRightsAtDB,
-    ServiceFiltersDB,
+    ServiceDBFilters,
     ServiceMetaDataDBPatch,
     ServiceWithHistoryDBGet,
 )
@@ -137,7 +137,7 @@ async def list_latest_catalog_services(
     user_id: UserID,
     limit: PageLimitInt | None,
     offset: NonNegativeInt = 0,
-    filters: ServiceFiltersDB | None = None,
+    filters: ServiceDBFilters | None = None,
 ) -> tuple[PageTotalCount, list[LatestServiceGet]]:
 
     # defines the order
@@ -520,7 +520,7 @@ async def list_user_service_release_history(
     limit: PageLimitInt | None = None,
     offset: NonNegativeInt | None = None,
     # filters
-    filters: ServiceFiltersDB | None = None,
+    filters: ServiceDBFilters | None = None,
     # options
     include_compatibility: bool = False,
 ) -> tuple[PageTotalCount, list[ServiceRelease]]:

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

@@ -28,7 +28,7 @@
 from simcore_postgres_database.models.projects import ProjectType, projects
 from simcore_service_catalog.models.services_db import (
     ServiceAccessRightsAtDB,
-    ServiceFiltersDB,
+    ServiceDBFilters,
     ServiceMetaDataDBCreate,
     ServiceMetaDataDBGet,
     ServiceMetaDataDBPatch,
@@ -445,7 +445,7 @@ async def test_list_latest_services_with_filters(
     )
 
     # Test: Apply filter for ServiceType.DYNAMIC
-    filters = ServiceFiltersDB(service_type=ServiceType.DYNAMIC)
+    filters = ServiceDBFilters(service_type=ServiceType.DYNAMIC)
     total_count, services_items = await services_repo.list_latest_services(
         product_name=target_product, user_id=user_id, filters=filters
     )
@@ -456,7 +456,7 @@ async def test_list_latest_services_with_filters(
     )
 
     # Test: Apply filter for ServiceType.COMPUTATIONAL
-    filters = ServiceFiltersDB(service_type=ServiceType.COMPUTATIONAL)
+    filters = ServiceDBFilters(service_type=ServiceType.COMPUTATIONAL)
     total_count, services_items = await services_repo.list_latest_services(
         product_name=target_product, user_id=user_id, filters=filters
     )
@@ -505,7 +505,7 @@ async def test_list_latest_services_with_pattern_filters(
     )
 
     # Test: Filter by service key pattern
-    filters = ServiceFiltersDB(service_key_pattern="*/jupyter-*")
+    filters = ServiceDBFilters(service_key_pattern="*/jupyter-*")
     total_count, services_items = await services_repo.list_latest_services(
         product_name=target_product, user_id=user_id, filters=filters
     )
@@ -519,7 +519,7 @@ async def test_list_latest_services_with_pattern_filters(
     )
 
     # Test: More specific pattern
-    filters = ServiceFiltersDB(service_key_pattern="*/jupyter-l*")
+    filters = ServiceDBFilters(service_key_pattern="*/jupyter-l*")
     total_count, services_items = await services_repo.list_latest_services(
         product_name=target_product, user_id=user_id, filters=filters
     )
@@ -528,7 +528,7 @@ async def test_list_latest_services_with_pattern_filters(
     assert services_items[0].key.endswith("jupyter-lab")
 
     # Test: Filter by version display pattern
-    filters = ServiceFiltersDB(version_display_pattern="*2023*")
+    filters = ServiceDBFilters(version_display_pattern="*2023*")
     total_count, services_items = await services_repo.list_latest_services(
         product_name=target_product, user_id=user_id, filters=filters
     )
@@ -537,15 +537,15 @@ async def test_list_latest_services_with_pattern_filters(
     assert services_items[0].version_display == "2023 Release"
 
     # Test: Filter by version display pattern with NULL handling
-    filters = ServiceFiltersDB(version_display_pattern="*")
+    filters = ServiceDBFilters(version_display_pattern="*")
     total_count, services_items = await services_repo.list_latest_services(
         product_name=target_product, user_id=user_id, filters=filters
     )
     assert total_count == 3  # Should match all, including NULL version_display
     assert len(services_items) == 3
 
     # Test: Combined filters
-    filters = ServiceFiltersDB(
+    filters = ServiceDBFilters(
         service_key_pattern="*/jupyter-*", version_display_pattern="*2024*"
     )
     total_count, services_items = await services_repo.list_latest_services(
@@ -768,7 +768,7 @@ async def test_get_service_history_page_with_filters(
     assert [release.version for release in history] == release_versions
 
     # Test: Apply filter for
-    filters = ServiceFiltersDB(service_type=expected_service_type)
+    filters = ServiceDBFilters(service_type=expected_service_type)
     total_count, filtered_history = await services_repo.get_service_history_page(
         product_name=target_product,
         user_id=user_id,
@@ -785,7 +785,7 @@ async def test_get_service_history_page_with_filters(
         if expected_service_type != ServiceType.COMPUTATIONAL
         else ServiceType.DYNAMIC
     )
-    filters = ServiceFiltersDB(service_type=different_service_type)
+    filters = ServiceDBFilters(service_type=different_service_type)
     total_count, no_history = await services_repo.get_service_history_page(
         product_name=target_product,
         user_id=user_id,