query: fix find_ids/find_with_scores, improve builder objectbox#24

Author: loryruta

objectbox/query.py

@@ -30,7 +30,7 @@ def find(self) -> list:
                 # OBX_bytes_array
                 c_bytes_array = c_bytes_array_p.contents
 
-                result = list()
+                result = []
                 for i in range(c_bytes_array.count):
                     # OBX_bytes
                     c_bytes = c_bytes_array.data[i]
@@ -44,7 +44,11 @@ def find_ids(self) -> List[int]:
         """ Finds a list of object IDs matching query. The result is sorted by ID (ascending order). """
         c_id_array_p = obx_query_find_ids(self._c_query)
         try:
-            return list(c_id_array_p.contents)
+            c_id_array: OBX_id_array = c_id_array_p.contents
+            result = []
+            for i in range(c_id_array.count):
+                result.append(c_id_array.ids[i])
+            return result
         finally:
             obx_id_array_free(c_id_array_p)
 
@@ -57,8 +61,12 @@ def find_with_scores(self):
             c_bytes_score_array: OBX_bytes_score_array = c_bytes_score_array_p.contents
             result = []
             for i in range(c_bytes_score_array.count):
-                # TODO implement
-                pass
+                c_bytes_score: OBX_bytes_score = c_bytes_score_array.bytes_scores[i]
+                data = c_voidp_as_bytes(c_bytes_score.data, c_bytes_score.size)
+                score = c_bytes_score.score
+
+                object_ = self._box._entity.unmarshal(data)
+                result.append((object_, score))
             return result
         finally:
             obx_bytes_score_array_free(c_bytes_score_array_p)

objectbox/query_builder.py

@@ -2,6 +2,7 @@
 import numpy as np
 from typing import *
 
+from objectbox.model.properties import Property
 from objectbox.objectbox import ObjectBox
 from objectbox.query import Query
 from objectbox.c import *
@@ -13,87 +14,113 @@ def __init__(self, ob: ObjectBox, box: 'Box'):
         self._entity = box._entity
         self._c_builder = obx_query_builder(ob._c_store, box._entity.id)
 
+    def _get_property_id(self, prop: Union[int, str, Property]) -> int:
+        if type(prop) is int:
+            return prop
+        elif type(prop) is str:
+            prop = self._entity.get_property(prop)
+        return prop._id
+
     def close(self) -> int:
-        return obx_qb_close(self)
+        return obx_qb_close(self._c_builder)
 
     def error_code(self) -> int:
-        return obx_qb_error_code(self)
-    
+        return obx_qb_error_code(self._c_builder)
+
     def error_message(self) -> str:
-        return obx_qb_error_message(self)
-    
-    def equals_string(self, property_id: int, value: str, case_sensitive: bool):
-        obx_qb_equals_string(self._c_builder, property_id, c_str(value), case_sensitive)
+        return obx_qb_error_message(self._c_builder)
+
+    def equals_string(self, prop: Union[int, str, Property], value: str, case_sensitive: bool = True):
+        prop_id = self._get_property_id(prop)
+        obx_qb_equals_string(self._c_builder, prop_id, c_str(value), case_sensitive)
         return self
-    
-    def not_equals_string(self, property_id: int, value: str, case_sensitive: bool):
-        obx_qb_not_equals_string(self._c_builder, property_id, c_str(value), case_sensitive)
+
+    def not_equals_string(self, prop: Union[int, str, Property], value: str, case_sensitive: bool = True):
+        prop_id = self._get_property_id(prop)
+        obx_qb_not_equals_string(self._c_builder, prop_id, c_str(value), case_sensitive)
         return self
-    
-    def contains_string(self, property_id: int, value: str, case_sensitive: bool):
-        obx_qb_contains_string(self._c_builder, property_id, c_str(value), case_sensitive)
+
+    def contains_string(self, prop: Union[int, str, Property], value: str, case_sensitive: bool = True):
+        prop_id = self._get_property_id(prop)
+        obx_qb_contains_string(self._c_builder, prop_id, c_str(value), case_sensitive)
         return self
-    
-    def starts_with_string(self, property_id: int, value: str, case_sensitive: bool):
-        obx_qb_starts_with_string(self._c_builder, property_id, c_str(value), case_sensitive)
+
+    def starts_with_string(self, prop: Union[int, str, Property], value: str, case_sensitive: bool = True):
+        prop_id = self._get_property_id(prop)
+        obx_qb_starts_with_string(self._c_builder, prop_id, c_str(value), case_sensitive)
         return self
-    
-    def ends_with_string(self, property_id: int, value: str, case_sensitive: bool):
-        obx_qb_ends_with_string(self._c_builder, property_id, c_str(value), case_sensitive)
+
+    def ends_with_string(self, prop: Union[int, str, Property], value: str, case_sensitive: bool = True):
+        prop_id = self._get_property_id(prop)
+        obx_qb_ends_with_string(self._c_builder, prop_id, c_str(value), case_sensitive)
         return self
