fixed unit tests

Author: Andrei Neagu

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

@@ -1,6 +1,6 @@
 from typing import Annotated, TypeAlias
 
-from pydantic import AfterValidator, AnyHttpUrl, AnyUrl, HttpUrl
+from pydantic import AfterValidator, AnyHttpUrl, AnyUrl, FileUrl, HttpUrl
 from pydantic_core import Url
 
 
@@ -23,3 +23,8 @@ def _strip_last_slash(url: Url) -> str:
     HttpUrl,
     AfterValidator(_strip_last_slash),
 ]
+
+FileUrlLegacy: TypeAlias = Annotated[
+    FileUrl,
+    AfterValidator(_strip_last_slash),
+]

services/dask-sidecar/src/simcore_service_dask_sidecar/computational_sidecar/core.py

@@ -71,7 +71,7 @@ async def _write_input_data(
             if isinstance(input_params, FileUrl):
                 file_name = (
                     input_params.file_mapping
-                    or Path(URL(input_params.url).path.strip("/")).name
+                    or Path(URL(f"{input_params.url}").path.strip("/")).name
                 )
 
                 destination_path = task_volumes.inputs_folder / file_name

services/dask-sidecar/src/simcore_service_dask_sidecar/computational_sidecar/errors.py

@@ -1,7 +1,7 @@
-from pydantic.errors import PydanticErrorMixin
+from common_library.errors_classes import OsparcErrorMixin
 
 
-class ComputationalSidecarRuntimeError(PydanticErrorMixin, RuntimeError):
+class ComputationalSidecarRuntimeError(OsparcErrorMixin, RuntimeError):
     ...
 
 

services/dask-sidecar/src/simcore_service_dask_sidecar/computational_sidecar/models.py

@@ -3,7 +3,14 @@
 from models_library.basic_regex import SIMPLE_VERSION_RE
 from models_library.services import ServiceMetaDataPublished
 from packaging import version
-from pydantic import BaseModel, ByteSize, Extra, Field, validator
+from pydantic import (
+    BaseModel,
+    ByteSize,
+    ConfigDict,
+    Field,
+    ValidationInfo,
+    field_validator,
+)
 
 LEGACY_INTEGRATION_VERSION = version.Version("0")
 PROGRESS_REGEXP: re.Pattern[str] = re.compile(
@@ -41,18 +48,20 @@ class ContainerHostConfig(BaseModel):
         ..., alias="NanoCPUs", description="CPU quota in units of 10-9 CPUs"
     )
 
-    @validator("memory_swap", pre=True, always=True)
+    @field_validator("memory_swap", mode="before")
     @classmethod
-    def ensure_no_memory_swap_means_no_swap(cls, v, values):
+    def ensure_no_memory_swap_means_no_swap(cls, v, info: ValidationInfo):
         if v is None:
             # if not set it will be the same value as memory to ensure swap is disabled
-            return values["memory"]
+            return info.data["memory"]
         return v
 
-    @validator("memory_swap")
+    @field_validator("memory_swap")
     @classmethod
-    def ensure_memory_swap_cannot_be_unlimited_nor_smaller_than_memory(cls, v, values):
-        if v < values["memory"]:
+    def ensure_memory_swap_cannot_be_unlimited_nor_smaller_than_memory(
+        cls, v, info: ValidationInfo
+    ):
+        if v < info.data["memory"]:
             msg = "Memory swap cannot be set to a smaller value than memory"
             raise ValueError(msg)
         return v
@@ -71,26 +80,24 @@ class ImageLabels(BaseModel):
         default=str(LEGACY_INTEGRATION_VERSION),
         alias="integration-version",
         description="integration version number",
-        regex=SIMPLE_VERSION_RE,
+        pattern=SIMPLE_VERSION_RE,
         examples=["1.0.0"],
     )
     progress_regexp: str = Field(
         default=PROGRESS_REGEXP.pattern,
         alias="progress_regexp",
         description="regexp pattern for detecting computational service's progress",
     )
+    model_config = ConfigDict(extra="ignore")
 
-    class Config:
-        extra = Extra.ignore
-
-    @validator("integration_version", pre=True)
+    @field_validator("integration_version", mode="before")
     @classmethod
     def default_integration_version(cls, v):
         if v is None:
             return ImageLabels().integration_version
         return v
 
-    @validator("progress_regexp", pre=True)
+    @field_validator("progress_regexp", mode="before")
     @classmethod
     def default_progress_regexp(cls, v):
         if v is None:
@@ -104,6 +111,6 @@ def get_progress_regexp(self) -> re.Pattern[str]:
         return re.compile(self.progress_regexp)
 
 
