add error handling to CatalogService

Author: bisgaard-itis

services/api-server/src/simcore_service_api_server/_service_programs.py

@@ -26,8 +26,8 @@ async def get_program(
     ) -> Program:
         service = await self._catalog_service.get(
             user_id=user_id,
-            service_key=name,
-            service_version=version,
+            name=name,
+            version=version,
             product_name=product_name,
         )
         assert service.service_type == ServiceType.DYNAMIC  # nosec

services/api-server/src/simcore_service_api_server/_service_solvers.py

@@ -34,8 +34,8 @@ async def get_solver(
     ) -> Solver:
         service = await self._catalog_service.get(
             user_id=user_id,
-            service_key=name,
-            service_version=version,
+            name=name,
+            version=version,
             product_name=product_name,
         )
         assert (  # nosec
@@ -66,8 +66,8 @@ async def get_latest_release(
         release = sorted(service_releases, key=lambda s: Version(s.version))[-1]
         service = await self._catalog_service.get(
             user_id=user_id,
-            service_key=solver_key,
-            service_version=release.version,
+            name=solver_key,
+            version=release.version,
             product_name=product_name,
         )
 

services/api-server/src/simcore_service_api_server/services_rpc/catalog.py

@@ -102,14 +102,14 @@ async def get(
         *,
         product_name: ProductName,
         user_id: UserID,
-        service_key: ServiceKey,
-        service_version: ServiceVersion,
+        name: ServiceKey,
+        version: ServiceVersion,
     ) -> ServiceGetV2:
 
         return await catalog_rpc.get_service(
             self._client,
             product_name=product_name,
             user_id=user_id,
-            service_key=service_key,
-            service_version=service_version,
+            service_key=name,
+            service_version=version,
         )

services/api-server/tests/unit/test_services_catalog.py

@@ -69,8 +69,8 @@ async def test_catalog_service_read_solvers(
     service: ServiceGetV2 = await catalog_service.get(
         product_name=product_name,
         user_id=user_id,
-        service_key=selected_solver.id,
-        service_version=oldest_release.version,
+        name=selected_solver.id,
+        version=oldest_release.version,
     )
     solver = to_solver(service)
     assert solver.id == selected_solver.id