fixed failing tests

Author: Andrei Neagu

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

@@ -66,7 +66,7 @@ def create(cls, app: FastAPI, **kwargs):
 
     @classmethod
     def instance(cls, app: FastAPI) -> "CatalogClient":
-        assert type(app.state.catalog_client) == CatalogClient  # nosec
+        assert isinstance(app.state.catalog_client, CatalogClient)  # nosec
         return app.state.catalog_client
 
     @handle_errors("Catalog", logger)

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

@@ -135,7 +135,6 @@ def mocked_director_service_fcts(
     minimal_app: FastAPI,
     fake_service_details: ServiceMetaDataPublished,
     fake_service_extras: ServiceExtras,
-    fake_service_labels: dict[str, Any],
 ) -> Iterator[respx.MockRouter]:
     # pylint: disable=not-context-manager
     with respx.mock(
@@ -151,12 +150,6 @@ def mocked_director_service_fcts(
         ).respond(
             json={"data": [fake_service_details.model_dump(mode="json", by_alias=True)]}
         )
-        respx_mock.get(
-            re.compile(
-                r"/services/simcore%2Fservices%2F(comp|dynamic|frontend)%2F[^/]+/\d+.\d+.\d+/labels"
-            ),
-            name="get_service_labels",
-        ).respond(json={"data": fake_service_labels})
 
         respx_mock.get(
             re.compile(
@@ -175,6 +168,7 @@ def mocked_catalog_service_fcts(
     minimal_app: FastAPI,
     fake_service_details: ServiceMetaDataPublished,
     fake_service_resources: ServiceResourcesDict,
+    fake_service_labels: dict[str, Any],
 ) -> Iterator[respx.MockRouter]:
     def _mocked_service_resources(request) -> httpx.Response:
         return httpx.Response(
@@ -223,6 +217,12 @@ def _mocked_services_details(
             ),
             name="get_service_resources",
         ).mock(side_effect=_mocked_service_resources)
+        respx_mock.get(
+            re.compile(
+                r"/services/simcore%2Fservices%2F(comp|dynamic|frontend)%2F[^/]+/\d+.\d+.\d+/labels"
+            ),
+            name="get_service_labels",
+        ).respond(json={"data": fake_service_labels})
         respx_mock.get(
             re.compile(
                 r"services/(?P<service_key>simcore%2Fservices%2F(comp|dynamic|frontend)%2F[^/]+)/(?P<service_version>[^\.]+.[^\.]+.[^/\?]+).*"
@@ -238,7 +238,7 @@ def mocked_catalog_service_fcts_deprecated(
     minimal_app: FastAPI,
     fake_service_details: ServiceMetaDataPublished,
     fake_service_extras: ServiceExtras,
-):
+) -> Iterator[respx.MockRouter]:
     def _mocked_services_details(
         request, service_key: str, service_version: str
     ) -> httpx.Response:
@@ -259,7 +259,7 @@ def _mocked_services_details(
         }
 
         data = {
-            **ServiceGet.model_config["json_schema_extra"]["examples"][0],
+            **ServiceGet.model_json_schema()["examples"][0],
             **data_published,
             **deprecated,
         }  # type: ignore
@@ -402,8 +402,8 @@ async def test_computation_create_validators(
 
 async def test_create_computation(
     minimal_configuration: None,
-    mocked_director_service_fcts,
-    mocked_catalog_service_fcts,
+    mocked_director_service_fcts: respx.MockRouter,
+    mocked_catalog_service_fcts: respx.MockRouter,
     product_name: str,
     fake_workbench_without_outputs: dict[str, Any],
     registered_user: Callable[..., dict[str, Any]],
@@ -678,8 +678,8 @@ async def test_create_computation_with_wallet_with_no_clusters_keeper_raises_503
 
 async def test_start_computation_without_product_fails(
     minimal_configuration: None,
-    mocked_director_service_fcts,
-    mocked_catalog_service_fcts,
+    mocked_director_service_fcts: respx.MockRouter,
+    mocked_catalog_service_fcts: respx.MockRouter,
     product_name: str,
     fake_workbench_without_outputs: dict[str, Any],
     registered_user: Callable[..., dict[str, Any]],
@@ -702,8 +702,8 @@ async def test_start_computation_without_product_fails(
 
 async def test_start_computation(
     minimal_configuration: None,
-    mocked_director_service_fcts,
-    mocked_catalog_service_fcts,
+    mocked_director_service_fcts: respx.MockRouter,
+    mocked_catalog_service_fcts: respx.MockRouter,
     product_name: str,
     fake_workbench_without_outputs: dict[str, Any],
     registered_user: Callable[..., dict[str, Any]],
@@ -734,8 +734,8 @@ async def test_start_computation(
 
 async def test_start_computation_with_project_node_resources_defined(
     minimal_configuration: None,
-    mocked_director_service_fcts,
-    mocked_catalog_service_fcts,
+    mocked_director_service_fcts: respx.MockRouter,
+    mocked_catalog_service_fcts: respx.MockRouter,
     product_name: str,
     fake_workbench_without_outputs: dict[str, Any],
     registered_user: Callable[..., dict[str, Any]],
@@ -779,8 +779,8 @@ async def test_start_computation_with_project_node_resources_defined(
 
 async def test_start_computation_with_deprecated_services_raises_406(
     minimal_configuration: None,
-    mocked_director_service_fcts,
-    mocked_catalog_service_fcts_deprecated,
+    mocked_director_service_fcts: respx.MockRouter,
+    mocked_catalog_service_fcts_deprecated: respx.MockRouter,
     product_name: str,
     fake_workbench_without_outputs: dict[str, Any],
     fake_workbench_adjacency: dict[str, Any],

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

@@ -163,17 +163,11 @@ async def mock_retrieve_features(
     ) as respx_mock:
         if is_legacy:
             service_details = RunningDynamicServiceDetails.model_validate(
-                RunningDynamicServiceDetails.model_config["json_schema_extra"][
-                    "examples"
-                ][0]
+                RunningDynamicServiceDetails.model_json_schema()["examples"][0]
             )
             respx_mock.post(
                 f"{service_details.legacy_service_url}/retrieve", name="retrieve"
-            ).respond(
-                json=RetrieveDataOutEnveloped.model_config["json_schema_extra"][
-                    "examples"
-                ][0]
-            )
+            ).respond(json=RetrieveDataOutEnveloped.model_json_schema()["examples"][0])
 
             yield respx_mock
             # no cleanup required
@@ -215,6 +209,25 @@ async def _mocked_context_manger(*args, **kwargs) -> AsyncIterator[int]:
             )
 
 
+@pytest.fixture
+def mocked_catalog_service_api(
+    minimal_app: FastAPI, service: dict[str, Any], service_labels: dict[str, Any]
+) -> Iterator[MockRouter]:
+    # pylint: disable=not-context-manager
+    with respx.mock(
+        base_url=minimal_app.state.settings.DIRECTOR_V2_CATALOG.api_base_url,
+        assert_all_called=False,
+        assert_all_mocked=True,
+    ) as respx_mock:
+        # get services labels
+        respx_mock.get(
+            f"/services/{urllib.parse.quote_plus(service['key'])}/{service['version']}/labels",
+            name="service labels",
+        ).respond(json={"data": service_labels})
+
+        yield respx_mock
+
+
 @pytest.fixture
 def mocked_director_v0_service_api(
     minimal_app: FastAPI, service: dict[str, Any], service_labels: dict[str, Any]
@@ -236,9 +249,7 @@ def mocked_director_v0_service_api(
             name="running interactive service",
         ).respond(
             json={
-                "data": RunningDynamicServiceDetails.model_config["json_schema_extra"][
-                    "examples"
-                ][0]
+                "data": RunningDynamicServiceDetails.model_json_schema()["examples"][0]
             }
         )
 
@@ -255,9 +266,7 @@ def get_stack_status(node_uuid: NodeID) -> RunningDynamicServiceDetails:
             raise DynamicSidecarNotFoundError(node_uuid=node_uuid)
 
         return RunningDynamicServiceDetails.model_validate(
-            RunningDynamicServiceDetails.model_config["json_schema_extra"]["examples"][
-                0
-            ]
+            RunningDynamicServiceDetails.model_json_schema()["examples"][0]
         )
 
     module_base = "simcore_service_director_v2.modules.dynamic_sidecar.scheduler"
@@ -289,9 +298,7 @@ def remove_service(node_uuid: NodeID, *ars: Any, **kwargs: Any) -> None:
     [
         pytest.param(
             *ServiceParams(
-                service=DynamicServiceCreate.model_config["json_schema_extra"][
-                    "example"
-                ],
+                service=DynamicServiceCreate.model_json_schema()["example"],
                 service_labels=SimcoreServiceLabels.model_json_schema()["examples"][0],
                 exp_status_code=status.HTTP_307_TEMPORARY_REDIRECT,
                 is_legacy=True,
@@ -300,9 +307,7 @@ def remove_service(node_uuid: NodeID, *ars: Any, **kwargs: Any) -> None:
         ),
         pytest.param(
             *ServiceParams(
-                service=DynamicServiceCreate.model_config["json_schema_extra"][
-                    "example"
-                ],
+                service=DynamicServiceCreate.model_json_schema()["example"],
                 service_labels=SimcoreServiceLabels.model_json_schema()["examples"][1],
                 exp_status_code=status.HTTP_201_CREATED,
                 is_legacy=False,
@@ -311,9 +316,7 @@ def remove_service(node_uuid: NodeID, *ars: Any, **kwargs: Any) -> None:
         ),
         pytest.param(
             *ServiceParams(
-                service=DynamicServiceCreate.model_config["json_schema_extra"][
-                    "example"
-                ],
+                service=DynamicServiceCreate.model_json_schema()["example"],
                 service_labels=SimcoreServiceLabels.model_json_schema()["examples"][2],
                 exp_status_code=status.HTTP_201_CREATED,
                 is_legacy=False,
@@ -325,6 +328,7 @@ def remove_service(node_uuid: NodeID, *ars: Any, **kwargs: Any) -> None:
 def test_create_dynamic_services(
     minimal_config: None,
     mocked_director_v0_service_api: MockRouter,
+    mocked_catalog_service_api: MockRouter,
     mocked_director_v2_scheduler: None,
     client: TestClient,
     dynamic_sidecar_headers: dict[str, str],
@@ -367,9 +371,7 @@ def test_create_dynamic_services(
     [
         pytest.param(
             *ServiceParams(
-                service=DynamicServiceCreate.model_config["json_schema_extra"][
-                    "example"
-                ],
+                service=DynamicServiceCreate.model_json_schema()["example"],
                 service_labels=SimcoreServiceLabels.model_json_schema()["examples"][0],
                 exp_status_code=status.HTTP_307_TEMPORARY_REDIRECT,
                 is_legacy=True,
@@ -378,9 +380,7 @@ def test_create_dynamic_services(
         ),
         pytest.param(
             *ServiceParams(
-                service=DynamicServiceCreate.model_config["json_schema_extra"][
-                    "example"
-                ],
+                service=DynamicServiceCreate.model_json_schema()["example"],
                 service_labels=SimcoreServiceLabels.model_json_schema()["examples"][1],
                 exp_status_code=status.HTTP_200_OK,
                 is_legacy=False,
@@ -389,9 +389,7 @@ def test_create_dynamic_services(
         ),
         pytest.param(
             *ServiceParams(
-                service=DynamicServiceCreate.model_config["json_schema_extra"][
-                    "example"
-                ],
+                service=DynamicServiceCreate.model_json_schema()["example"],
                 service_labels=SimcoreServiceLabels.model_json_schema()["examples"][2],
                 exp_status_code=status.HTTP_200_OK,
                 is_legacy=False,
@@ -402,6 +400,7 @@ def test_create_dynamic_services(
 )
 def test_get_service_status(
     mocked_director_v0_service_api: MockRouter,
+    mocked_catalog_service_api: MockRouter,
     mocked_director_v2_scheduler: None,
     client: TestClient,
     service: dict[str, Any],
@@ -431,9 +430,7 @@ def test_get_service_status(
     [
         pytest.param(
             *ServiceParams(
-                service=DynamicServiceCreate.model_config["json_schema_extra"][
-                    "example"
-                ],
+                service=DynamicServiceCreate.model_json_schema()["example"],
                 service_labels=SimcoreServiceLabels.model_json_schema()["examples"][0],
                 exp_status_code=status.HTTP_307_TEMPORARY_REDIRECT,
                 is_legacy=True,
@@ -442,9 +439,7 @@ def test_get_service_status(
         ),
         pytest.param(
             *ServiceParams(
-                service=DynamicServiceCreate.model_config["json_schema_extra"][
-                    "example"
-                ],
+                service=DynamicServiceCreate.model_json_schema()["example"],
                 service_labels=SimcoreServiceLabels.model_json_schema()["examples"][1],
                 exp_status_code=status.HTTP_204_NO_CONTENT,
                 is_legacy=False,
@@ -453,9 +448,7 @@ def test_get_service_status(
         ),
         pytest.param(
             *ServiceParams(
-                service=DynamicServiceCreate.model_config["json_schema_extra"][
-                    "example"
-                ],
+                service=DynamicServiceCreate.model_json_schema()["example"],
                 service_labels=SimcoreServiceLabels.model_json_schema()["examples"][2],
                 exp_status_code=status.HTTP_204_NO_CONTENT,
                 is_legacy=False,
@@ -470,6 +463,7 @@ def test_get_service_status(
 def test_delete_service(
     docker_swarm: None,
     mocked_director_v0_service_api: MockRouter,
+    mocked_catalog_service_api: MockRouter,
     mocked_director_v2_scheduler: None,
     mocked_service_awaits_manual_interventions: None,
     client: TestClient,
@@ -509,9 +503,7 @@ def dynamic_sidecar_scheduler(minimal_app: FastAPI) -> DynamicSidecarsScheduler:
     [
         pytest.param(
             *ServiceParams(
-                service=DynamicServiceCreate.model_config["json_schema_extra"][
-                    "example"
-                ],
+                service=DynamicServiceCreate.model_json_schema()["example"],
                 service_labels=SimcoreServiceLabels.model_json_schema()["examples"][1],
                 exp_status_code=status.HTTP_201_CREATED,
                 is_legacy=False,
@@ -522,6 +514,7 @@ def dynamic_sidecar_scheduler(minimal_app: FastAPI) -> DynamicSidecarsScheduler:
 def test_delete_service_waiting_for_manual_intervention(
     minimal_config: None,
     mocked_director_v0_service_api: MockRouter,
+    mocked_catalog_service_api: MockRouter,
     mocked_director_v2_scheduler: None,
     client: TestClient,
     dynamic_sidecar_headers: dict[str, str],
@@ -558,9 +551,7 @@ def test_delete_service_waiting_for_manual_intervention(
     [
         pytest.param(
             *ServiceParams(
-                service=DynamicServiceCreate.model_config["json_schema_extra"][
-                    "example"
-                ],
+                service=DynamicServiceCreate.model_json_schema()["example"],
                 service_labels=SimcoreServiceLabels.model_json_schema()["examples"][0],
                 exp_status_code=status.HTTP_200_OK,
                 is_legacy=True,
@@ -569,9 +560,7 @@ def test_delete_service_waiting_for_manual_intervention(
         ),
         pytest.param(
             *ServiceParams(
-                service=DynamicServiceCreate.model_config["json_schema_extra"][
-                    "example"
-                ],
+                service=DynamicServiceCreate.model_json_schema()["example"],
                 service_labels=SimcoreServiceLabels.model_json_schema()["examples"][1],
                 exp_status_code=status.HTTP_200_OK,
                 is_legacy=False,
@@ -580,9 +569,7 @@ def test_delete_service_waiting_for_manual_intervention(
         ),
         pytest.param(
             *ServiceParams(
-                service=DynamicServiceCreate.model_config["json_schema_extra"][
-                    "example"
-                ],
+                service=DynamicServiceCreate.model_json_schema()["example"],
                 service_labels=SimcoreServiceLabels.model_json_schema()["examples"][2],
                 exp_status_code=status.HTTP_200_OK,
                 is_legacy=False,
@@ -595,6 +582,7 @@ def test_retrieve(
     minimal_config: None,
     mock_retrieve_features: MockRouter | None,
     mocked_director_v0_service_api: MockRouter,
+    mocked_catalog_service_api: MockRouter,
     mocked_director_v2_scheduler: None,
     client: TestClient,
     service: dict[str, Any],
@@ -607,8 +595,7 @@ def test_retrieve(
         response.status_code == exp_status_code
     ), f"expected status code {exp_status_code}, received {response.status_code}: {response.text}"
     assert (
-        response.json()
-        == RetrieveDataOutEnveloped.model_config["json_schema_extra"]["examples"][0]
+        response.json() == RetrieveDataOutEnveloped.model_json_schema()["examples"][0]
     )