reroute getting labels

Author: Andrei Neagu

services/catalog/src/simcore_service_catalog/api/rest/_services_labels.py

@@ -16,8 +16,9 @@ async def get_service_labels(
     service_key: ServiceKey,
     service_version: ServiceVersion,
     director_client: Annotated[DirectorApi, Depends(get_director_api)],
-) -> Envelope[dict[str, Any]]:
+) -> Envelope[dict[str, Any]]:  # TODO: change the type
     response = await director_client.get(
         f"/services/{urllib.parse.quote_plus(service_key)}/{service_version}/labels"
     )
+    # TODO: remove the envelope since it does not make sense
     return Envelope[dict[str, Any]](data=cast(dict[str, Any], response))

services/director-v2/src/simcore_service_director_v2/api/routes/dynamic_services.py

@@ -17,13 +17,13 @@
 from models_library.projects import ProjectAtDB, ProjectID
 from models_library.projects_nodes_io import NodeID
 from models_library.service_settings_labels import SimcoreServiceLabels
-from models_library.services import ServiceKeyVersion
 from models_library.users import UserID
 from pydantic import NonNegativeFloat, NonNegativeInt
 from servicelib.fastapi.requests_decorators import cancel_on_disconnect
 from servicelib.logging_utils import log_decorator
 from servicelib.rabbitmq import RabbitMQClient
 from servicelib.utils import logged_gather
+from simcore_service_director_v2.api.dependencies.catalog import get_catalog_client
 from starlette import status
 from starlette.datastructures import URL
 from tenacity import RetryCallState, TryAgain
@@ -37,6 +37,7 @@
 from ...core.dynamic_services_settings import DynamicServicesSettings
 from ...core.dynamic_services_settings.scheduler import DynamicServicesSchedulerSettings
 from ...modules import projects_networks
+from ...modules.catalog import CatalogClient
 from ...modules.db.repositories.projects import ProjectsRepository
 from ...modules.db.repositories.projects_networks import ProjectsNetworksRepository
 from ...modules.director_v0 import DirectorV0Client
