Add to_dict method to NodeSchema

Author: dgarros

backend/infrahub/core/schema/attribute_schema.py

@@ -3,7 +3,7 @@
 import enum
 from typing import TYPE_CHECKING, Any, Optional, Union
 
-from pydantic import field_validator, model_validator
+from pydantic import ConfigDict, field_validator, model_validator
 
 from infrahub import config
 from infrahub.core.enums import generate_python_enum
@@ -21,6 +21,8 @@
 
 
 class AttributeSchema(GeneratedAttributeSchema):
+    model_config = ConfigDict(use_enum_values=True)
+
     _sort_by: list[str] = ["name"]
     _enum_class: Optional[type[enum.Enum]] = None
 

backend/infrahub/core/schema/basenode_schema.py

@@ -7,7 +7,7 @@
 from typing import TYPE_CHECKING, Any, Callable, Iterable, Literal, Optional, Union, overload
 
 from infrahub_sdk.utils import compare_lists, intersection
-from pydantic import field_validator
+from pydantic import ConfigDict, field_validator
 
 from infrahub.core.constants import RelationshipCardinality, RelationshipKind
 from infrahub.core.models import HashableModelDiff
@@ -27,6 +27,8 @@
 
 
 class BaseNodeSchema(GeneratedBaseNodeSchema):
+    model_config = ConfigDict(use_enum_values=True)
+
     _exclude_from_hash: list[str] = ["attributes", "relationships"]
     _sort_by: list[str] = ["namespace", "name"]
 
@@ -62,6 +64,9 @@ def __hash__(self) -> int:
         Be careful hash generated from hash() have a salt by default and they will not be the same across run"""
         return hash(self.get_hash())
 
+    def to_dict(self) -> dict:
+        return self.model_dump(exclude_unset=True, exclude_none=True, exclude_defaults=True)
+
     def get_hash(self, display_values: bool = False) -> str:
         """Extend the Hash Calculation to account for attributes and relationships."""
 

backend/infrahub/core/schema/definitions/core/__init__.py

@@ -1098,7 +1098,7 @@
                 },
             ],
         },
-        core_repository.model_dump(),
+        core_repository.to_dict(),
         core_read_only_repository,
         {
             "name": "TransformJinja2",

backend/infrahub/core/schema/relationship_schema.py

@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, Any, Optional, Union
 
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 
 from infrahub import config
 from infrahub.core.constants import RelationshipDirection
@@ -19,6 +19,8 @@
 
 
 class RelationshipSchema(GeneratedRelationshipSchema):
+    model_config = ConfigDict(use_enum_values=True)
+
     _exclude_from_hash: list[str] = ["filters"]
     _sort_by: list[str] = ["name"]