Refresh snapshots and bump version to 0.0.112

Author: adpena

.cache/entities_Current_Districts_2025_Schools_2024_to_2025.sqlite

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:519bfdbfbbd9896812649b39c97bb882557c95c25a995cf725d3e2e8fc3a7c9a
+oid sha256:f8cbbcd83c58ab1c7a711338003553599919e1f8a1c9f1576406904493b1012f
 size 259493888

.cache/map_payloads_Current_Districts_2025_Schools_2024_to_2025.sqlite

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:438b6c5bf6b045d69b02949030748d7b346507896d9511577daeba2696a45ded
+oid sha256:6a3dd6d364d372719d6208dd33b594ba09ed02a13552daa333f1f51613d5294c
 size 317960192

.cache/repo_districts_campuses.pkl.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5931d979b28f5a73965a0dcf323aca267c58db230383626ed99f806555e3098b
-size 441
+oid sha256:dc605919048190e61ad82d2451086a71d184301448d7e094f60474db3e8260e6
+size 525

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "teadata"
-version = "0.0.111"
+version = "0.0.112"
 description = "Pythonic data engine for Texas education datasets"
 authors = [{name="Alejandro Peña", email="adpena@gmail.com"}]
 readme = "README.md"

teadata/.cache/entities_Current_Districts_2025_Schools_2024_to_2025.sqlite

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:519bfdbfbbd9896812649b39c97bb882557c95c25a995cf725d3e2e8fc3a7c9a
+oid sha256:f8cbbcd83c58ab1c7a711338003553599919e1f8a1c9f1576406904493b1012f
 size 259493888

teadata/.cache/map_payloads_Current_Districts_2025_Schools_2024_to_2025.sqlite

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:438b6c5bf6b045d69b02949030748d7b346507896d9511577daeba2696a45ded
+oid sha256:6a3dd6d364d372719d6208dd33b594ba09ed02a13552daa333f1f51613d5294c
 size 317960192

teadata/.cache/repo_districts_campuses.pkl.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5931d979b28f5a73965a0dcf323aca267c58db230383626ed99f806555e3098b
-size 441
+oid sha256:dc605919048190e61ad82d2451086a71d184301448d7e094f60474db3e8260e6
+size 525

teadata/engine.py

@@ -8,7 +8,15 @@
 if TYPE_CHECKING:
     from .engine import DataEngine
 
-from .entities import EntityList, EntityMap, ReadOnlyEntityView, is_charter, is_private
+from .entities import (
+    Campus,
+    District,
+    EntityList,
+    EntityMap,
+    ReadOnlyEntityView,
+    is_charter,
+    is_private,
+)
 from .geometry import point_xy
 from .grades import coerce_grade_bounds, coerce_grade_spans
 
@@ -455,45 +463,42 @@ def _overlaps(obj: Any) -> bool:
     def _op_campuses_in(self, op: tuple):
         campuses: List[Any] = []
         for item in self._items:
-            if getattr(item.__class__, "__name__", "") == "District":
+            if isinstance(item, District):
                 campuses.extend(self._repo.campuses_in(item))
-            elif getattr(item.__class__, "__name__", "") == "Campus":
+            elif isinstance(item, Campus):
                 campuses.append(item)
         self._items = campuses
         return self
 
     def _op_private_campuses_in(self, op: tuple):
         max_m = float(op[1]) if len(op) >= 2 and op[1] is not None else None
 
+        allowed_cache: Dict[uuid.UUID, set[uuid.UUID]] = {}
+
+        def _allowed_ids_for_district(district: District) -> set[uuid.UUID]:
+            did = district.id
+            allowed = allowed_cache.get(did)
+            if allowed is None:
+                allowed = {
+                    c.id for c in self._repo.private_campuses_in(district, max_miles=max_m)
+                }
+                allowed_cache[did] = allowed
+            return allowed
+
         campuses: List[Any] = []
         for item in self._items:
-            if getattr(item.__class__, "__name__", "") == "District":
-                campuses.extend(self._repo.private_campuses_in(item, max_miles=max_m))
-            elif getattr(item.__class__, "__name__", "") == "Campus" and is_private(
-                item
-            ):
-                campuses.append(item)
-
-        if max_m is not None and campuses:
-            allowed_cache: Dict[uuid.UUID, set[uuid.UUID]] = {}
-            filtered: List[Any] = []
-            for campus in campuses:
-                district = campus.district
-                if district is None:
-                    continue
-                did = district.id
-                allowed = allowed_cache.get(did)
-                if allowed is None:
-                    allowed = {
-                        c.id
-                        for c in self._repo.private_campuses_in(
-                            district, max_miles=max_m
-                        )
-                    }
-                    allowed_cache[did] = allowed
-                if campus.id in allowed:
-                    filtered.append(campus)
-            campuses = filtered
+            if isinstance(item, District):
+                districts_private = self._repo.private_campuses_in(item, max_miles=max_m)
+                campuses.extend(districts_private)
+            elif isinstance(item, Campus) and is_private(item):
+                if max_m is None:
+                    campuses.append(item)
+                else:
+                    district = item.district
+                    if district is None:
+                        continue
+                    if item.id in _allowed_ids_for_district(district):
+                        campuses.append(item)
 
         self._items = campuses
         return self
