continue mypy

Author: giancarloromeo

services/clusters-keeper/src/simcore_service_clusters_keeper/core/application.py

@@ -25,7 +25,7 @@
 
 
 def create_app(settings: ApplicationSettings) -> FastAPI:
-    logger.info("app settings: %s", settings.json(indent=1))
+    logger.info("app settings: %s", settings.model_dump_json(indent=1))
 
     app = FastAPI(
         debug=settings.CLUSTERS_KEEPER_DEBUG,

services/clusters-keeper/tests/unit/conftest.py

@@ -81,7 +81,7 @@ def mocked_ec2_server_envs(
     # NOTE: overrides the EC2Settings with what clusters-keeper expects
     changed_envs: EnvVarsDict = {
         f"{CLUSTERS_KEEPER_ENV_PREFIX}{k}": v
-        for k, v in mocked_ec2_server_settings.dict().items()
+        for k, v in mocked_ec2_server_settings.model_dump().items()
     }
     return setenvs_from_dict(monkeypatch, changed_envs)
 

services/clusters-keeper/tests/unit/test_modules_dask.py

@@ -12,7 +12,7 @@
     NoAuthentication,
     TLSAuthentication,
 )
-from pydantic import AnyUrl, parse_obj_as
+from pydantic import AnyUrl, TypeAdapter
 from simcore_service_clusters_keeper.modules.dask import (
     is_scheduler_busy,
     ping_scheduler,
@@ -38,7 +38,7 @@ async def test_ping_scheduler_non_existing_scheduler(
 ):
     assert (
         await ping_scheduler(
-            parse_obj_as(AnyUrl, f"tcp://{faker.ipv4()}:{faker.port_number()}"),
+            TypeAdapter(AnyUrl).validate_python(f"tcp://{faker.ipv4()}:{faker.port_number()}"),
             authentication,
         )
         is False
@@ -48,7 +48,7 @@ async def test_ping_scheduler_non_existing_scheduler(
 async def test_ping_scheduler(dask_spec_local_cluster: SpecCluster):
     assert (
         await ping_scheduler(
-            parse_obj_as(AnyUrl, dask_spec_local_cluster.scheduler_address),
+            TypeAdapter(AnyUrl).validate_python(dask_spec_local_cluster.scheduler_address),
             NoAuthentication(),
         )
         is True
@@ -71,7 +71,7 @@ async def test_is_scheduler_busy(
     dask_spec_cluster_client: distributed.Client,
 ):
     # nothing runs right now
-    scheduler_address = parse_obj_as(AnyUrl, dask_spec_local_cluster.scheduler_address)
+    scheduler_address = TypeAdapter(AnyUrl).validate_python(dask_spec_local_cluster.scheduler_address)
     assert await is_scheduler_busy(scheduler_address, NoAuthentication()) is False
     _SLEEP_TIME = 5
 

services/clusters-keeper/tests/unit/test_modules_rabbitmq.py

@@ -116,7 +116,7 @@ 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")
 

services/clusters-keeper/tests/unit/test_utils_clusters.py

@@ -23,7 +23,7 @@
     TLSAuthentication,
 )
 from models_library.utils.json_serialization import json_dumps
-from pydantic import ByteSize, parse_obj_as
+from pydantic import ByteSize, TypeAdapter
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
 from simcore_service_clusters_keeper.core.settings import ApplicationSettings
 from simcore_service_clusters_keeper.utils.clusters import (
@@ -178,7 +178,7 @@ def test_create_startup_script_script_size_below_16kb(
     script_size_in_bytes = len(startup_script.encode("utf-8"))
 
     print(
-        f"current script size is {parse_obj_as(ByteSize, script_size_in_bytes).human_readable()}"
+        f"current script size is {TypeAdapter(ByteSize).validate_python(script_size_in_bytes).human_readable()}"
     )
     # NOTE: EC2 user data cannot be above 16KB, we keep some margin here
     assert script_size_in_bytes < 15 * 1024