fastquadtree 1.2.1__cp38-abi3-win_amd64.whl → 1.3.0__cp38-abi3-win_amd64.whl

fastquadtree/_base_quadtree.py

@@ -18,6 +18,8 @@ from ._item import Item  # base class for PointItem and RectItem
 from ._obj_store import ObjStore
 
 if TYPE_CHECKING:
+    from typing import Self  # Only in Python 3.11+
+
     from numpy.typing import NDArray
 
 Bounds = Tuple[float, float, float, float]
@@ -46,6 +48,7 @@ class _BaseQuadTree(Generic[G, HitT, ItemType], ABC):
         "_bounds",
         "_capacity",
         "_count",
+        "_dtype",
         "_max_depth",
         "_native",
         "_next_id",
@@ -59,6 +62,10 @@ class _BaseQuadTree(Generic[G, HitT, ItemType], ABC):
     def _new_native(self, bounds: Bounds, capacity: int, max_depth: int | None) -> Any:
         """Create the native engine instance."""
 
+    @classmethod
+    def _new_native_from_bytes(cls, data: bytes, dtype: str) -> Any:
+        """Create the native engine instance from serialized bytes."""
+
     @staticmethod
     @abstractmethod
     def _make_item(id_: int, geom: G, obj: Any | None) -> ItemType:
@@ -73,10 +80,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)
@@ -132,12 +141,13 @@ class _BaseQuadTree(Generic[G, HitT, ItemType], ABC):
         return pickle.dumps(self.to_dict())
 
     @classmethod
-    def from_bytes(cls, data: bytes) -> _BaseQuadTree[G, HitT, ItemType]:
+    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.
@@ -154,7 +164,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)

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,26 +49,16 @@ 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,
         )
 
