fastquadtree 1.2.3__cp38-abi3-win_amd64.whl → 1.3.1__cp38-abi3-win_amd64.whl

fastquadtree/_base_quadtree.py

@@ -29,6 +29,14 @@ G = TypeVar("G")  # geometry type, e.g. Point or Bounds
 HitT = TypeVar("HitT")  # raw native tuple, e.g. (id,x,y) or (id,x0,y0,x1,y1)
 ItemType = TypeVar("ItemType", bound=Item)  # e.g. PointItem or RectItem
 
+# Quadtree dtype to numpy dtype mapping
+QUADTREE_DTYPE_TO_NP_DTYPE = {
+    "f32": "float32",
+    "f64": "float64",
+    "i32": "int32",
+    "i64": "int64",
+}
+
 
 def _is_np_array(x: Any) -> bool:
     mod = getattr(x.__class__, "__module__", "")
@@ -48,6 +56,7 @@ class _BaseQuadTree(Generic[G, HitT, ItemType], ABC):
         "_bounds",
         "_capacity",
         "_count",
+        "_dtype",
         "_max_depth",
         "_native",
         "_next_id",
@@ -62,7 +71,7 @@ class _BaseQuadTree(Generic[G, HitT, ItemType], ABC):
         """Create the native engine instance."""
 
     @classmethod
-    def _new_native_from_bytes(cls, data: bytes) -> Any:
+    def _new_native_from_bytes(cls, data: bytes, dtype: str) -> Any:
         """Create the native engine instance from serialized bytes."""
 
     @staticmethod
@@ -79,10 +88,12 @@ class _BaseQuadTree(Generic[G, HitT, ItemType], ABC):
         *,
         max_depth: int | None = None,
         track_objects: bool = False,
+        dtype: str = "f32",
     ):
         self._bounds = bounds
         self._max_depth = max_depth
         self._capacity = capacity
+        self._dtype = dtype
         self._native = self._new_native(bounds, capacity, max_depth)
 
         self._track_objects = bool(track_objects)
@@ -138,12 +149,13 @@ class _BaseQuadTree(Generic[G, HitT, ItemType], ABC):
         return pickle.dumps(self.to_dict())
 
     @classmethod
-    def from_bytes(cls, data: bytes) -> Self:
+    def from_bytes(cls, data: bytes, dtype: str = "f32") -> Self:
         """
-        Deserialize a quadtree from bytes.
+        Deserialize a quadtree from bytes. Specifiy the dtype if the original tree that was serialized used a non-default dtype.
 
         Args:
             data: Bytes representing the serialized quadtree from `to_bytes()`.
+            dtype: The data type used in the native engine ('f32', 'f64', 'i32', 'i64') when saved to bytes.
 
         Returns:
             A new quadtree instance with the same state as when serialized.
@@ -160,7 +172,15 @@ class _BaseQuadTree(Generic[G, HitT, ItemType], ABC):
         store_dict = in_dict["store"]
 
         qt = cls.__new__(cls)  # type: ignore[call-arg]
-        qt._native = cls._new_native_from_bytes(core_bytes)
+        try:
+            qt._native = cls._new_native_from_bytes(core_bytes, dtype=dtype)
+        except ValueError as ve:
+            raise ValueError(
+                "Failed to deserialize quadtree native core. "
+                "This may be due to a dtype mismatch. "
+                "Ensure the dtype used in from_bytes() matches the original tree. "
+                "Error details: " + str(ve)
+            ) from ve
 
         if store_dict is not None:
             qt._store = ObjStore.from_dict(store_dict, qt._make_item)
@@ -238,7 +258,7 @@ class _BaseQuadTree(Generic[G, HitT, ItemType], ABC):
     ) -> int:
         """
         Bulk insert with auto-assigned contiguous ids. Faster than inserting one-by-one.<br>
-        Can accept either a Python sequence of geometries or a NumPy array of shape (N,2) or (N,4) with dtype float32.
+        Can accept either a Python sequence of geometries or a NumPy array of shape (N,2) or (N,4) with a dtype that matches the quadtree's dtype.
 
         If tracking is enabled, the objects will be bulk stored internally.
         If no objects are provided, the items will have obj=None (if tracking).
