@sanderegg review: relative imports, doc, private

Author: pcrespov

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

@@ -2,7 +2,7 @@
 from types import MappingProxyType
 from typing import Final
 
-from models_library.services_enums import ServiceType
+from .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 = {

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

@@ -1,4 +1,12 @@
-"""RPC client-side for the RPC server at the payments service"""
+"""RPC client-side for the RPC server at the payments service
+
+In this interface (and all belows), the context of the caller is passed in the following arguments:
+- `user_id` is intended for the caller's identifer. Do not add other user_id that is not the callers!.
+    - Ideally this could be injected by an authentication layer (as in the rest API)
+        but  for now we are passing it as an argument.
+- `product_name` is the name of the product at the caller's context as well
+
+"""
 
 import logging
 from typing import cast
@@ -32,14 +40,6 @@
 
 _logger = logging.getLogger(__name__)
 
-#
-# In this interface, the context of the caller is passed in the following arguments:
-#   - `user_id` is intended for the caller's identifer. Do not add other user_id that is not the callers!.
-#      - Ideally this could be injected by an authentication layer (as in the rest API)
-#        but  for now we are passing it as an argument.
-#   - `product_name` is the name of the product at the caller's context as well
-#
-
 
 @validate_call(config={"arbitrary_types_allowed": True})
 async def list_services_paginated(  # pylint: disable=too-many-arguments

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

@@ -47,7 +47,7 @@
 from ._services_sql import (
     SERVICES_META_DATA_COLS,
     AccessRightsClauses,
-    apply_services_filters,
+    _apply_services_filters,
     by_version,
     can_get_service_stmt,
     get_service_history_stmt,
@@ -514,7 +514,7 @@ async def get_service_history_page(
         )
 
         if filters:
-            base_stmt = apply_services_filters(base_stmt, filters)
+            base_stmt = _apply_services_filters(base_stmt, filters)
 
         base_subquery = base_stmt.subquery()