dropped enveloped response

Author: Andrei Neagu

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

@@ -1,7 +1,6 @@
 from typing import Annotated, Any
 
 from fastapi import APIRouter, Depends
-from models_library.generics import Envelope
 from models_library.services import ServiceKey, ServiceVersion
 
 from ...services.director import DirectorApi
@@ -16,7 +15,4 @@ async def get_service_extras(
     service_version: ServiceVersion,
     director_client: Annotated[DirectorApi, Depends(get_director_api)],
 ) -> dict[str, Any]:
-    service_extras = await director_client.get_service_extras(
-        service_key, service_version
-    )
-    return Envelope[dict[str, Any]](data=service_extras).model_dump(mode="json")
+    return await director_client.get_service_extras(service_key, service_version)

services/catalog/tests/unit/test_utils_service_extras.py

@@ -15,7 +15,7 @@ def mock_engine(app: FastAPI) -> None:
     app.state.engine = AsyncMock()
 
 
-async def test_get_service_labels(
+async def test_get_service_extras(
     postgres_setup_disabled: None,
     mocked_director_service_api: MockRouter,
     rabbitmq_and_rpc_setup_disabled: None,
@@ -28,4 +28,4 @@ async def test_get_service_labels(
     service_version = "3.0.0"
     result = await aclient.get(f"/v0/services/{service_key}/{service_version}/extras")
     assert result.status_code == status.HTTP_200_OK, result.text
-    assert result.json() == {"data": mock_service_extras, "error": None}
+    assert result.json() == mock_service_extras

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

@@ -16,7 +16,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__)
 
@@ -130,7 +129,7 @@ async def get_service_extras(
             f"/services/{urllib.parse.quote_plus(service_key)}/{service_version}/extras",
         )
         if resp.status_code == status.HTTP_200_OK:
-            return ServiceExtras.model_validate(unenvelope_or_raise_error(resp))
+            return ServiceExtras.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

@@ -219,9 +219,7 @@ def _mocked_services_details(
                 r"/services/simcore%2Fservices%2F(comp|dynamic|frontend)%2F[^/]+/\d+.\d+.\d+/extras"
             ),
             name="get_service_extras",
-        ).respond(
-            json={"data": fake_service_extras.model_dump(mode="json", by_alias=True)}
-        )
+        ).respond(json=fake_service_extras.model_dump(mode="json", by_alias=True))
         respx_mock.get(
             re.compile(
                 r"services/(?P<service_key>simcore%2Fservices%2F(comp|dynamic|frontend)%2F[^/]+)/(?P<service_version>[^\.]+.[^\.]+.[^/\?]+).*"