-assert set(ImageLabels.__fields__).issubset(
-    ServiceMetaDataPublished.__fields__
+assert set(ImageLabels.model_fields).issubset(
+    ServiceMetaDataPublished.model_fields
 ), "ImageLabels must be compatible with ServiceDockerData"

services/dask-sidecar/src/simcore_service_dask_sidecar/file_utils.py

@@ -12,7 +12,8 @@
 import aiofiles
 import aiofiles.tempfile
 import fsspec  # type: ignore[import-untyped]
-from pydantic import ByteSize, FileUrl, parse_obj_as
+from common_library.pydantic_networks_extension import FileUrlLegacy
+from pydantic import ByteSize, TypeAdapter
 from pydantic.networks import AnyUrl
 from servicelib.logging_utils import LogLevelInt, LogMessageStr
 from settings_library.s3 import S3Settings
@@ -145,7 +146,7 @@ async def pull_file_from_remote(
         storage_kwargs = _s3fs_settings_from_s3_settings(s3_settings)
     await _copy_file(
         src_url,
-        parse_obj_as(FileUrl, dst_path.as_uri()),
+        TypeAdapter(FileUrlLegacy).validate_python(dst_path.as_uri()),
         src_storage_cfg=cast(dict[str, Any], storage_kwargs),
         log_publishing_cb=log_publishing_cb,
         text_prefix=f"Downloading '{src_url.path.strip('/')}':",
@@ -215,7 +216,7 @@ async def _push_file_to_remote(
         storage_kwargs = _s3fs_settings_from_s3_settings(s3_settings)
 
     await _copy_file(
-        parse_obj_as(FileUrl, file_to_upload.as_uri()),
+        TypeAdapter(FileUrlLegacy).validate_python(file_to_upload.as_uri()),
         dst_url,
         dst_storage_cfg=cast(dict[str, Any], storage_kwargs),
         log_publishing_cb=log_publishing_cb,
@@ -243,7 +244,7 @@ async def push_file_to_remote(
         src_mime_type, _ = mimetypes.guess_type(src_path)
 
         if dst_mime_type == _ZIP_MIME_TYPE and src_mime_type != _ZIP_MIME_TYPE:
-            archive_file_path = Path(tmp_dir) / Path(URL(dst_url).path).name
+            archive_file_path = Path(tmp_dir) / Path(URL(f"{dst_url}").path).name
             await log_publishing_cb(
                 f"Compressing '{src_path.name}' to '{archive_file_path.name}'...",
                 logging.INFO,

services/dask-sidecar/src/simcore_service_dask_sidecar/settings.py

@@ -2,7 +2,7 @@
 from typing import Any
 
 from models_library.basic_types import LogLevel
-from pydantic import Field, validator
+from pydantic import AliasChoices, Field, field_validator
 from settings_library.base import BaseCustomSettings
 from settings_library.utils_logging import MixinLoggingSettings
 
@@ -14,7 +14,9 @@ class Settings(BaseCustomSettings, MixinLoggingSettings):
     SC_BOOT_MODE: str | None = None
     LOG_LEVEL: LogLevel = Field(
         LogLevel.INFO.value,
-        env=["DASK_SIDECAR_LOGLEVEL", "SIDECAR_LOGLEVEL", "LOG_LEVEL", "LOGLEVEL"],
+        validation_alias=AliasChoices(
+            "DASK_SIDECAR_LOGLEVEL", "SIDECAR_LOGLEVEL", "LOG_LEVEL", "LOGLEVEL"
+        ),
     )
 
     # sidecar config ---
@@ -37,7 +39,10 @@ class Settings(BaseCustomSettings, MixinLoggingSettings):
 
     DASK_LOG_FORMAT_LOCAL_DEV_ENABLED: bool = Field(
         default=False,
-        env=["DASK_LOG_FORMAT_LOCAL_DEV_ENABLED", "LOG_FORMAT_LOCAL_DEV_ENABLED"],
+        validation_alias=AliasChoices(
+            "DASK_LOG_FORMAT_LOCAL_DEV_ENABLED",
+            "LOG_FORMAT_LOCAL_DEV_ENABLED",
+        ),
         description="Enables local development log format. WARNING: make sure it is disabled if you want to have structured logs!",
     )
 
@@ -50,7 +55,7 @@ def as_worker(self) -> bool:
             assert self.DASK_SCHEDULER_HOST is not None  # nosec
         return as_worker
 
-    @validator("LOG_LEVEL", pre=True)
+    @field_validator("LOG_LEVEL", mode="before")
     @classmethod
     def _validate_loglevel(cls, value: Any) -> str:
         return cls.validate_log_level(f"{value}")