Fix blanket file-wide type ignores

Author: jeffmaki

CLAUDE.md

@@ -151,10 +151,14 @@ that is a code change in the read routes, not a test change.
 SQLModel declares columns as plain annotations (e.g. `id: int | None`) rather
 than `Mapped[int]`, so Pyright reads `Column == value` as `bool` and flags
 `where()`/`exec()`/`select()`/`selectinload` calls and `result.rowcount`. These
-are framework false positives. The three repository modules carry a documented
-file-level `# pyright: reportArgumentType=false, reportCallIssue=false,
-reportAttributeAccessIssue=false` directive; other rules stay enabled so real
-bugs still surface. Keep `api/` and `tests/` at zero Pyright errors.
+are framework false positives. Suppress them with **targeted, inline**
+`# pyright: ignore[<rule>]` comments at the specific offending call sites (e.g.
+`# pyright: ignore[reportArgumentType]` on a `.where(Column == value)` line) —
+not blanket file-level `# pyright:` directives, which would hide genuine errors
+of those rules elsewhere in the file. Note Black may wrap a long query line and
+move a trailing comment off the flagged line; place the ignore on the line
+Pyright actually reports (often the inner `== value` line) so it survives
+formatting. Keep `api/` and `tests/` at zero Pyright errors.
 
 ### Alembic enum migrations
 

api/src/tasking/projects/repository.py

@@ -1,11 +1,3 @@
-# SQLModel declares columns as plain annotations (e.g. ``id: int | None``) rather
-# than ``Mapped[int]``, so Pyright reads ``Column == value`` as ``bool`` and
-# misjudges ``where()``/``select()``/``selectinload`` calls; the nullable
-# ``deleted_at`` column additionally trips ``reportOptionalMemberAccess`` on
-# ``.is_(None)``. These are framework false positives; the queries are valid at
-# runtime. Other rules stay enabled so real bugs still surface.
-# pyright: reportArgumentType=false, reportCallIssue=false, reportAttributeAccessIssue=false, reportOptionalMemberAccess=false
-
 from __future__ import annotations
 
 import json
@@ -96,7 +88,7 @@ def _aoi_to_shapely(aoi: AoiInput) -> ShapelyMultiPolygon:
     if not geom.is_valid:
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-            detail=f"AOI is not a valid polygon: {geom.is_valid_reason if hasattr(geom, 'is_valid_reason') else 'self-intersection or invalid ring'}",
+            detail=f"AOI is not a valid polygon: {geom.is_valid_reason if hasattr(geom, 'is_valid_reason') else 'self-intersection or invalid ring'}",  # pyright: ignore[reportAttributeAccessIssue]
         )
 
     return geom
@@ -221,7 +213,11 @@ async def _get_active(self, workspace_id: int, project_id: int) -> TaskingProjec
             select(TaskingProject).where(
                 (TaskingProject.id == project_id)
                 & (TaskingProject.workspace_id == workspace_id)
-                & (TaskingProject.deleted_at.is_(None))
+                & (
+                    TaskingProject.deleted_at.is_(  # pyright: ignore[reportAttributeAccessIssue, reportOptionalMemberAccess]
+                        None
+                    )
+                )
             )
         )
         project = result.scalar_one_or_none()
