fastquadtree 1.0.2__cp38-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl → 1.1.1__cp38-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl

fastquadtree/_base_quadtree.py

@@ -2,11 +2,23 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from typing import Any, Generic, Iterable, Tuple, TypeVar
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Generic,
+    Iterable,
+    Sequence,
+    Tuple,
+    TypeVar,
+    overload,
+)
 
 from ._item import Item  # base class for PointItem and RectItem
 from ._obj_store import ObjStore
 
+if TYPE_CHECKING:
+    from numpy.typing import NDArray
+
 Bounds = Tuple[float, float, float, float]
 
 # Generic parameters
@@ -15,6 +27,11 @@ 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
 
 
+def _is_np_array(x: Any) -> bool:
+    mod = getattr(x.__class__, "__module__", "")
+    return mod.startswith("numpy") and hasattr(x, "ndim") and hasattr(x, "shape")
+
+
 class _BaseQuadTree(Generic[G, HitT, ItemType], ABC):
     """
     Shared logic for Python QuadTree wrappers over native Rust engines.
@@ -110,9 +127,18 @@ class _BaseQuadTree(Generic[G, HitT, ItemType], ABC):
         self._count += 1
         return rid
 
-    def insert_many(self, geoms: list[G], objs: list[Any] | None = None) -> int:
+    @overload
+    def insert_many(self, geoms: Sequence[G], objs: list[Any] | None = None) -> int: ...
+    @overload
+    def insert_many(
+        self, geoms: NDArray[Any], objs: list[Any] | None = None
+    ) -> int: ...
+    def insert_many(
+        self, geoms: NDArray[Any] | Sequence[G], objs: list[Any] | None = None
+    ) -> 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.
 
         If tracking is enabled, the objects will be bulk stored internally.
         If no objects are provided, the items will have obj=None (if tracking).
@@ -127,13 +153,30 @@ class _BaseQuadTree(Generic[G, HitT, ItemType], ABC):
         Raises:
             ValueError: If any geometry is outside bounds.
         """
-        if not geoms:
+        if type(geoms) is list and len(geoms) == 0:
             return 0
 
+        if _is_np_array(geoms):
+            import numpy as _np
+        else:
+            _np = None
+
+        # Early return if the numpy array is empty
+        if _np is not None and isinstance(geoms, _np.ndarray):
+            if geoms.size == 0:
+                return 0
+
+            if geoms.dtype != _np.float32:
+                raise TypeError("Numpy array must use dtype float32")
+
         if self._store is None:
             # Simple contiguous path with native bulk insert
             start_id = self._next_id
-            last_id = self._native.insert_many(start_id, geoms)
+
+            if _np is not None:
+                last_id = self._native.insert_many_np(start_id, geoms)
+            else:
+                last_id = self._native.insert_many(start_id, geoms)
             num = last_id - start_id + 1
             if num < len(geoms):
                 raise ValueError("One or more items are outside tree bounds")
@@ -143,7 +186,10 @@ class _BaseQuadTree(Generic[G, HitT, ItemType], ABC):
 
         # With tracking enabled:
         start_id = len(self._store._arr)  # contiguous tail position
-        last_id = self._native.insert_many(start_id, geoms)
+        if _np is not None:
+            last_id = self._native.insert_many_np(start_id, geoms)
+        else:
+            last_id = self._native.insert_many(start_id, geoms)
         num = last_id - start_id + 1
         if num < len(geoms):
             raise ValueError("One or more items are outside tree bounds")

fastquadtree/pyqtree.py

@@ -40,7 +40,7 @@ class Index:
     Based on the benchmarks, this gives a overall performance boost of 6.514x.
     See the benchmark section of the docs for more details and the latest numbers.
 
-
+    Original docstring from pyqtree follows:
     The top spatial index to be created by the user. Once created it can be
     populated with geographically placed members that can later be tested for
     intersection with a user inputted geographic bounding box. Note that the
