✨ Add service key prefixes and refactor regex patterns for dynamic and computational services

Author: pcrespov

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

@@ -1,4 +1,5 @@
 import re
+from types import MappingProxyType
 from typing import Final
 
 from models_library.services_enums import ServiceType
@@ -14,47 +15,50 @@
 FILENAME_RE = r".+"
 
 
-# e.g. simcore/services/comp/opencor
+# Add key prefixes for dynamic and computational services
+DYNAMIC_SERVICE_KEY_PREFIX: Final[str] = "simcore/services/dynamic"
+COMPUTATIONAL_SERVICE_KEY_PREFIX: Final[str] = "simcore/services/comp"
+FRONTEND_SERVICE_KEY_PREFIX: Final[str] = "simcore/services/frontend"
+
+
 SERVICE_KEY_RE: Final[re.Pattern[str]] = re.compile(
-    r"^simcore/services/"
-    r"(?P<type>(comp|dynamic|frontend))/"
-    r"(?P<subdir>[a-z0-9][a-z0-9_.-]*/)*"
+    rf"^(?P<key_prefix>{COMPUTATIONAL_SERVICE_KEY_PREFIX}|{DYNAMIC_SERVICE_KEY_PREFIX}|{FRONTEND_SERVICE_KEY_PREFIX})"
+    r"/(?P<subdir>[a-z0-9][a-z0-9_.-]*/)*"
     r"(?P<name>[a-z0-9-_]+[a-z0-9])$"
 )
-# e.g. simcore%2Fservices%2Fcomp%2Fopencor
 SERVICE_ENCODED_KEY_RE: Final[re.Pattern[str]] = re.compile(
-    r"^simcore%2Fservices%2F"
-    r"(?P<type>(comp|dynamic|frontend))%2F"
-    r"(?P<subdir>[a-z0-9][a-z0-9_.-]*%2F)*"
+    rf"^(?P<key_prefix>{COMPUTATIONAL_SERVICE_KEY_PREFIX.replace('/', '%2F')}|{DYNAMIC_SERVICE_KEY_PREFIX.replace('/', '%2F')}|{FRONTEND_SERVICE_KEY_PREFIX.replace('/', '%2F')})"
+    r"(?P<subdir>(%2F[a-z0-9][a-z0-9_.-]*)*%2F)?"
     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(
     rf"^{DYNAMIC_SERVICE_KEY_PREFIX}/"
     r"(?P<subdir>[a-z0-9][a-z0-9_.-]*/)*"
     r"(?P<name>[a-z0-9-_]+[a-z0-9])$"
 )
 
-COMPUTATIONAL_SERVICE_KEY_PREFIX: Final[str] = "simcore/services/comp"
 COMPUTATIONAL_SERVICE_KEY_RE: Final[re.Pattern[str]] = re.compile(
     rf"^{COMPUTATIONAL_SERVICE_KEY_PREFIX}/"
     r"(?P<subdir>[a-z0-9][a-z0-9_.-]*/)*"
     r"(?P<name>[a-z0-9-_]+[a-z0-9])$"
 )
 
-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,
-}
+
+SERVICE_TYPE_PREFIXES = MappingProxyType(
+    {
+        ServiceType.COMPUTATIONAL: COMPUTATIONAL_SERVICE_KEY_PREFIX,
+        ServiceType.DYNAMIC: DYNAMIC_SERVICE_KEY_PREFIX,
+        ServiceType.FRONTEND: FRONTEND_SERVICE_KEY_PREFIX,
+    }
+)
+
+assert all(  # nosec
+    not prefix.endswith("/") for prefix in SERVICE_TYPE_PREFIXES.values()
+), "Service type prefixes must not end with '/'"

services/web/server/src/simcore_service_webserver/studies_dispatcher/_catalog.py

@@ -9,6 +9,10 @@
 from aiopg.sa.engine import Engine
 from models_library.groups import EVERYONE_GROUP_ID
 from models_library.services import ServiceKey, ServiceVersion
+from models_library.services_regex import (
+    COMPUTATIONAL_SERVICE_KEY_PREFIX,
+    DYNAMIC_SERVICE_KEY_PREFIX,
+)
 from pydantic import HttpUrl, PositiveInt, TypeAdapter, ValidationError
 from servicelib.logging_utils import log_decorator
 from simcore_postgres_database.models.services import (
@@ -92,8 +96,8 @@ async def iter_latest_product_services(
         )
         .where(
             (
-                services_meta_data.c.key.like("simcore/services/dynamic/%%")
-                | (services_meta_data.c.key.like("simcore/services/comp/%%"))
+                services_meta_data.c.key.like(f"{DYNAMIC_SERVICE_KEY_PREFIX}/%")
+                | services_meta_data.c.key.like(f"{COMPUTATIONAL_SERVICE_KEY_PREFIX}/%")
             )
             & (services_meta_data.c.deprecated.is_(None))
             & (services_access_rights.c.gid == EVERYONE_GROUP_ID)