-    @classmethod
-    def from_bytes(cls, data: bytes) -> QuadTree:
-        """
-        Create a QuadTree instance from serialized bytes.
-
-        Args:
-            data: Serialized byte data from `to_bytes()`.
-        Returns:
-            A QuadTree instance.
-        """
-        return super().from_bytes(data)
-
     @overload
     def query(
         self, rect: Bounds, *, as_items: Literal[False] = ...
@@ -160,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 ValueError(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 ValueError(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,26 +54,16 @@ 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,
         )
 
-    @classmethod
-    def from_bytes(cls, data: bytes) -> RectQuadTree:
-        """
-        Create a RectQuadTree instance from serialized bytes.
-
-        Args:
-            data: Serialized byte data from `to_bytes()`.
-        Returns:
-            A RectQuadTree instance.
-        """
-        return super().from_bytes(data)
-
     @overload
     def query(
         self, rect: Bounds, *, as_items: Literal[False] = ...
@@ -96,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 ValueError(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 ValueError(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.1.dist-info → fastquadtree-1.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastquadtree
-Version: 1.2.1
+Version: 1.3.0
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Rust
@@ -26,12 +26,13 @@ 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.
 Keywords: quadtree,spatial-index,geometry,rust,pyo3,nearest-neighbor,k-nn
 Author: Ethan Anderson
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Project-URL: Homepage, https://github.com/Elan456/fastquadtree
 Project-URL: Repository, https://github.com/Elan456/fastquadtree
@@ -45,6 +46,8 @@ Project-URL: Issues, https://github.com/Elan456/fastquadtree/issues
 
 Rust-optimized quadtree with a clean Python API
 
+👉 **Check out the Docs:** https://elan456.github.io/fastquadtree/
+
 [![PyPI](https://img.shields.io/pypi/v/fastquadtree.svg)](https://pypi.org/project/fastquadtree/)
 [![Python versions](https://img.shields.io/pypi/pyversions/fastquadtree.svg)](https://pypi.org/project/fastquadtree/)
 [![Downloads](https://static.pepy.tech/personalized-badge/fastquadtree?period=total&units=INTERNATIONAL_SYSTEM&left_color=GRAY&right_color=BLUE&left_text=Total%20Downloads)](https://pepy.tech/projects/fastquadtree)
@@ -64,19 +67,19 @@ Rust-optimized quadtree with a clean Python API
 
 ## Why use fastquadtree
 
-- Clean [Python API](https://elan456.github.io/fastquadtree/api/quadtree/) with no external dependencies and modern typing hints
+- Clean [Python API](https://elan456.github.io/fastquadtree/api/quadtree/) with **no external dependencies** and modern typing hints
 - The fastest quadtree Python package ([>10x faster](https://elan456.github.io/fastquadtree/benchmark/) than pyqtree)
 - Prebuilt wheels for Windows, macOS, and Linux
 - Support for [inserting bounding boxes](https://elan456.github.io/fastquadtree/api/rect_quadtree/) or points
 - 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
 
 ----
 
-👉 **Docs:** https://elan456.github.io/fastquadtree/
 
 ## Examples
 See examples of how fastquadtree can be used in the [runnables](https://elan456.github.io/fastquadtree/runnables/) section.

fastquadtree-1.3.0.dist-info/RECORD

@@ -0,0 +1,13 @@
+fastquadtree-1.3.0.dist-info/METADATA,sha256=_I1G4rPdB-3ZjizUq7MhU9WKQKoquKoNOS_mTPvYeeM,9908
+fastquadtree-1.3.0.dist-info/WHEEL,sha256=CG8OzNtm0LMpJ2zhrjswlO8N-965OeMLklsQAG-nMvQ,94
+fastquadtree-1.3.0.dist-info/licenses/LICENSE,sha256=46IVFhoCIwMo-ocq4olyEB1eBvvtaKic5yGLeKXnDuc,1092
+fastquadtree/__init__.py,sha256=jy7uimnd7QDllmNOgnRByKom1aONIKOWhCvCJxndsnM,200
+fastquadtree/_base_quadtree.py,sha256=GCFn8YR-ViB0n1n8vYzcy15iDUR7D2HzRqp1uPHn9NE,16426
+fastquadtree/_item.py,sha256=hlA71tvmLUQey42VokaZ7AmorIA8yZoGlvZWW9G4l4k,2496
+fastquadtree/_native.pyd,sha256=kPC2Er1AMbJohtS9S4nq5738BxmSead-2szXN96Svlk,548352
+fastquadtree/_obj_store.py,sha256=e164LT01nU5KqPX0udMzcJtpONAohDMEw-c9zEqh7uo,6723
+fastquadtree/point_quadtree.py,sha256=8BDH4RNspH4Y-Vz9PSQH3y_Z4z5Oq5Cmcq9xnwVV6nk,6358
+fastquadtree/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fastquadtree/pyqtree.py,sha256=Evu-MKHKrs_xNVWChukD4hJLyIc-u7iuQ4hA_zvJtu4,6246
+fastquadtree/rect_quadtree.py,sha256=-R0eLbjnGsPPfj5v2vDjdSIzGcmNcX9tVFDkd6J8Iqo,4121
+fastquadtree-1.3.0.dist-info/RECORD,,

fastquadtree-1.2.1.dist-info/RECORD

@@ -1,13 +0,0 @@
-fastquadtree-1.2.1.dist-info/METADATA,sha256=1xRs6uTPeGao894dhIxehGbwiviqdEeS6Wzg2LDdP1A,9773
-fastquadtree-1.2.1.dist-info/WHEEL,sha256=CG8OzNtm0LMpJ2zhrjswlO8N-965OeMLklsQAG-nMvQ,94
-fastquadtree-1.2.1.dist-info/licenses/LICENSE,sha256=46IVFhoCIwMo-ocq4olyEB1eBvvtaKic5yGLeKXnDuc,1092
-fastquadtree/__init__.py,sha256=jy7uimnd7QDllmNOgnRByKom1aONIKOWhCvCJxndsnM,200
-fastquadtree/_base_quadtree.py,sha256=rBcoZjVg3mi-dFnyJ3GZBW9hn38P5gqgUceQrDatdZg,15574
-fastquadtree/_item.py,sha256=hlA71tvmLUQey42VokaZ7AmorIA8yZoGlvZWW9G4l4k,2496
-fastquadtree/_native.pyd,sha256=TODf58qjWedkKE38aKaf-SL2Q0aMapKmIIHEtkwmIjk,338944
-fastquadtree/_obj_store.py,sha256=e164LT01nU5KqPX0udMzcJtpONAohDMEw-c9zEqh7uo,6723
-fastquadtree/point_quadtree.py,sha256=phwiT6jVpdAnGf0dQ8_d2VW5DERDzCrOfqkSDzO39LI,6119
-fastquadtree/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastquadtree/pyqtree.py,sha256=Evu-MKHKrs_xNVWChukD4hJLyIc-u7iuQ4hA_zvJtu4,6246
-fastquadtree/rect_quadtree.py,sha256=EH1h1OlLt3K2GNxD9QwtlHyVFOmu8wTw-TeSnNDGmBU,3917
-fastquadtree-1.2.1.dist-info/RECORD,,