✨ Refactor service API usage: replace services_api with services for improved clarity

Author: pcrespov

services/catalog/src/simcore_service_catalog/api/rpc/_services.py

@@ -26,7 +26,7 @@
 from simcore_service_catalog.repository.groups import GroupsRepository
 
 from ...repository.services import ServicesRepository
-from ...service import services_api
+from ...service import services
 from .._dependencies.director import get_director_api
 
 _logger = logging.getLogger(__name__)
@@ -68,7 +68,7 @@ async def list_services_paginated(
 ) -> PageRpcLatestServiceGet:
     assert app.state.engine  # nosec
 
-    total_count, items = await services_api.list_latest_services(
+    total_count, items = await services.list_latest_services(
         repo=ServicesRepository(app.state.engine),
         director_api=get_director_api(app),
         product_name=product_name,
@@ -111,7 +111,7 @@ async def get_service(
 ) -> ServiceGetV2:
     assert app.state.engine  # nosec
 
-    service = await services_api.get_service(
+    service = await services.get_service(
         repo=ServicesRepository(app.state.engine),
         director_api=get_director_api(app),
         product_name=product_name,
@@ -148,7 +148,7 @@ async def update_service(
 
     assert app.state.engine  # nosec
 
-    service = await services_api.update_service(
+    service = await services.update_service(
         repo=ServicesRepository(app.state.engine),
         director_api=get_director_api(app),
         product_name=product_name,
@@ -184,7 +184,7 @@ async def check_for_service(
     """Checks whether service exists and can be accessed, otherwise it raise"""
     assert app.state.engine  # nosec
 
-    await services_api.check_for_service(
+    await services.check_for_service(
         repo=ServicesRepository(app.state.engine),
         product_name=product_name,
         user_id=user_id,
@@ -210,7 +210,7 @@ async def batch_get_my_services(
 ) -> list[MyServiceGet]:
     assert app.state.engine  # nosec
 
-    services = await services_api.batch_get_my_services(
+    services = await services.batch_get_my_services(
         repo=ServicesRepository(app.state.engine),
         groups_repo=GroupsRepository(app.state.engine),
         product_name=product_name,
@@ -237,7 +237,7 @@ async def list_my_service_history_paginated(
 ) -> PageRpcServiceRelease:
     assert app.state.engine  # nosec
 
-    total_count, items = await services_api.list_my_service_release_history(
+    total_count, items = await services.list_my_service_release_history(
         repo=ServicesRepository(app.state.engine),
         product_name=product_name,
         user_id=user_id,

services/catalog/src/simcore_service_catalog/service/services_api.py renamed to services/catalog/src/simcore_service_catalog/service/services.py

@@ -29,7 +29,7 @@
     ServiceWithHistoryDBGet,
 )
 from ..repository.services import ServicesRepository
-from ..service import manifest
+from . import manifest
 from .compatibility import evaluate_service_compatibility_map
 from .function_services import is_function_service
 

services/catalog/tests/unit/with_dbs/test_service_services_api.py

@@ -20,7 +20,7 @@
 from simcore_service_catalog.clients.director import DirectorApi
 from simcore_service_catalog.repository.groups import GroupsRepository
 from simcore_service_catalog.repository.services import ServicesRepository
-from simcore_service_catalog.service import manifest, services_api
+from simcore_service_catalog.service import manifest, services
 from sqlalchemy.ext.asyncio import AsyncEngine
 
 pytest_simcore_core_services_selection = [
@@ -125,7 +125,7 @@ async def test_list_services_paginated(
 
     assert not mocked_director_service_api["get_service"].called
 
-    total_count, page_items = await services_api.list_latest_services(
+    total_count, page_items = await services.list_latest_services(
         services_repo,
         director_client,
         product_name=target_product,
@@ -144,7 +144,7 @@ async def test_list_services_paginated(
         assert item.access_rights
         assert item.owner is not None
 
-        got = await services_api.get_service(
+        got = await services.get_service(
             services_repo,
             director_client,
             product_name=target_product,
@@ -227,7 +227,7 @@ async def test_batch_get_my_services(
         (other_service_key, other_service_version),
     ]
 
-    my_services = await services_api.batch_get_my_services(
+    my_services = await services.batch_get_my_services(
         services_repo,
         groups_repo,
         product_name=target_product,