remove deprecated .dict()

Author: giancarloromeo

packages/service-library/src/servicelib/services_utils.py

@@ -22,7 +22,7 @@ def get_status_as_dict(
 ) -> dict:
     """shared between different backend services to guarantee same result to frontend"""
     return (
-        status.dict(by_alias=True)
+        status.model_dump(by_alias=True)
         if isinstance(status, DynamicServiceGet)
-        else status.dict()
+        else status.model_dump()
     )

packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks_with_task_context.py

@@ -53,7 +53,7 @@ async def _test_task_context_decorator(
         ) -> web.StreamResponse:
             """this task context callback tries to get the user_id from the query if available"""
             query_param = parse_request_query_parameters_as(query_model, request)
-            request[RQT_LONG_RUNNING_TASKS_CONTEXT_KEY] = query_param.dict()
+            request[RQT_LONG_RUNNING_TASKS_CONTEXT_KEY] = query_param.model_dump()
             return await handler(request)
 
         return _test_task_context_decorator

services/director-v2/tests/unit/conftest.py

@@ -267,7 +267,7 @@ def fake_service_specifications(faker: Faker) -> dict[str, Any]:
                     },
                 },
             }
-        ).dict(by_alias=True, exclude_unset=True)
+        ).model_dump(by_alias=True, exclude_unset=True)
     }
 
 

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

@@ -245,9 +245,14 @@ def creator(user: dict[str, Any], **cluster_kwargs) -> Cluster:
                 for gid, rights in cluster_kwargs["access_rights"].items():
                     conn.execute(
                         pg_insert(cluster_to_groups)
-                        .values(cluster_id=created_cluster.id, gid=gid, **rights.dict())
+                        .values(
+                            cluster_id=created_cluster.id,
+                            gid=gid,
+                            **rights.model_dump(),
+                        )
                         .on_conflict_do_update(
-                            index_elements=["gid", "cluster_id"], set_=rights.dict()
+                            index_elements=["gid", "cluster_id"],
+                            set_=rights.model_dump(),
                         )
                     )
             access_rights_in_db = {}

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

@@ -576,7 +576,7 @@ async def test_container_create_outputs_dirs(
     assert mock_event_filter_enqueue.call_count == 0
 
     json_outputs_labels = {
-        k: v.dict(by_alias=True) for k, v in mock_outputs_labels.items()
+        k: v.model_dump(by_alias=True) for k, v in mock_outputs_labels.items()
     }
     response = await test_client.post(
         f"/{API_VTAG}/containers/ports/outputs/dirs",

services/invitations/tests/unit/api/test_api_dependencies.py

@@ -18,7 +18,7 @@ def test_invalid_http_basic_auth(
 ):
     response = client.post(
         f"/{API_VTAG}/invitations",
-        json=invitation_data.dict(),
+        json=invitation_data.model_dump(),
         auth=invalid_basic_auth,
     )
     assert response.status_code == status.HTTP_401_UNAUTHORIZED, f"{response.json()=}"

services/invitations/tests/unit/test_cli.py

@@ -46,7 +46,7 @@ def test_invite_user_and_check_invitation(
     }
 
     expected = {
-        **invitation_data.dict(exclude={"product"}),
+        **invitation_data.model_dump(exclude={"product"}),
         "product": environs["INVITATIONS_DEFAULT_PRODUCT"],
     }
 

services/web/server/src/simcore_service_webserver/catalog/_api_units.py

@@ -57,10 +57,10 @@ async def replace_service_input_outputs(
 
     # replace if above is successful
     for input_key, new_input in zip(service["inputs"], new_inputs, strict=True):
-        service["inputs"][input_key] = new_input.dict(**export_options)
+        service["inputs"][input_key] = new_input.model_dump(**export_options)
 
     for output_key, new_output in zip(service["outputs"], new_outputs, strict=True):
-        service["outputs"][output_key] = new_output.dict(**export_options)
+        service["outputs"][output_key] = new_output.model_dump(**export_options)
 
 
 def can_connect(

services/web/server/src/simcore_service_webserver/groups/_handlers.py

@@ -166,7 +166,7 @@ async def update_group(request: web.Request):
     req_ctx = _GroupsRequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(_GroupPathParams, request)
     update: GroupUpdate = await parse_request_body_as(GroupUpdate, request)
-    new_group_values = update.dict(exclude_unset=True)
+    new_group_values = update.model_dump(exclude_unset=True)
 
     updated_group = await api.update_user_group(
         request.app, req_ctx.user_id, path_params.gid, new_group_values
@@ -270,7 +270,7 @@ async def update_group_user(request: web.Request):
         user_id=req_ctx.user_id,
         gid=path_params.gid,
         the_user_id_in_group=path_params.uid,
-        access_rights=update.access_rights.dict(),
+        access_rights=update.access_rights.model_dump(),
     )
     assert GroupUserGet.model_validate(user) is not None  # nosec
     return envelope_json_response(user)

services/web/server/tests/unit/with_dbs/03/meta_modeling/test_meta_modeling_iterations.py

@@ -262,7 +262,7 @@ async def _mock_catalog_get(*args, **kwarg):
     assert node.inputs
     node.inputs["linspace_stop"] = 4
 
-    _new_project_data = new_project.dict(**REQUEST_MODEL_POLICY)
+    _new_project_data = new_project.model_dump(**REQUEST_MODEL_POLICY)
     _new_project_data.pop("state")
     await db.replace_project(
         json_loads(json_dumps(_new_project_data)),