refactor

Author: Andrei Neagu

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/service_tracker/_models.py

@@ -131,7 +131,9 @@ def set_last_status_notification_to_now(self) -> None:
     #####################
 
     def to_bytes(self) -> bytes:
-        result: bytes = umsgpack.packb(self.dict(), ext_handlers=_PACKB_EXTENSION_TYPES)
+        result: bytes = umsgpack.packb(
+            self.model_dump(), ext_handlers=_PACKB_EXTENSION_TYPES
+        )
         return result
 
     @classmethod

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/api/rest/health.py

@@ -29,7 +29,7 @@ async def health_endpoint(
 ) -> ApplicationHealth:
     if not application_health.is_healthy:
         raise HTTPException(
-            status.HTTP_503_SERVICE_UNAVAILABLE, detail=application_health.dict()
+            status.HTTP_503_SERVICE_UNAVAILABLE, detail=application_health.model_dump()
         )
 
     if not rabbitmq_client.healthy or not rabbitmq_rpc_server.healthy:

services/dynamic-sidecar/tests/unit/test_api_rest_containers.py

@@ -104,7 +104,7 @@ async def _start_containers(
 
     response = await test_client.post(
         f"/{API_VTAG}/containers",
-        json={"metrics_params": mock_metrics_params.dict()},
+        json={"metrics_params": mock_metrics_params.model_dump()},
     )
     assert response.status_code == status.HTTP_202_ACCEPTED, response.text
     task_id: TaskId = response.json()

services/dynamic-sidecar/tests/unit/test_api_rest_containers_long_running_tasks.py

@@ -290,15 +290,16 @@ async def _get_task_id_create_service_containers(
     *args,
     **kwargs,
 ) -> TaskId:
-    ctontainers_compose_spec = ContainersComposeSpec(
+    containers_compose_spec = ContainersComposeSpec(
         docker_compose_yaml=compose_spec,
     )
     await httpx_async_client.post(
-        f"/{API_VTAG}/containers/compose-spec", json=ctontainers_compose_spec.dict()
+        f"/{API_VTAG}/containers/compose-spec",
+        json=containers_compose_spec.model_dump(),
     )
     containers_create = ContainersCreate(metrics_params=mock_metrics_params)
     response = await httpx_async_client.post(
-        f"/{API_VTAG}/containers", json=containers_create.dict()
+        f"/{API_VTAG}/containers", json=containers_create.model_dump()
     )
     task_id: TaskId = response.json()
     assert isinstance(task_id, str)

services/dynamic-sidecar/tests/unit/test_api_rest_health.py

@@ -18,14 +18,16 @@ async def test_is_healthy(test_client: TestClient) -> None:
     test_client.application.state.application_health.is_healthy = True
     response = await test_client.get("/health")
     assert response.status_code == status.HTTP_200_OK, response
-    assert response.json() == ApplicationHealth(is_healthy=True).dict()
+    assert response.json() == ApplicationHealth(is_healthy=True).model_dump()
 
 
 async def test_is_unhealthy(test_client: TestClient) -> None:
     test_client.application.state.application_health.is_healthy = False
     response = await test_client.get("/health")
     assert response.status_code == status.HTTP_503_SERVICE_UNAVAILABLE, response
-    assert response.json() == {"detail": ApplicationHealth(is_healthy=False).dict()}
+    assert response.json() == {
+        "detail": ApplicationHealth(is_healthy=False).model_dump()
+    }
 
 
 async def test_is_unhealthy_via_rabbitmq(test_client: TestClient) -> None:

services/dynamic-sidecar/tests/unit/test_api_rest_prometheus_metrics.py

@@ -111,11 +111,12 @@ async def _get_task_id_create_service_containers(
         docker_compose_yaml=compose_spec,
     )
     await httpx_async_client.post(
-        f"/{API_VTAG}/containers/compose-spec", json=ctontainers_compose_spec.dict()
+        f"/{API_VTAG}/containers/compose-spec",
+        json=ctontainers_compose_spec.model_dump(),
     )
     containers_create = ContainersCreate(metrics_params=mock_metrics_params)
     response = await httpx_async_client.post(
-        f"/{API_VTAG}/containers", json=containers_create.dict()
+        f"/{API_VTAG}/containers", json=containers_create.model_dump()
     )
     task_id: TaskId = response.json()
     assert isinstance(task_id, str)

services/dynamic-sidecar/tests/unit/test_api_rest_workflow_service_metrics.py

@@ -149,15 +149,16 @@ async def _get_task_id_create_service_containers(
     compose_spec: str,
     mock_metrics_params: CreateServiceMetricsAdditionalParams,
 ) -> TaskId:
-    ctontainers_compose_spec = ContainersComposeSpec(
+    containers_compose_spec = ContainersComposeSpec(
         docker_compose_yaml=compose_spec,
     )
     await httpx_async_client.post(
-        f"/{API_VTAG}/containers/compose-spec", json=ctontainers_compose_spec.dict()
+        f"/{API_VTAG}/containers/compose-spec",
+        json=containers_compose_spec.model_dump(),
     )
     containers_create = ContainersCreate(metrics_params=mock_metrics_params)
     response = await httpx_async_client.post(
-        f"/{API_VTAG}/containers", json=containers_create.dict()
+        f"/{API_VTAG}/containers", json=containers_create.model_dump()
     )
     task_id: TaskId = response.json()
     assert isinstance(task_id, str)