@@ -104,6 +105,7 @@ async def list_tracked_dynamic_services(
 @log_decorator(logger=logger)
 async def create_dynamic_service(
     service: DynamicServiceCreate,
+    catalog_client: CatalogClient,
     director_v0_client: Annotated[DirectorV0Client, Depends(get_director_v0_client)],
     dynamic_services_settings: Annotated[
         DynamicServicesSettings, Depends(get_dynamic_services_settings)
@@ -114,9 +116,7 @@ async def create_dynamic_service(
     x_simcore_user_agent: str = Header(...),
 ) -> DynamicServiceGet | RedirectResponse:
     simcore_service_labels: SimcoreServiceLabels = (
-        await director_v0_client.get_service_labels(
-            service=ServiceKeyVersion(key=service.key, version=service.version)
-        )
+        await catalog_client.get_service_labels(service.key, service.version)
     )
 
     # LEGACY (backwards compatibility)
@@ -324,7 +324,7 @@ async def update_projects_networks(
         ProjectsRepository, Depends(get_repository(ProjectsRepository))
     ],
     scheduler: Annotated[DynamicSidecarsScheduler, Depends(get_scheduler)],
-    director_v0_client: Annotated[DirectorV0Client, Depends(get_director_v0_client)],
+    catalog_client: Annotated[CatalogClient, Depends(get_catalog_client)],
     rabbitmq_client: Annotated[
         RabbitMQClient, Depends(get_rabbitmq_client_from_request)
     ],
@@ -334,7 +334,7 @@ async def update_projects_networks(
         projects_networks_repository=projects_networks_repository,
         projects_repository=projects_repository,
         scheduler=scheduler,
-        director_v0_client=director_v0_client,
+        catalog_client=catalog_client,
         rabbitmq_client=rabbitmq_client,
         project_id=project_id,
     )

services/director-v2/src/simcore_service_director_v2/cli/_core.py

@@ -16,6 +16,7 @@
 from rich.live import Live
 from rich.table import Table
 from servicelib.services_utils import get_service_from_key
+from simcore_service_director_v2.modules.catalog import CatalogClient
 from tenacity.asyncio import AsyncRetrying
 from tenacity.stop import stop_after_attempt
 from tenacity.wait import wait_random_exponential
@@ -25,7 +26,6 @@
 from ..models.dynamic_services_scheduler import DynamicSidecarNamesHelper
 from ..modules import db, director_v0, dynamic_sidecar
 from ..modules.db.repositories.projects import ProjectsRepository
-from ..modules.director_v0 import DirectorV0Client
 from ..modules.dynamic_sidecar import api_client
 from ..modules.projects_networks import requires_dynamic_sidecar
 from ..utils.db import get_repository
@@ -101,7 +101,7 @@ async def async_project_save_state(project_id: ProjectID, save_attempts: int) ->
             if not await requires_dynamic_sidecar(
                 service_key=node_content.key,
                 service_version=node_content.version,
-                director_v0_client=DirectorV0Client.instance(app),
+                catalog_client=CatalogClient.instance(app),
             ):
                 continue
 

services/director-v2/src/simcore_service_director_v2/modules/catalog.py

@@ -5,6 +5,7 @@
 
 import httpx
 from fastapi import FastAPI, HTTPException, status
+from models_library.service_settings_labels import SimcoreServiceLabels
 from models_library.services import ServiceKey, ServiceVersion
 from models_library.services_resources import ServiceResourcesDict
 from models_library.users import UserID
@@ -14,6 +15,7 @@
 from settings_library.tracing import TracingSettings
 
 from ..utils.client_decorators import handle_errors, handle_retry
+from ..utils.clients import unenvelope_or_raise_error
 
 logger = logging.getLogger(__name__)
 
@@ -107,6 +109,18 @@ async def get_service_resources(
             return json_response
         raise HTTPException(status_code=resp.status_code, detail=resp.content)
 
+    async def get_service_labels(
+        self, service_key: ServiceKey, service_version: ServiceVersion
+    ) -> SimcoreServiceLabels:
+        resp = await self.request(
+            "GET",
+            f"/services/{urllib.parse.quote( service_key, safe='')}/{service_version}/labels",
+        )
+        resp.raise_for_status()
+        if resp.status_code == status.HTTP_200_OK:
+            return SimcoreServiceLabels.model_validate(unenvelope_or_raise_error(resp))
+        raise HTTPException(status_code=resp.status_code, detail=resp.content)
+
     async def get_service_specifications(
         self, user_id: UserID, service_key: ServiceKey, service_version: ServiceVersion
     ) -> dict[str, Any]:

services/director-v2/src/simcore_service_director_v2/modules/db/repositories/comp_tasks/_utils.py

@@ -150,7 +150,7 @@ async def _get_node_infos(
     ] = await asyncio.gather(
         _get_service_details(catalog_client, user_id, product_name, node),
         director_client.get_service_extras(node.key, node.version),
-        director_client.get_service_labels(node),
+        catalog_client.get_service_labels(node.key, node.version),
     )
     return result
 

services/director-v2/src/simcore_service_director_v2/modules/director_v0.py

@@ -14,8 +14,7 @@
 from models_library.api_schemas_directorv2.services import ServiceExtras
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
-from models_library.service_settings_labels import SimcoreServiceLabels
-from models_library.services import ServiceKey, ServiceKeyVersion, ServiceVersion
+from models_library.services import ServiceKey, ServiceVersion
 from models_library.users import UserID
 from servicelib.fastapi.tracing import setup_httpx_client_tracing
 from servicelib.logging_utils import log_decorator
@@ -107,19 +106,6 @@ async def get_running_service_details(
             )
         raise HTTPException(status_code=resp.status_code, detail=resp.content)
 
-    @log_decorator(logger=logger)
-    async def get_service_labels(
-        self, service: ServiceKeyVersion
-    ) -> SimcoreServiceLabels:
-        resp = await self._request(
-            "GET",
-            f"services/{urllib.parse.quote_plus(service.key)}/{service.version}/labels",
-        )
-        resp.raise_for_status()
-        if resp.status_code == status.HTTP_200_OK:
-            return SimcoreServiceLabels.model_validate(unenvelope_or_raise_error(resp))
-        raise HTTPException(status_code=resp.status_code, detail=resp.content)
-
     @log_decorator(logger=logger)
     async def get_running_services(
         self, user_id: UserID | None = None, project_id: ProjectID | None = None

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/settings.py

@@ -14,7 +14,6 @@
     SimcoreServiceSettingLabelEntry,
     SimcoreServiceSettingsLabel,
 )
-from models_library.services import ServiceKeyVersion
 from models_library.services_resources import (
     CPU_100_PERCENT,
     DEFAULT_SINGLE_SERVICE_NAME,
@@ -29,7 +28,7 @@
     MATCH_SERVICE_VERSION,
 )
 
-from ....modules.director_v0 import DirectorV0Client
+from ....modules.catalog import CatalogClient
 from ..errors import DynamicSidecarError
 
 BOOT_OPTION_PREFIX = "DY_BOOT_OPTION"
@@ -193,7 +192,7 @@ def _assemble_key(service_key: str, service_tag: str) -> str:
 
 
 async def _extract_osparc_involved_service_labels(
-    director_v0_client: DirectorV0Client,
+    catalog_client: CatalogClient,
     service_key: str,
     service_tag: str,
     service_labels: SimcoreServiceLabels,
@@ -252,10 +251,8 @@ def remap_to_compose_spec_key() -> dict[str, SimcoreServiceLabels]:
         reverse_mapping[involved_key] = compose_service_key
 
         simcore_service_labels: SimcoreServiceLabels = (
-            await director_v0_client.get_service_labels(
-                service=ServiceKeyVersion(
-                    key=current_service_key, version=current_service_tag
-                )
+            await catalog_client.get_service_labels(
+                current_service_key, current_service_tag
             )
         )
         docker_image_name_by_services[involved_key] = simcore_service_labels
@@ -432,14 +429,12 @@ def _assemble_env_vars_for_boot_options(
 
 
 async def get_labels_for_involved_services(
-    director_v0_client: DirectorV0Client,
+    catalog_client: CatalogClient,
     service_key: ServiceKey,
     service_tag: ServiceVersion,
 ) -> dict[str, SimcoreServiceLabels]:
     simcore_service_labels: SimcoreServiceLabels = (
-        await director_v0_client.get_service_labels(
-            service=ServiceKeyVersion(key=service_key, version=service_tag)
-        )
+        await catalog_client.get_service_labels(service_key, service_tag)
     )
     log.info(
         "image=%s, tag=%s, labels=%s", service_key, service_tag, simcore_service_labels
@@ -451,7 +446,7 @@ async def get_labels_for_involved_services(
     labels_for_involved_services: dict[
         str, SimcoreServiceLabels
     ] = await _extract_osparc_involved_service_labels(
-        director_v0_client=director_v0_client,
+        catalog_client=catalog_client,
         service_key=service_key,
         service_tag=service_tag,
         service_labels=simcore_service_labels,
@@ -461,7 +456,7 @@ async def get_labels_for_involved_services(
 
 
 async def merge_settings_before_use(
-    director_v0_client: DirectorV0Client,
+    catalog_client: CatalogClient,
     *,
     service_key: ServiceKey,
     service_tag: ServiceVersion,
@@ -470,7 +465,7 @@ async def merge_settings_before_use(
     placement_substitutions: dict[str, DockerPlacementConstraint],
 ) -> SimcoreServiceSettingsLabel:
     labels_for_involved_services = await get_labels_for_involved_services(
-        director_v0_client=director_v0_client,
+        catalog_client=catalog_client,
         service_key=service_key,
         service_tag=service_tag,
     )

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/scheduler/_core/_event_create_sidecars.py

@@ -188,8 +188,10 @@ async def action(cls, app: FastAPI, scheduler_data: SchedulerData) -> None:
         )
         _logger.info("%s", f"{boot_options=}")
 
+        catalog_client = CatalogClient.instance(app)
+
         settings: SimcoreServiceSettingsLabel = await merge_settings_before_use(
-            director_v0_client=director_v0_client,
+            catalog_client=catalog_client,
             service_key=scheduler_data.key,
             service_tag=scheduler_data.version,
             service_user_selection_boot_options=boot_options,
@@ -257,7 +259,6 @@ async def action(cls, app: FastAPI, scheduler_data: SchedulerData) -> None:
             rpc_client=rpc_client,
         )
 
-        catalog_client = CatalogClient.instance(app)
         user_specific_service_spec = (
             await catalog_client.get_service_specifications(
                 scheduler_data.user_id, scheduler_data.key, scheduler_data.version

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/scheduler/_core/_events_user_services.py

@@ -5,7 +5,7 @@
 from models_library.projects import ProjectAtDB
 from models_library.projects_nodes_io import NodeIDStr
 from models_library.service_settings_labels import SimcoreServiceLabels
-from models_library.services import ServiceKeyVersion, ServiceVersion
+from models_library.services import ServiceVersion
 from models_library.services_creation import CreateServiceMetricsAdditionalParams
 from pydantic import TypeAdapter
 from servicelib.fastapi.long_running_tasks.client import TaskId
@@ -19,16 +19,15 @@
     DynamicServicesSchedulerSettings,
 )
 from .....models.dynamic_services_scheduler import SchedulerData
+from .....modules.catalog import CatalogClient
 from .....modules.instrumentation import get_instrumentation, get_metrics_labels
 from .....utils.db import get_repository
 from ....db.repositories.groups_extra_properties import GroupsExtraPropertiesRepository
 from ....db.repositories.projects import ProjectsRepository
 from ....db.repositories.users import UsersRepository
-from ....director_v0 import DirectorV0Client
 from ...api_client import get_sidecars_client
 from ...docker_compose_specs import assemble_spec
 from ...errors import EntrypointContainerNotFoundError
-from ._events_utils import get_director_v0_client
 
 _logger = logging.getLogger(__name__)
 
@@ -63,12 +62,10 @@ async def submit_compose_sepc(app: FastAPI, scheduler_data: SchedulerData) -> No
     # creates a docker compose spec given the service key and tag
     # fetching project form DB and fetching user settings
 
-    director_v0_client: DirectorV0Client = get_director_v0_client(app)
+    catalog_client = CatalogClient.instance(app)
     simcore_service_labels: SimcoreServiceLabels = (
-        await director_v0_client.get_service_labels(
-            service=ServiceKeyVersion(
-                key=scheduler_data.key, version=scheduler_data.version
-            )
+        await catalog_client.get_service_labels(
+            scheduler_data.key, scheduler_data.version
         )
     )
 

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/scheduler/_core/_events_utils.py

@@ -12,7 +12,6 @@
 from models_library.projects_nodes_io import NodeID, NodeIDStr
 from models_library.rabbitmq_messages import InstrumentationRabbitMessage
 from models_library.service_settings_labels import SimcoreServiceLabels
-from models_library.services import ServiceKeyVersion
 from models_library.shared_user_preferences import (
     AllowMetricsCollectionFrontendUserPreference,
 )
@@ -52,6 +51,7 @@
     DockerStatus,
     SchedulerData,
 )
+from .....modules.catalog import CatalogClient
 from .....modules.instrumentation import (
     get_instrumentation,
     get_metrics_labels,
@@ -534,12 +534,10 @@ async def _restore_service_state_with_metrics() -> None:
     await limited_gather(*tasks, limit=3)
 
     # inside this directory create the missing dirs, fetch those form the labels
-    director_v0_client: DirectorV0Client = get_director_v0_client(app)
+    catalog_client = CatalogClient.instance(app)
     simcore_service_labels: SimcoreServiceLabels = (
-        await director_v0_client.get_service_labels(
-            service=ServiceKeyVersion(
-                key=scheduler_data.key, version=scheduler_data.version
-            )
+        await catalog_client.get_service_labels(
+            scheduler_data.key, scheduler_data.version
         )
     )
     service_outputs_labels = json.loads(