fix mypy

Author: giancarloromeo

services/clusters-keeper/src/simcore_service_clusters_keeper/_meta.py

@@ -9,17 +9,21 @@
 
 from models_library.basic_types import VersionStr, VersionTag
 from packaging.version import Version
-from pydantic import parse_obj_as
+from pydantic import TypeAdapter
 
 _current_distribution = distribution("simcore-service-clusters-keeper")
 __version__: str = version("simcore-service-clusters-keeper")
 
 
 APP_NAME: Final[str] = _current_distribution.metadata["Name"]
-API_VERSION: Final[VersionStr] = parse_obj_as(VersionStr, __version__)
+API_VERSION: Final[VersionStr] = TypeAdapter(VersionStr).validate_python(__version__)
 VERSION: Final[Version] = Version(__version__)
-API_VTAG: Final[VersionTag] = parse_obj_as(VersionTag, f"v{VERSION.major}")
-RPC_VTAG: Final[VersionTag] = parse_obj_as(VersionTag, f"v{VERSION.major}")
+API_VTAG: Final[VersionTag] = TypeAdapter(VersionTag).validate_python(
+    f"v{VERSION.major}"
+)
+RPC_VTAG: Final[VersionTag] = TypeAdapter(VersionTag).validate_python(
+    f"v{VERSION.major}"
+)
 
 
 def get_summary() -> str:

services/clusters-keeper/src/simcore_service_clusters_keeper/modules/clusters_management_core.py

@@ -8,7 +8,7 @@
 from fastapi import FastAPI
 from models_library.users import UserID
 from models_library.wallets import WalletID
-from pydantic import parse_obj_as
+from pydantic import TypeAdapter
 from servicelib.logging_utils import log_catch
 
 from ..core.settings import get_application_settings
@@ -35,8 +35,10 @@ def _get_instance_last_heartbeat(instance: EC2InstanceData) -> datetime.datetime
     return None
 
 
-_USER_ID_TAG_KEY: Final[AWSTagKey] = parse_obj_as(AWSTagKey, "user_id")
-_WALLET_ID_TAG_KEY: Final[AWSTagKey] = parse_obj_as(AWSTagKey, "wallet_id")
+_USER_ID_TAG_KEY: Final[AWSTagKey] = TypeAdapter(AWSTagKey).validate_python("user_id")
+_WALLET_ID_TAG_KEY: Final[AWSTagKey] = TypeAdapter(AWSTagKey).validate_python(
+    "wallet_id"
+)
 
 
 async def _get_all_associated_worker_instances(

services/clusters-keeper/src/simcore_service_clusters_keeper/utils/dask.py

@@ -1,13 +1,15 @@
 from aws_library.ec2 import EC2InstanceData
 from fastapi import FastAPI
 from models_library.clusters import InternalClusterAuthentication
-from pydantic import AnyUrl, parse_obj_as
+from pydantic import AnyUrl, TypeAdapter
 
 from ..core.settings import get_application_settings
 
 
 def get_scheduler_url(ec2_instance: EC2InstanceData) -> AnyUrl:
-    url: AnyUrl = parse_obj_as(AnyUrl, f"tls://{ec2_instance.aws_private_dns}:8786")
+    url: AnyUrl = TypeAdapter(AnyUrl).validate_python(
+        f"tls://{ec2_instance.aws_private_dns}:8786"
+    )
     return url
 
 

services/clusters-keeper/src/simcore_service_clusters_keeper/utils/ec2.py

@@ -4,17 +4,19 @@
 from aws_library.ec2 import AWSTagKey, AWSTagValue, EC2Tags
 from models_library.users import UserID
 from models_library.wallets import WalletID
-from pydantic import parse_obj_as
+from pydantic import TypeAdapter
 
 from .._meta import VERSION
 from ..core.settings import ApplicationSettings
 
 _APPLICATION_TAG_KEY: Final[str] = "io.simcore.clusters-keeper"
-_APPLICATION_VERSION_TAG: Final[EC2Tags] = parse_obj_as(
-    EC2Tags, {f"{_APPLICATION_TAG_KEY}.version": f"{VERSION}"}
+_APPLICATION_VERSION_TAG: Final[EC2Tags] = TypeAdapter(EC2Tags).validate_python(
+    {f"{_APPLICATION_TAG_KEY}.version": f"{VERSION}"}
 )
 
-HEARTBEAT_TAG_KEY: Final[AWSTagKey] = parse_obj_as(AWSTagKey, "last_heartbeat")
+HEARTBEAT_TAG_KEY: Final[AWSTagKey] = TypeAdapter(AWSTagKey).validate_python(
+    "last_heartbeat"
+)
 CLUSTER_NAME_PREFIX: Final[str] = "osparc-computational-cluster-"