Merge remote-tracking branch 'upstream/pydantic_v2_migration_do_not_squash_updates' into pr-osparc-add-dybamic-services-monitor-dashboard2

Author: Andrei Neagu

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

@@ -1,7 +1,7 @@
 from typing import Annotated, Final, Generic, TypeAlias, TypeVar
 
-from common_library.pydantic_networks_extension import AnyHttpUrlLegacy
 from pydantic import (
+    AnyHttpUrl,
     BaseModel,
     BeforeValidator,
     ConfigDict,
@@ -100,9 +100,7 @@ class PageLinks(
     PageRefs[
         Annotated[
             str,
-            BeforeValidator(
-                lambda x: str(TypeAdapter(AnyHttpUrlLegacy).validate_python(x))
-            ),
+            BeforeValidator(lambda x: str(TypeAdapter(AnyHttpUrl).validate_python(x))),
         ]
     ]
 ):

packages/common-library/tests/test_pydantic_networks_extension.py

@@ -1,7 +1,7 @@
 from math import ceil
 from typing import Any, Protocol, runtime_checkable
 
-from common_library.pydantic_networks_extension import AnyHttpUrlLegacy
+from pydantic import AnyHttpUrl, TypeAdapter
 from pydantic import TypeAdapter
 from typing_extensions import (  # https://docs.pydantic.dev/latest/api/standard_library_types/#typeddict
     TypedDict,
@@ -44,7 +44,7 @@ def _replace_query(url: _URLType, query: dict[str, Any]) -> str:
         new_url = url.replace_query_params(**query)
 
     new_url_str = f"{new_url}"
-    return f"{TypeAdapter(AnyHttpUrlLegacy).validate_python(new_url_str)}"
+    return f"{TypeAdapter(AnyHttpUrl).validate_python(new_url_str)}"
 
 
 class PageDict(TypedDict):

packages/models-library/src/models_library/rest_pagination.py

@@ -1,7 +1,6 @@
 from typing import Annotated
 
-from common_library.pydantic_networks_extension import AnyHttpUrlLegacy
-from pydantic import BeforeValidator, Field, SecretStr, TypeAdapter
+from pydantic import AnyHttpUrl, BeforeValidator, Field, SecretStr, TypeAdapter
 from pydantic_settings import SettingsConfigDict
 
 from .base import BaseCustomSettings
@@ -12,9 +11,7 @@ class SSMSettings(BaseCustomSettings):
     SSM_ENDPOINT: (
         Annotated[
             str,
-            BeforeValidator(
-                lambda x: str(TypeAdapter(AnyHttpUrlLegacy).validate_python(x))
-            ),
+            BeforeValidator(lambda x: str(TypeAdapter(AnyHttpUrl).validate_python(x))),
         ]
         | None
     ) = Field(default=None, description="do not define if using standard AWS")

packages/models-library/src/models_library/rest_pagination_utils.py

@@ -1,8 +1,7 @@
 from datetime import timedelta
 
-from common_library.pydantic_networks_extension import AnyHttpUrlLegacy
 from models_library.basic_types import BootModeEnum, LogLevel
-from pydantic import AliasChoices, Field, field_validator
+from pydantic import AliasChoices, AnyHttpUrl, Field, field_validator
 from servicelib.logging_utils_filtering import LoggerName, MessageSubstring
 from settings_library.base import BaseCustomSettings
 from settings_library.r_clone import S3Provider
@@ -43,7 +42,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: AnyHttpUrlLegacy
+    AGENT_VOLUMES_CLEANUP_S3_ENDPOINT: AnyHttpUrl
     AGENT_VOLUMES_CLEANUP_S3_ACCESS_KEY: str
     AGENT_VOLUMES_CLEANUP_S3_SECRET_KEY: str
     AGENT_VOLUMES_CLEANUP_S3_BUCKET: str

packages/settings-library/src/settings_library/ssm.py

@@ -3,7 +3,6 @@
 
 
 import pytest
-from common_library.pydantic_networks_extension import HttpUrlLegacy
 from faker import Faker
 from models_library.basic_types import BootModeEnum
 from moto.server import ThreadedMotoServer
@@ -65,8 +64,8 @@ def mock_environment(
 
 
 @pytest.fixture(scope="module")
-def mocked_s3_server_url(mocked_aws_server: ThreadedMotoServer) -> HttpUrlLegacy:
+def mocked_s3_server_url(mocked_aws_server: ThreadedMotoServer) -> HttpUrl:
     # pylint: disable=protected-access
-    return TypeAdapter(HttpUrlLegacy).validate_python(
+    return TypeAdapter(HttpUrl).validate_python(
         f"http://{mocked_aws_server._ip_address}:{mocked_aws_server._port}",  # noqa: SLF001
     )

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

@@ -50,7 +50,13 @@ async def get_volume_by_label(label: str, run_id: RunID) -> dict[str, Any]:
         volumes = data["Volumes"]
         _logger.debug("volumes query for label=%s volumes=%s", label, volumes)
         if len(volumes) != 1:
-            raise VolumeNotFoundError(label, run_id, volumes)
+            raise VolumeNotFoundError(
+                volume_count=len(volumes),
+                source_label=label,
+                run_id=run_id,
+                volume_names=" ".join(v.get("Name", "UNKNOWN") for v in volumes),
+                status_code=http_status.HTTP_404_NOT_FOUND,
+            )
         volume_details: dict[str, Any] = volumes[0]
         return volume_details
 

services/agent/tests/conftest.py

@@ -12,7 +12,7 @@ async def http_error_handler(
 ) -> JSONResponse:
     return JSONResponse(
         content=jsonable_encoder({"errors": [exception.message]}),
-        status_code=exception.status_code,
+        status_code=exception.status_code,  # type:ignore[attr-defined]
     )
 
 

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/core/docker_utils.py

@@ -1,53 +1,30 @@
-from typing import Any
-
 from common_library.errors_classes import OsparcErrorMixin
-from fastapi import status
-from models_library.services import RunID
 
 
-class BaseDynamicSidecarError(Exception):
+class BaseDynamicSidecarError(OsparcErrorMixin, Exception):
     """Used as base for all exceptions"""
 
-    def __init__(
-        self, nessage: str, status_code: int = status.HTTP_500_INTERNAL_SERVER_ERROR
-    ) -> None:
-        self.message: str = nessage
-        self.status_code: int = status_code
-        super().__init__(nessage)
-
 
 class VolumeNotFoundError(BaseDynamicSidecarError):
-    def __init__(
-        self, source_label: str, run_id: RunID, volumes: list[dict[str, Any]]
-    ) -> None:
-        super().__init__(
-            f"Expected 1 got {len(volumes)} volumes labels with {source_label=}, {run_id=}: "
-            f"Found {' '.join(v.get('Name', 'UNKNOWN') for v in volumes)}",
-            status_code=status.HTTP_404_NOT_FOUND,
-        )
+    msg_template = (
+        "Expected 1 got {volume_count} volumes labels with "
+        "source_label={source_label}, run_id={run_id}: Found {volume_names}"
+    )
 
 
 class UnexpectedDockerError(BaseDynamicSidecarError):
-    def __init__(self, message: str, status_code: int) -> None:
-        super().__init__(
-            f"An unexpected Docker error occurred {status_code=}, {message=}",
-            status_code=status_code,
-        )
-
-
-class BaseError(OsparcErrorMixin, BaseDynamicSidecarError):
-    ...
+    msg_template = "An unexpected Docker error occurred status_code={status_code}, message={message}"
 
 
-class ContainerExecContainerNotFoundError(BaseError):
+class ContainerExecContainerNotFoundError(BaseDynamicSidecarError):
     msg_template = "Container '{container_name}' was not found"
 
 
-class ContainerExecTimeoutError(BaseError):
+class ContainerExecTimeoutError(BaseDynamicSidecarError):
     msg_template = "Timed out after {timeout} while executing: '{command}'"
 
 
-class ContainerExecCommandFailedError(BaseError):
+class ContainerExecCommandFailedError(BaseDynamicSidecarError):
     msg_template = (
         "Command '{command}' exited with code '{exit_code}'"
         "and output: '{command_result}'"