remove remnants of http catalog service

Author: bisgaard-itis

packages/pytest-simcore/src/pytest_simcore/helpers/faker_catalog.py

@@ -12,7 +12,7 @@
 from .._meta import API_VERSION, API_VTAG, APP_NAME
 from ..api.root import create_router
 from ..api.routes.health import router as health_router
-from ..services_http import catalog, director_v2, storage, webserver
+from ..services_http import director_v2, storage, webserver
 from ..services_http.rabbitmq import setup_rabbitmq
 from ._prometheus_instrumentation import setup_prometheus_instrumentation
 from .events import create_start_app_handler, create_stop_app_handler
@@ -93,13 +93,6 @@ def init_app(settings: ApplicationSettings | None = None) -> FastAPI:
             tracing_settings=settings.API_SERVER_TRACING,
         )
 
-    if settings.API_SERVER_CATALOG:
-        catalog.setup(
-            app,
-            settings.API_SERVER_CATALOG,
-            tracing_settings=settings.API_SERVER_TRACING,
-        )
-
     if settings.API_SERVER_STORAGE:
         storage.setup(
             app,

services/api-server/src/simcore_service_api_server/core/application.py

@@ -13,7 +13,6 @@
 )
 from servicelib.logging_utils_filtering import LoggerName, MessageSubstring
 from settings_library.base import BaseCustomSettings
-from settings_library.catalog import CatalogSettings
 from settings_library.director_v2 import DirectorV2Settings
 from settings_library.postgres import PostgresSettings
 from settings_library.rabbit import RabbitSettings
@@ -123,9 +122,6 @@ class ApplicationSettings(BasicSettings):
         WebServerSettings | None,
         Field(json_schema_extra={"auto_default_from_env": True}),
     ]
-    API_SERVER_CATALOG: Annotated[
-        CatalogSettings | None, Field(json_schema_extra={"auto_default_from_env": True})
-    ]
     API_SERVER_STORAGE: Annotated[
         StorageSettings | None, Field(json_schema_extra={"auto_default_from_env": True})
     ]

services/api-server/src/simcore_service_api_server/core/settings.py

@@ -4,16 +4,14 @@
 
 
 from collections.abc import AsyncIterable, Callable
-from copy import deepcopy
 from datetime import datetime, timedelta
-from typing import Any, Final
+from typing import Final
 
 import httpx
 import pytest
 from fastapi import FastAPI, status
 from fastapi.encoders import jsonable_encoder
 from models_library.projects_state import RunningState
-from pytest_simcore.helpers import faker_catalog
 from respx import MockRouter
 from simcore_service_api_server.core.settings import ApplicationSettings
 from simcore_service_api_server.services_http.director_v2 import ComputationTaskGet
@@ -43,52 +41,6 @@ def mocked_webserver_rest_api(
     return mocked_webserver_rest_api_base
 
 
-@pytest.fixture
-def mocked_catalog_rest_api(
-    app: FastAPI,
-    mocked_catalog_rest_api_base: MockRouter,
-    catalog_service_openapi_specs: dict[str, Any],
-) -> MockRouter:
-    respx_mock = mocked_catalog_rest_api_base
-    openapi = deepcopy(catalog_service_openapi_specs)
-    schemas = openapi["components"]["schemas"]
-
-    respx_mock.get(
-        "/v0/services?user_id=1&details=false", name="list_services"
-    ).respond(
-        200,
-        json=[
-            # one solver
-            faker_catalog.create_service_out(
-                key="simcore/services/comp/foo", name="foo"
-            ),
-            # two version of the same solver
-            faker_catalog.create_service_out(version="0.0.1"),
-            faker_catalog.create_service_out(version="1.0.1"),
-            # not a solver
-            faker_catalog.create_service_out(type="dynamic"),
-        ],
-    )
-
-    # -----
-    # NOTE: we could use https://python-jsonschema.readthedocs.io/en/stable/
-    #
-
-    respx_mock.get(
-        # NOTE: regex does not work even if tested https://regex101.com/r/drVAGr/1
-        # path__regex=r"/v0/services/(?P<service_key>[\w/%]+)/(?P<service_version>[\d\.]+)/ports\?user_id=(?P<user_id>\d+)",
-        path__startswith="/v0/services/simcore/services/comp/itis/sleeper/2.1.4/ports",
-        name="list_service_ports",
-    ).respond(
-        200,
-        json=[
-            schemas["ServicePortGet"]["example"],
-        ],
-    )
-
-    return respx_mock
-
-
 @pytest.fixture
 async def mocked_directorv2_rest_api(
     mocked_directorv2_rest_api_base,