@@ -277,8 +297,12 @@ class _BaseQuadTree(Generic[G, HitT, ItemType], ABC):
             if geoms.size == 0:
                 return 0
 
-            if geoms.dtype != _np.float32:
-                raise TypeError("Numpy array must use dtype float32")
+            # Check if dtype matches quadtree dtype
+            expected_np_dtype = QUADTREE_DTYPE_TO_NP_DTYPE.get(self._dtype)
+            if geoms.dtype != expected_np_dtype:
+                raise TypeError(
+                    f"Numpy array dtype {geoms.dtype} does not match quadtree dtype {self._dtype}"
+                )
 
         if self._store is None:
             # Simple contiguous path with native bulk insert

fastquadtree/point_quadtree.py

@@ -5,10 +5,17 @@ from typing import Any, Literal, Tuple, overload
 
 from ._base_quadtree import Bounds, _BaseQuadTree
 from ._item import Point, PointItem
-from ._native import QuadTree as _RustQuadTree  # native point tree
+from ._native import QuadTree as QuadTreeF32, QuadTreeF64, QuadTreeI32, QuadTreeI64
 
 _IdCoord = Tuple[int, float, float]
 
+DTYPE_MAP = {
+    "f32": QuadTreeF32,
+    "f64": QuadTreeF64,
+    "i32": QuadTreeI32,
+    "i64": QuadTreeI64,
+}
+
 
 class QuadTree(_BaseQuadTree[Point, _IdCoord, PointItem]):
     """
@@ -29,6 +36,7 @@ class QuadTree(_BaseQuadTree[Point, _IdCoord, PointItem]):
         capacity: Max number of points per node before splitting.
         max_depth: Optional max tree depth. If omitted, engine decides.
         track_objects: Enable id <-> object mapping inside Python.
+        dtype: Data type for coordinates and ids in the native engine. Default is 'f32'. Options are 'f32', 'f64', 'i32', 'i64'.
 
     Raises:
         ValueError: If parameters are invalid or inserts are out of bounds.
@@ -41,12 +49,14 @@ class QuadTree(_BaseQuadTree[Point, _IdCoord, PointItem]):
         *,
         max_depth: int | None = None,
         track_objects: bool = False,
+        dtype: str = "f32",
     ):
         super().__init__(
             bounds,
             capacity,
             max_depth=max_depth,
             track_objects=track_objects,
+            dtype=dtype,
         )
 
     @overload
@@ -148,14 +158,19 @@ class QuadTree(_BaseQuadTree[Point, _IdCoord, PointItem]):
         return out
 
     def _new_native(self, bounds: Bounds, capacity: int, max_depth: int | None) -> Any:
-        if max_depth is None:
-            return _RustQuadTree(bounds, capacity)
-        return _RustQuadTree(bounds, capacity, max_depth=max_depth)
+        """Create the native engine instance."""
+        rust_cls = DTYPE_MAP.get(self._dtype)
+        if rust_cls is None:
+            raise TypeError(f"Unsupported dtype: {self._dtype}")
+        return rust_cls(bounds, capacity, max_depth)
 
     @classmethod
-    def _new_native_from_bytes(cls, data: bytes) -> Any:
+    def _new_native_from_bytes(cls, data: bytes, dtype: str = "f32") -> Any:
         """Create a new native engine instance from serialized bytes."""
-        return _RustQuadTree.from_bytes(data)
+        rust_cls = DTYPE_MAP.get(dtype)
+        if rust_cls is None:
+            raise TypeError(f"Unsupported dtype: {dtype}")
+        return rust_cls.from_bytes(data)
 
     @staticmethod
     def _make_item(id_: int, geom: Point, obj: Any | None) -> PointItem:

fastquadtree/rect_quadtree.py

@@ -5,10 +5,21 @@ from typing import Any, Literal, Tuple, overload
 
 from ._base_quadtree import Bounds, _BaseQuadTree
 from ._item import RectItem
-from ._native import RectQuadTree as _RustRectQuadTree  # native rect tree
+from ._native import (
+    RectQuadTree as RectQuadTreeF32,
+    RectQuadTreeF64,
+    RectQuadTreeI32,
+    RectQuadTreeI64,
+)
 
 _IdRect = Tuple[int, float, float, float, float]
-Point = Tuple[float, float]  # only for type hints in docstrings
+
+DTYPE_MAP = {
+    "f32": RectQuadTreeF32,
+    "f64": RectQuadTreeF64,
+    "i32": RectQuadTreeI32,
+    "i64": RectQuadTreeI64,
+}
 
 
 class RectQuadTree(_BaseQuadTree[Bounds, _IdRect, RectItem]):
@@ -30,6 +41,7 @@ class RectQuadTree(_BaseQuadTree[Bounds, _IdRect, RectItem]):
         capacity: Max number of points per node before splitting.
         max_depth: Optional max tree depth. If omitted, engine decides.
         track_objects: Enable id <-> object mapping inside Python.
+        dtype: Data type for coordinates and ids in the native engine. Default is 'f32'. Options are 'f32', 'f64', 'i32', 'i64'.
 
     Raises:
         ValueError: If parameters are invalid or inserts are out of bounds.
@@ -42,12 +54,14 @@ class RectQuadTree(_BaseQuadTree[Bounds, _IdRect, RectItem]):
         *,
         max_depth: int | None = None,
         track_objects: bool = False,
+        dtype: str = "f32",
     ):
         super().__init__(
             bounds,
             capacity,
             max_depth=max_depth,
             track_objects=track_objects,
+            dtype=dtype,
         )
 
     @overload
@@ -84,14 +98,19 @@ class RectQuadTree(_BaseQuadTree[Bounds, _IdRect, RectItem]):
         return self._store.get_many_by_ids(self._native.query_ids(rect))
 
     def _new_native(self, bounds: Bounds, capacity: int, max_depth: int | None) -> Any:
-        if max_depth is None:
-            return _RustRectQuadTree(bounds, capacity)
-        return _RustRectQuadTree(bounds, capacity, max_depth=max_depth)
+        """Create the native engine instance."""
+        rust_cls = DTYPE_MAP.get(self._dtype)
+        if rust_cls is None:
+            raise TypeError(f"Unsupported dtype: {self._dtype}")
+        return rust_cls(bounds, capacity, max_depth)
 
     @classmethod
-    def _new_native_from_bytes(cls, data: bytes) -> Any:
+    def _new_native_from_bytes(cls, data: bytes, dtype: str = "f32") -> Any:
         """Create a new native engine instance from serialized bytes."""
-        return _RustRectQuadTree.from_bytes(data)
+        rust_cls = DTYPE_MAP.get(dtype)
+        if rust_cls is None:
+            raise TypeError(f"Unsupported dtype: {dtype}")
+        return rust_cls.from_bytes(data)
 
     @staticmethod
     def _make_item(id_: int, geom: Bounds, obj: Any | None) -> RectItem:

{fastquadtree-1.2.3.dist-info → fastquadtree-1.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastquadtree
-Version: 1.2.3
+Version: 1.3.1
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Rust
@@ -26,6 +26,7 @@ Requires-Dist: mkdocs-minify-plugin ; extra == 'dev'
 Requires-Dist: maturin>=1.5 ; extra == 'dev'
 Requires-Dist: pyqtree==1.0.0 ; extra == 'dev'
 Requires-Dist: numpy ; extra == 'dev'
+Requires-Dist: pre-commit ; extra == 'dev'
 Provides-Extra: dev
 License-File: LICENSE
 Summary: Rust-accelerated quadtree for Python with fast inserts, range queries, and k-NN search.
@@ -73,6 +74,7 @@ Rust-optimized quadtree with a clean Python API
 - Fast KNN and range queries
 - Optional object tracking for id ↔ object mapping
 - Fast [serialization](https://elan456.github.io/fastquadtree/benchmark/#serialization-vs-rebuild) to/from bytes
+- Support for multiple data types (f32, f64, i32, i64) for coordinates
 - [100% test coverage](https://codecov.io/gh/Elan456/fastquadtree) and CI on GitHub Actions
 - Offers a drop-in [pyqtree shim](https://elan456.github.io/fastquadtree/benchmark/#pyqtree-drop-in-shim-performance-gains) that is 6.567x faster while keeping the same API
 

fastquadtree-1.3.1.dist-info/RECORD

@@ -0,0 +1,13 @@
+fastquadtree-1.3.1.dist-info/METADATA,sha256=I-i4n6m7lHGpghZLTGl6FpHf15iTIP5muLCOCjljaaU,9908
+fastquadtree-1.3.1.dist-info/WHEEL,sha256=CG8OzNtm0LMpJ2zhrjswlO8N-965OeMLklsQAG-nMvQ,94
+fastquadtree-1.3.1.dist-info/licenses/LICENSE,sha256=46IVFhoCIwMo-ocq4olyEB1eBvvtaKic5yGLeKXnDuc,1092
+fastquadtree/__init__.py,sha256=jy7uimnd7QDllmNOgnRByKom1aONIKOWhCvCJxndsnM,200
+fastquadtree/_base_quadtree.py,sha256=gwCBgmMa36-7tbmSO8_qIEKNfzfL15TG7jOjqtlZQOI,16838
+fastquadtree/_item.py,sha256=hlA71tvmLUQey42VokaZ7AmorIA8yZoGlvZWW9G4l4k,2496
+fastquadtree/_native.pyd,sha256=VHyQ4qeXJd7i59f34iw8aDYjAeozarfR1Sb10HPa5r8,548352
+fastquadtree/_obj_store.py,sha256=e164LT01nU5KqPX0udMzcJtpONAohDMEw-c9zEqh7uo,6723
+fastquadtree/point_quadtree.py,sha256=gf0oVEhhr0yiyhRocdtG19tHOHYWyNhic7KSu1-yqtY,6356
+fastquadtree/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fastquadtree/pyqtree.py,sha256=Evu-MKHKrs_xNVWChukD4hJLyIc-u7iuQ4hA_zvJtu4,6246
+fastquadtree/rect_quadtree.py,sha256=n--4V9gYT6BltNdVwbT4vTzHzI2U6mfw-UYMegKsPNo,4119
+fastquadtree-1.3.1.dist-info/RECORD,,

fastquadtree-1.2.3.dist-info/RECORD

@@ -1,13 +0,0 @@
-fastquadtree-1.2.3.dist-info/METADATA,sha256=_fEVrhcT8naqmksDN1xcWbxWuhsAZayCOoZuQexLg-g,9793
-fastquadtree-1.2.3.dist-info/WHEEL,sha256=CG8OzNtm0LMpJ2zhrjswlO8N-965OeMLklsQAG-nMvQ,94
-fastquadtree-1.2.3.dist-info/licenses/LICENSE,sha256=46IVFhoCIwMo-ocq4olyEB1eBvvtaKic5yGLeKXnDuc,1092
-fastquadtree/__init__.py,sha256=jy7uimnd7QDllmNOgnRByKom1aONIKOWhCvCJxndsnM,200
-fastquadtree/_base_quadtree.py,sha256=2y80MqTbY8oFQtsWPlWjwgsqSeN1x5lZJ6s47cBDcQ8,15751
-fastquadtree/_item.py,sha256=hlA71tvmLUQey42VokaZ7AmorIA8yZoGlvZWW9G4l4k,2496
-fastquadtree/_native.pyd,sha256=BOzIkWmmPtWIJdH-NYtTqi6gPGEOO-KpDRTEfcTG0Hc,338944
-fastquadtree/_obj_store.py,sha256=e164LT01nU5KqPX0udMzcJtpONAohDMEw-c9zEqh7uo,6723
-fastquadtree/point_quadtree.py,sha256=t0qiKMCCmmlvVVEIsouj3L-yixHdUbnQgVs8wFODrdA,5794
-fastquadtree/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastquadtree/pyqtree.py,sha256=Evu-MKHKrs_xNVWChukD4hJLyIc-u7iuQ4hA_zvJtu4,6246
-fastquadtree/rect_quadtree.py,sha256=JN_2j3DfSENnKha7mJOE7l98S1aKrywJg8PVCZdNA6E,3580
-fastquadtree-1.2.3.dist-info/RECORD,,