replace deprecated dict

Author: giancarloromeo

packages/postgres-database/src/simcore_postgres_database/utils_projects_nodes.py

@@ -83,7 +83,7 @@ async def add(
                 [
                     {
                         "project_uuid": f"{self.project_uuid}",
-                        **node.dict(),
+                        **node.model_dump(),
                     }
                     for node in nodes
                 ]

packages/postgres-database/tests/test_utils_projects_nodes.py

@@ -412,9 +412,9 @@ async def test_get_project_id_from_node_id_raises_if_multiple_projects_with_same
     assert len(project1_nodes) == 1
     project2_nodes = await project2_repo.add(connection, nodes=[shared_node])
     assert len(project2_nodes) == 1
-    assert project1_nodes[0].dict(
+    assert project1_nodes[0].model_dump(
         include=ProjectNodeCreate.get_field_names(exclude={"created", "modified"})
-    ) == project2_nodes[0].dict(
+    ) == project2_nodes[0].model_dump(
         include=ProjectNodeCreate.get_field_names(exclude={"created", "modified"})
     )
     with pytest.raises(ProjectNodesNonUniqueNodeFoundError):

packages/pytest-simcore/src/pytest_simcore/minio_service.py

@@ -31,5 +31,5 @@ def minio_s3_settings_envs(
     minio_s3_settings: S3Settings,
     monkeypatch: pytest.MonkeyPatch,
 ) -> EnvVarsDict:
-    changed_envs: EnvVarsDict = minio_s3_settings.dict(exclude_unset=True)
+    changed_envs: EnvVarsDict = minio_s3_settings.model_dump(exclude_unset=True)
     return setenvs_from_dict(monkeypatch, changed_envs)

packages/service-integration/src/service_integration/cli/_compose_spec.py

@@ -196,7 +196,7 @@ def create_compose(
     for n, config_name in enumerate(configs_kwargs_map):
         nth_compose_spec = create_docker_compose_image_spec(
             settings, **configs_kwargs_map[config_name]
-        ).dict(exclude_unset=True)
+        ).model_dump(exclude_unset=True)
 
         if n == 0:
             compose_spec_dict = nth_compose_spec

packages/service-library/tests/aiohttp/test_docker_utils.py

@@ -96,13 +96,13 @@ def _assert_progress_report_values(
     # check first progress
     assert mocked_progress_cb.call_args_list[0].args[0].dict(
         exclude={"message"}
-    ) == ProgressReport(actual_value=0, total=total, unit="Byte").dict(
+    ) == ProgressReport(actual_value=0, total=total, unit="Byte").model_dump(
         exclude={"message"}
     )
     # check last progress
     assert mocked_progress_cb.call_args_list[-1].args[0].dict(
         exclude={"message"}
-    ) == ProgressReport(actual_value=total, total=total, unit="Byte").dict(
+    ) == ProgressReport(actual_value=total, total=total, unit="Byte").model_dump(
         exclude={"message"}
     )
 

packages/service-library/tests/aiohttp/test_requests_validation.py

@@ -55,7 +55,7 @@ class MyRequestQueryParams(BaseModel):
     label: str
 
     def as_params(self, **kwargs) -> dict[str, str]:
-        data = self.dict(**kwargs)
+        data = self.model_dump(**kwargs)
         return {k: f"{v}" for k, v in data.items()}
 
     @classmethod
@@ -324,7 +324,7 @@ async def test_parse_request_with_invalid_json_body(
         f"/projects/{path_params.project_uuid}",
         params=query_params.as_params(),
         data=b"[ 1 2, 3 'broken-json' ]",
-        headers=headers_params.dict(by_alias=True),
+        headers=headers_params.model_dump(by_alias=True),
     )
 
     body = await r.text()
@@ -342,8 +342,8 @@ async def test_parse_request_with_invalid_headers_params(
     r = await client.get(
         f"/projects/{path_params.project_uuid}",
         params=query_params.as_params(),
-        json=body.dict(),
-        headers=headers_params.dict(),  # we pass the wrong names
+        json=body.model_dump(),
+        headers=headers_params.model_dump(),  # we pass the wrong names
     )
     assert r.status == status.HTTP_422_UNPROCESSABLE_ENTITY, f"{await r.text()}"
 

packages/service-library/tests/fastapi/test_docker_utils.py

@@ -102,13 +102,13 @@ def _assert_progress_report_values(
     # check first progress
     assert mocked_progress_cb.call_args_list[0].args[0].dict(
         exclude={"message"}
-    ) == ProgressReport(actual_value=0, total=total, unit="Byte").dict(
+    ) == ProgressReport(actual_value=0, total=total, unit="Byte").model_dump(
         exclude={"message"}
     )
     # check last progress
     assert mocked_progress_cb.call_args_list[-1].args[0].dict(
         exclude={"message"}
-    ) == ProgressReport(actual_value=total, total=total, unit="Byte").dict(
+    ) == ProgressReport(actual_value=total, total=total, unit="Byte").model_dump(
         exclude={"message"}
     )
 

packages/simcore-sdk/src/simcore_sdk/node_ports_v2/serialization_v2.py

@@ -115,7 +115,7 @@ async def dump(nodeports: Nodeports) -> None:
         "dumping node_ports_v2 object %s",
         pformat(nodeports, indent=2),
     )
-    _nodeports_cfg = nodeports.dict(
+    _nodeports_cfg = nodeports.model_dump(
         include={"internal_inputs", "internal_outputs"},
         by_alias=True,
         exclude_unset=True,

packages/simcore-sdk/tests/integration/test_node_ports_v2_nodeports2.py

@@ -91,7 +91,7 @@ async def _check_port_valid(
             assert port.value
             assert isinstance(port.value, DownloadLink | PortLink | BaseFileLink)
             assert (
-                port.value.dict(by_alias=True, exclude_unset=True)
+                port.value.model_dump(by_alias=True, exclude_unset=True)
                 == port_values[key_name]
             )
         else:

packages/simcore-sdk/tests/unit/test_node_ports_v2_port_validation.py

@@ -143,7 +143,7 @@ class A(BaseModel):
         "contentSchema": content_schema,
     }
     sample = [{"i": 5, "s": "x", "l": [1, 2]}, {"i": 6, "s": "y", "l": [2]}]
-    expected_value = [A(**i).dict() for i in sample]
+    expected_value = [A(**i).model_dump() for i in sample]
 
     print(json.dumps(port_meta, indent=1))
     print(json.dumps(expected_value, indent=1))