continue upgrading

Author: giancarloromeo

services/autoscaling/src/simcore_service_autoscaling/_meta.py

@@ -1,5 +1,7 @@
 from typing import Final
 
+from pydantic import TypeAdapter
+
 from models_library.basic_types import VersionStr, VersionTag
 from packaging.version import Version
 from servicelib.utils_meta import PackageInfo
@@ -10,7 +12,7 @@
 APP_NAME: Final[str] = info.project_name
 API_VERSION: Final[VersionStr] = info.__version__
 VERSION: Final[Version] = info.version
-API_VTAG: Final[VersionTag] = VersionTag(info.api_prefix_path_tag)
+API_VTAG: Final[VersionTag] = TypeAdapter(VersionTag).validate_python(info.api_prefix_path_tag)
 SUMMARY: Final[str] = info.get_summary()
 
 

services/autoscaling/src/simcore_service_autoscaling/constants.py

@@ -2,32 +2,34 @@
 from typing import Final
 
 from aws_library.ec2._models import AWSTagKey, AWSTagValue, EC2Tags
-from pydantic import parse_obj_as
+from pydantic import TypeAdapter
 
-BUFFER_MACHINE_PULLING_EC2_TAG_KEY: Final[AWSTagKey] = parse_obj_as(
-    AWSTagKey, "pulling"
+BUFFER_MACHINE_PULLING_EC2_TAG_KEY: Final[AWSTagKey] = TypeAdapter(AWSTagKey).validate_python(
+    "pulling"
 )
-BUFFER_MACHINE_PULLING_COMMAND_ID_EC2_TAG_KEY: Final[AWSTagKey] = parse_obj_as(
-    AWSTagKey, "ssm-command-id"
+BUFFER_MACHINE_PULLING_COMMAND_ID_EC2_TAG_KEY: Final[AWSTagKey] = TypeAdapter(AWSTagKey).validate_python(
+    "ssm-command-id"
 )
 PREPULL_COMMAND_NAME: Final[str] = "docker images pulling"
 
 DOCKER_PULL_COMMAND: Final[
     str
 ] = "docker compose -f /docker-pull.compose.yml -p buffering pull"
 
-PRE_PULLED_IMAGES_EC2_TAG_KEY: Final[AWSTagKey] = parse_obj_as(
-    AWSTagKey, "io.simcore.autoscaling.pre_pulled_images"
+PRE_PULLED_IMAGES_EC2_TAG_KEY: Final[AWSTagKey] = TypeAdapter(AWSTagKey).validate_python(
+    "io.simcore.autoscaling.pre_pulled_images"
 )
 
-BUFFER_MACHINE_TAG_KEY: Final[AWSTagKey] = parse_obj_as(
-    AWSTagKey, "io.simcore.autoscaling.buffer_machine"
+BUFFER_MACHINE_TAG_KEY: Final[AWSTagKey] = TypeAdapter(AWSTagKey).validate_python(
+    "io.simcore.autoscaling.buffer_machine"
 )
 DEACTIVATED_BUFFER_MACHINE_EC2_TAGS: Final[EC2Tags] = {
-    BUFFER_MACHINE_TAG_KEY: parse_obj_as(AWSTagValue, "true")
+    BUFFER_MACHINE_TAG_KEY: TypeAdapter(AWSTagValue).validate_python(
+        "true"
+    )
 }
 ACTIVATED_BUFFER_MACHINE_EC2_TAGS: Final[EC2Tags] = {
-    BUFFER_MACHINE_TAG_KEY: parse_obj_as(AWSTagValue, "false")
+    BUFFER_MACHINE_TAG_KEY: TypeAdapter(AWSTagValue).validate_python("false")
 }
 PRE_PULLED_IMAGES_RE: Final[re.Pattern] = re.compile(
     rf"{PRE_PULLED_IMAGES_EC2_TAG_KEY}_\((\d+)\)"

services/autoscaling/src/simcore_service_autoscaling/core/errors.py

@@ -1,12 +1,7 @@
-from typing import Any
-
 from models_library.errors_classes import OsparcErrorMixin
 
 
 class AutoscalingRuntimeError(OsparcErrorMixin, RuntimeError):
-    def __init__(self, **ctx: Any) -> None:
-        super().__init__(**ctx)
-
     msg_template: str = "Autoscaling unexpected error"
 
 

services/autoscaling/src/simcore_service_autoscaling/core/settings.py

@@ -1,6 +1,6 @@
 import datetime
 from functools import cached_property
-from typing import Final, cast
+from typing import Annotated, Final, cast
 
 from aws_library.ec2 import EC2InstanceBootSpecific, EC2Tags
 from fastapi import FastAPI
@@ -183,7 +183,7 @@ class NodesMonitoringSettings(BaseCustomSettings):
 
 
 class DaskMonitoringSettings(BaseCustomSettings):
-    DASK_MONITORING_URL: AnyUrl = Field(
+    DASK_MONITORING_URL: Annotated[str, AnyUrl] = Field(
         ..., description="the url to the osparc-dask-scheduler"
     )
     DASK_SCHEDULER_AUTH: InternalClusterAuthentication = Field(

services/autoscaling/tests/unit/test_utils_rabbitmq.py

@@ -18,7 +18,7 @@
     ProgressRabbitMessageNode,
     ProgressType,
 )
-from pydantic import parse_obj_as
+from pydantic import TypeAdapter
 from pytest_mock.plugin import MockerFixture
 from servicelib.rabbitmq import BIND_TO_ALL_TOPICS, RabbitMQClient
 from settings_library.rabbit import RabbitSettings
@@ -78,8 +78,7 @@ async def test_post_task_log_message(
         "running",
     )
     assert service_with_labels.Spec
-    service_tasks = parse_obj_as(
-        list[Task],
+    service_tasks = TypeAdapter(list[Task]).validate_python(
         await async_docker_client.tasks.list(
             filters={"service": service_with_labels.Spec.Name}
         ),
@@ -103,7 +102,7 @@ async def test_post_task_log_message(
                     messages=[f"[cluster] {log_message}"],
                     log_level=0,
                 )
-                .json()
+                .model_dump_json()
                 .encode()
             )
             print("... message received")
@@ -125,8 +124,7 @@ async def test_post_task_log_message_does_not_raise_if_service_has_no_labels(
 ):
     service_without_labels = await create_service(task_template, {}, "running")
     assert service_without_labels.Spec
-    service_tasks = parse_obj_as(
-        list[Task],
+    service_tasks = TypeAdapter(list[Task]).validate_python(
         await async_docker_client.tasks.list(
             filters={"service": service_without_labels.Spec.Name}
         ),
@@ -170,8 +168,7 @@ async def test_post_task_progress_message(
         "running",
     )
     assert service_with_labels.Spec
-    service_tasks = parse_obj_as(
-        list[Task],
+    service_tasks = TypeAdapter(list[Task]).validate_python(
         await async_docker_client.tasks.list(
             filters={"service": service_with_labels.Spec.Name}
         ),
@@ -195,7 +192,7 @@ async def test_post_task_progress_message(
                     progress_type=ProgressType.CLUSTER_UP_SCALING,
                     report=ProgressReport(actual_value=progress_value, total=1),
                 )
-                .json()
+                .model_dump_json()
                 .encode()
             )
             print("... message received")
@@ -217,8 +214,7 @@ async def test_post_task_progress_does_not_raise_if_service_has_no_labels(
 ):
     service_without_labels = await create_service(task_template, {}, "running")
     assert service_without_labels.Spec
-    service_tasks = parse_obj_as(
-        list[Task],
+    service_tasks = TypeAdapter(list[Task]).validate_python(
         await async_docker_client.tasks.list(
             filters={"service": service_without_labels.Spec.Name}
         ),