fastquadtree 1.3.0__tar.gz → 1.3.2__tar.gz

fastquadtree-1.3.2/.github/workflows/test.yml

@@ -0,0 +1,65 @@
+# .github/workflows/test.yml
+name: Test
+on:
+  push:
+    branches: [ main ]
+
+permissions:
+  contents: write
+  pages: write
+  id-token: write
+
+jobs:
+  test:
+    name: Test build (Python ${{ matrix.python-version }})
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.9", "3.14"]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+          allow-prereleases: true
+          cache: "pip"
+        
+      - name: Create venv for maturin develop
+        run: python -m venv .venv
+
+      - name: Build with maturin into this Python
+        uses: PyO3/maturin-action@v1
+        with:
+          command: develop
+          args: --release
+          manylinux: manylinux2014
+
+      - name: Install Python test deps into .venv
+        run: |
+          . .venv/bin/activate
+          pip install -e '.[dev]'
+
+      - name: Run Python tests
+        run: |
+          . .venv/bin/activate
+          pytest
+
+      - name: Run Python tests
+        run: |
+          . .venv/bin/activate
+          pytest
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Run Rust tests
+        run: cargo test
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}

{fastquadtree-1.3.0 → fastquadtree-1.3.2}/Cargo.lock

@@ -30,7 +30,7 @@ dependencies = [
 
 [[package]]
 name = "fastquadtree"
-version = "1.3.0"
+version = "1.3.2"
 dependencies = [
  "bincode",
  "num-traits",

{fastquadtree-1.3.0 → fastquadtree-1.3.2}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fastquadtree"
-version = "1.3.0"
+version = "1.3.2"
 edition = "2021"
 readme = "README.md"
 

{fastquadtree-1.3.0 → fastquadtree-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastquadtree
-Version: 1.3.0
+Version: 1.3.2
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Rust

fastquadtree-1.3.2/docs/api/pyqtree.md

@@ -0,0 +1,4 @@
+# fastquadtree.pyqtree.Index
+::: fastquadtree.pyqtree.Index
+    options:
+        inherited_members: true

{fastquadtree-1.3.0 → fastquadtree-1.3.2}/pysrc/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__", "")
@@ -250,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).
@@ -289,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-1.3.0 → fastquadtree-1.3.2}/pysrc/fastquadtree/point_quadtree.py

@@ -161,7 +161,7 @@ class QuadTree(_BaseQuadTree[Point, _IdCoord, PointItem]):
         """Create the native engine instance."""
         rust_cls = DTYPE_MAP.get(self._dtype)
         if rust_cls is None:
-            raise ValueError(f"Unsupported dtype: {self._dtype}")
+            raise TypeError(f"Unsupported dtype: {self._dtype}")
         return rust_cls(bounds, capacity, max_depth)
 
     @classmethod
@@ -169,7 +169,7 @@ class QuadTree(_BaseQuadTree[Point, _IdCoord, PointItem]):
         """Create a new native engine instance from serialized bytes."""
         rust_cls = DTYPE_MAP.get(dtype)
         if rust_cls is None:
-            raise ValueError(f"Unsupported dtype: {dtype}")
+            raise TypeError(f"Unsupported dtype: {dtype}")
         return rust_cls.from_bytes(data)
 
     @staticmethod

{fastquadtree-1.3.0 → fastquadtree-1.3.2}/pysrc/fastquadtree/pyqtree.py

@@ -5,8 +5,9 @@ drop-in replacement to fastquadtree.
 
 from __future__ import annotations
 
+from collections.abc import Iterable
 from operator import itemgetter
-from typing import Any, Tuple
+from typing import Any, SupportsFloat, Tuple
 
 from ._native import RectQuadTree
 
@@ -34,18 +35,18 @@ def gather_objs(objs, ids, chunk=2048):
 
 class Index:
     """
-    The class below is taken from the pyqtree package, but the implementation
+    The interface of the class below is taken from the pyqtree package, but the implementation
     has been modified to use the fastquadtree package as a backend instead of
     the original pure-python implementation.
     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
-    index can be iterated through in a for-statement, which loops through all
-    all the quad instances and lets you access their properties.
+    Index is  the top-level class for creating and using a quadtree spatial index
+    with the original pyqtree interface. If you are not migrating from pyqtree,
+    consider using the RectQuadTree class for detailed control and better performance.
+
+    This class wraps a RectQuadTree instance and provides methods to insert items with bounding boxes,
+    remove items, and query for items intersecting a given bounding box.
 
     Example usage:
     ```python
@@ -65,32 +66,36 @@ class Index:
 
     def __init__(
         self,
-        bbox=None,
-        x=None,
-        y=None,
-        width=None,
-        height=None,
-        max_items=MAX_ITEMS,
-        max_depth=MAX_DEPTH,
+        bbox: Iterable[SupportsFloat] | None = None,
+        x: float | int | None = None,
+        y: float | int | None = None,
+        width: float | int | None = None,
+        height: float | int | None = None,
+        max_items: int = MAX_ITEMS,
+        max_depth: int = MAX_DEPTH,
     ):
         """
         Initiate by specifying either 1) a bbox to keep track of, or 2) with an xy centerpoint and a width and height.
 
