fix serialization

Author: giancarloromeo

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

@@ -1,6 +1,7 @@
 from datetime import timedelta
-from typing import Any, get_origin
+from typing import Any
 
+from common_library.pydantic_fields_extension import get_type
 from pydantic import BaseModel, SecretStr
 from pydantic_core import Url
 
@@ -20,14 +21,15 @@ def model_dump_with_secrets(
             data[field_name] = field_data.total_seconds()
 
         elif isinstance(field_data, SecretStr):
-            data[field_name] = field_data.get_secret_value() if show_secrets else str(field_data)
-
+            data[field_name] = (
+                field_data.get_secret_value() if show_secrets else str(field_data)
+            )
 
         elif isinstance(field_data, Url):
             data[field_name] = str(field_data)
 
         elif isinstance(field_data, dict):
-            field_type = get_origin(settings_obj.model_fields[field_name].annotation)
+            field_type = get_type(settings_obj.model_fields[field_name])
             if field_type and issubclass(field_type, BaseModel):
                 data[field_name] = model_dump_with_secrets(
                     field_type.model_validate(field_data),

packages/common-library/tests/test_serialization.py

@@ -4,22 +4,31 @@
 
 
 class Credentials(BaseModel):
-    USERNAME: str | None = None
-    PASSWORD: SecretStr | None = None
+    username: str
+    password: SecretStr
+
+
+class Access(BaseModel):
+    credentials: Credentials
 
 
 @pytest.mark.parametrize(
     "expected,show_secrets",
     [
         (
-            {"USERNAME": "DeepThought", "PASSWORD": "42"},
+            {"credentials": {"username": "DeepThought", "password": "42"}},
             True,
         ),
         (
-            {"USERNAME": "DeepThought", "PASSWORD": "**********"},
+            {"credentials": {"username": "DeepThought", "password": "**********"}},
             False,  # hide secrets
         ),
     ],
 )
 def test_model_dump_with_secrets(expected: dict, show_secrets: bool):
-    assert expected == model_dump_with_secrets(Credentials(USERNAME="DeepThought", PASSWORD=SecretStr("42")), show_secrets=show_secrets)
+    assert expected == model_dump_with_secrets(
+        Access(
+            credentials=Credentials(username="DeepThought", password=SecretStr("42"))
+        ),
+        show_secrets=show_secrets,
+    )

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

@@ -7,10 +7,10 @@
 from typing import Any, AsyncIterator, Callable, get_args
 from unittest import mock
 
-from common_library.json_serialization import json_dumps
-from common_library.serialization import model_dump_with_secrets
 import pytest
 from _dask_helpers import DaskGatewayServer
+from common_library.json_serialization import json_dumps
+from common_library.serialization import model_dump_with_secrets
 from distributed.deploy.spec import SpecCluster
 from faker import Faker
 from models_library.clusters import (
@@ -26,7 +26,6 @@
 from pydantic import SecretStr
 from pytest_mock.plugin import MockerFixture
 from pytest_simcore.helpers.typing_env import EnvVarsDict
-from settings_library.utils_encoders import create_json_encoder_wo_secrets
 from simcore_postgres_database.models.clusters import ClusterType
 from simcore_service_director_v2.core.application import init_app
 from simcore_service_director_v2.core.errors import (
@@ -133,9 +132,10 @@ def creator():
                     SimpleAuthentication(
                         username=faker.user_name(),
                         password=SecretStr(local_dask_gateway_server.password),
-                    ), show_secrets=True
+                    ),
+                    show_secrets=True,
                 )
-            )
+            ),
         )
 
     return creator