fixing

Author: giancarloromeo

services/director-v2/src/simcore_service_director_v2/constants.py

@@ -1,5 +1,4 @@
 from typing import Final
-
 # dynamic services
 
 DYNAMIC_SIDECAR_SERVICE_PREFIX: Final[str] = "dy-sidecar"
@@ -14,7 +13,7 @@
 # - itisfoundation
 # - 10.0.0.0:8473 (IP & Port)
 DYNAMIC_SIDECAR_DOCKER_IMAGE_RE = (
-    r"(^([_a-zA-Z0-9:.-]+)/)?(dynamic-sidecar):([_a-zA-Z0-9.-]+$)"
+    r"^(([_a-zA-Z0-9:.-]+)/)?(dynamic-sidecar):([_a-zA-Z0-9.-]+)$"
 )
 
 REGEX_DY_SERVICE_SIDECAR = rf"^{DYNAMIC_SIDECAR_SERVICE_PREFIX}_[a-zA-Z0-9-_]*"

services/director-v2/src/simcore_service_director_v2/core/errors.py

@@ -28,9 +28,6 @@
 class DirectorError(Exception):
     """Basic exception"""
 
-    def message(self) -> str:
-        return f"{self.args[0]}"
-
 
 class ConfigurationError(DirectorError):
     """An error in the director-v2 configuration"""
@@ -161,7 +158,7 @@ def get_errors(self) -> list[ErrorDict]:
                     f"{self.project_id}",
                     f"{self.node_id}",
                 ),
-                "msg": self.message(),
+                "msg": f"{self.args[0]}",
                 "type": self.code,
             },
         ]

services/director-v2/tests/unit/test_modules_dynamic_sidecar_client_api_public.py

@@ -4,6 +4,9 @@
 from contextlib import contextmanager
 from typing import Any, AsyncIterable, Callable, Iterator
 from unittest.mock import AsyncMock
+from models_library.api_schemas_dynamic_sidecar.containers import (
+    ActivityInfoOrNone
+)
 
 import pytest
 from common_library.json_serialization import json_dumps
@@ -352,21 +355,21 @@ async def test_update_volume_state(
 
 
 @pytest.mark.parametrize(
-    "mock_json",
+    "mock_dict",
     [{"seconds_inactive": 1}, {"seconds_inactive": 0}, None],
 )
 async def test_get_service_activity(
     get_patched_client: Callable,
     dynamic_sidecar_endpoint: AnyHttpUrl,
-    mock_json: dict[str, Any],
+    mock_dict: dict[str, Any],
 ) -> None:
     with get_patched_client(
         "get_containers_activity",
         return_value=Response(
-            status_code=status.HTTP_200_OK, text=json_dumps(mock_json)
+            status_code=status.HTTP_200_OK, text=json_dumps(mock_dict)
         ),
     ) as client:
-        assert await client.get_service_activity(dynamic_sidecar_endpoint) == mock_json
+        assert await client.get_service_activity(dynamic_sidecar_endpoint) == TypeAdapter(ActivityInfoOrNone).validate_python(mock_dict)
 
 
 async def test_free_reserved_disk_space(