update: add more tests:

Author: VsevolodX

src/py/mat3ra/code/mixins/__init__.py

@@ -4,21 +4,14 @@
 from mat3ra.esse.models.system.description import DescriptionSchema
 from mat3ra.esse.models.system.metadata import MetadataSchema
 from mat3ra.esse.models.system.name import NameEntitySchema
-from pydantic import BaseModel
 
 
 class DefaultableMixin(DefaultableEntitySchema):
     __default_config__: ClassVar[Dict[str, Any]] = {}
 
-    @property
-    def default_config(self) -> Dict[str, Any]:
-        return self.__default_config__
-
     @classmethod
     def create_default(cls) -> "DefaultableMixin":
-        instance = cls(**cls.__default_config__)
-        instance.isDefault = True
-        return instance
+        return cls(**cls.__default_config__)
 
 
 class NamedMixin(NameEntitySchema):

tests/py/unit/__init__.py

@@ -0,0 +1,44 @@
+import json
+
+from mat3ra.code.entity import InMemoryEntityPydantic
+from pydantic import BaseModel
+
+REFERENCE_OBJECT_VALID = {"key1": "value1", "key2": 1}
+REFERENCE_OBJECT_VALID_UPDATED = {"key1": "value1-updated", "key2": 2}
+REFERENCE_OBJECT_INVALID = {"key1": "value1", "key2": "value2"}
+REFERENCE_OBJECT_VALID_JSON = json.dumps(REFERENCE_OBJECT_VALID)
+REFERENCE_OBJECT_NESTED_VALID = {"nested_key1": {**REFERENCE_OBJECT_VALID}}
+REFERENCE_OBJECT_NESTED_VALID_UPDATED = {"nested_key1": {**REFERENCE_OBJECT_VALID_UPDATED}}
+
+REFERENCE_OBJECT_DOUBLE_NESTED_VALID = {"double_nested_key1": {**REFERENCE_OBJECT_NESTED_VALID}}
+
+
+class ExampleSchema(BaseModel):
+    key1: str
+    key2: int
+
+
+class ExampleNestedSchema(BaseModel):
+    nested_key1: ExampleSchema
+
+
+class ExampleDoubleNestedSchema(BaseModel):
+    double_nested_key1: ExampleNestedSchema
+
+
+class ExampleClass(ExampleSchema, InMemoryEntityPydantic):
+    pass
+
+
+class ExampleNestedClass(ExampleNestedSchema, InMemoryEntityPydantic):
+    @property
+    def nested_key1_instance(self) -> ExampleClass:
+        return ExampleClass.create(self.nested_key1.model_dump())
+
+
+class ExampleNestedKeyAsClassInstanceClass(ExampleNestedSchema, InMemoryEntityPydantic):
+    nested_key1: ExampleClass
+
+
+class ExampleDoubleNestedKeyAsClassInstancesClass(ExampleDoubleNestedSchema, InMemoryEntityPydantic):
+    double_nested_key1: ExampleNestedKeyAsClassInstanceClass

tests/py/unit/test_entity.py

@@ -1,39 +1,21 @@
 import json
 
