Linter fixes

Author: jeffmaki

alembic_task/versions/b3f8a2c91e04_add_auto_flag_review.py

@@ -9,7 +9,6 @@
 from typing import Sequence, Union
 
 import sqlalchemy as sa
-
 from alembic import op
 
 revision: str = "b3f8a2c91e04"

api/src/osm/repository.py

@@ -35,11 +35,7 @@ async def getWorkspaceBBox(
 
         return retVal
 
-    async def getChangesetAdiff(
-        self,
-        workspace_id: int,
-        changeset_id: int
-    ) -> list:
+    async def getChangesetAdiff(self, workspace_id: int, changeset_id: int) -> list:
         await self.session.execute(
             text(f"SET search_path TO 'workspace-{int(workspace_id)}', public")
         )

api/src/osm/routes.py

@@ -60,8 +60,9 @@ async def resolve_changeset(
     repository_osm: OSMRepository = Depends(get_osm_repo),
     current_user: UserInfo = Depends(validate_token),
 ) -> None:
-    if (not current_user.isWorkspaceLead(workspace_id)
-            and not current_user.isWorkspaceValidator(workspace_id)):
+    if not current_user.isWorkspaceLead(
+        workspace_id
+    ) and not current_user.isWorkspaceValidator(workspace_id):
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Only workspace leads and validators can resolve changesets",

api/src/workspaces/schemas.py

@@ -320,4 +320,3 @@ class Workspace(SQLModel, table=True):
             "cascade": "all, delete-orphan",
         }
     )
-

scripts/fix-lint.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+# Auto-fix the formatting issues that scripts/ci.sh checks for.
+#
+# Runs isort then black in write mode over the repo (the same tools/config CI
+# enforces, minus the `--check`). Safe to run repeatedly; it only rewrites files
+# that are not already compliant. Does not touch pyright — type errors are not
+# auto-fixable.
+set -euo pipefail
+
+cd "$(dirname "$0")/.."
+
+echo "==> Sorting imports (isort)"
+uv run isort .
+
+echo ""
+echo "==> Formatting code (black)"
+uv run black .
+
+echo ""
+echo "Done. Review the changes with 'git diff', then re-run ./scripts/ci.sh."

tests/integration/test_audit_flow.py

@@ -90,9 +90,7 @@ async def test_lists_lifecycle_events_newest_first(
     ):
         """Project create → AOI upload → tasks → activate all appear in audit."""
         contributor = await extra_user_factory("contributor")
-        pid = await _open_project_with_tasks(
-            client, seeded_workspace_id, contributor
-        )
+        pid = await _open_project_with_tasks(client, seeded_workspace_id, contributor)
 
         r = await client.get(f"{API.format(wid=seeded_workspace_id)}/{pid}/audit")
         assert r.status_code == 200, r.text
@@ -112,9 +110,7 @@ async def test_filter_by_event_type(
     ):
         """`event_type` query narrows results to one kind."""
         contributor = await extra_user_factory("contributor")
-        pid = await _open_project_with_tasks(
-            client, seeded_workspace_id, contributor
-        )
+        pid = await _open_project_with_tasks(client, seeded_workspace_id, contributor)
 
         r = await client.get(
             f"{API.format(wid=seeded_workspace_id)}/{pid}/audit",
@@ -129,9 +125,7 @@ async def test_filter_by_actor(
     ):
         """`actor_user_id` filters to events emitted by that user only."""
         contributor = await extra_user_factory("contributor")
-        pid = await _open_project_with_tasks(
-            client, seeded_workspace_id, contributor
-        )
+        pid = await _open_project_with_tasks(client, seeded_workspace_id, contributor)
         r = await client.get(
             f"{API.format(wid=seeded_workspace_id)}/{pid}/audit",
             params={"actor_user_id": str(as_lead.user_uuid)},
@@ -145,9 +139,7 @@ async def test_pagination_clamps_and_total(
     ):
         """Page size of 1 still returns one row; total reflects the whole set."""
         contributor = await extra_user_factory("contributor")
-        pid = await _open_project_with_tasks(
-            client, seeded_workspace_id, contributor
-        )
+        pid = await _open_project_with_tasks(client, seeded_workspace_id, contributor)
         r = await client.get(
             f"{API.format(wid=seeded_workspace_id)}/{pid}/audit",
             params={"page_size": 1, "page": 1},
@@ -184,9 +176,7 @@ async def test_lists_task_events(
         # then we switch to that contributor to lock + unlock so we generate
         # task events.
         contributor = await extra_user_factory("contributor")
-        pid = await _open_project_with_tasks(
-            client, seeded_workspace_id, contributor
-        )
+        pid = await _open_project_with_tasks(client, seeded_workspace_id, contributor)
         override_user(contributor)
 
         # Contributor locks task 1.
@@ -219,9 +209,7 @@ async def test_unknown_task_404(
     ):
         """A bogus task number on a real project returns 404."""
         contributor = await extra_user_factory("contributor")
-        pid = await _open_project_with_tasks(
-            client, seeded_workspace_id, contributor
-        )
+        pid = await _open_project_with_tasks(client, seeded_workspace_id, contributor)
         r = await client.get(
             f"{API.format(wid=seeded_workspace_id)}/{pid}/tasks/99/audit"
         )
@@ -240,9 +228,7 @@ async def test_deleted_project_hidden_by_default(
     ):
         """A soft-deleted project's audit returns 404 unless `include_deleted=true`."""
         contributor = await extra_user_factory("contributor")
-        pid = await _open_project_with_tasks(
-            client, seeded_workspace_id, contributor
-        )
+        pid = await _open_project_with_tasks(client, seeded_workspace_id, contributor)
 
         # Project must be closed before delete.
         r = await client.post(f"{API.format(wid=seeded_workspace_id)}/{pid}/close")