Remove list subscripts and update flatbuffers #4

Author: ivahnenkoAnna

objectbox/model/entity.py

@@ -85,7 +85,7 @@ def fill_properties(self):
     def get_value(self, object, prop: Property):
         # in case value is not overwritten on the object, it's the Property object itself (= as defined in the Class)
         val = getattr(object, prop._name)
-        if prop._py_type == list[int] or prop._py_type == list[float]:
+        if prop._py_type == list:
             if (val == np.array(prop)).all():
                 return prop._py_type()
         elif prop._py_type == np.ndarray:
@@ -161,28 +161,20 @@ def unmarshal(self, data: bytes):
                 # access the FB byte vector information
                 start = table.Vector(o)
                 size = table.VectorLen(o)
-
                 # slice the vector as a requested type
                 val = prop._py_type(table.Bytes[start:start+size])
             elif prop._ob_type == OBXPropertyType_IntVector:
                 val = table.GetVectorAsNumpy(flatbuffers.number_types.Int32Flags, o)
-                if prop._py_type == list[int]:
-                    val = val.tolist()
             elif prop._ob_type == OBXPropertyType_LongVector:
                 val = table.GetVectorAsNumpy(flatbuffers.number_types.Int64Flags, o)
-                if prop._py_type == list[int]:
-                    val = val.tolist()
             elif prop._ob_type == OBXPropertyType_FloatVector:
                 val = table.GetVectorAsNumpy(flatbuffers.number_types.Float32Flags, o)
-                if prop._py_type == list[float]:
-                    val = val.tolist()
             elif prop._ob_type == OBXPropertyType_DoubleVector:
                 val = table.GetVectorAsNumpy(flatbuffers.number_types.Float64Flags, o)
-                if prop._py_type == list[float]:
-                    val = val.tolist()
             else:
                 val = table.Get(prop._fb_type, o + table.Pos)
-
+            if prop._py_type == list:
+                val = val.tolist()
             setattr(obj, prop._name, val)
         return obj
 

objectbox/model/properties.py

@@ -86,11 +86,7 @@ def __determine_ob_type(self) -> OBXPropertyType:
             return OBXPropertyType_Long
         elif ts == bytes:  # or ts == bytearray: might require further tests on read objects due to mutability
             return OBXPropertyType_ByteVector
-        elif ts == list[int]:
-            return OBXPropertyType_LongVector
-        elif ts == list[float]:
-            return OBXPropertyType_DoubleVector
-        elif ts == np.ndarray:
+        elif ts == list or ts == np.ndarray:
             return OBXPropertyType_DoubleVector
         elif ts == float:
             return OBXPropertyType_Double

requirements.txt

@@ -1,6 +1,6 @@
 pip
 wheel
-flatbuffers==2.0
+flatbuffers==23.5.26
 pytest>=4.4.1
 twine
 numpy

setup.py

@@ -46,7 +46,7 @@
     ],
 
     install_requires=[
-       'flatbuffers==2.0',
+       'flatbuffers==23.5.26',
     ],
 
     packages=setuptools.find_packages(),

tests/model.py

@@ -18,10 +18,10 @@ class TestEntity:
     longs = Property(np.ndarray, type=PropertyType.longVector, id=12, uid=1012)
     floats = Property(np.ndarray, type=PropertyType.floatVector, id=13, uid=1013)
     doubles = Property(np.ndarray, type=PropertyType.doubleVector, id=14, uid=1014)
-    ints_list = Property(list[int], type=PropertyType.intVector, id=15, uid=1015)
-    longs_list = Property(list[int], type=PropertyType.longVector, id=16, uid=1016)
-    floats_list = Property(list[float], type=PropertyType.floatVector, id=17, uid=1017)
-    doubles_list = Property(list[float], type=PropertyType.doubleVector, id=18, uid=1018)
+    ints_list = Property(list, type=PropertyType.intVector, id=15, uid=1015)
+    longs_list = Property(list, type=PropertyType.longVector, id=16, uid=1016)
+    floats_list = Property(list, type=PropertyType.floatVector, id=17, uid=1017)
+    doubles_list = Property(list, type=PropertyType.doubleVector, id=18, uid=1018)
     transient = ""  # not "Property" so it's not stored
 
     def __init__(self, string: str = ""):