-    
-    def greater_than_string(self, property_id: int, value: str, case_sensitive: bool):
-        obx_qb_greater_than_string(self._c_builder, property_id, c_str(value), case_sensitive)
+
+    def greater_than_string(self, prop: Union[int, str, Property], value: str, case_sensitive: bool = True):
+        prop_id = self._get_property_id(prop)
+        obx_qb_greater_than_string(self._c_builder, prop_id, c_str(value), case_sensitive)
         return self
-    
-    def greater_or_equal_string(self, property_id: int, value: str, case_sensitive: bool):
-        obx_qb_greater_or_equal_string(self._c_builder, property_id, c_str(value), case_sensitive)
+
+    def greater_or_equal_string(self, prop: Union[int, str, Property], value: str, case_sensitive: bool = True):
+        prop_id = self._get_property_id(prop)
+        obx_qb_greater_or_equal_string(self._c_builder, prop_id, c_str(value), case_sensitive)
         return self
-    
-    def less_than_string(self, property_id: int, value: str, case_sensitive: bool):
-        obx_qb_less_than_string(self._c_builder, property_id, c_str(value), case_sensitive)
+
+    def less_than_string(self, prop: Union[int, str, Property], value: str, case_sensitive: bool = True):
+        prop_id = self._get_property_id(prop)
+        obx_qb_less_than_string(self._c_builder, prop_id, c_str(value), case_sensitive)
         return self
-    
-    def less_or_equal_string(self, property_id: int, value: str, case_sensitive: bool):
-        obx_qb_less_or_equal_string(self._c_builder, property_id, c_str(value), case_sensitive)
+
+    def less_or_equal_string(self, prop: Union[int, str, Property], value: str, case_sensitive: bool = True):
+        prop_id = self._get_property_id(prop)
+        obx_qb_less_or_equal_string(self._c_builder, prop_id, c_str(value), case_sensitive)
         return self
-    
-    def equals_int(self, property_id: int, value: int):
-        obx_qb_equals_int(self._c_builder, property_id, value)
+
+    def equals_int(self, prop: Union[int, str, Property], value: int):
+        prop_id = self._get_property_id(prop)
+        obx_qb_equals_int(self._c_builder, prop_id, value)
         return self
-    
-    def not_equals_int(self, property_id: int, value: int):
-        obx_qb_not_equals_int(self._c_builder, property_id, value)
+
+    def not_equals_int(self, prop: Union[int, str, Property], value: int):
+        prop_id = self._get_property_id(prop)
+        obx_qb_not_equals_int(self._c_builder, prop_id, value)
         return self
-    
-    def greater_than_int(self, property_id: int, value: int):
-        obx_qb_greater_than_int(self._c_builder, property_id, value)
+
+    def greater_than_int(self, prop: Union[int, str, Property], value: int):
+        prop_id = self._get_property_id(prop)
+        obx_qb_greater_than_int(self._c_builder, prop_id, value)
         return self
-    
-    def greater_or_equal_int(self, property_id: int, value: int):
-        obx_qb_greater_or_equal_int(self._c_builder, property_id, value)
+
+    def greater_or_equal_int(self, prop: Union[int, str, Property], value: int):
+        prop_id = self._get_property_id(prop)
+        obx_qb_greater_or_equal_int(self._c_builder, prop_id, value)
         return self
-    
-    def less_than_int(self, property_id: int, value: int):
-        obx_qb_less_than_int(self._c_builder, property_id, value)
+
+    def less_than_int(self, prop: Union[int, str, Property], value: int):
+        prop_id = self._get_property_id(prop)
+        obx_qb_less_than_int(self._c_builder, prop_id, value)
         return self
-    
-    def less_or_equal_int(self, property_id: int, value: int):
-        obx_qb_less_or_equal_int(self._c_builder, property_id, value)
+
+    def less_or_equal_int(self, prop: Union[int, str, Property], value: int):
+        prop_id = self._get_property_id(prop)
+        obx_qb_less_or_equal_int(self._c_builder, prop_id, value)
         return self
-    
-    def between_2ints(self, property_id: int, value_a: int, value_b: int):
-        obx_qb_between_2ints(self._c_builder, property_id, value_a, value_b)
+
+    def between_2ints(self, prop: Union[int, str, Property], value_a: int, value_b: int):
+        prop_id = self._get_property_id(prop)
+        obx_qb_between_2ints(self._c_builder, prop_id, value_a, value_b)
         return self
 
-    def nearest_neighbors_f32(self, vector_property_id: int, query_vector: Union[np.ndarray, List[float]], element_count: int):
+    def nearest_neighbors_f32(self, prop: Union[int, str, Property], query_vector: Union[np.ndarray, List[float]],
+                              element_count: int):
         if isinstance(query_vector, np.ndarray):
             if query_vector.dtype != np.float32:
                 raise Exception(f"query_vector dtype must be float32")
             query_vector_data = query_vector.ctypes.data_as(ctypes.POINTER(ctypes.c_float))
         else:  # List[float]
             query_vector_data = (ctypes.c_float * len(query_vector))(*query_vector)
-        obx_qb_nearest_neighbors_f32(self._c_builder, vector_property_id, query_vector_data, element_count)
+
+        prop_id = self._get_property_id(prop)
+        obx_qb_nearest_neighbors_f32(self._c_builder, prop_id, query_vector_data, element_count)
         return self
 
     def build(self) -> Query: