✨ Refactor service key prefixes and enhance service type filtering in SQL queries

Author: pcrespov

packages/models-library/src/models_library/function_services_catalog/_key_labels.py

@@ -1,10 +1,11 @@
 from typing import Final
 
 from ..services import ServiceKey
+from ..services_regex import FRONTEND_SERVICE_KEY_PREFIX
 
 # NOTE: due to legacy reasons, the name remains with 'frontend' in it but
 # it now refers to a more general group: function sections that contains front-end services as well
-FUNCTION_SERVICE_KEY_PREFIX: Final[str] = "simcore/services/frontend"
+FUNCTION_SERVICE_KEY_PREFIX: Final[str] = FRONTEND_SERVICE_KEY_PREFIX
 
 
 def is_function_service(service_key: ServiceKey) -> bool:

packages/models-library/src/models_library/services_regex.py

@@ -1,6 +1,8 @@
 import re
 from typing import Final
 
+from models_library.services_enums import ServiceType
+
 PROPERTY_TYPE_RE = r"^(number|integer|boolean|string|ref_contentSchema|data:([^/\s,]+/[^/\s,]+|\[[^/\s,]+/[^/\s,]+(,[^/\s]+/[^/,\s]+)*\]))$"
 PROPERTY_TYPE_TO_PYTHON_TYPE_MAP = {
     "integer": int,
@@ -27,18 +29,32 @@
     r"(?P<name>[a-z0-9-_]+[a-z0-9])$"
 )
 
+# Add key prefixes for dynamic and computational services
+DYNAMIC_SERVICE_KEY_PREFIX: Final[str] = "simcore/services/dynamic"
 DYNAMIC_SERVICE_KEY_RE: Final[re.Pattern[str]] = re.compile(
-    r"^simcore/services/dynamic/"
+    rf"^{DYNAMIC_SERVICE_KEY_PREFIX}/"
     r"(?P<subdir>[a-z0-9][a-z0-9_.-]*/)*"
     r"(?P<name>[a-z0-9-_]+[a-z0-9])$"
 )
-DYNAMIC_SERVICE_KEY_FORMAT = "simcore/services/dynamic/{service_name}"
-
 
-# Computational regex & format
+COMPUTATIONAL_SERVICE_KEY_PREFIX: Final[str] = "simcore/services/comp"
 COMPUTATIONAL_SERVICE_KEY_RE: Final[re.Pattern[str]] = re.compile(
-    r"^simcore/services/comp/"
+    rf"^{COMPUTATIONAL_SERVICE_KEY_PREFIX}/"
     r"(?P<subdir>[a-z0-9][a-z0-9_.-]*/)*"
     r"(?P<name>[a-z0-9-_]+[a-z0-9])$"
 )
-COMPUTATIONAL_SERVICE_KEY_FORMAT: Final[str] = "simcore/services/comp/{service_name}"
+
+FRONTEND_SERVICE_KEY_PREFIX: Final[str] = "simcore/services/frontend"
+
+FRONTEND_SERVICE_KEY_RE: Final[re.Pattern[str]] = re.compile(
+    rf"^{FRONTEND_SERVICE_KEY_PREFIX}/"
+    r"(?P<subdir>[a-z0-9][a-z0-9_.-]*/)*"
+    r"(?P<name>[a-z0-9-_]+[a-z0-9])$"
+)
+
+# Add service type prefixes mapping (moved from _services_sql.py)
+SERVICE_TYPE_PREFIXES = {
+    ServiceType.COMPUTATIONAL: COMPUTATIONAL_SERVICE_KEY_PREFIX,
+    ServiceType.DYNAMIC: DYNAMIC_SERVICE_KEY_PREFIX,
+    ServiceType.FRONTEND: FRONTEND_SERVICE_KEY_PREFIX,
+}

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

@@ -2,6 +2,9 @@
 
 import sqlalchemy as sa
 from models_library.products import ProductName
+from models_library.services_regex import (
+    SERVICE_TYPE_PREFIXES,
+)
 from models_library.services_types import ServiceKey, ServiceVersion
 from models_library.users import UserID
 from simcore_postgres_database.models.groups import user_to_groups
@@ -118,7 +121,13 @@ def apply_services_filters(
     filters: ServiceFiltersDB,
 ):
     if filters.service_type:
-        stmt = stmt.where(services_meta_data.c.service_type == filters.service_type)
+        prefix = SERVICE_TYPE_PREFIXES.get(filters.service_type)
+        if prefix is None:
+            msg = f"Undefined service type {filters.service_type}. Please update prefix expressions"
+            raise ValueError(msg)
+        prefix = prefix.rstrip("/")  # safety
+        stmt = stmt.where(services_meta_data.c.service_key.like(f"{prefix}/%"))
+    return stmt
 
 
 def latest_services_total_count_stmt(