cleanup _services_sql free functions use

Author: pcrespov

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

@@ -116,7 +116,7 @@ def _has_access_rights(
     )
 
 
-def _apply_services_filters(
+def apply_services_filters(
     stmt: sa.sql.Select,
     filters: ServiceFiltersDB,
 ) -> sa.sql.Select:
@@ -180,7 +180,7 @@ def latest_services_total_count_stmt(
     )
 
     if filters:
-        stmt = _apply_services_filters(stmt, filters)
+        stmt = apply_services_filters(stmt, filters)
 
     return stmt
 
@@ -224,7 +224,7 @@ def list_latest_services_stmt(
     )
 
     if filters:
-        cte_stmt = _apply_services_filters(cte_stmt, filters)
+        cte_stmt = apply_services_filters(cte_stmt, filters)
 
     cte = cte_stmt.cte("cte")
 

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

@@ -43,18 +43,11 @@
     ServiceWithHistoryDBGet,
 )
 from ..models.services_specifications import ServiceSpecificationsAtDB
+from . import _services_sql
 from ._base import BaseRepository
 from ._services_sql import (
     SERVICES_META_DATA_COLS,
     AccessRightsClauses,
-    _apply_services_filters,
-    by_version,
-    can_get_service_stmt,
-    get_service_history_stmt,
-    get_service_stmt,
-    latest_services_total_count_stmt,
-    list_latest_services_stmt,
-    list_services_stmt,
 )
 
 _logger = logging.getLogger(__name__)
@@ -101,7 +94,7 @@ async def list_services(
             return [
                 ServiceMetaDataDBGet.model_validate(row)
                 async for row in await conn.stream(
-                    list_services_stmt(
+                    _services_sql.list_services_stmt(
                         gids=gids,
                         execute_access=execute_access,
                         write_access=write_access,
@@ -295,7 +288,7 @@ async def can_get_service(
         """Returns False if it cannot get the service i.e. not found or does not have access"""
         async with self.db_engine.begin() as conn:
             result = await conn.execute(
-                can_get_service_stmt(
+                _services_sql.can_get_service_stmt(
                     product_name=product_name,
                     user_id=user_id,
                     access_rights=AccessRightsClauses.can_read,
@@ -316,7 +309,7 @@ async def can_update_service(
     ) -> bool:
         async with self.db_engine.begin() as conn:
             result = await conn.execute(
-                can_get_service_stmt(
+                _services_sql.can_get_service_stmt(
                     product_name=product_name,
                     user_id=user_id,
                     access_rights=AccessRightsClauses.can_edit,
@@ -336,7 +329,7 @@ async def get_service_with_history(
         version: ServiceVersion,
     ) -> ServiceWithHistoryDBGet | None:
 
-        stmt_get = get_service_stmt(
+        stmt_get = _services_sql.get_service_stmt(
             product_name=product_name,
             user_id=user_id,
             access_rights=AccessRightsClauses.can_read,
@@ -349,7 +342,7 @@ async def get_service_with_history(
             row = result.one_or_none()
 
         if row:
-            stmt_history = get_service_history_stmt(
+            stmt_history = _services_sql.get_service_history_stmt(
                 product_name=product_name,
                 user_id=user_id,
                 access_rights=AccessRightsClauses.can_read,
@@ -396,13 +389,13 @@ async def list_latest_services(
     ) -> tuple[PositiveInt, list[ServiceWithHistoryDBGet]]:
 
         # get page
-        stmt_total = latest_services_total_count_stmt(
+        stmt_total = _services_sql.latest_services_total_count_stmt(
             product_name=product_name,
             user_id=user_id,
             access_rights=AccessRightsClauses.can_read,
             filters=filters,
         )
-        stmt_page = list_latest_services_stmt(
+        stmt_page = _services_sql.list_latest_services_stmt(
             product_name=product_name,
             user_id=user_id,
             access_rights=AccessRightsClauses.can_read,
@@ -459,7 +452,7 @@ async def get_service_history(
         """
         DEPRECATED: use get_service_history_page instead!
         """
-        stmt_history = get_service_history_stmt(
+        stmt_history = _services_sql.get_service_history_stmt(
             product_name=product_name,
             user_id=user_id,
             access_rights=AccessRightsClauses.can_read,
@@ -514,7 +507,7 @@ async def get_service_history_page(
         )
 
         if filters:
-            base_stmt = _apply_services_filters(base_stmt, filters)
+            base_stmt = _services_sql.apply_services_filters(base_stmt, filters)
 
         base_subquery = base_stmt.subquery()
 
@@ -546,7 +539,7 @@ async def get_service_history_page(
                     ),
                 )
             )
-            .order_by(sql.desc(by_version(services_meta_data.c.version)))
+            .order_by(sql.desc(_services_sql.by_version(services_meta_data.c.version)))
             .offset(offset)
             .limit(limit)
         )