revert validator

Author: giancarloromeo

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

@@ -1,6 +1,6 @@
 from enum import auto
 from pathlib import Path
-from typing import Final, Literal, Self, TypeAlias
+from typing import Final, Literal, TypeAlias
 
 from pydantic import (
     AnyUrl,
@@ -221,13 +221,14 @@ class Cluster(BaseCluster):
         },
     )
 
-    @model_validator(mode="after")
-    def _check_owner_has_access_rights(self) -> Self:
-        is_default_cluster = bool(self.id == DEFAULT_CLUSTER_ID)
-        owner_gid = self.owner
+    @model_validator(mode="before")
+    @classmethod
+    def check_owner_has_access_rights(cls, values):
+        is_default_cluster = bool(values["id"] == DEFAULT_CLUSTER_ID)
+        owner_gid = values["owner"]
 
         # check owner is in the access rights, if not add it
-        access_rights = self.access_rights or {}
+        access_rights = values.get("access_rights", values.get("accessRights", {}))
         if owner_gid not in access_rights:
             access_rights[owner_gid] = (
                 CLUSTER_USER_RIGHTS if is_default_cluster else CLUSTER_ADMIN_RIGHTS
@@ -238,5 +239,5 @@ def _check_owner_has_access_rights(self) -> Self:
         ):
             msg = f"the cluster owner access rights are incorrectly set: {access_rights[owner_gid]}"
             raise ValueError(msg)
-        self.access_rights = access_rights
-        return self
+        values["access_rights"] = access_rights
+        return values