remove deprecated

giancarloromeo · giancarloromeo · commit 3f91e305acf4 · 2024-10-01T10:13:00.000+02:00
diff --git a/packages/dask-task-models-library/src/dask_task_models_library/container_tasks/io.py b/packages/dask-task-models-library/src/dask_task_models_library/container_tasks/io.py
@@ -175,7 +175,7 @@ def from_task_output(
                 msg = f"Could not locate '{output_key}' in {output_data_file}"
                 raise ValueError(msg)
 
-        return cls.parse_obj(data)
+        return cls.model_validate(data)
 
     model_config = ConfigDict(
         json_schema_extra={
diff --git a/packages/dask-task-models-library/tests/container_tasks/test_io.py b/packages/dask-task-models-library/tests/container_tasks/test_io.py
@@ -30,7 +30,7 @@ def test_io_models_examples(model_cls, model_cls_examples):
     for name, example in model_cls_examples.items():
         print(name, ":", pformat(example))
 
-        model_instance = model_cls.parse_obj(example)
+        model_instance = model_cls.model_validate(example)
 
         assert model_instance, f"Failed with {name}"
         print(name, ":", model_instance)
@@ -73,7 +73,7 @@ def test_create_task_output_from_task_with_optional_fields_as_required(
         "examples"
     ]:
 
-        task_output_schema = TaskOutputDataSchema.parse_obj(schema_example)
+        task_output_schema = TaskOutputDataSchema.model_validate(schema_example)
         outputs_file_name = _create_fake_outputs(
             task_output_schema, tmp_path, optional_fields_set, faker
         )
@@ -94,7 +94,7 @@ def test_create_task_output_from_task_with_optional_fields_as_required(
 def test_create_task_output_from_task_throws_when_there_are_missing_files(
     tmp_path: Path, faker: Faker
 ):
-    task_output_schema = TaskOutputDataSchema.parse_obj(
+    task_output_schema = TaskOutputDataSchema.model_validate(
         {
             "required_file_output": {
                 "required": True,
@@ -115,7 +115,7 @@ def test_create_task_output_from_task_throws_when_there_are_missing_files(
 def test_create_task_output_from_task_does_not_throw_when_there_are_optional_missing_files(
     tmp_path: Path, faker: Faker
 ):
-    task_output_schema = TaskOutputDataSchema.parse_obj(
+    task_output_schema = TaskOutputDataSchema.model_validate(
         {
             "optional_file_output": {
                 "required": False,
@@ -136,7 +136,7 @@ def test_create_task_output_from_task_does_not_throw_when_there_are_optional_mis
 def test_create_task_output_from_task_throws_when_there_are_entries(
     tmp_path: Path, faker: Faker
 ):
-    task_output_schema = TaskOutputDataSchema.parse_obj(
+    task_output_schema = TaskOutputDataSchema.model_validate(
         {
             "some_output": {
                 "required": True,
@@ -155,7 +155,7 @@ def test_create_task_output_from_task_throws_when_there_are_entries(
 def test_create_task_output_from_task_does_not_throw_when_there_are_optional_entries(
     tmp_path: Path, faker: Faker
 ):
-    task_output_schema = TaskOutputDataSchema.parse_obj(
+    task_output_schema = TaskOutputDataSchema.model_validate(
         {
             "some_output": {
                 "required": False,
@@ -184,6 +184,6 @@ def test_objects_are_compatible_with_dask_requirements(model_cls, model_cls_exam
     for name, example in model_cls_examples.items():
         print(name, ":", pformat(example))
 
-        model_instance = model_cls.parse_obj(example)
+        model_instance = model_cls.model_validate(example)
         reloaded_instance = loads(dumps(model_instance))
         assert reloaded_instance == model_instance
diff --git a/packages/pytest-simcore/src/pytest_simcore/docker_registry.py b/packages/pytest-simcore/src/pytest_simcore/docker_registry.py
@@ -106,9 +106,9 @@ def external_registry_settings(
     if external_envfile_dict:
         config = {
             field: external_envfile_dict.get(field, None)
-            for field in RegistrySettings.__fields__
+            for field in RegistrySettings.model_fields
         }
-        return RegistrySettings.parse_obj(config)
+        return RegistrySettings.model_validate(config)
     return None
 
 
diff --git a/packages/pytest-simcore/src/pytest_simcore/pydantic_models.py b/packages/pytest-simcore/src/pytest_simcore/pydantic_models.py
@@ -64,7 +64,7 @@ def test_model_examples(
             model_cls: type[BaseModel], example_name: int, example_data: Any
         ):
             print(example_name, ":", json.dumps(example_data))
-            assert model_cls.parse_obj(example_data)
+            assert model_cls.model_validate(example_data)
     """
 
     def _is_model_cls(obj) -> bool:
diff --git a/packages/pytest-simcore/src/pytest_simcore/rabbit_service.py b/packages/pytest-simcore/src/pytest_simcore/rabbit_service.py
@@ -56,7 +56,7 @@ def rabbit_env_vars_dict(
 async def rabbit_settings(rabbit_env_vars_dict: EnvVarsDict) -> RabbitSettings:
     """Returns the settings of a rabbit service that is up and responsive"""
 
-    settings = RabbitSettings.parse_obj(rabbit_env_vars_dict)
+    settings = RabbitSettings.model_validate(rabbit_env_vars_dict)
     await wait_till_rabbit_responsive(settings.dsn)
     return settings
 
diff --git a/packages/pytest-simcore/src/pytest_simcore/services_api_mocks_for_aiohttp_clients.py b/packages/pytest-simcore/src/pytest_simcore/services_api_mocks_for_aiohttp_clients.py
@@ -107,7 +107,7 @@ def create_computation_cb(url, **kwargs) -> CallbackResult:
                 "62237c33-8d6c-4709-aa92-c3cf693dd6d2",
             ],
         }
-    returned_computation = ComputationTask.parse_obj(
+    returned_computation = ComputationTask.model_validate(
         ComputationTask.model_config["json_schema_extra"]["examples"][0]
     ).copy(
         update={
@@ -131,7 +131,7 @@ def get_computation_cb(url, **kwargs) -> CallbackResult:
     state = RunningState.NOT_STARTED
     pipeline: dict[str, list[str]] = FULL_PROJECT_PIPELINE_ADJACENCY
     node_states = FULL_PROJECT_NODE_STATES
-    returned_computation = ComputationTask.parse_obj(
+    returned_computation = ComputationTask.model_validate(
         ComputationTask.model_config["json_schema_extra"]["examples"][0]
     ).copy(
         update={
@@ -169,7 +169,7 @@ def list_clusters_cb(url, **kwargs) -> CallbackResult:
         body=json.dumps(
             [
                 json.loads(
-                    Cluster.parse_obj(
+                    Cluster.model_validate(
                         random.choice(
                             Cluster.model_config["json_schema_extra"]["examples"]
                         )
@@ -187,7 +187,7 @@ def get_cluster_cb(url, **kwargs) -> CallbackResult:
     return CallbackResult(
         status=200,
         payload=json.loads(
-            Cluster.parse_obj(
+            Cluster.model_validate(
                 {
                     **random.choice(
                         Cluster.model_config["json_schema_extra"]["examples"]
@@ -218,7 +218,7 @@ def patch_cluster_cb(url, **kwargs) -> CallbackResult:
     return CallbackResult(
         status=200,
         payload=json.loads(
-            Cluster.parse_obj(
+            Cluster.model_validate(
                 {
                     **random.choice(
                         Cluster.model_config["json_schema_extra"]["examples"]
diff --git a/packages/service-integration/src/service_integration/cli/__init__.py b/packages/service-integration/src/service_integration/cli/__init__.py
@@ -62,7 +62,7 @@ def main(
         overrides["COMPOSE_VERSION"] = compose_version
 
     # save states
-    ctx.settings = AppSettings.parse_obj(overrides)  # type: ignore[attr-defined] # pylint:disable=no-member
+    ctx.settings = AppSettings.model_validate(overrides)  # type: ignore[attr-defined] # pylint:disable=no-member
 
 
 #
diff --git a/packages/service-library/src/servicelib/aiohttp/long_running_tasks/client.py b/packages/service-library/src/servicelib/aiohttp/long_running_tasks/client.py
@@ -35,7 +35,7 @@ async def _start(session: ClientSession, url: URL, json: RequestBody | None) ->
         data, error = unwrap_envelope(await response.json())
     assert not error  # nosec
     assert data is not None  # nosec
-    return TaskGet.parse_obj(data)
+    return TaskGet.model_validate(data)
 
 
 @retry(**_DEFAULT_AIOHTTP_RETRY_POLICY)
@@ -57,7 +57,7 @@ async def _wait_for_completion(
                     data, error = unwrap_envelope(await response.json())
                     assert not error  # nosec
                     assert data is not None  # nosec
-                task_status = TaskStatus.parse_obj(data)
+                task_status = TaskStatus.model_validate(data)
                 yield task_status.task_progress
                 if not task_status.done:
                     await asyncio.sleep(
diff --git a/packages/service-library/src/servicelib/aiohttp/requests_validation.py b/packages/service-library/src/servicelib/aiohttp/requests_validation.py
@@ -140,7 +140,7 @@ def parse_request_path_parameters_as(
         use_error_v1=use_enveloped_error_v1,
     ):
         data = dict(request.match_info)
-        return parameters_schema_cls.parse_obj(data)
+        return parameters_schema_cls.model_validate(data)
 
 
 def parse_request_query_parameters_as(
diff --git a/packages/service-library/src/servicelib/deferred_tasks/_redis_task_tracker.py b/packages/service-library/src/servicelib/deferred_tasks/_redis_task_tracker.py
@@ -43,7 +43,9 @@ async def get(self, task_uid: TaskUID) -> TaskScheduleModel | None:
         return await self._get_raw(_get_key(task_uid))
 
     async def save(self, task_uid: TaskUID, task_schedule: TaskScheduleModel) -> None:
-        await self.redis_client_sdk.redis.set(_get_key(task_uid), task_schedule.json())
+        await self.redis_client_sdk.redis.set(
+            _get_key(task_uid), task_schedule.model_dump_json()
+        )
 
     async def remove(self, task_uid: TaskUID) -> None:
         await self.redis_client_sdk.redis.delete(_get_key(task_uid))
diff --git a/packages/service-library/src/servicelib/fastapi/long_running_tasks/_context_manager.py b/packages/service-library/src/servicelib/fastapi/long_running_tasks/_context_manager.py
@@ -96,7 +96,7 @@ async def periodic_task_result(
 
     async def _status_update() -> TaskStatus:
         task_status: TaskStatus = await client.get_task_status(task_id)
-        logger.debug("Task status %s", task_status.json())
+        logger.debug("Task status %s", task_status.model_dump_json())
         await progress_manager.update(
             task_id=task_id,
             message=task_status.task_progress.message,
diff --git a/packages/service-library/src/servicelib/long_running_tasks/_task.py b/packages/service-library/src/servicelib/long_running_tasks/_task.py
@@ -123,7 +123,9 @@ async def _stale_tasks_monitor_worker(self) -> None:
                 logger.warning(
                     "Removing stale task '%s' with status '%s'",
                     task_id,
-                    self.get_task_status(task_id, with_task_context=None).json(),
+                    self.get_task_status(
+                        task_id, with_task_context=None
+                    ).model_dump_json(),
                 )
                 await self.remove_task(
                     task_id, with_task_context=None, reraise_errors=False
@@ -210,7 +212,7 @@ def get_task_status(
         task = tracked_task.task
         done = task.done()
 
-        return TaskStatus.parse_obj(
+        return TaskStatus.model_validate(
             {
                 "task_progress": tracked_task.task_progress,
                 "done": done,
diff --git a/packages/service-library/tests/aiohttp/long_running_tasks/conftest.py b/packages/service-library/tests/aiohttp/long_running_tasks/conftest.py
@@ -122,7 +122,7 @@ async def _waiter(
                 data, error = await assert_status(result, status.HTTP_200_OK)
                 assert data
                 assert not error
-                task_status = long_running_tasks.server.TaskStatus.parse_obj(data)
+                task_status = long_running_tasks.server.TaskStatus.model_validate(data)
                 assert task_status
                 assert task_status.done
 
diff --git a/packages/service-library/tests/fastapi/long_running_tasks/test_long_running_tasks.py b/packages/service-library/tests/fastapi/long_running_tasks/test_long_running_tasks.py
@@ -124,7 +124,7 @@ async def _waiter(
             with attempt:
                 result = await client.get(f"{status_url}")
                 assert result.status_code == status.HTTP_200_OK
-                task_status = long_running_tasks.server.TaskStatus.parse_obj(
+                task_status = long_running_tasks.server.TaskStatus.model_validate(
                     result.json()
                 )
                 assert task_status
@@ -183,7 +183,7 @@ async def test_workflow(
     result = await client.get(f"{result_url}")
     # NOTE: this is DIFFERENT than with aiohttp where we return the real result
     assert result.status_code == status.HTTP_200_OK
-    task_result = long_running_tasks.server.TaskResult.parse_obj(result.json())
+    task_result = long_running_tasks.server.TaskResult.model_validate(result.json())
     assert not task_result.error
     assert task_result.result == [f"{x}" for x in range(10)]
     # getting the result again should raise a 404
@@ -222,7 +222,7 @@ async def test_failing_task_returns_error(
     result_url = app.url_path_for("get_task_result", task_id=task_id)
     result = await client.get(f"{result_url}")
     assert result.status_code == status.HTTP_200_OK
-    task_result = long_running_tasks.server.TaskResult.parse_obj(result.json())
+    task_result = long_running_tasks.server.TaskResult.model_validate(result.json())
 
     assert not task_result.result
     assert task_result.error
diff --git a/packages/service-library/tests/fastapi/test_rabbitmq.py b/packages/service-library/tests/fastapi/test_rabbitmq.py
@@ -132,6 +132,6 @@ async def test_post_message(
                 f"--> checking for message in rabbit exchange {rabbit_message.channel_name}, {attempt.retry_state.retry_object.statistics}"
             )
             mocked_message_handler.assert_called_once_with(
-                rabbit_message.json().encode()
+                rabbit_message.model_dump_json().encode()
             )
             print("... message received")
diff --git a/packages/settings-library/tests/test__models_examples.py b/packages/settings-library/tests/test__models_examples.py
@@ -14,6 +14,6 @@
 def test_all_settings_library_models_config_examples(
     model_cls: type[BaseModel], example_name: int, example_data: Any
 ):
-    assert model_cls.parse_obj(
+    assert model_cls.model_validate(
         example_data
     ), f"Failed {example_name} : {json.dumps(example_data)}"
diff --git a/packages/simcore-sdk/src/simcore_sdk/node_ports_common/storage_client.py b/packages/simcore-sdk/src/simcore_sdk/node_ports_common/storage_client.py
@@ -144,7 +144,7 @@ async def get_storage_locations(
         expected_status=status.HTTP_200_OK,
         params={"user_id": f"{user_id}"},
     ) as response:
-        locations_enveloped = Envelope[FileLocationArray].parse_obj(
+        locations_enveloped = Envelope[FileLocationArray].model_validate(
             await response.json()
         )
         if locations_enveloped.data is None:
@@ -173,7 +173,7 @@ async def get_download_file_link(
         expected_status=status.HTTP_200_OK,
         params={"user_id": f"{user_id}", "link_type": link_type.value},
     ) as response:
-        presigned_link_enveloped = Envelope[PresignedLink].parse_obj(
+        presigned_link_enveloped = Envelope[PresignedLink].model_validate(
             await response.json()
         )
         if not presigned_link_enveloped.data or not presigned_link_enveloped.data.link:
@@ -215,7 +215,7 @@ async def get_upload_file_links(
         expected_status=status.HTTP_200_OK,
         params=query_params,
     ) as response:
-        file_upload_links_enveloped = Envelope[FileUploadSchema].parse_obj(
+        file_upload_links_enveloped = Envelope[FileUploadSchema].model_validate(
             await response.json()
         )
     if file_upload_links_enveloped.data is None:
@@ -245,7 +245,7 @@ async def get_file_metadata(
             # NOTE: keeps backwards compatibility
             raise exceptions.S3InvalidPathError(file_id)
 
-        file_metadata_enveloped = Envelope[FileMetaDataGet].parse_obj(payload)
+        file_metadata_enveloped = Envelope[FileMetaDataGet].model_validate(payload)
         assert file_metadata_enveloped.data  # nosec
         return file_metadata_enveloped.data
 
@@ -265,7 +265,7 @@ async def list_file_metadata(
         expected_status=status.HTTP_200_OK,
         params={"user_id": f"{user_id}", "uuid_filter": uuid_filter},
     ) as resp:
-        envelope = Envelope[list[FileMetaDataGet]].parse_obj(await resp.json())
+        envelope = Envelope[list[FileMetaDataGet]].model_validate(await resp.json())
         assert envelope.data is not None  # nosec
         file_meta_data: list[FileMetaDataGet] = envelope.data
         return file_meta_data
diff --git a/packages/simcore-sdk/tests/integration/conftest.py b/packages/simcore-sdk/tests/integration/conftest.py
@@ -142,7 +142,7 @@ async def _create(file_path: Path) -> dict[str, Any]:
         async with ClientSession() as session:
             async with session.put(url) as resp:
                 resp.raise_for_status()
-                presigned_links_enveloped = Envelope[FileUploadSchema].parse_obj(
+                presigned_links_enveloped = Envelope[FileUploadSchema].model_validate(
                     await resp.json()
                 )
             assert presigned_links_enveloped.data
diff --git a/packages/simcore-sdk/tests/unit/test_node_data_data_manager.py b/packages/simcore-sdk/tests/unit/test_node_data_data_manager.py
@@ -40,7 +40,7 @@ def _create_files(number: int, folder: Path) -> list[Path]:
 
 @pytest.fixture
 def r_clone_settings(faker: Faker) -> RCloneSettings:
-    return RCloneSettings.parse_obj(
+    return RCloneSettings.model_validate(
         {
             "R_CLONE_S3": {
                 "S3_ENDPOINT": faker.url(),

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ def main(`
`62`	`62`	`overrides["COMPOSE_VERSION"] = compose_version`
`63`	`63`
`64`	`64`	`# save states`
`65`		`- ctx.settings = AppSettings.parse_obj(overrides) # type: ignore[attr-defined] # pylint:disable=no-member`
	`65`	`+ ctx.settings = AppSettings.model_validate(overrides) # type: ignore[attr-defined] # pylint:disable=no-member`
`66`	`66`
`67`	`67`
`68`	`68`	`#`