fix tests after removing http catalog client

Author: bisgaard-itis

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

@@ -1,6 +1,5 @@
-""" Dependences with any other services (except webserver)
+"""Dependences with any other services (except webserver)"""
 
-"""
 from collections.abc import Callable
 
 from fastapi import HTTPException, Request, status
@@ -15,7 +14,6 @@ def get_api_client(client_type: type[BaseServiceClientApi]) -> Callable:
     Usage:
 
         director_client: DirectorApi = Depends(get_api_client(DirectorApi)),
-        catalog_client: CatalogApi = Depends(get_api_client(CatalogApi)),
         storage_client: StorageApi = Depends(get_api_client(StorageApi)),
     """
     assert issubclass(client_type, BaseServiceClientApi)  # nosec

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

@@ -10,7 +10,6 @@
 
 from ..._meta import API_VERSION, PROJECT_NAME
 from ...core.health_checker import ApiServerHealthChecker, get_health_checker
-from ...services_http.catalog import CatalogApi
 from ...services_http.director_v2 import DirectorV2Api
 from ...services_http.storage import StorageApi
 from ...services_http.webserver import WebserverApi
@@ -22,7 +21,7 @@
 
 @router.get("/", include_in_schema=False, response_class=PlainTextResponse)
 async def check_service_health(
-    health_checker: Annotated[ApiServerHealthChecker, Depends(get_health_checker)]
+    health_checker: Annotated[ApiServerHealthChecker, Depends(get_health_checker)],
 ):
     if not health_checker.healthy:
         raise HTTPException(
@@ -39,14 +38,12 @@ async def check_service_health(
     response_model_exclude_unset=True,
 )
 async def get_service_state(
-    catalog_client: Annotated[CatalogApi, Depends(get_api_client(CatalogApi))],
     director2_api: Annotated[DirectorV2Api, Depends(get_api_client(DirectorV2Api))],
     storage_client: Annotated[StorageApi, Depends(get_api_client(StorageApi))],
     webserver_client: Annotated[WebserverApi, Depends(get_api_client(WebserverApi))],
     url_for: Annotated[Callable, Depends(get_reverse_url_mapper)],
 ):
     apis = (
-        catalog_client,
         director2_api,
         storage_client,
         webserver_client,

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

@@ -10,7 +10,6 @@
 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.pagination import OnePage
 from simcore_service_api_server.models.schemas.solvers import Solver, SolverPort
@@ -20,7 +19,6 @@
 @pytest.mark.skip(reason="Still under development. Currently using fake implementation")
 async def test_list_solvers(
     client: httpx.AsyncClient,
-    mocked_catalog_rest_api: MockRouter,
     mocker: MockFixture,
 ):
     warn = mocker.patch.object(
@@ -65,7 +63,7 @@ async def test_list_solvers(
 
 
 async def test_list_solver_ports(
-    mocked_catalog_rest_api: MockRouter,
+    mocked_rpc_catalog_service_api: dict,
     client: httpx.AsyncClient,
     auth: httpx.BasicAuth,
 ):
@@ -76,7 +74,7 @@ async def test_list_solver_ports(
     assert resp.status_code == status.HTTP_200_OK
 
     assert resp.json() == {
-        "total": 1,
+        "total": 2,
         "items": [
             {
                 "key": "input_1",
@@ -89,6 +87,15 @@ async def test_list_solver_ports(
                     "maximum": 5,
                 },
             },
+            {
+                "key": "output_1",
+                "kind": "output",
+                "content_schema": {
+                    "description": "Integer is generated in range [1-9]",
+                    "title": "File containing one random integer",
+                    "type": "string",
+                },
+            },
         ],
     }
 

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

@@ -30,7 +30,6 @@ def healthy(self) -> bool:
 
 async def test_get_service_state(
     client: AsyncClient,
-    mocked_catalog_rest_api_base: MockRouter,
     mocked_directorv2_rest_api_base: MockRouter,
     mocked_storage_rest_api_base: MockRouter,
     mocked_webserver_rest_api_base: MockRouter,
@@ -45,7 +44,6 @@ async def test_get_service_state(
         "app_name": "simcore-service-api-server",
         "version": version_file.read_text().strip(),
         "services": {
-            "catalog": {"healthy": True},
             "director_v2": {"healthy": True},
             "storage": {"healthy": True},
             "webserver": {"healthy": True},

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

@@ -77,7 +77,6 @@ def app_environment(
 @pytest.fixture
 def mock_missing_plugins(app_environment: EnvVarsDict, mocker: MockerFixture):
     mocker.patch("simcore_service_api_server.core.application.webserver.setup")
-    mocker.patch("simcore_service_api_server.core.application.catalog.setup")
     mocker.patch("simcore_service_api_server.core.application.storage.setup")