-        Parameters:
-        - **bbox**: The coordinate system bounding box of the area that the quadtree should
+        Args:
+          bbox: The coordinate system bounding box of the area that the quadtree should
             keep track of, as a 4-length sequence (xmin,ymin,xmax,ymax)
-        - **x**:
+          x:
             The x center coordinate of the area that the quadtree should keep track of.
-        - **y**
+          y:
             The y center coordinate of the area that the quadtree should keep track of.
-        - **width**:
+          width:
             How far from the xcenter that the quadtree should look when keeping track.
-        - **height**:
+          height:
             How far from the ycenter that the quadtree should look when keeping track
-        - **max_items** (optional): The maximum number of items allowed per quad before splitting
-            up into four new subquads. Default is 10.
-        - **max_depth** (optional): The maximum levels of nested subquads, after which no more splitting
+          max_items (optional): The maximum number of items allowed per quad before splitting
+              up into four new subquads. Default is 10.
+          max_depth (optional): The maximum levels of nested subquads, after which no more splitting
             occurs and the bottommost quad nodes may grow indefinately. Default is 20.
+
+        Note:
+            Either the bbox argument must be set, or the x, y, width, and height
+            arguments must be set.
         """
         if bbox is not None:
             x1, y1, x2, y2 = bbox
@@ -114,15 +119,15 @@ class Index:
         self._free = []
         self._item_to_id = {}
 
-    def insert(self, item: Any, bbox):  # pyright: ignore[reportIncompatibleMethodOverride]
+    def insert(self, item: Any, bbox: Iterable[SupportsFloat]):
         """
         Inserts an item into the quadtree along with its bounding box.
 
-        Parameters:
-        - **item**: The item to insert into the index, which will be returned by the intersection method
-        - **bbox**: The spatial bounding box tuple of the item, with four members (xmin,ymin,xmax,ymax)
+        Args:
+          item: The item to insert into the index, which will be returned by the intersection method
+          bbox: The spatial bounding box tuple of the item, with four members (xmin,ymin,xmax,ymax)
         """
-        if type(bbox) is list:  # Handle list input
+        if type(bbox) is not tuple:  # Handle non-tuple input
             bbox = tuple(bbox)
 
         if self._free:
@@ -134,17 +139,18 @@ class Index:
         self._qt.insert(rid, bbox)
         self._item_to_id[id(item)] = rid
 
-    def remove(self, item, bbox):
+    def remove(self, item: Any, bbox: Iterable[SupportsFloat]):
         """
         Removes an item from the quadtree.
 
-        Parameters:
-        - **item**: The item to remove from the index
-        - **bbox**: The spatial bounding box tuple of the item, with four members (xmin,ymin,xmax,ymax)
+        Args:
+          item: The item to remove from the index
+          bbox: The spatial bounding box tuple of the item, with four members (xmin,ymin,xmax,ymax)
 
-        Both parameters need to exactly match the parameters provided to the insert method.
+        Note:
+            Both parameters need to exactly match the parameters provided to the insert method.
         """
-        if type(bbox) is list:  # Handle list input
+        if type(bbox) is not tuple:  # Handle non-tuple input
             bbox = tuple(bbox)
 
         rid = self._item_to_id.pop(id(item))
@@ -152,18 +158,18 @@ class Index:
         self._objects[rid] = None
         self._free.append(rid)
 
-    def intersect(self, bbox):
+    def intersect(self, bbox: Iterable[SupportsFloat]) -> list:
         """
