fix broken test

Author: Andrei Neagu

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

@@ -1,11 +1,9 @@
 from datetime import timedelta
 from typing import Any
 
-from pydantic import BaseModel, SecretStr
+from pydantic import BaseModel, SecretStr, TypeAdapter
 from pydantic_core import Url
 
-from .pydantic_fields_extension import get_type
-
 
 def model_dump_with_secrets(
     settings_obj: BaseModel, *, show_secrets: bool, **pydantic_export_options
@@ -31,12 +29,12 @@ def model_dump_with_secrets(
             data[field_name] = str(field_data)
 
         elif isinstance(field_data, dict):
-            field_type = get_type(settings_obj.model_fields[field_name])
-            if issubclass(field_type, BaseModel):
-                data[field_name] = model_dump_with_secrets(
-                    field_type.model_validate(field_data),
-                    show_secrets=show_secrets,
-                    **pydantic_export_options,
-                )
+            field_type = settings_obj.model_fields[field_name].annotation
+
+            data[field_name] = model_dump_with_secrets(
+                TypeAdapter(field_type).validate_python(field_data),
+                show_secrets=show_secrets,
+                **pydantic_export_options,
+            )
 
     return data

packages/models-library/src/models_library/api_schemas_clusters_keeper/clusters.py

@@ -1,7 +1,7 @@
 import datetime
 from enum import auto
 
-from pydantic import AnyUrl, BaseModel
+from pydantic import AnyUrl, BaseModel, Field
 
 from ..clusters import ClusterAuthentication
 from ..users import UserID
@@ -17,7 +17,7 @@ class ClusterState(StrAutoEnum):
 
 class OnDemandCluster(BaseModel):
     endpoint: AnyUrl
-    authentication: ClusterAuthentication
+    authentication: ClusterAuthentication = Field(discriminator="discriminator_type")
     state: ClusterState
     user_id: UserID
     wallet_id: WalletID | None

packages/models-library/src/models_library/api_schemas_directorv2/clusters.py

@@ -114,7 +114,9 @@ class ClusterDetailsGet(ClusterDetails):
 
 class ClusterCreate(BaseCluster):
     owner: GroupID | None = None  # type: ignore[assignment]
-    authentication: ExternalClusterAuthentication
+    authentication: ExternalClusterAuthentication = Field(
+        discriminator="discriminator_type"
+    )
     access_rights: dict[GroupID, ClusterAccessRights] = Field(
         alias="accessRights", default_factory=dict
     )
@@ -174,7 +176,7 @@ class ClusterPatch(BaseCluster):
     owner: GroupID | None = None  # type: ignore[assignment]
     thumbnail: HttpUrl | None = None
     endpoint: AnyUrl | None = None  # type: ignore[assignment]
-    authentication: ExternalClusterAuthentication | None = None  # type: ignore[assignment]
+    authentication: ExternalClusterAuthentication | None = Field(None, discriminator="discriminator_type")  # type: ignore[assignment]
     access_rights: dict[GroupID, ClusterAccessRights] | None = Field(  # type: ignore[assignment]
         default=None, alias="accessRights"
     )
@@ -203,5 +205,7 @@ class ClusterPatch(BaseCluster):
 class ClusterPing(BaseModel):
     endpoint: AnyHttpUrl
     authentication: ClusterAuthentication = Field(
-        ..., description="Dask gateway authentication"
+        ...,
+        description="Dask gateway authentication",
+        discriminator="discriminator_type",
     )

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

@@ -42,21 +42,21 @@ class ClusterAccessRights(BaseModel):
 
 
 class BaseAuthentication(BaseModel):
-    type: str
+    discriminator_type: str
 
     model_config = ConfigDict(frozen=True, extra="forbid")
 
 
 class SimpleAuthentication(BaseAuthentication):
-    type: Literal["simple"] = "simple"
+    discriminator_type: Literal["simple"] = "simple"
     username: str
     password: SecretStr
 
     model_config = ConfigDict(
         json_schema_extra={
             "examples": [
                 {
-                    "type": "simple",
+                    "discriminator_type": "simple",
                     "username": "someuser",
                     "password": "somepassword",
                 },
@@ -66,40 +66,45 @@ class SimpleAuthentication(BaseAuthentication):
 
 
 class KerberosAuthentication(BaseAuthentication):
-    type: Literal["kerberos"] = "kerberos"
+    discriminator_type: Literal["kerberos"] = "kerberos"
 
     model_config = ConfigDict(
         json_schema_extra={
             "examples": [
                 {
-                    "type": "kerberos",
+                    "discriminator_type": "kerberos",
                 },
             ]
         }
     )
 
 
 class JupyterHubTokenAuthentication(BaseAuthentication):
-    type: Literal["jupyterhub"] = "jupyterhub"
+    discriminator_type: Literal["jupyterhub"] = "jupyterhub"
     api_token: str
 
     model_config = ConfigDict(
         json_schema_extra={
             "examples": [
-                {"type": "jupyterhub", "api_token": "some_jupyterhub_token"},
+                {
+                    "discriminator_type": "jupyterhub",
+                    "api_token": "some_jupyterhub_token",
+                },
             ]
         }
     )
 
 
 class NoAuthentication(BaseAuthentication):
-    type: Literal["none"] = "none"
+    discriminator_type: Literal["none"] = "none"
 
-    model_config = ConfigDict(json_schema_extra={"examples": [{"type": "none"}]})
+    model_config = ConfigDict(
+        json_schema_extra={"examples": [{"discriminator_type": "none"}]}
+    )
 
 
 class TLSAuthentication(BaseAuthentication):
-    type: Literal["tls"] = "tls"
+    discriminator_type: Literal["tls"] = "tls"
     tls_ca_file: Path
     tls_client_cert: Path
     tls_client_key: Path
@@ -108,7 +113,7 @@ class TLSAuthentication(BaseAuthentication):
         json_schema_extra={
             "examples": [
                 {
-                    "type": "tls",
+                    "discriminator_type": "tls",
                     "tls_ca_file": "/path/to/ca_file",
                     "tls_client_cert": "/path/to/cert_file",
                     "tls_client_key": "/path/to/key_file",
@@ -140,7 +145,9 @@ class BaseCluster(BaseModel):
     )
     endpoint: AnyUrl
     authentication: ClusterAuthentication = Field(
-        ..., description="Dask gateway authentication"
+        ...,
+        description="Dask gateway authentication",
+        discriminator="discriminator_type",
     )
     access_rights: dict[GroupID, ClusterAccessRights] = Field(default_factory=dict)
 
@@ -169,7 +176,7 @@ class Cluster(BaseCluster):
                     "owner": 1456,
                     "endpoint": "tcp://default-dask-scheduler:8786",
                     "authentication": {
-                        "type": "simple",
+                        "discriminator_type": "simple",
                         "username": "someuser",
                         "password": "somepassword",
                     },
@@ -181,7 +188,7 @@ class Cluster(BaseCluster):
                     "owner": 12,
                     "endpoint": "https://registry.osparc-development.fake.dev",
                     "authentication": {
-                        "type": "simple",
+                        "discriminator_type": "simple",
                         "username": "someuser",
                         "password": "somepassword",
                     },
@@ -193,7 +200,7 @@ class Cluster(BaseCluster):
                     "type": ClusterTypeInModel.AWS,
                     "owner": 154,
                     "endpoint": "https://registry.osparc-development.fake.dev",
-                    "authentication": {"type": "kerberos"},
+                    "authentication": {"discriminator_type": "kerberos"},
                     "access_rights": {
                         154: CLUSTER_ADMIN_RIGHTS,  # type: ignore[dict-item]
                         12: CLUSTER_MANAGER_RIGHTS,  # type: ignore[dict-item]
@@ -208,7 +215,7 @@ class Cluster(BaseCluster):
                     "owner": 2321,
                     "endpoint": "https://registry.osparc-development.fake2.dev",
                     "authentication": {
-                        "type": "jupyterhub",
+                        "discriminator_type": "jupyterhub",
                         "api_token": "some_fake_token",
                     },
                     "access_rights": {