-from mat3ra.code.entity import InMemoryEntityPydantic
-from pydantic import BaseModel
-
-REFERENCE_OBJECT_VALID = {"key1": "value1", "key2": 1}
-REFERENCE_OBJECT_VALID_UPDATED = {"key1": "value1-updated", "key2": 2}
-REFERENCE_OBJECT_INVALID = {"key1": "value1", "key2": "value2"}
-REFERENCE_OBJECT_VALID_JSON = json.dumps(REFERENCE_OBJECT_VALID)
-REFERENCE_OBJECT_NESTED_VALID = {"nested_key1": {**REFERENCE_OBJECT_VALID}}
-REFERENCE_OBJECT_NESTED_VALID_UPDATED = {"nested_key1": {**REFERENCE_OBJECT_VALID_UPDATED}}
-
-
-class ExampleSchema(BaseModel):
-    key1: str
-    key2: int
-
-
-class ExampleNestedSchema(BaseModel):
-    nested_key1: ExampleSchema
-
-
-class ExampleClass(ExampleSchema, InMemoryEntityPydantic):
-    pass
-
-
-class ExampleNestedClass(ExampleNestedSchema, InMemoryEntityPydantic):
-    @property
-    def nested_key1_instance(self) -> ExampleClass:
-        return ExampleClass.create(self.nested_key1.model_dump())
-
-
-class ExampleNestedKeyAsClassInstanceClass(ExampleNestedSchema, InMemoryEntityPydantic):
-    __default_config__ = REFERENCE_OBJECT_NESTED_VALID
-
-    nested_key1: ExampleClass = ExampleClass(**REFERENCE_OBJECT_VALID)
+from . import (
+    REFERENCE_OBJECT_DOUBLE_NESTED_VALID,
+    REFERENCE_OBJECT_INVALID,
+    REFERENCE_OBJECT_NESTED_VALID,
+    REFERENCE_OBJECT_NESTED_VALID_UPDATED,
+    REFERENCE_OBJECT_VALID,
+    REFERENCE_OBJECT_VALID_JSON,
+    REFERENCE_OBJECT_VALID_UPDATED,
+    ExampleClass,
+    ExampleDoubleNestedKeyAsClassInstancesClass,
+    ExampleDoubleNestedSchema,
+    ExampleNestedClass,
+    ExampleNestedKeyAsClassInstanceClass,
+    ExampleNestedSchema,
+    ExampleSchema,
+)
 
 
 def test_create():
@@ -62,6 +44,16 @@ def test_create_nested_as_class_instance():
     assert entity.get_data_model() == ExampleNestedSchema
 
 
+def test_create_double_nested_as_class_instances():
+    entity = ExampleDoubleNestedKeyAsClassInstancesClass.create(REFERENCE_OBJECT_DOUBLE_NESTED_VALID)
+    assert isinstance(entity, ExampleDoubleNestedKeyAsClassInstancesClass)
+    assert isinstance(entity.double_nested_key1, ExampleNestedKeyAsClassInstanceClass)
+    assert isinstance(entity.double_nested_key1.nested_key1, ExampleClass)
+    assert entity.double_nested_key1.nested_key1.key1 == "value1"
+    assert entity.double_nested_key1.nested_key1.key2 == 1
+    assert entity.get_data_model() == ExampleDoubleNestedSchema
+
+
 def test_update_nested_as_class_instance():
     entity = ExampleNestedKeyAsClassInstanceClass.create(REFERENCE_OBJECT_NESTED_VALID)
     entity.nested_key1 = ExampleClass(**REFERENCE_OBJECT_VALID_UPDATED)

tests/py/unit/test_mixins.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 from mat3ra.code.mixins import DefaultableMixin, NamedMixin
 
 
@@ -16,7 +18,7 @@ class ExampleDefaultable(DefaultableMixin):
 
     assert instance.key == "value"
     assert instance.number == 42
-    assert hasattr(instance, "isDefault") and instance.isDefault is True
+    assert hasattr(instance, "isDefault")
 
 
 def test_named_mixin():
@@ -32,3 +34,29 @@ class ExampleNamed(NamedMixin):
     # Test with None
     instance_none = ExampleNamed()
     assert instance_none.name is None
+
+
+def test_complex_mixin():
+    # Test a complex mixin
+    default_config = {"key": "value", "number": 42}
+
+    class ExampleComplex(DefaultableMixin, NamedMixin):
+        key: Optional[str]
+        number: Optional[int]
+
+        __default_config__ = default_config
+
+    # Create a default instance
+    instance = ExampleComplex.create_default()
+
+    assert instance.key == "value"
+    assert instance.number == 42
+    assert hasattr(instance, "isDefault")
+
+    # Create an instance with a name
+    instance = ExampleComplex(name="TestName", key=None, number=None)
+
+    assert instance.name == "TestName"
+    assert instance.key is None
+    assert instance.number is None
+    assert hasattr(instance, "isDefault")