continue migration

Author: giancarloromeo

services/api-server/src/simcore_service_api_server/services/director_v2.py

@@ -93,7 +93,7 @@ async def create_computation(
             },
         )
         response.raise_for_status()
-        task: ComputationTaskGet = ComputationTaskGet.parse_raw(response.text)
+        task: ComputationTaskGet = ComputationTaskGet.model_validate_json(response.text)
         return task
 
     @_exception_mapper({})
@@ -129,7 +129,7 @@ async def start_computation(
             },
         )
         response.raise_for_status()
-        task: ComputationTaskGet = ComputationTaskGet.parse_raw(response.text)
+        task: ComputationTaskGet = ComputationTaskGet.model_validate_json(response.text)
         return task
 
     @_exception_mapper({status.HTTP_404_NOT_FOUND: JobNotFoundError})
@@ -143,7 +143,7 @@ async def get_computation(
             },
         )
         response.raise_for_status()
-        task: ComputationTaskGet = ComputationTaskGet.parse_raw(response.text)
+        task: ComputationTaskGet = ComputationTaskGet.model_validate_json(response.text)
         return task
 
     @_exception_mapper({status.HTTP_404_NOT_FOUND: JobNotFoundError})
@@ -157,7 +157,7 @@ async def stop_computation(
             },
         )
         response.raise_for_status()
-        task: ComputationTaskGet = ComputationTaskGet.parse_raw(response.text)
+        task: ComputationTaskGet = ComputationTaskGet.model_validate_json(response.text)
         return task
 
     @_exception_mapper({status.HTTP_404_NOT_FOUND: JobNotFoundError})

services/api-server/src/simcore_service_api_server/services/webserver.py

@@ -102,7 +102,7 @@
 
 def _get_lrt_urls(lrt_response: httpx.Response):
     # WARNING: this function is patched in patch_lrt_response_urls fixture
-    data = Envelope[TaskGet].parse_raw(lrt_response.text).data
+    data = Envelope[TaskGet].model_validate_json(lrt_response.text).data
     assert data is not None  # nosec
 
     return data.status_href, data.result_href
@@ -207,7 +207,7 @@ async def _page_projects(
             )
             resp.raise_for_status()
 
-            return Page[ProjectGet].parse_raw(resp.text)
+            return Page[ProjectGet].model_validate_json(resp.text)
 
     async def _wait_for_long_running_task_results(self, lrt_response: httpx.Response):
         status_url, result_url = _get_lrt_urls(lrt_response)
@@ -224,7 +224,9 @@ async def _wait_for_long_running_task_results(self, lrt_response: httpx.Response
                     url=status_url, cookies=self.session_cookies
                 )
                 get_response.raise_for_status()
-                task_status = Envelope[TaskStatus].parse_raw(get_response.text).data
+                task_status = (
+                    Envelope[TaskStatus].model_validate_json(get_response.text).data
+                )
                 assert task_status is not None  # nosec
                 if not task_status.done:
                     msg = "Timed out creating project. TIP: Try again, or contact oSparc support if this is happening repeatedly"

services/api-server/tests/unit/conftest.py

@@ -450,7 +450,7 @@ def patch_lrt_response_urls(mocker: MockerFixture):
     def _() -> MagicMock:
         def _get_lrt_urls(lrt_response: httpx.Response):
             # NOTE: this function is needed to mock
-            data = Envelope[TaskGet].parse_raw(lrt_response.text).data
+            data = Envelope[TaskGet].model_validate_json(lrt_response.text).data
             assert data is not None  # nosec
 
             def _patch(href):

services/api-server/tests/unit/test_cli.py

@@ -29,7 +29,7 @@ def test_cli_list_settings(cli_runner: CliRunner, app_environment: EnvVarsDict):
     assert result.exit_code == os.EX_OK, result.output
 
     print(result.output)
-    settings = ApplicationSettings.parse_raw(result.output)
+    settings = ApplicationSettings.model_validate_json(result.output)
     assert settings == ApplicationSettings.create_from_envs()
 
 

services/api-server/tests/unit/test_exceptions.py

@@ -67,7 +67,7 @@ async def test_raised_http_exception(client: httpx.AsyncClient):
 
     assert response.status_code == status.HTTP_503_SERVICE_UNAVAILABLE
 
-    got = ErrorGet.parse_raw(response.text)
+    got = ErrorGet.model_validate_json(response.text)
     assert got.errors == ["fail message"]
 
 
@@ -78,7 +78,7 @@ async def test_fastapi_http_exception_respond_with_error_model(
 
     assert response.status_code == status.HTTP_404_NOT_FOUND
 
-    got = ErrorGet.parse_raw(response.text)
+    got = ErrorGet.model_validate_json(response.text)
     assert got.errors == [HTTPStatus(response.status_code).phrase]
 
 
@@ -87,7 +87,7 @@ async def test_custom_error_handlers(client: httpx.AsyncClient):
 
     assert response.status_code == status.HTTP_424_FAILED_DEPENDENCY
 
-    got = ErrorGet.parse_raw(response.text)
+    got = ErrorGet.model_validate_json(response.text)
     assert got.errors == [f"{MissingWalletError(job_id=123)}"]
 
 

services/api-server/tests/unit/test_services_rabbitmq.py

@@ -378,7 +378,7 @@ async def _log_publisher():
 
     collected_messages: list[str] = []
     async for log in log_streamer_with_distributor.log_generator():
-        job_log: JobLog = JobLog.parse_raw(log)
+        job_log: JobLog = JobLog.model_validate_json(log)
         assert len(job_log.messages) == 1
         assert job_log.job_id == project_id
         collected_messages.append(job_log.messages[0])
@@ -458,7 +458,7 @@ async def test_log_generator(mocker: MockFixture, faker: Faker):
 
     collected_logs: list[str] = []
     async for log in log_streamer.log_generator():
-        job_log = JobLog.parse_raw(log)
+        job_log = JobLog.model_validate_json(log)
         assert len(job_log.messages) == 1
         collected_logs.append(job_log.messages[0])
 

services/api-server/tests/unit/test_utils_http_calls_capture.py

@@ -89,7 +89,7 @@ async def test_capture_http_dynamic_call(
         assert found.groupdict() == {"resouce_uid": sample_uid}
 
         # subs_json = re.sub(f"{resource_uid}", pattern, captured.json())
-        # new_capture = HttpApiCallCaptureModel.parse_raw(subs_json)
+        # new_capture = HttpApiCallCaptureModel.model_validate_json(subs_json)
 
         # MOCK
         with respx.mock(
@@ -140,6 +140,6 @@ def test_template_capture(project_tests_dir: Path, faker: Faker):
 
     # loads parametrized capture
     # replace in response and solve
-    capture = HttpApiCallCaptureModel.parse_raw(template.render(context))
+    capture = HttpApiCallCaptureModel.model_validate_json(template.render(context))
     print(capture.json(indent=1))
     assert capture.path == url_path