fix deprecated

Author: giancarloromeo

api/specs/director/schemas/scripts/create_node-meta-schema.py

@@ -15,7 +15,7 @@
 
 if __name__ == "__main__":
     with Path.open(CURRENT_DIR.parent / "node-meta-v0.0.1-pydantic.json", "w") as f:
-        schema = ServiceMetaDataPublished.schema_json()
+        schema = ServiceMetaDataPublished.model_json_schema()
         schema_without_ref = jsonref.loads(schema)
 
         json.dump(schema_without_ref, f, indent=2)

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

@@ -56,31 +56,27 @@ def _check_size(cls, v, info: ValidationInfo):
 
     @cached_property
     def dsn(self) -> str:
-        dsn: str = str(
-            PostgresDsn.build(  # pylint: disable=no-member
-                scheme="postgresql",
-                username=self.POSTGRES_USER,
-                password=self.POSTGRES_PASSWORD.get_secret_value(),
-                host=self.POSTGRES_HOST,
-                port=self.POSTGRES_PORT,
-                path=f"{self.POSTGRES_DB}",
-            )
+        dsn = PostgresDsn.build(  # pylint: disable=no-member
+            scheme="postgresql",
+            username=self.POSTGRES_USER,
+            password=self.POSTGRES_PASSWORD.get_secret_value(),
+            host=self.POSTGRES_HOST,
+            port=self.POSTGRES_PORT,
+            path=f"{self.POSTGRES_DB}",
         )
-        return dsn
+        return f"{dsn}"
 
     @cached_property
     def dsn_with_async_sqlalchemy(self) -> str:
-        dsn: str = str(
-            PostgresDsn.build(  # pylint: disable=no-member
-                scheme="postgresql+asyncpg",
-                username=self.POSTGRES_USER,
-                password=self.POSTGRES_PASSWORD.get_secret_value(),
-                host=self.POSTGRES_HOST,
-                port=self.POSTGRES_PORT,
-                path=f"{self.POSTGRES_DB}",
-            )
+        dsn = PostgresDsn.build(  # pylint: disable=no-member
+            scheme="postgresql+asyncpg",
+            username=self.POSTGRES_USER,
+            password=self.POSTGRES_PASSWORD.get_secret_value(),
+            host=self.POSTGRES_HOST,
+            port=self.POSTGRES_PORT,
+            path=f"{self.POSTGRES_DB}",
         )
-        return dsn
+        return f"{dsn}"
 
     @cached_property
     def dsn_with_query(self) -> str:

services/director-v2/src/simcore_service_director_v2/modules/db/repositories/projects_networks.py

@@ -33,7 +33,7 @@ async def upsert_projects_networks(
         )
 
         async with self.db_engine.acquire() as conn:
-            row_data = json.loads(projects_networks_to_insert.json())
+            row_data = json.loads(projects_networks_to_insert.model_dump_json())
             insert_stmt = pg_insert(projects_networks).values(**row_data)
             upsert_snapshot = insert_stmt.on_conflict_do_update(
                 constraint=projects_networks.primary_key, set_=row_data

services/director-v2/src/simcore_service_director_v2/utils/clients.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Any, Union
+from typing import Any
 
 import httpx
 from fastapi import HTTPException
@@ -9,7 +9,7 @@
 logger = logging.getLogger(__name__)
 
 
-def unenvelope_or_raise_error(resp: httpx.Response) -> Union[list[Any], dict[str, Any]]:
+def unenvelope_or_raise_error(resp: httpx.Response) -> list[Any] | dict[str, Any]:
     """
     Director responses are enveloped
     If successful response, we un-envelop it and return data as a dict

services/director-v2/tests/helpers/shared_comp_utils.py

@@ -64,7 +64,7 @@ async def assert_and_wait_for_pipeline_status(
     MAX_TIMEOUT_S = 5 * MINUTE
 
     async def check_pipeline_state() -> ComputationGet:
-        response = await client.get(url, params={"user_id": user_id})
+        response = await client.get(f"{url}", params={"user_id": user_id})
         assert (
             response.status_code == status.HTTP_200_OK
         ), f"response code is {response.status_code}, error: {response.text}"
@@ -100,4 +100,5 @@ async def check_pipeline_state() -> ComputationGet:
             return task_out
 
     # this is only to satisfy pylance
-    raise AssertionError("No computation task generated!")
+    msg = "No computation task generated!"
+    raise AssertionError(msg)

services/director-v2/tests/integration/02/test_dynamic_sidecar_nodeports_integration.py

@@ -403,7 +403,7 @@ def mock_env(
             "COMPUTATIONAL_BACKEND_ENABLED": "true",
             "COMPUTATIONAL_BACKEND_DASK_CLIENT_ENABLED": "true",
             "COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_URL": dask_scheduler_service,
-            "COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_AUTH": dask_scheduler_auth.json(),
+            "COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_AUTH": dask_scheduler_auth.model_dump_json(),
             "DIRECTOR_V2_PROMETHEUS_INSTRUMENTATION_ENABLED": "1",
         },
     )

services/director-v2/tests/integration/02/utils.py

@@ -263,7 +263,9 @@ async def patch_dynamic_service_url(app: FastAPI, node_uuid: str) -> str:
             proxy_service_name,
             target_port=dynamic_sidecar_proxy_settings.DYNAMIC_SIDECAR_CADDY_ADMIN_API_PORT,
         )
-        assert proxy_published_port is not None, f"{sidecar_settings.json()=}"
+        assert (
+            proxy_published_port is not None
+        ), f"{sidecar_settings.model_dump_json()=}"
 
         async with scheduler.scheduler._lock:  # noqa: SLF001
             localhost_ip = get_localhost_ip()
@@ -458,7 +460,7 @@ async def assert_retrieve_service(
 
     size_bytes = json_result["data"]["size_bytes"]
     assert size_bytes > 0
-    assert type(size_bytes) == int
+    assert isinstance(size_bytes, int)
 
 
 async def assert_stop_service(

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

@@ -123,7 +123,7 @@ def scheduler_data_from_http_request(
 def mock_service_inspect(
     scheduler_data_from_http_request: ServiceDetails,
 ) -> Mapping[str, Any]:
-    service_details = json.loads(scheduler_data_from_http_request.json())
+    service_details = json.loads(scheduler_data_from_http_request.model_dump_json())
     service_details["compose_spec"] = json.dumps(service_details["compose_spec"])
     return {
         "Spec": {

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

@@ -4,8 +4,8 @@
 from copy import deepcopy
 from pathlib import Path
 
-from pydantic import TypeAdapter
 import pytest
+from pydantic import TypeAdapter
 from simcore_service_director_v2.models.dynamic_services_scheduler import SchedulerData
 
 
@@ -20,7 +20,7 @@ def test_regression_as_label_data(scheduler_data: SchedulerData) -> None:
     # old tested implementation
     scheduler_data_copy = deepcopy(scheduler_data)
     scheduler_data_copy.compose_spec = json.dumps(scheduler_data_copy.compose_spec)
-    json_encoded = scheduler_data_copy.json()
+    json_encoded = scheduler_data_copy.model_dump_json()
 
     # using pydantic's internals
     label_data = scheduler_data.as_label_data()
@@ -35,4 +35,6 @@ def test_ensure_legacy_format_compatibility(legacy_scheduler_data_format: Path):
 
     # PRs applying changes to the legacy format:
     # - https://github.com/ITISFoundation/osparc-simcore/pull/3610
-    assert TypeAdapter(list[SchedulerData]).validate_json(legacy_scheduler_data_format.read_text())
+    assert TypeAdapter(list[SchedulerData]).validate_json(
+        legacy_scheduler_data_format.read_text()
+    )

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

@@ -44,7 +44,7 @@ def message(faker: Faker) -> WalletCreditsLimitReachedMessage:
 async def test_handler_out_of_credits(
     mock_app: FastAPI, message: WalletCreditsLimitReachedMessage, ignore_limits
 ):
-    await handler_out_of_credits(mock_app, message.json().encode())
+    await handler_out_of_credits(mock_app, message.model_dump_json().encode())
 
     removal_mark_count = (
         mock_app.state.dynamic_sidecar_scheduler.mark_all_services_in_wallet_for_removal.call_count