@@ -387,7 +383,9 @@ async def list_projects(
         col = col.desc() if order_dir.upper() == "DESC" else col.asc()
 
         where = (TaskingProject.workspace_id == workspace_id) & (
-            TaskingProject.deleted_at.is_(None)
+            TaskingProject.deleted_at.is_(  # pyright: ignore[reportAttributeAccessIssue, reportOptionalMemberAccess]
+                None
+            )
         )
         if status_filter is not None:
             where = where & (TaskingProject.status == status_filter)
@@ -634,7 +632,10 @@ async def patch(
             try:
                 await self.session.execute(
                     update(TaskingProject)
-                    .where(TaskingProject.id == project.id)
+                    .where(
+                        TaskingProject.id
+                        == project.id  # pyright: ignore[reportArgumentType]
+                    )
                     .values(**updates)
                 )
                 await self._audit(
@@ -678,7 +679,9 @@ async def soft_delete(
         # Soft-delete the project, hard-delete its tasks, flag audit rows.
         await self.session.execute(
             update(TaskingProject)
-            .where(TaskingProject.id == project.id)
+            .where(
+                TaskingProject.id == project.id  # pyright: ignore[reportArgumentType]
+            )
             .values(deleted_at=datetime.now())
         )
         await self.session.execute(
@@ -748,7 +751,9 @@ async def activate(
 
         await self.session.execute(
             update(TaskingProject)
-            .where(TaskingProject.id == project.id)
+            .where(
+                TaskingProject.id == project.id  # pyright: ignore[reportArgumentType]
+            )
             .values(status=ProjectStatus.OPEN, updated_at=datetime.now())
         )
         await self._audit(
@@ -799,7 +804,9 @@ async def close(
 
         await self.session.execute(
             update(TaskingProject)
-            .where(TaskingProject.id == project.id)
+            .where(
+                TaskingProject.id == project.id  # pyright: ignore[reportArgumentType]
+            )
             .values(status=ProjectStatus.DONE, updated_at=datetime.now())
         )
         await self._audit(
@@ -847,7 +854,10 @@ async def reset(
         if project.status == ProjectStatus.DONE:
             await self.session.execute(
                 update(TaskingProject)
-                .where(TaskingProject.id == project.id)
+                .where(
+                    TaskingProject.id
+                    == project.id  # pyright: ignore[reportArgumentType]
+                )
                 .values(status=ProjectStatus.OPEN, updated_at=datetime.now())
             )
 
@@ -870,7 +880,7 @@ async def get_aoi(self, workspace_id: int, project_id: int) -> AoiFeature:
         geom = to_shape(project.aoi)
         if isinstance(geom, ShapelyPolygon):  # defensive
             geom = ShapelyMultiPolygon([geom])
-        return _shapely_to_aoi_feature(geom)
+        return _shapely_to_aoi_feature(geom)  # pyright: ignore[reportArgumentType]
 
     async def upload_aoi(
         self, workspace_id: int, project_id: int, aoi: AoiInput, current_user: UserInfo
@@ -893,7 +903,9 @@ async def upload_aoi(
         )
         await self.session.execute(
             update(TaskingProject)
-            .where(TaskingProject.id == project.id)
+            .where(
+                TaskingProject.id == project.id  # pyright: ignore[reportArgumentType]
+            )
             .values(
                 aoi=from_shape(geom, srid=4326),
                 task_boundary_type=None,
@@ -1355,7 +1367,9 @@ async def delete_aoi(
         )
         await self.session.execute(
             update(TaskingProject)
-            .where(TaskingProject.id == project.id)
+            .where(
+                TaskingProject.id == project.id  # pyright: ignore[reportArgumentType]
+            )
             .values(
                 aoi=None,
                 task_boundary_type=None,

api/src/tasking/tasks/repository.py

@@ -1,11 +1,3 @@
-# SQLModel declares columns as plain annotations (e.g. ``id: int | None``) rather
-# than ``Mapped[int]``, so Pyright reads ``Column == value`` as ``bool`` and
-# misjudges ``where()``/``select()``/``selectinload`` calls; nullable columns
-# (``deleted_at``, ``released_at``) additionally trip ``reportOptionalMemberAccess``
-# on ``.is_(None)``. These are framework false positives; the queries are valid at
-# runtime. Other rules stay enabled so real bugs still surface.
-# pyright: reportArgumentType=false, reportCallIssue=false, reportAttributeAccessIssue=false, reportOptionalMemberAccess=false
-
 from __future__ import annotations
 
 import hashlib
@@ -179,7 +171,11 @@ def _generate_grid_over_aoi(
                     # `intersection` can return a Polygon, MultiPolygon,
                     # or GeometryCollection; retain polygon pieces only.
                     geoms = (
-                        list(clipped.geoms) if hasattr(clipped, "geoms") else [clipped]
+                        list(
+                            clipped.geoms  # pyright: ignore[reportAttributeAccessIssue]
+                        )
+                        if hasattr(clipped, "geoms")
+                        else [clipped]
                     )
                     for piece in geoms:
                         if isinstance(piece, ShapelyPolygon) and piece.area > 0:
@@ -215,7 +211,11 @@ async def _get_project(self, workspace_id: int, project_id: int) -> TaskingProje
             select(TaskingProject).where(
                 (TaskingProject.id == project_id)
                 & (TaskingProject.workspace_id == workspace_id)
-                & (TaskingProject.deleted_at.is_(None))
+                & (
+                    TaskingProject.deleted_at.is_(  # pyright: ignore[reportAttributeAccessIssue, reportOptionalMemberAccess]
+                        None
+                    )
+                )
             )
         )
         project = rs.scalar_one_or_none()
@@ -226,7 +226,9 @@ async def _get_project(self, workspace_id: int, project_id: int) -> TaskingProje
     async def _get_task(self, project_id: int, task_number: int) -> TaskingTask:
         rs = await self.session.execute(
             select(TaskingTask).where(
-                (TaskingTask.project_id == project_id)
+                (
+                    TaskingTask.project_id == project_id
+                )  # pyright: ignore[reportArgumentType]
                 & (TaskingTask.task_number == task_number)
             )
         )
@@ -240,7 +242,12 @@ async def _get_task(self, project_id: int, task_number: int) -> TaskingTask:
     async def _get_active_lock(self, task_id: int) -> Optional[TaskingLock]:
         rs = await self.session.execute(
             select(TaskingLock).where(
-                (TaskingLock.task_id == task_id) & (TaskingLock.released_at.is_(None))
+                (TaskingLock.task_id == task_id)
+                & (
+                    TaskingLock.released_at.is_(  # pyright: ignore[reportAttributeAccessIssue, reportOptionalMemberAccess]
+                        None
+                    )
+                )
             )
         )
         return rs.scalar_one_or_none()
@@ -252,7 +259,11 @@ async def _get_active_lock_for_user_in_project(
             select(TaskingLock).where(
                 (TaskingLock.project_id == project_id)
                 & (TaskingLock.user_auth_uid == user_auth_uid)
-                & (TaskingLock.released_at.is_(None))
+                & (
+                    TaskingLock.released_at.is_(  # pyright: ignore[reportAttributeAccessIssue, reportOptionalMemberAccess]
+                        None
+                    )
+                )
             )
         )
         return rs.scalar_one_or_none()
@@ -390,7 +401,9 @@ async def generate_grid(
         if isinstance(aoi_geom, ShapelyPolygon):
             aoi_geom = ShapelyMultiPolygon([aoi_geom])
 
-        cells = _generate_grid_over_aoi(aoi_geom, float(cell_size_m))
+        cells = _generate_grid_over_aoi(
+            aoi_geom, float(cell_size_m)  # pyright: ignore[reportArgumentType]
+        )
         if not cells:
             raise HTTPException(
                 status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
@@ -537,7 +550,9 @@ async def save(
             task = TaskingTask(
                 project_id=project.id,  # type: ignore[arg-type]
                 task_number=idx + 1,
-                area_sqkm=round(_polygon_area_km2(poly), 4),
+                area_sqkm=round(
+                    _polygon_area_km2(poly), 4
+                ),  # pyright: ignore[reportArgumentType]
                 status=TaskStatus.TO_MAP,
                 geometry=from_shape(poly, srid=4326),
             )
@@ -549,7 +564,9 @@ async def save(
         # Set boundary type + bump project updated_at.
         await self.session.execute(
             update(TaskingProject)
-            .where(TaskingProject.id == project.id)
+            .where(
+                TaskingProject.id == project.id  # pyright: ignore[reportArgumentType]
+            )
             .values(
                 task_boundary_type=body.source,
                 updated_at=datetime.now(),
@@ -616,7 +633,9 @@ async def list_tasks(
             where = where & (TaskingTask.last_mapper_id == str(last_mapper_id))
 
         total_q = await self.session.execute(
-            select(func.count()).select_from(TaskingTask).where(where)
+            select(func.count())
+            .select_from(TaskingTask)
+            .where(where)  # pyright: ignore[reportArgumentType]
         )
         total = int(total_q.scalar() or 0)
 
@@ -626,8 +645,10 @@ async def list_tasks(
 
         rows = await self.session.execute(
             select(TaskingTask)
-            .where(where)
-            .order_by(TaskingTask.task_number.asc())
+            .where(where)  # pyright: ignore[reportArgumentType]
+            .order_by(
+                TaskingTask.task_number.asc()  # pyright: ignore[reportAttributeAccessIssue]
+            )
             .limit(page_size)
             .offset(offset)
         )
@@ -727,7 +748,10 @@ async def lock_task(
         )
         if other is not None:
             other_task_rs = await self.session.execute(
-                select(TaskingTask).where(TaskingTask.id == other.task_id)
+                select(TaskingTask).where(
+                    TaskingTask.id
+                    == other.task_id  # pyright: ignore[reportArgumentType]
+                )
             )
             other_task = other_task_rs.scalar_one()
             summary = ExistingLockSummary(
@@ -803,7 +827,7 @@ async def unlock_task(
         now = datetime.now()
         await self.session.execute(
             update(TaskingLock)
-            .where(TaskingLock.id == lock.id)
+            .where(TaskingLock.id == lock.id)  # pyright: ignore[reportArgumentType]
             .values(released_at=now, release_reason=release_reason)
         )
         await self._audit(
@@ -846,7 +870,7 @@ async def extend_lock(
         new_expiry = prev + timedelta(hours=project.lock_timeout_hours)
         await self.session.execute(
             update(TaskingLock)
-            .where(TaskingLock.id == lock.id)
+            .where(TaskingLock.id == lock.id)  # pyright: ignore[reportArgumentType]
             .values(expires_at=new_expiry)
         )
         await self._audit(
@@ -884,7 +908,7 @@ async def reset_task(
         if lock is not None:
             await self.session.execute(
                 update(TaskingLock)
-                .where(TaskingLock.id == lock.id)
+                .where(TaskingLock.id == lock.id)  # pyright: ignore[reportArgumentType]
                 .values(
                     released_at=now,
                     release_reason=LockReleaseReason.RESET,
@@ -905,7 +929,7 @@ async def reset_task(
         if previous_status != TaskStatus.TO_MAP:
             await self.session.execute(
                 update(TaskingTask)
-                .where(TaskingTask.id == task.id)
+                .where(TaskingTask.id == task.id)  # pyright: ignore[reportArgumentType]
                 .values(
                     status=TaskStatus.TO_MAP,
                     last_mapper_id=None,
@@ -927,7 +951,7 @@ async def reset_task(
             # Clear last_mapper_id even if state was already to_map.
             await self.session.execute(
                 update(TaskingTask)
-                .where(TaskingTask.id == task.id)
+                .where(TaskingTask.id == task.id)  # pyright: ignore[reportArgumentType]
                 .values(last_mapper_id=None, updated_at=now)
             )
 
@@ -1009,7 +1033,7 @@ async def submit(
             new_expiry = now + timedelta(hours=project.lock_timeout_hours)
             await self.session.execute(
                 update(TaskingLock)
-                .where(TaskingLock.id == lock.id)
+                .where(TaskingLock.id == lock.id)  # pyright: ignore[reportArgumentType]
                 .values(expires_at=new_expiry)
             )
             await self._audit(
@@ -1075,7 +1099,7 @@ async def submit(
         # Release the lock (auto_unlock).
         await self.session.execute(
             update(TaskingLock)
-            .where(TaskingLock.id == lock.id)
+            .where(TaskingLock.id == lock.id)  # pyright: ignore[reportArgumentType]
             .values(
                 released_at=now,
                 release_reason=LockReleaseReason.AUTO_UNLOCK,
@@ -1095,7 +1119,7 @@ async def submit(
         # Apply state transition.
         await self.session.execute(
             update(TaskingTask)
-            .where(TaskingTask.id == task.id)
+            .where(TaskingTask.id == task.id)  # pyright: ignore[reportArgumentType]
             .values(
                 status=new_status,
                 last_mapper_id=new_last_mapper,