♻️ Fix deprecated stuff (Pydantic v2) (#6732)

Author: giancarloromeo

api/specs/web-server/_common.py

@@ -8,6 +8,7 @@
 from typing import Any, ClassVar, NamedTuple
 
 import yaml
+from common_library.pydantic_fields_extension import get_type
 from fastapi import FastAPI
 from models_library.basic_types import LogLevel
 from pydantic import BaseModel, Field
@@ -116,8 +117,8 @@ def assert_handler_signature_against_model(
 
     # query and path parameters
     implemented_params = [
-        ParamSpec(field.name, field.type_, field.field_info)
-        for field in model_cls.__fields__.values()
+        ParamSpec(name, get_type(info), info)
+        for name, info in model_cls.model_fields.items()
     ]
 
     assert {p.name for p in implemented_params}.issubset(  # nosec

packages/models-library/src/models_library/function_services_catalog/api.py

@@ -24,7 +24,7 @@
 def iter_service_docker_data() -> Iterator[ServiceMetaDataPublished]:
     for meta_obj in catalog.iter_metadata():
         # NOTE: the originals are this way not modified from outside
-        copied_meta_obj = meta_obj.copy(deep=True)
+        copied_meta_obj = meta_obj.model_copy(deep=True)
         assert is_function_service(copied_meta_obj.key)  # nosec
         yield copied_meta_obj
 

packages/pytest-simcore/src/pytest_simcore/services_api_mocks_for_aiohttp_clients.py

@@ -109,7 +109,7 @@ def create_computation_cb(url, **kwargs) -> CallbackResult:
         }
     returned_computation = ComputationTask.model_validate(
         ComputationTask.model_config["json_schema_extra"]["examples"][0]
-    ).copy(
+    ).model_copy(
         update={
             "id": f"{kwargs['json']['project_id']}",
             "state": state,
@@ -133,7 +133,7 @@ def get_computation_cb(url, **kwargs) -> CallbackResult:
     node_states = FULL_PROJECT_NODE_STATES
     returned_computation = ComputationTask.model_validate(
         ComputationTask.model_config["json_schema_extra"]["examples"][0]
-    ).copy(
+    ).model_copy(
         update={
             "id": Path(url.path).name,
             "state": state,

packages/service-library/src/servicelib/aiohttp/db_asyncpg_engine.py

@@ -46,7 +46,7 @@ async def connect_to_db(app: web.Application, settings: PostgresSettings) -> Non
     - sets an engine in app state (use `get_async_engine(app)` to retrieve)
     """
     if settings.POSTGRES_CLIENT_NAME:
-        settings = settings.copy(
+        settings = settings.model_copy(
             update={"POSTGRES_CLIENT_NAME": settings.POSTGRES_CLIENT_NAME + "-asyncpg"}
         )
 

packages/service-library/src/servicelib/aiohttp/requests_validation.py

@@ -171,7 +171,7 @@ def parse_request_query_parameters_as(
         # query parameters with the same key. However, we are not using such cases anywhere at the moment.
         data = dict(request.query)
 
-        if hasattr(parameters_schema_cls, "parse_obj"):
+        if hasattr(parameters_schema_cls, "model_validate"):
             return parameters_schema_cls.model_validate(data)
         model: ModelClass = TypeAdapter(parameters_schema_cls).validate_python(data)
         return model

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

@@ -49,7 +49,7 @@ async def lock_project(
                 value=True,
                 owner=owner,
                 status=status,
-            ).json(),
+            ).model_dump_json(),
         ):
             msg = f"Lock for project {project_uuid!r} owner {owner!r} could not be acquired"
             raise ProjectLockError(msg)

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

packages/settings-library/src/settings_library/utils_encoders.py

@@ -14,4 +14,4 @@
 def test_health_ok(test_client: TestClient):
     response = test_client.get("/health")
     assert response.status_code == status.HTTP_200_OK
-    assert HealthCheckGet.parse_obj(response.json())
+    assert HealthCheckGet.model_validate(response.json())