@@ -607,9 +612,9 @@ def _op_nearest_charter_same_type(self, op: tuple):
         k = int(op[1]) if len(op) >= 2 else 1
         campuses: List[Any] = []
         for item in self._items:
-            if getattr(item.__class__, "__name__", "") == "Campus":
+            if isinstance(item, Campus):
                 campuses.append(item)
-            elif getattr(item.__class__, "__name__", "") == "District":
+            elif isinstance(item, District):
                 campuses.extend(self._repo.campuses_in(item))
         if not campuses:
             self._items = []
@@ -625,9 +630,9 @@ def _op_nearest_charter_same_type(self, op: tuple):
     def _op_nearest_charter_transfer_destination(self, op: tuple):
         campuses: List[Any] = []
         for item in self._items:
-            if getattr(item.__class__, "__name__", "") == "Campus":
+            if isinstance(item, Campus):
                 campuses.append(item)
-            elif getattr(item.__class__, "__name__", "") == "District":
+            elif isinstance(item, District):
                 campuses.extend(self._repo.campuses_in(item))
         if not campuses:
             self._items = []
@@ -653,7 +658,7 @@ def _op_transfers_out(self, op: tuple):
         campuses = [
             it
             for it in self._items
-            if getattr(it.__class__, "__name__", "") == "Campus"
+            if isinstance(it, Campus)
         ]
         rows = []
         for c in campuses:
@@ -674,7 +679,7 @@ def _op_transfers_in(self, op: tuple):
         campuses = [
             it
             for it in self._items
-            if getattr(it.__class__, "__name__", "") == "Campus"
+            if isinstance(it, Campus)
         ]
         rows = []
         for c in campuses:

teadata/query.py

@@ -0,0 +1,123 @@
+import uuid
+
+from teadata.classes import Campus, DataEngine, District
+
+
+def _district(name: str, number: str) -> District:
+    return District(
+        id=uuid.uuid4(),
+        name=name,
+        district_number=number,
+        enrollment=1000,
+        rating="A",
+    )
+
+
+def _campus(
+    district: District,
+    *,
+    name: str,
+    campus_number: str,
+    lon: float,
+    lat: float,
+    is_charter: bool = False,
+) -> Campus:
+    return Campus(
+        id=uuid.uuid4(),
+        district_id=district.id,
+        name=name,
+        charter_type="Charter" if is_charter else "Public",
+        is_charter=is_charter,
+        district_number=district.district_number,
+        campus_number=campus_number,
+        location=(lon, lat),
+    )
+
+
+def test_district_lookup_by_number_and_name_returns_all_matches():
+    repo = DataEngine()
+    d1 = _district("Alpha ISD", "123")
+    d2 = _district("Alpha ISD", "'000123")
+    d3 = _district("Beta ISD", "456")
+    repo.add_district(d1)
+    repo.add_district(d2)
+    repo.add_district(d3)
+
+    number_hits = repo >> ("district", 123)
+    assert [d.id for d in number_hits] == [d1.id, d2.id]
+
+    exact_hits = repo >> ("district", "ALPHA ISD")
+    assert [d.id for d in exact_hits] == [d1.id, d2.id]
+
+    wildcard_hits = repo >> ("district", "ALPHA*")
+    assert [d.id for d in wildcard_hits] == [d1.id, d2.id]
+
+
+def test_campus_lookup_by_exact_name_returns_all_matches():
+    repo = DataEngine()
+    d1 = _district("Gamma ISD", "111111")
+    d2 = _district("Delta ISD", "222222")
+    repo.add_district(d1)
+    repo.add_district(d2)
+    c1 = _campus(
+        d1,
+        name="Central High",
+        campus_number="111111001",
+        lon=-97.0,
+        lat=32.0,
+    )
+    c2 = _campus(
+        d2,
+        name="Central High",
+        campus_number="222222001",
+        lon=-97.1,
+        lat=32.1,
+    )
+    repo.add_campus(c1)
+    repo.add_campus(c2)
+
+    hits = repo >> ("campus", "CENTRAL HIGH")
+    assert [c.id for c in hits] == [c1.id, c2.id]
+
+
+def test_nearest_campuses_charter_only_returns_empty_when_no_charters():
+    repo = DataEngine()
+    d1 = _district("Echo ISD", "333333")
+    repo.add_district(d1)
+    repo.add_campus(
+        _campus(
+            d1,
+            name="Echo Middle",
+            campus_number="333333001",
+            lon=-97.0,
+            lat=32.0,
+        )
+    )
+
+    hits = repo.nearest_campuses(-97.0, 32.0, limit=3, charter_only=True)
+    assert hits == []
+
+
+def test_nearest_campuses_respects_max_miles():
+    repo = DataEngine()
+    d1 = _district("Foxtrot ISD", "444444")
+    repo.add_district(d1)
+    near = _campus(
+        d1,
+        name="Near Campus",
+        campus_number="444444001",
+        lon=0.0,
+        lat=0.0,
+    )
+    far = _campus(
+        d1,
+        name="Far Campus",
+        campus_number="444444002",
+        lon=1.0,
+        lat=1.0,
+    )
+    repo.add_campus(near)
+    repo.add_campus(far)
+
+    hits = repo.nearest_campuses(0.0, 0.0, limit=5, max_miles=10.0, geodesic=True)
+    assert [c.id for c in hits] == [near.id]