fix deprecated

Author: giancarloromeo

services/director-v2/src/simcore_service_director_v2/modules/comp_scheduler/dask_scheduler.py

@@ -322,7 +322,7 @@ async def _process_task_result(
 
     async def _task_progress_change_handler(self, event: str) -> None:
         with log_catch(_logger, reraise=False):
-            task_progress_event = TaskProgressEvent.parse_raw(event)
+            task_progress_event = TaskProgressEvent.model_validate_json(event)
             _logger.debug("received task progress update: %s", task_progress_event)
             user_id = task_progress_event.task_owner.user_id
             project_id = task_progress_event.task_owner.project_id
@@ -353,7 +353,7 @@ async def _task_progress_change_handler(self, event: str) -> None:
 
     async def _task_log_change_handler(self, event: str) -> None:
         with log_catch(_logger, reraise=False):
-            task_log_event = TaskLogEvent.parse_raw(event)
+            task_log_event = TaskLogEvent.model_validate_json(event)
             _logger.debug("received task log update: %s", task_log_event)
             await publish_service_log(
                 self.rabbitmq_client,

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

@@ -22,7 +22,7 @@
 
 
 async def handler_out_of_credits(app: FastAPI, data: bytes) -> bool:
-    message = WalletCreditsLimitReachedMessage.parse_raw(data)
+    message = WalletCreditsLimitReachedMessage.model_validate_json(data)
 
     scheduler: "DynamicSidecarsScheduler" = app.state.dynamic_sidecar_scheduler  # type: ignore[name-defined] # noqa: F821
     settings: AppSettings = app.state.settings

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

@@ -25,8 +25,8 @@ def test_regression_as_label_data(scheduler_data: SchedulerData) -> None:
     # using pydantic's internals
     label_data = scheduler_data.as_label_data()
 
-    parsed_json_encoded = SchedulerData.parse_raw(json_encoded)
-    parsed_label_data = SchedulerData.parse_raw(label_data)
+    parsed_json_encoded = SchedulerData.model_validate_json(json_encoded)
+    parsed_label_data = SchedulerData.model_validate_json(label_data)
     assert parsed_json_encoded == parsed_label_data
 
 

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

@@ -40,11 +40,11 @@ def assert_copy_has_changes(original: SchedulerData) -> Iterator[SchedulerData]:
 
 
 async def test_parse_saved_fake_scheduler_data(fake_scheduler_data: str) -> None:
-    assert SchedulerData.parse_raw(fake_scheduler_data)
+    assert SchedulerData.model_validate_json(fake_scheduler_data)
 
 
 def test_nested_compare(fake_scheduler_data: str) -> None:
-    scheduler_data = SchedulerData.parse_raw(fake_scheduler_data)
+    scheduler_data = SchedulerData.model_validate_json(fake_scheduler_data)
 
     with assert_copy_has_changes(scheduler_data) as to_change:
         to_change.paths_mapping.inputs_path = Path("/tmp")

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

@@ -180,7 +180,7 @@ async def test_get_task_logs_file(
     )
     assert resp.status_code == status.HTTP_200_OK
 
-    log_file = TaskLogFileGet.parse_raw(resp.text)
+    log_file = TaskLogFileGet.model_validate_json(resp.text)
     assert log_file.download_link
 
 

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

@@ -726,7 +726,7 @@ async def _return_1st_task_running(job_ids: list[str]) -> list[DaskClientTaskSta
     mocked_dask_client.get_tasks_status.reset_mock()
     mocked_dask_client.get_task_result.assert_not_called()
     messages = await _assert_message_received(
-        instrumentation_rabbit_client_parser, 1, InstrumentationRabbitMessage.parse_raw
+        instrumentation_rabbit_client_parser, 1, InstrumentationRabbitMessage.model_validate_json
     )
     assert messages[0].metrics == "service_started"
     assert messages[0].service_uuid == exp_started_task.node_id
@@ -737,7 +737,7 @@ def _parser(x) -> RabbitResourceTrackingMessages:
     messages = await _assert_message_received(
         resource_tracking_rabbit_client_parser,
         1,
-        RabbitResourceTrackingStartedMessage.parse_raw,
+        RabbitResourceTrackingStartedMessage.model_validate_json,
     )
     assert messages[0].node_id == exp_started_task.node_id
 
@@ -769,14 +769,14 @@ async def _return_random_task_result(job_id) -> TaskOutputData:
         expected_progress=1,
     )
     messages = await _assert_message_received(
-        instrumentation_rabbit_client_parser, 1, InstrumentationRabbitMessage.parse_raw
+        instrumentation_rabbit_client_parser, 1, InstrumentationRabbitMessage.model_validate_jsonidate_jsonidate_json
     )
     assert messages[0].metrics == "service_stopped"
     assert messages[0].service_uuid == exp_started_task.node_id
     messages = await _assert_message_received(
         resource_tracking_rabbit_client_parser,
         1,
-        RabbitResourceTrackingStoppedMessage.parse_raw,
+        RabbitResourceTrackingStoppedMessage.model_validate_json,
     )
 
     completed_tasks = [exp_started_task]
@@ -871,14 +871,14 @@ async def _return_2nd_task_running(job_ids: list[str]) -> list[DaskClientTaskSta
     mocked_dask_client.get_tasks_status.reset_mock()
     mocked_dask_client.get_task_result.assert_not_called()
     messages = await _assert_message_received(
-        instrumentation_rabbit_client_parser, 1, InstrumentationRabbitMessage.parse_raw
+        instrumentation_rabbit_client_parser, 1, InstrumentationRabbitMessage.model_validate_json
     )
     assert messages[0].metrics == "service_started"
     assert messages[0].service_uuid == exp_started_task.node_id
     messages = await _assert_message_received(
         resource_tracking_rabbit_client_parser,
         1,
-        RabbitResourceTrackingStartedMessage.parse_raw,
+        RabbitResourceTrackingStartedMessage.model_validate_json,
     )
     assert messages[0].node_id == exp_started_task.node_id
 
@@ -915,14 +915,14 @@ async def _return_2nd_task_failed(job_ids: list[str]) -> list[DaskClientTaskStat
     mocked_parse_output_data_fct.assert_not_called()
     expected_pending_tasks.remove(exp_started_task)
     messages = await _assert_message_received(
-        instrumentation_rabbit_client_parser, 1, InstrumentationRabbitMessage.parse_raw
+        instrumentation_rabbit_client_parser, 1, InstrumentationRabbitMessage.model_validate_json
     )
     assert messages[0].metrics == "service_stopped"
     assert messages[0].service_uuid == exp_started_task.node_id
     messages = await _assert_message_received(
         resource_tracking_rabbit_client_parser,
         1,
-        RabbitResourceTrackingStoppedMessage.parse_raw,
+        RabbitResourceTrackingStoppedMessage.model_validate_json,
     )
 
     # -------------------------------------------------------------------------------
@@ -959,7 +959,7 @@ async def _return_3rd_task_success(job_ids: list[str]) -> list[DaskClientTaskSta
     )
     mocked_dask_client.get_task_result.assert_called_once_with(exp_started_task.job_id)
     messages = await _assert_message_received(
-        instrumentation_rabbit_client_parser, 2, InstrumentationRabbitMessage.parse_raw
+        instrumentation_rabbit_client_parser, 2, InstrumentationRabbitMessage.model_validate_json
     )
     # NOTE: the service was fast and went directly to success
     assert messages[0].metrics == "service_started"
@@ -1328,7 +1328,7 @@ async def _return_1st_task_running(job_ids: list[str]) -> list[DaskClientTaskSta
     messages = await _assert_message_received(
         resource_tracking_rabbit_client_parser,
         1,
-        RabbitResourceTrackingStartedMessage.parse_raw,
+        RabbitResourceTrackingStartedMessage.model_validate_json,
     )
     assert messages[0].node_id == exp_started_task.node_id
 
@@ -1340,7 +1340,7 @@ async def _return_1st_task_running(job_ids: list[str]) -> list[DaskClientTaskSta
     messages = await _assert_message_received(
         resource_tracking_rabbit_client_parser,
         1,
-        RabbitResourceTrackingHeartbeatMessage.parse_raw,
+        RabbitResourceTrackingHeartbeatMessage.model_validate_json,
     )
     assert isinstance(messages[0], RabbitResourceTrackingHeartbeatMessage)
 
@@ -1352,7 +1352,7 @@ async def _return_1st_task_running(job_ids: list[str]) -> list[DaskClientTaskSta
     messages = await _assert_message_received(
         resource_tracking_rabbit_client_parser,
         1,
-        RabbitResourceTrackingHeartbeatMessage.parse_raw,
+        RabbitResourceTrackingHeartbeatMessage.model_validate_json,
     )
     assert isinstance(messages[0], RabbitResourceTrackingHeartbeatMessage)
 

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

@@ -729,7 +729,7 @@ async def test_update_scheduler_data_label(
     # fetch stored data in labels
     service_inspect = await async_docker_client.services.inspect(mock_service)
     labels = service_inspect["Spec"]["Labels"]
-    scheduler_data = SchedulerData.parse_raw(
+    scheduler_data = SchedulerData.model_validate_json(
         labels[DYNAMIC_SIDECAR_SCHEDULER_DATA_LABEL]
     )
     assert scheduler_data == mock_scheduler_data