-        Intersects an input boundingbox rectangle with all of the items
+        Intersects an input bounding box rectangle with all of the items
         contained in the quadtree.
 
-        Parameters:
-        - **bbox**: A spatial bounding box tuple with four members (xmin,ymin,xmax,ymax)
+        Args:
+          bbox: A spatial bounding box tuple with four members (xmin,ymin,xmax,ymax)
 
         Returns:
-        - A list of inserted items whose bounding boxes intersect with the input bbox.
+          A list of inserted items whose bounding boxes intersect with the input bbox.
         """
-        if type(bbox) is list:  # Handle list input
+        if type(bbox) is not tuple:  # Handle non-tuple input
             bbox = tuple(bbox)
         result = self._qt.query_ids(bbox)
         # result = [id1, id2, ...]

{fastquadtree-1.3.0 → fastquadtree-1.3.2}/pysrc/fastquadtree/rect_quadtree.py

@@ -101,7 +101,7 @@ class RectQuadTree(_BaseQuadTree[Bounds, _IdRect, RectItem]):
         """Create the native engine instance."""
         rust_cls = DTYPE_MAP.get(self._dtype)
         if rust_cls is None:
-            raise ValueError(f"Unsupported dtype: {self._dtype}")
+            raise TypeError(f"Unsupported dtype: {self._dtype}")
         return rust_cls(bounds, capacity, max_depth)
 
     @classmethod
@@ -109,7 +109,7 @@ class RectQuadTree(_BaseQuadTree[Bounds, _IdRect, RectItem]):
         """Create a new native engine instance from serialized bytes."""
         rust_cls = DTYPE_MAP.get(dtype)
         if rust_cls is None:
-            raise ValueError(f"Unsupported dtype: {dtype}")
+            raise TypeError(f"Unsupported dtype: {dtype}")
         return rust_cls.from_bytes(data)
 
     @staticmethod

{fastquadtree-1.3.0 → fastquadtree-1.3.2}/tests/test_insert_many_numpy.py

@@ -52,6 +52,48 @@ def test_type_error_on_wrong_dtype():
     assert len(qt) == 0
 
 
+def test_non_default_dtype_insert_many():
+    qt = QuadTree(BOUNDS, capacity=8, track_objects=True, dtype="f64")
+    points = np.array([[10, 10], [20, 20], [30, 30]], dtype=np.float64)
+    n = qt.insert_many(points)
+    assert n == 3
+    assert len(qt) == 3
+
+    raw = qt.query((0, 0, 40, 40), as_items=False)
+
+    assert len(raw) == 3
+    # ids and positions match
+    m_raw = {t[0]: (t[1], t[2]) for t in raw}
+    for t in raw:
+        assert (t[1], t[2]) == m_raw[t[0]]
+
+
+def test_non_default_quadtree_dtype_with_default_numpy_dtype_raises():
+    qt = QuadTree(BOUNDS, capacity=8, track_objects=True, dtype="f64")
+    points = np.array([[10, 10], [20, 20], [30, 30]], dtype=np.float32)  # Wrong dtype
+    with pytest.raises(TypeError):
+        qt.insert_many(points)
+    assert len(qt) == 0
+
+
+def test_unspported_quadtree_dtype_insert_many_raises():
+    qt = QuadTree(BOUNDS, capacity=8, track_objects=True, dtype="i32")
+    points = np.array([[10, 10], [20, 20], [30, 30]], dtype=np.float32)  # Wrong dtype
+    with pytest.raises(TypeError):
+        qt.insert_many(points)
+    assert len(qt) == 0
+
+    points = np.array(
+        [[10, 10], [20, 20], [30, 30]], dtype=np.uint32
+    )  # unsupported dtype
+    with pytest.raises(TypeError):
+        qt.insert_many(points)
+
+    # QT is also unsupported
+    with pytest.raises(TypeError):
+        qt = QuadTree(BOUNDS, capacity=8, track_objects=True, dtype="u32")
+
+
 def test_insert_empty_numpy_array():
     qt = QuadTree(BOUNDS, capacity=8, track_objects=True)
     points = np.empty((0, 2), dtype=np.float32)

{fastquadtree-1.3.0 → fastquadtree-1.3.2}/tests/test_point_quadtree_dtypes.py

@@ -5,13 +5,13 @@ from fastquadtree import QuadTree
 
 def test_unsupported_dtype():
     """Test that providing an unsupported dtype raises ValueError."""
-    with pytest.raises(ValueError):
+    with pytest.raises(TypeError):
         QuadTree((0, 0, 100, 100), capacity=4, track_objects=True, dtype="f128")  # type: ignore
 
     # From bytes
     qt = QuadTree((0, 0, 100, 100), capacity=4, track_objects=True, dtype="f32")
     data = qt.to_bytes()
-    with pytest.raises(ValueError):
+    with pytest.raises(TypeError):
         QuadTree.from_bytes(data, dtype="f128")  # type: ignore
 
 

{fastquadtree-1.3.0 → fastquadtree-1.3.2}/tests/test_pyqtree_shim_compat.py

@@ -401,3 +401,73 @@ def test_insert_list_and_tuple_equivalence():
     # Both objects should be present
     results = idx.intersect((0.0, 0.0, 100.0, 100.0))
     assert set(results) == {obj1, obj2}
+
+
+def test_insert_non_list_non_tuple_iterator():
+    """Test that any iterable (not just list/tuple) works for bbox in insert."""
+    idx = FQTIndex(bbox=WORLD)
+
+    obj1, box1 = "obj1", (10.0, 10.0, 20.0, 20.0)
+
+    obj2 = "obj2"
+
+    def obj2_box2_iterator():
+        yield 30.0
+        yield 30.0
+        yield 40.0
+        yield 40.0
+
+    # Insert using tuple
+    idx.insert(obj1, box1)
+
+    # Insert using range iterator
+    idx.insert(obj2, obj2_box2_iterator())
+
+    # Both objects should be present
+    results = idx.intersect((0.0, 0.0, 100.0, 100.0))
+    assert set(results) == {obj1, obj2}
+
+    # Try Range
+    obj3 = "obj3"
+    box3_range = range(50, 54)  # 50, 51, 52, 53
+    idx.insert(obj3, box3_range)
+    results = idx.intersect((0.0, 0.0, 100.0, 100.0))
+    assert set(results) == {obj1, obj2, obj3}
+
+
+def test_insert_fails_on_tuple_too_long():
+    """Test that insert fails when bbox tuple is too long."""
+    idx = FQTIndex(bbox=WORLD)
+
+    obj1 = "obj1"
+    box1 = (10.0, 10.0, 20.0, 20.0, 30.0)  # This should fail
+
+    with pytest.raises(ValueError):
+        idx.insert(obj1, box1)
+
+
+def non_tuple_intersect_and_non_tuple_remove_handled():
+    """Test that intersect and remove accept any iterable (not just list/tuple)."""
+    idx = FQTIndex(bbox=WORLD)
+
+    obj1, box1 = "obj1", (10.0, 10.0, 20.0, 20.0)
+
+    idx.insert(obj1, box1)
+
+    def query_iterator():
+        yield 15.0
+        yield 15.0
+        yield 25.0
+        yield 25.0
+
+    results = idx.intersect(query_iterator())
+    assert results == [obj1]
+
+    def remove_box_iterator():
+        yield 10.0
+        yield 10.0
+        yield 20.0
+        yield 20.0
+
+    idx.remove(obj1, remove_box_iterator())
+    assert idx.intersect((0.0, 0.0, 100.0, 100.0)) == []

{fastquadtree-1.3.0 → fastquadtree-1.3.2}/tests/test_rect_quadtree.py

@@ -195,7 +195,7 @@ def test_accurate_obj_output_with_tracking():
 
 def test_unsupported_dtype():
     """Test that providing an unsupported dtype raises ValueError."""
-    with pytest.raises(ValueError):
+    with pytest.raises(TypeError):
         rq.RectQuadTree(
             b_to_float(0, 0, 100, 100), capacity=4, track_objects=True, dtype="f128"
         )  # type: ignore
@@ -205,7 +205,7 @@ def test_unsupported_dtype():
         b_to_float(0, 0, 100, 100), capacity=4, track_objects=True, dtype="f32"
     )
     data = qt.to_bytes()
-    with pytest.raises(ValueError):
+    with pytest.raises(TypeError):
         rq.RectQuadTree.from_bytes(data, dtype="f128")  # type: ignore
 
 

fastquadtree-1.3.0/docs/api/pyqtree.md

@@ -1,4 +0,0 @@
-# fastquadtree.pyqtree
-::: fastquadtree.pyqtree.Index
-    options:
-        inherited_members: true