Merge branch 'main' of github.com:Exabyte-io/code into chore/SOF-7602

Author: k0stik

src/py/mat3ra/code/entity.py

@@ -62,7 +62,7 @@ def from_json(cls: Type[T], json_str: str) -> T:
     def clean(cls: Type[T], config: Dict[str, Any]) -> Dict[str, Any]:
         # Validate the config; extra keys are dropped and defaults are substituted.
         validated = cls.model_validate(config, strict=False)
-        return validated.model_dump(exclude_unset=False)
+        return validated.model_dump(mode="json", exclude_unset=False)
 
     def get_schema(self) -> Dict[str, Any]:
         return self.model_json_schema()
@@ -77,7 +77,7 @@ def get_cls_name(self) -> str:
         return self.__class__.__name__
 
     def to_dict(self, exclude: Optional[List[str]] = None) -> Dict[str, Any]:
-        return self.model_dump(exclude=set(exclude) if exclude else None)
+        return self.model_dump(mode="json", exclude=set(exclude) if exclude else None)
 
     def to_json(self, exclude: Optional[List[str]] = None) -> str:
         return self.model_dump_json(exclude=set(exclude) if exclude else None)

src/py/mat3ra/code/vector.py

@@ -1,7 +1,7 @@
 from typing import List
 
 import numpy as np
-from mat3ra.esse.models.core.abstract.point import PointSchema as Vector3DSchema
+from mat3ra.esse.models.core.abstract.vector_3d import Vector3dSchema as Vector3DSchema
 from mat3ra.utils.mixins import RoundNumericValuesMixin
 from pydantic import model_serializer
 

tests/py/unit/__init__.py

@@ -1,4 +1,5 @@
 import json
+from enum import Enum
 
 from mat3ra.code.entity import InMemoryEntityPydantic
 from pydantic import BaseModel
@@ -53,3 +54,17 @@ class ExampleNestedKeyAsClassInstanceClass(ExampleNestedSchema, InMemoryEntityPy
 
 class ExampleDoubleNestedKeyAsClassInstancesClass(ExampleDoubleNestedSchema, InMemoryEntityPydantic):
     double_nested_key1: ExampleNestedKeyAsClassInstanceClass
+
+
+class SampleEnum(str, Enum):
+    VALUE1 = "value1"
+    VALUE2 = "value2"
+
+
+class SampleModelWithEnum(BaseModel):
+    type: SampleEnum
+    name: str = "test"
+
+
+class SampleEntityWithEnum(SampleModelWithEnum, InMemoryEntityPydantic):
+    pass

tests/py/unit/test_entity.py

@@ -18,6 +18,8 @@
     ExampleNestedKeyAsClassInstanceClass,
     ExampleNestedSchema,
     ExampleSchema,
+    SampleEnum,
+    SampleEntityWithEnum,
 )
 
 
@@ -165,6 +167,16 @@ def test_to_dict():
     assert result_exclude == {"key1": "value1"}
 
 
+def test_to_dict_with_enum():
+    entity = SampleEntityWithEnum(type=SampleEnum.VALUE1, name="example")
+    result = entity.to_dict()
+    
+    assert isinstance(result, dict)
+    assert not isinstance(result["type"], SampleEnum)  # Should not be an enum object
+    assert result == {"type": "value1", "name": "example"}
+    assert result["type"] == "value1"  # String, not enum object
+
+
 def test_to_json():
     entity = ExampleClass.create(REFERENCE_OBJECT_VALID)
     result = entity.to_json()