use catalog_service in ports listing

Author: bisgaard-itis

services/api-server/src/simcore_service_api_server/api/routes/solvers.py

@@ -20,10 +20,8 @@
 from ...models.schemas.errors import ErrorGet
 from ...models.schemas.model_adapter import ServicePricingPlanGetLegacy
 from ...models.schemas.solvers import Solver, SolverKeyId, SolverPort
-from ...services_http.catalog import CatalogApi
 from ..dependencies.application import get_reverse_url_mapper
 from ..dependencies.authentication import get_current_user_id, get_product_name
-from ..dependencies.services import get_api_client
 from ..dependencies.webserver_http import AuthSession, get_webserver_session
 from ._constants import (
     FMSG_CHANGELOG_NEW_IN_VERSION,
@@ -336,16 +334,17 @@ async def list_solver_ports(
     solver_key: SolverKeyId,
     version: VersionStr,
     user_id: Annotated[int, Depends(get_current_user_id)],
-    catalog_client: Annotated[CatalogApi, Depends(get_api_client(CatalogApi))],
+    catalog_service: Annotated[CatalogService, Depends()],
     product_name: Annotated[str, Depends(get_product_name)],
 ):
-    ports = await catalog_client.get_service_ports(
+    ports = await catalog_service.get_service_ports(
         user_id=user_id,
         name=solver_key,
         version=version,
         product_name=product_name,
     )
 
+    ports = [SolverPort.model_validate(port.model_dump()) for port in ports]
     return OnePage[SolverPort].model_validate(dict(items=ports))
 
 

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

@@ -1,22 +1,19 @@
-import asyncio
 import logging
 import urllib.parse
-from collections.abc import Callable
 from dataclasses import dataclass
 from functools import partial
 from typing import Final, Literal
 
 from fastapi import FastAPI, status
 from models_library.emails import LowerCaseEmailStr
 from models_library.products import ProductName
-from models_library.services import ServiceMetaDataPublished, ServiceType
+from models_library.services import ServiceMetaDataPublished
 from models_library.users import UserID
 from pydantic import ConfigDict, TypeAdapter
 from settings_library.catalog import CatalogSettings
 from settings_library.tracing import TracingSettings
 
 from ..exceptions.backend_errors import (
-    ListSolversOrStudiesError,
     ProgramOrSolverOrStudyNotFoundError,
 )
 from ..exceptions.service_errors_utils import service_exception_mapper
@@ -107,43 +104,6 @@ class CatalogApi(BaseServiceClientApi):
     SEE osparc-simcore/services/catalog/openapi.json
     """
 
-    @_exception_mapper(
-        http_status_map={status.HTTP_404_NOT_FOUND: ListSolversOrStudiesError}
-    )
-    async def list_services(
-        self,
-        *,
-        user_id: int,
-        product_name: str,
-        predicate: Callable[[TruncatedCatalogServiceOut], bool] | None = None,
-        type_filter: ServiceTypes,
-    ) -> list[TruncatedCatalogServiceOut]:
-
-        response = await self.client.get(
-            "/services",
-            params={"user_id": user_id, "details": True},
-            headers={"x-simcore-products-name": product_name},
-        )
-        response.raise_for_status()
-
-        services: list[
-            TruncatedCatalogServiceOut
-        ] = await asyncio.get_event_loop().run_in_executor(
-            None,
-            _parse_response,
-            TruncatedCatalogServiceOutListAdapter,
-            response,
-        )
-
-        services = [
-            service
-            for service in services
-            if service.service_type == ServiceType[type_filter]
-        ]
-        if predicate is not None:
-            services = [service for service in services if predicate(service)]
-        return services
-
     @_exception_mapper(
         http_status_map={status.HTTP_404_NOT_FOUND: ProgramOrSolverOrStudyNotFoundError}
     )
@@ -171,25 +131,6 @@ async def get_service_ports(
 
         return TypeAdapter(list[SolverPort]).validate_python(response.json())
 
-    async def list_service_releases(
-        self,
-        *,
-        user_id: int,
-        solver_key: SolverKeyId,
-        product_name: str,
-    ) -> list[Solver]:
-        def _this_solver(solver: Solver) -> bool:
-            return solver.id == solver_key
-
-        services = await self.list_services(
-            user_id=user_id,
-            predicate=None,
-            product_name=product_name,
-            type_filter="COMPUTATIONAL",
-        )
-        solvers = [service.to_solver() for service in services]
-        return [solver for solver in solvers if _this_solver(solver)]
-
 
 # MODULES APP SETUP -------------------------------------------------------------
 

services/api-server/tests/unit/api_solvers/test_api_routers_solvers.py

@@ -8,10 +8,12 @@
 import httpx
 import pytest
 import simcore_service_api_server.api.routes.solvers
+from pydantic import TypeAdapter
 from pytest_mock import MockFixture
 from respx import MockRouter
 from simcore_service_api_server._meta import API_VTAG
-from simcore_service_api_server.models.schemas.solvers import Solver
+from simcore_service_api_server.models.pagination import OnePage
+from simcore_service_api_server.models.schemas.solvers import Solver, SolverPort
 from starlette import status
 
 
@@ -140,3 +142,17 @@ async def test_list_solver_releases_with_mocked_catalog(
     solver_key = "simcore/services/comp/itis/sleeper"
     response = await client.get(f"/{API_VTAG}/solvers/{solver_key}/releases", auth=auth)
     assert response.status_code == status.HTTP_200_OK
+
+
+async def test_list_solver_ports_with_mocked_catalog(
+    client: httpx.AsyncClient,
+    mocked_rpc_catalog_service_api: dict,
+    auth: httpx.BasicAuth,
+):
+    solver_key = "simcore/services/comp/itis/sleeper"
+    solver_version = "3.2.1"
+    response = await client.get(
+        f"/{API_VTAG}/solvers/{solver_key}/releases/{solver_version}/ports", auth=auth
+    )
+    assert response.status_code == status.HTTP_200_OK
+    assert TypeAdapter(OnePage[SolverPort]).validate_python(response.json())