Test flex property with concrete types #10

Author: ivahnenkoAnna

objectbox/model/entity.py

@@ -128,7 +128,9 @@ def marshal(self, object, id: int) -> bytearray:
             elif prop._ob_type == OBXPropertyType_DoubleVector:
                 offsets[prop._id] = builder.CreateNumpyVector(np.array(val, dtype=np.float64))
             elif prop._ob_type == OBXPropertyType_Flex:
-                buffer = flatbuffers.flexbuffers.Dumps(val)
+                flex_builder = flatbuffers.flexbuffers.Builder()
+                flex_builder.Add(val)
+                buffer = flex_builder.Finish()
                 offsets[prop._id] = builder.CreateByteVector(bytes(buffer))
             else:
                 assert False, "programming error - invalid type OB & FB type combination"

tests/common.py

@@ -2,7 +2,7 @@
 import os
 import shutil
 import pytest
-from tests.model import TestEntity, TestEntityDatetime
+from tests.model import TestEntity, TestEntityDatetime, TestEntityFlex
 import numpy as np
 
 test_dir = 'testdata'
@@ -35,14 +35,25 @@ def load_empty_test_objectbox(name: str = "") -> objectbox.ObjectBox:
 def load_empty_test_datetime(name: str = "") -> objectbox.ObjectBox:
     model = objectbox.Model()
     from objectbox.model import IdUid
-    model.entity(TestEntityDatetime, last_property_id=IdUid(3, 2003))
+    model.entity(TestEntityDatetime, last_property_id=IdUid(4, 2004))
     model.last_entity_id = IdUid(2, 2)
 
     db_name = test_dir if len(name) == 0 else test_dir + "/" + name
 
     return objectbox.Builder().model(model).directory(db_name).build()
 
 
+def load_empty_test_flex(name: str = "") -> objectbox.ObjectBox:
+    model = objectbox.Model()
+    from objectbox.model import IdUid
+    model.entity(TestEntityFlex, last_property_id=IdUid(3, 3003))
+    model.last_entity_id = IdUid(3, 3)
+
+    db_name = test_dir if len(name) == 0 else test_dir + "/" + name
+
+    return objectbox.Builder().model(model).directory(db_name).build()
+
+
 def assert_equal_prop(actual, expected, default):
     assert actual == expected or (isinstance(
         expected, objectbox.model.Property) and actual == default)
@@ -77,11 +88,3 @@ def assert_equal(actual: TestEntity, expected: TestEntity):
     assert_equal_prop_approx(actual.date, expected.date, 0)
     assert_equal_prop(actual.date_nano, expected.date_nano, 0)
     assert_equal_prop(actual.flex, expected.flex, None)
-
-
-def put_flex(object, box, property):
-    object.flex = property
-    id = box.put(object)
-    assert id == object.id
-    read = box.get(object.id)
-    assert read.flex == object.flex

tests/model.py

@@ -1,7 +1,7 @@
 from objectbox.model import *
 import numpy as np
 from datetime import datetime
-from typing import Generic
+from typing import Generic, Dict, Any
 
 
 @Entity(id=1, uid=1)
@@ -40,3 +40,12 @@ class TestEntityDatetime:
 
     def __init__(self, string: str = ""):
         self.str = string
+
+@Entity(id=3, uid=3)
+class TestEntityFlex:
+    id = Id(id=1, uid=3001)
+    flex_dict = Property(Dict[str, Any], type=PropertyType.flex, id=2, uid=3002)
+    flex_int = Property(int, type=PropertyType.flex, id=3, uid=3003)
+
+    def __init__(self, string: str = ""):
+        self.str = string

tests/test_box.py

@@ -1,12 +1,12 @@
 import pytest
 import objectbox
-from tests.model import TestEntity, TestEntityDatetime
+from tests.model import TestEntity, TestEntityDatetime, TestEntityFlex
 from tests.common import (
     autocleanup,
     load_empty_test_objectbox,
     load_empty_test_datetime,
+    load_empty_test_flex,
     assert_equal,
-    put_flex,
 )
 import numpy as np
 from datetime import datetime
@@ -179,32 +179,64 @@ def test_datetime():
 
 
 def test_flex():
+
+    def test_put_get(object: TestEntity, box: objectbox.Box, property):
+        object.flex = property
+        id = box.put(object)
+        assert id == object.id
+        read = box.get(object.id)
+        assert read.flex == object.flex
+
     ob = load_empty_test_objectbox()
     box = objectbox.Box(ob, TestEntity)
     object = TestEntity()
 
-    # Put a None type first
-    put_flex(object, box, None)
+    # Put an empty object
+    id = box.put(object)
+    assert id == object.id
+
+    # Put a None type object
+    test_put_get(object, box, None)
 
     # Update to int
-    put_flex(object, box, 1)
+    test_put_get(object, box, 1)
 
     # Update to float
-    put_flex(object, box, 1.2)
+    test_put_get(object, box, 1.2)
 
     # Update to string
-    put_flex(object, box, "foo")
+    test_put_get(object, box, "foo")
 
     # Update to int list
-    put_flex(object, box, [1, 2, 3])
+    test_put_get(object, box, [1, 2, 3])
 
     # Update to float list
-    put_flex(object, box, [1.1, 2.2, 3.3])
+    test_put_get(object, box, [1.1, 2.2, 3.3])
 
     # Update to dict
-    put_flex(object, box, {"a": 1, "b": 2})
+    test_put_get(object, box, {"a": 1, "b": 2})
 
     # Update to bool
-    put_flex(object, box, True)
+    test_put_get(object, box, True)
+
+    # Update to dict inside dict
+    test_put_get(object, box, {"a": 1, "b": {"c": 2}})
+
+    # Update to list inside dict
+    test_put_get(object, box, {"a": 1, "b": [1, 2, 3]})
 
-    ob.close()
+    ob.close()
+
+
+def test_flex_dict():
+    ob = load_empty_test_flex()
+    box = objectbox.Box(ob, TestEntityFlex)
+    object = TestEntityFlex()
+
+    object.flex_dict = {"a": 1, "b": 2}
+    object.flex_int = 25
+    id = box.put(object)
+    assert id == object.id
+    read = box.get(object.id)
+    assert read.flex_dict == object.flex_dict
+    assert read.flex_int == object.flex_int