Skip to content

Commit 143f13c

Browse files
author
Andrei Neagu
committed
using not deprecated forms
1 parent 56ccda3 commit 143f13c

File tree

5 files changed

+15
-9
lines changed

5 files changed

+15
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ async def set_if_status_changed_for_service(
150150
model.scheduled_to_run = False
151151

152152
# check if model changed
153-
json_status = status.json()
153+
json_status = status.model_dump_json()
154154
if model.service_status != json_status:
155155
model.service_status = json_status
156156
model.current_state = _get_current_scheduler_service_state(

services/dynamic-scheduler/tests/unit/api_rest/test_api_rest__meta.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
async def test_health(client: AsyncClient):
1010
response = await client.get(f"/{API_VTAG}/meta")
1111
assert response.status_code == status.HTTP_200_OK
12-
assert Meta.parse_raw(response.text)
12+
assert Meta.model_validate_json(response.text)

services/dynamic-scheduler/tests/unit/api_rpc/test_api_rpc__services.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,9 @@ def mock_director_v0_service_state(
9191
) as mock:
9292
mock.get(f"/fake-status/{node_id_legacy}").respond(
9393
status.HTTP_200_OK,
94-
text=json.dumps(jsonable_encoder({"data": service_status_legacy.dict()})),
94+
text=json.dumps(
95+
jsonable_encoder({"data": service_status_legacy.model_dump()})
96+
),
9597
)
9698

9799
# service was not found response
@@ -114,7 +116,7 @@ def mock_director_v2_service_state(
114116
assert_all_mocked=True, # IMPORTANT: KEEP always True!
115117
) as mock:
116118
mock.get(f"/dynamic_services/{node_id_new_style}").respond(
117-
status.HTTP_200_OK, text=service_status_new_style.json()
119+
status.HTTP_200_OK, text=service_status_new_style.model_dump_json()
118120
)
119121

120122
# emulate redirect response to director-v0
@@ -199,7 +201,9 @@ def mock_director_v0_service_run(
199201
) as mock:
200202
mock.post("/fake-service-run").respond(
201203
status.HTTP_201_CREATED,
202-
text=json.dumps(jsonable_encoder({"data": service_status_legacy.dict()})),
204+
text=json.dumps(
205+
jsonable_encoder({"data": service_status_legacy.model_dump()})
206+
),
203207
)
204208

205209
yield None
@@ -226,7 +230,7 @@ def mock_director_v2_service_run(
226230
else:
227231
request.respond(
228232
status.HTTP_201_CREATED,
229-
text=service_status_new_style.json(),
233+
text=service_status_new_style.model_dump_json(),
230234
)
231235
yield None
232236

services/dynamic-scheduler/tests/unit/service_tracker/test__api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ async def test_set_if_status_changed(
151151
model = await get_tracked_service(app, node_id)
152152
assert model
153153

154-
assert model.service_status == status.json()
154+
assert model.service_status == status.model_dump_json()
155155

156156

157157
async def test_set_service_status_task_uid(

services/dynamic-scheduler/tests/unit/status_monitor/test_services_status_monitor__monitor.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,12 @@ def _side_effect_node_status_response(request: Request) -> Response:
221221
if isinstance(service_status, NodeGet):
222222
return Response(
223223
status.HTTP_200_OK,
224-
text=json.dumps(jsonable_encoder({"data": service_status.dict()})),
224+
text=json.dumps(
225+
jsonable_encoder({"data": service_status.model_dump()})
226+
),
225227
)
226228
if isinstance(service_status, DynamicServiceGet):
227-
return Response(status.HTTP_200_OK, text=service_status.json())
229+
return Response(status.HTTP_200_OK, text=service_status.model_dump_json())
228230
if isinstance(service_status, NodeGetIdle):
229231
return Response(status.HTTP_404_NOT_FOUND)
230232

0 commit comments

Comments
 (0)