refactor

Author: Andrei Neagu

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

@@ -1,5 +1,4 @@
-import urllib.parse
-from typing import Annotated, Any, cast
+from typing import Annotated, Any
 
 from fastapi import APIRouter, Depends
 from models_library.services import ServiceKey, ServiceVersion
@@ -11,12 +10,9 @@
 
 
 @router.get("/{service_key:path}/{service_version}/labels")
-async def get_service_labels(
+async def get_service_labels_(
     service_key: ServiceKey,
     service_version: ServiceVersion,
     director_client: Annotated[DirectorApi, Depends(get_director_api)],
 ) -> dict[str, Any]:
-    response = await director_client.get(
-        f"/services/{urllib.parse.quote_plus(service_key)}/{service_version}/labels"
-    )
-    return cast(dict[str, Any], response)
+    return await director_client.get_service_labels(service_key, service_version)

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

@@ -1,7 +1,7 @@
 import logging
 import urllib.parse
 from copy import deepcopy
-from typing import Annotated, Any, Final, cast
+from typing import Annotated, Any, Final
 
 import yaml
 from fastapi import APIRouter, Depends, HTTPException, status
@@ -131,12 +131,7 @@ async def _get_service_labels(
     director_client: DirectorApi, key: ServiceKey, version: ServiceVersion
 ) -> dict[str, Any] | None:
     try:
-        service_labels = cast(
-            dict[str, Any],
-            await director_client.get(
-                f"/services/{urllib.parse.quote_plus(key)}/{version}/labels"
-            ),
-        )
+        service_labels = await director_client.get_service_labels(key, version)
         _logger.debug(
             "received for %s %s",
             f"/services/{urllib.parse.quote_plus(key)}/{version}/labels",

services/catalog/src/simcore_service_catalog/services/director.py

@@ -4,7 +4,7 @@
 import urllib.parse
 from collections.abc import Awaitable, Callable
 from contextlib import suppress
-from typing import Any
+from typing import Any, cast
 
 import httpx
 from common_library.json_serialization import json_dumps
@@ -156,6 +156,16 @@ async def get_service(
         assert len(data) == 1  # nosec
         return ServiceMetaDataPublished.model_validate(data[0])
 
+    async def get_service_labels(
+        self,
+        service_key: ServiceKey,
+        service_version: ServiceVersion,
+    ) -> dict[str, Any]:
+        response = await self.get(
+            f"/services/{urllib.parse.quote_plus(service_key)}/{service_version}/labels"
+        )
+        return cast(dict[str, Any], response)
+
 
 async def setup_director(
     app: FastAPI, tracing_settings: TracingSettings | None