fixed tests

Author: Andrei Neagu

packages/common-library/src/common_library/pydantic_validators.py

@@ -0,0 +1,12 @@
+from models_library.services_types import RunID
+from pydantic import field_validator
+
+
+def _convert_str_to_run_id_object(v: RunID | str) -> RunID:
+    if isinstance(v, str):
+        return RunID(v)
+    return v
+
+
+def convert_str_to_run_id_object(field: str):
+    return field_validator(field, mode="before")(_convert_str_to_run_id_object)

services/agent/src/simcore_service_agent/core/settings.py

@@ -1,7 +1,8 @@
 from datetime import timedelta
 
+from common_library.pydantic_type_adapters import AnyHttpUrlLegacy
 from models_library.basic_types import BootModeEnum, LogLevel
-from pydantic import AliasChoices, AnyHttpUrl, Field, field_validator
+from pydantic import AliasChoices, Field, field_validator
 from settings_library.base import BaseCustomSettings
 from settings_library.r_clone import S3Provider
 from settings_library.rabbit import RabbitSettings
@@ -32,7 +33,7 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     AGENT_VOLUMES_CLEANUP_TARGET_SWARM_STACK_NAME: str = Field(
         ..., description="Exactly the same as director-v2's `SWARM_STACK_NAME` env var"
     )
-    AGENT_VOLUMES_CLEANUP_S3_ENDPOINT: AnyHttpUrl
+    AGENT_VOLUMES_CLEANUP_S3_ENDPOINT: AnyHttpUrlLegacy
     AGENT_VOLUMES_CLEANUP_S3_ACCESS_KEY: str
     AGENT_VOLUMES_CLEANUP_S3_SECRET_KEY: str
     AGENT_VOLUMES_CLEANUP_S3_BUCKET: str

services/agent/src/simcore_service_agent/models/volumes.py

@@ -1,13 +1,15 @@
 from pathlib import Path
+from typing import Final
 
+from common_library.pydantic_validators import convert_str_to_run_id_object
 from models_library.api_schemas_directorv2.services import (
     CHARS_IN_VOLUME_NAME_BEFORE_DIR_NAME,
 )
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
 from models_library.services_types import RunID
 from models_library.users import UserID
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field, TypeAdapter
 
 
 class DynamicServiceVolumeLabels(BaseModel):
@@ -22,7 +24,16 @@ class DynamicServiceVolumeLabels(BaseModel):
     def directory_name(self) -> str:
         return self.source[CHARS_IN_VOLUME_NAME_BEFORE_DIR_NAME:][::-1].strip("_")
 
+    _convert_str_to_run_id_object = convert_str_to_run_id_object("run_id")
+
+    model_config = ConfigDict(
+        arbitrary_types_allowed=True,
+    )
+
 
 class VolumeDetails(BaseModel):
     mountpoint: Path = Field(alias="Mountpoint")
     labels: DynamicServiceVolumeLabels = Field(alias="Labels")
+
+
+VolumeDetailsAdapter: Final[TypeAdapter[VolumeDetails]] = TypeAdapter(VolumeDetails)

services/agent/src/simcore_service_agent/services/docker_utils.py

@@ -15,7 +15,7 @@
 from simcore_service_agent.core.settings import ApplicationSettings
 from starlette import status
 
-from ..models.volumes import VolumeDetails
+from ..models.volumes import VolumeDetails, VolumeDetailsAdapter
 from .backup import backup_volume
 from .instrumentation import get_instrumentation
 
@@ -60,7 +60,7 @@ async def get_unused_dynamc_sidecar_volumes(docker: Docker) -> set[str]:
 
 async def get_volume_details(docker: Docker, *, volume_name: str) -> VolumeDetails:
     volume_details = await DockerVolume(docker, volume_name).show()
-    return VolumeDetails.parse_obj(volume_details)
+    return VolumeDetailsAdapter.validate_python(volume_details)
 
 
 @contextmanager