@@ -157,6 +157,8 @@ class Index:
         Returns:
         - A list of inserted items whose bounding boxes intersect with the input bbox.
         """
+        if type(bbox) is list:  # Handle list input
+            bbox = tuple(bbox)
         result = self._qt.query_ids(bbox)
         # result = [id1, id2, ...]
         return gather_objs(self._objects, result)

{fastquadtree-1.0.2.dist-info → fastquadtree-1.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastquadtree
-Version: 1.0.2
+Version: 1.1.1
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Rust
@@ -25,6 +25,7 @@ Requires-Dist: mkdocs-git-revision-date-localized-plugin ; extra == 'dev'
 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'
 Provides-Extra: dev
 License-File: LICENSE
 Summary: Rust-accelerated quadtree for Python with fast inserts, range queries, and k-NN search.
@@ -48,6 +49,7 @@ Rust-optimized quadtree with a clean Python API
 [![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)
 [![Build](https://github.com/Elan456/fastquadtree/actions/workflows/release.yml/badge.svg)](https://github.com/Elan456/fastquadtree/actions/workflows/release.yml)
+![No runtime deps](https://img.shields.io/badge/deps-none-success)
 
 [![PyO3](https://img.shields.io/badge/Rust-core%20via%20PyO3-orange)](https://pyo3.rs/)
 [![maturin](https://img.shields.io/badge/Built%20with-maturin-1f6feb)](https://www.maturin.rs/)
@@ -62,7 +64,7 @@ Rust-optimized quadtree with a clean Python API
 
 ## Why use fastquadtree
 
-- Clean [Python API](https://elan456.github.io/fastquadtree/api/quadtree/) with 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

{fastquadtree-1.0.2.dist-info → fastquadtree-1.1.1.dist-info}/RECORD

@@ -1,13 +1,13 @@
-fastquadtree-1.0.2.dist-info/METADATA,sha256=9WAl3PbvlWJYBoqyjKexb0M6QPu68n4eR34LCPIgOok,9367
-fastquadtree-1.0.2.dist-info/WHEEL,sha256=xBqaWU3Z-cfW-EFy0ENuEqxgXZXkIHUBkA1cT6FlqGM,127
-fastquadtree-1.0.2.dist-info/licenses/LICENSE,sha256=pRuvcuqIMtEUBMgvP1Bc4fOHydzeuA61c6DQoQ1pb1w,1071
+fastquadtree-1.1.1.dist-info/METADATA,sha256=szgCbwJaeD_tIire0P01nYD6Iy4_3E-XUXRhh4S6loQ,9501
+fastquadtree-1.1.1.dist-info/WHEEL,sha256=xBqaWU3Z-cfW-EFy0ENuEqxgXZXkIHUBkA1cT6FlqGM,127
+fastquadtree-1.1.1.dist-info/licenses/LICENSE,sha256=pRuvcuqIMtEUBMgvP1Bc4fOHydzeuA61c6DQoQ1pb1w,1071
 fastquadtree/__init__.py,sha256=rtkveNz7rScRasTRGu1yEqzeoJfLfreJNxg21orPL-U,195
-fastquadtree/_base_quadtree.py,sha256=tP6pymgV6s29C_1TjCZ6u0XKb6NFq3tQ7tk6REKS020,8576
+fastquadtree/_base_quadtree.py,sha256=o5T0xqDM9i_JjpYF4U7VmLM0qUHkw0wr0bbRqb-CGt4,9901
 fastquadtree/_item.py,sha256=LoTDr7zlsZyUrrKK6Ketzl5fxTcFF8YbcxEXbQ65st4,1679
-fastquadtree/_native.abi3.so,sha256=JdgtsiwQhc-rvOjpX_XFfrlg43yxesSWfiFONTj4UM0,463372
+fastquadtree/_native.abi3.so,sha256=ho-JQh7qmLzIqu4rf03UhgmQ5oELEbmmhCsI2P03vdI,499692
 fastquadtree/_obj_store.py,sha256=vmhZGdzEoTQHvRbFjTne_0X2Z1l48SXyB6I9SAjjbiM,5267
 fastquadtree/point_quadtree.py,sha256=Pz8ZS7N3kYSYJJYGa3ghKzy7d3JCA1dbi9nfEwwpF_k,5178
 fastquadtree/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastquadtree/pyqtree.py,sha256=W5akt9gua7mr51eI-I1hqbZJMRdcNKWzpeaZhlOvhb0,5781
+fastquadtree/pyqtree.py,sha256=m3ylDtG3bnxBJSLoEH7u0rLdzb6l3MLI_UrggAkesI4,5908
 fastquadtree/rect_quadtree.py,sha256=7F-JceCHn5RLhztxSYCIJEZ_e2TV-NeobobbrdauJQA,3024
-fastquadtree-1.0.2.dist-info/RECORD,,
+fastquadtree-1.1.1.dist-info/RECORD,,