remove envelope

Author: Andrei Neagu

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

@@ -2,7 +2,6 @@
 from typing import Annotated, Any, cast
 
 from fastapi import APIRouter, Depends
-from models_library.generics import Envelope
 from models_library.services import ServiceKey, ServiceVersion
 
 from ...services.director import DirectorApi
@@ -16,9 +15,8 @@ async def get_service_labels(
     service_key: ServiceKey,
     service_version: ServiceVersion,
     director_client: Annotated[DirectorApi, Depends(get_director_api)],
-) -> Envelope[dict[str, Any]]:  # TODO: change the type
+) -> dict[str, Any]:
     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))
+    return cast(dict[str, Any], response)

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

@@ -15,7 +15,6 @@
 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__)
 
@@ -118,7 +117,7 @@ async def get_service_labels(
         )
         resp.raise_for_status()
         if resp.status_code == status.HTTP_200_OK:
-            return SimcoreServiceLabels.model_validate(unenvelope_or_raise_error(resp))
+            return SimcoreServiceLabels.model_validate(resp)
         raise HTTPException(status_code=resp.status_code, detail=resp.content)
 
     async def get_service_specifications(

services/director-v2/tests/unit/with_dbs/comp_scheduler/test_api_route_computations.py

@@ -222,7 +222,7 @@ def _mocked_services_details(
                 r"/services/simcore%2Fservices%2F(comp|dynamic|frontend)%2F[^/]+/\d+.\d+.\d+/labels"
             ),
             name="get_service_labels",
-        ).respond(json={"data": fake_service_labels})
+        ).respond(json=fake_service_labels)
         respx_mock.get(
             re.compile(
                 r"services/(?P<service_key>simcore%2Fservices%2F(comp|dynamic|frontend)%2F[^/]+)/(?P<service_version>[^\.]+.[^\.]+.[^/\?]+).*"

services/director-v2/tests/unit/with_dbs/test_api_route_dynamic_services.py

@@ -223,7 +223,7 @@ def mocked_catalog_service_api(
         respx_mock.get(
             f"/services/{urllib.parse.quote_plus(service['key'])}/{service['version']}/labels",
             name="service labels",
-        ).respond(json={"data": service_labels})
+        ).respond(json=service_labels)
 
         yield respx_mock