@sanderegg review: services constants

Author: pcrespov

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

@@ -1,7 +1,7 @@
 from typing import Final
 
 from ..services import ServiceKey
-from ..services_regex import FRONTEND_SERVICE_KEY_PREFIX
+from ..services_constants 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

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

@@ -1,6 +1,27 @@
+from types import MappingProxyType
 from typing import Final
 
-LATEST_INTEGRATION_VERSION: Final[str] = "1.0.0"
+from .services_enums import ServiceType
 
+LATEST_INTEGRATION_VERSION: Final[str] = "1.0.0"
 
 ANY_FILETYPE: Final[str] = "data:*/*"
+
+SERVICE_TYPE_TO_NAME_MAP = MappingProxyType(
+    {
+        ServiceType.COMPUTATIONAL: "comp",
+        ServiceType.DYNAMIC: "dynamic",
+        ServiceType.FRONTEND: "frontend",
+    }
+)
+
+
+def _create_key_prefix(service_type: ServiceType) -> str:
+    return f"simcore/services/{SERVICE_TYPE_TO_NAME_MAP[service_type]}"
+
+
+COMPUTATIONAL_SERVICE_KEY_PREFIX: Final[str] = _create_key_prefix(
+    ServiceType.COMPUTATIONAL
+)
+DYNAMIC_SERVICE_KEY_PREFIX: Final[str] = _create_key_prefix(ServiceType.DYNAMIC)
+FRONTEND_SERVICE_KEY_PREFIX: Final[str] = _create_key_prefix(ServiceType.FRONTEND)

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

@@ -2,6 +2,12 @@
 from types import MappingProxyType
 from typing import Final
 
+from .services_constants import (
+    COMPUTATIONAL_SERVICE_KEY_PREFIX,
+    DYNAMIC_SERVICE_KEY_PREFIX,
+    FRONTEND_SERVICE_KEY_PREFIX,
+    SERVICE_TYPE_TO_NAME_MAP,
+)
 from .services_enums import ServiceType
 
 PROPERTY_TYPE_RE = r"^(number|integer|boolean|string|ref_contentSchema|data:([^/\s,]+/[^/\s,]+|\[[^/\s,]+/[^/\s,]+(,[^/\s]+/[^/,\s]+)*\]))$"
@@ -14,15 +20,6 @@
 
 FILENAME_RE = r".+"
 
-
-SERVICE_TYPE_TO_NAME_MAP = MappingProxyType(
-    {
-        ServiceType.COMPUTATIONAL: "comp",
-        ServiceType.DYNAMIC: "dynamic",
-        ServiceType.FRONTEND: "frontend",
-    }
-)
-
 # e.g. simcore/services/comp/opencor
 SERVICE_KEY_RE: Final[re.Pattern[str]] = re.compile(
     r"^simcore/services/"
@@ -40,41 +37,32 @@
 )
 
 
-def create_key_prefix(service_type: ServiceType) -> str:
-    return f"simcore/services/{SERVICE_TYPE_TO_NAME_MAP[service_type]}"
-
-
-COMPUTATIONAL_SERVICE_KEY_PREFIX: Final[str] = create_key_prefix(
-    ServiceType.COMPUTATIONAL
-)
-DYNAMIC_SERVICE_KEY_PREFIX: Final[str] = create_key_prefix(ServiceType.DYNAMIC)
-FRONTEND_SERVICE_KEY_PREFIX: Final[str] = create_key_prefix(ServiceType.FRONTEND)
-
-
-def create_key_regex(service_type: ServiceType) -> re.Pattern[str]:
+def _create_key_regex(service_type: ServiceType) -> re.Pattern[str]:
     return re.compile(
         rf"^simcore/services/{SERVICE_TYPE_TO_NAME_MAP[service_type]}/"
         r"(?P<subdir>[a-z0-9][a-z0-9_.-]*/)*"
         r"(?P<name>[a-z0-9-_]+[a-z0-9])$"
     )
 
 
-def create_key_format(service_type: ServiceType) -> str:
+def _create_key_format(service_type: ServiceType) -> str:
     return f"simcore/services/{SERVICE_TYPE_TO_NAME_MAP[service_type]}/{{service_name}}"
 
 
-COMPUTATIONAL_SERVICE_KEY_RE: Final[re.Pattern[str]] = create_key_regex(
+COMPUTATIONAL_SERVICE_KEY_RE: Final[re.Pattern[str]] = _create_key_regex(
     ServiceType.COMPUTATIONAL
 )
-COMPUTATIONAL_SERVICE_KEY_FORMAT: Final[str] = create_key_format(
+COMPUTATIONAL_SERVICE_KEY_FORMAT: Final[str] = _create_key_format(
     ServiceType.COMPUTATIONAL
 )
 
-DYNAMIC_SERVICE_KEY_RE: Final[re.Pattern[str]] = create_key_regex(ServiceType.DYNAMIC)
-DYNAMIC_SERVICE_KEY_FORMAT: Final[str] = create_key_format(ServiceType.DYNAMIC)
+DYNAMIC_SERVICE_KEY_RE: Final[re.Pattern[str]] = _create_key_regex(ServiceType.DYNAMIC)
+DYNAMIC_SERVICE_KEY_FORMAT: Final[str] = _create_key_format(ServiceType.DYNAMIC)
 
-FRONTEND_SERVICE_KEY_RE: Final[re.Pattern[str]] = create_key_regex(ServiceType.FRONTEND)
-FRONTEND_SERVICE_KEY_FORMAT: Final[str] = create_key_format(ServiceType.FRONTEND)
+FRONTEND_SERVICE_KEY_RE: Final[re.Pattern[str]] = _create_key_regex(
+    ServiceType.FRONTEND
+)
+FRONTEND_SERVICE_KEY_FORMAT: Final[str] = _create_key_format(ServiceType.FRONTEND)
 
 
 SERVICE_TYPE_TO_PREFIX_MAP = MappingProxyType(