Replace custom OGC API implementation with pygeoapi (mounted in FastAPI)

.env.example

@@ -20,6 +20,7 @@ TRANSFER_PARALLEL=1
 TRANSFER_WELL_SCREENS=True
 TRANSFER_SENSORS=True
 TRANSFER_CONTACTS=True
+TRANSFER_PERMISSIONS=True
 TRANSFER_WATERLEVELS=True
 TRANSFER_WATERLEVELS_PRESSURE=True
 TRANSFER_WATERLEVELS_ACOUSTIC=True

.github/workflows/CD_production.yml

@@ -43,6 +43,11 @@ jobs:
             CLOUD_SQL_INSTANCE_NAME: "${{ secrets.CLOUD_SQL_INSTANCE_NAME }}"
             CLOUD_SQL_DATABASE: "${{ vars.CLOUD_SQL_DATABASE }}"
             CLOUD_SQL_USER: "${{ secrets.CLOUD_SQL_USER }}"
+            PYGEOAPI_POSTGRES_DB: "${{ vars.CLOUD_SQL_DATABASE }}"
+            PYGEOAPI_POSTGRES_USER: "${{ secrets.PYGEOAPI_POSTGRES_USER }}"
+            PYGEOAPI_POSTGRES_HOST: "${{ vars.PYGEOAPI_POSTGRES_HOST || '127.0.0.1' }}"
+            PYGEOAPI_POSTGRES_PORT: "${{ vars.PYGEOAPI_POSTGRES_PORT || '5432' }}"
+            PYGEOAPI_POSTGRES_PASSWORD: "${{ secrets.PYGEOAPI_POSTGRES_PASSWORD }}"
             CLOUD_SQL_IAM_AUTH: true
           run: |
             uv run alembic upgrade head
@@ -66,6 +71,11 @@ jobs:
               CLOUD_SQL_INSTANCE_NAME: "${{ secrets.CLOUD_SQL_INSTANCE_NAME }}"
               CLOUD_SQL_DATABASE: "${{ vars.CLOUD_SQL_DATABASE }}"
               CLOUD_SQL_USER: "${{ secrets.CLOUD_SQL_USER }}"
+              PYGEOAPI_POSTGRES_DB: "${{ vars.CLOUD_SQL_DATABASE }}"
+              PYGEOAPI_POSTGRES_USER: "${{ secrets.PYGEOAPI_POSTGRES_USER }}"
+              PYGEOAPI_POSTGRES_HOST: "${{ vars.PYGEOAPI_POSTGRES_HOST || '127.0.0.1' }}"
+              PYGEOAPI_POSTGRES_PORT: "${{ vars.PYGEOAPI_POSTGRES_PORT || '5432' }}"
+              PYGEOAPI_POSTGRES_PASSWORD: "${{ secrets.PYGEOAPI_POSTGRES_PASSWORD }}"
               CLOUD_SQL_IAM_AUTH: true
               GCS_SERVICE_ACCOUNT_KEY: "${{ secrets.GCS_SERVICE_ACCOUNT_KEY }}"
               GCS_BUCKET_NAME: "${{ vars.GCS_BUCKET_NAME }}"

.github/workflows/CD_staging.yml

@@ -43,6 +43,11 @@ jobs:
             CLOUD_SQL_INSTANCE_NAME: "${{ secrets.CLOUD_SQL_INSTANCE_NAME }}"
             CLOUD_SQL_DATABASE: "${{ vars.CLOUD_SQL_DATABASE }}"
             CLOUD_SQL_USER: "${{ secrets.CLOUD_SQL_USER }}"
+            PYGEOAPI_POSTGRES_DB: "${{ vars.CLOUD_SQL_DATABASE }}"
+            PYGEOAPI_POSTGRES_USER: "${{ secrets.PYGEOAPI_POSTGRES_USER }}"
+            PYGEOAPI_POSTGRES_HOST: "${{ vars.PYGEOAPI_POSTGRES_HOST || '127.0.0.1' }}"
+            PYGEOAPI_POSTGRES_PORT: "${{ vars.PYGEOAPI_POSTGRES_PORT || '5432' }}"
+            PYGEOAPI_POSTGRES_PASSWORD: "${{ secrets.PYGEOAPI_POSTGRES_PASSWORD }}"
             CLOUD_SQL_IAM_AUTH: true
           run: |
             uv run alembic upgrade head
@@ -67,6 +72,11 @@ jobs:
               CLOUD_SQL_INSTANCE_NAME: "${{ secrets.CLOUD_SQL_INSTANCE_NAME }}"
               CLOUD_SQL_DATABASE: "${{ vars.CLOUD_SQL_DATABASE }}"
               CLOUD_SQL_USER: "${{ secrets.CLOUD_SQL_USER }}"
+              PYGEOAPI_POSTGRES_DB: "${{ vars.CLOUD_SQL_DATABASE }}"
+              PYGEOAPI_POSTGRES_USER: "${{ secrets.PYGEOAPI_POSTGRES_USER }}"
+              PYGEOAPI_POSTGRES_HOST: "${{ vars.PYGEOAPI_POSTGRES_HOST || '127.0.0.1' }}"
+              PYGEOAPI_POSTGRES_PORT: "${{ vars.PYGEOAPI_POSTGRES_PORT || '5432' }}"
+              PYGEOAPI_POSTGRES_PASSWORD: "${{ secrets.PYGEOAPI_POSTGRES_PASSWORD }}"
               CLOUD_SQL_IAM_AUTH: true
               GCS_SERVICE_ACCOUNT_KEY: "${{ secrets.GCS_SERVICE_ACCOUNT_KEY }}"
               GCS_BUCKET_NAME: "${{ vars.GCS_BUCKET_NAME }}"

.github/workflows/tests.yml

@@ -19,38 +19,38 @@ jobs:
       POSTGRES_HOST: localhost
       POSTGRES_PORT: 5432
       POSTGRES_USER: postgres
+      PYGEOAPI_POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
+      PYGEOAPI_POSTGRES_PASSWORD: postgres
       POSTGRES_DB: ocotilloapi_test
+      PYGEOAPI_POSTGRES_HOST: localhost
+      PYGEOAPI_POSTGRES_PORT: 5432
+      PYGEOAPI_POSTGRES_DB: ocotilloapi_test
       DB_DRIVER: postgres
       BASE_URL: http://localhost:8000
       SESSION_SECRET_KEY: supersecretkeyforunittests
       AUTHENTIK_DISABLE_AUTHENTICATION: 1
 
-    services:
-      postgis:
-        image: postgis/postgis:17-3.5
-        # don't test against latest. be explicit in version being tested to avoid breaking changes
-        # image: postgis/postgis:latest
-
-        # These env vars are ONLY for the service container itself
-        env:
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_PORT: 5432
-
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-
-        ports:
-          # Maps tcp port 5432 on service container to the host
-          - 5432:5432
-
     steps:
       - name: Check out source repository
         uses: actions/checkout@v6.0.2
 
+      - name: Start database (PostGIS + pg_cron)
+        run: |
+          docker compose build db
+          docker compose up -d db
+
+      - name: Wait for database readiness
+        run: |
+          for i in {1..60}; do
+            if PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -d postgres -c "SELECT 1" >/dev/null 2>&1; then
+              exit 0
+            fi
+            sleep 2
+          done
+          echo "Database did not become ready in time"
+          exit 1
+
       - name: Install uv
         uses: astral-sh/setup-uv@v7.3.0
         with:
@@ -76,10 +76,12 @@ jobs:
       - name: Show Alembic heads
         run: uv run alembic heads
 
-      - name: Create test database
+      - name: Create test database and extensions
         run: |
-          PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -c "CREATE DATABASE ocotilloapi_test"
+          PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -tc "SELECT 1 FROM pg_database WHERE datname = 'ocotilloapi_test'" | grep -q 1 || \
+            PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -c "CREATE DATABASE ocotilloapi_test"
           PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -d ocotilloapi_test -c "CREATE EXTENSION IF NOT EXISTS postgis"
+          PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -d ocotilloapi_test -c "CREATE EXTENSION IF NOT EXISTS pg_cron"
 
       - name: Run tests
         run: uv run pytest -vv --durations=20 --cov --cov-report=xml --junitxml=junit.xml --ignore=tests/transfers
@@ -90,6 +92,10 @@ jobs:
           report_type: test_results
           token: ${{ secrets.CODECOV_TOKEN }}
 
+      - name: Stop database
+        if: always()
+        run: docker compose down -v
+
   bdd-tests:
     runs-on: ubuntu-latest
 
@@ -98,32 +104,39 @@ jobs:
       POSTGRES_HOST: localhost
       POSTGRES_PORT: 5432
       POSTGRES_USER: postgres
+      PYGEOAPI_POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
+      PYGEOAPI_POSTGRES_PASSWORD: postgres
       POSTGRES_DB: ocotilloapi_test
+      PYGEOAPI_POSTGRES_HOST: localhost
+      PYGEOAPI_POSTGRES_PORT: 5432
+      PYGEOAPI_POSTGRES_DB: ocotilloapi_test
       DB_DRIVER: postgres
       BASE_URL: http://localhost:8000
       SESSION_SECRET_KEY: supersecretkeyforunittests
       AUTHENTIK_DISABLE_AUTHENTICATION: 1
       DROP_AND_REBUILD_DB: 1
 
-    services:
-      postgis:
-        image: postgis/postgis:17-3.5
-        env:
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_PORT: 5432
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432:5432
-
     steps:
       - name: Check out source repository
         uses: actions/checkout@v6.0.2
 
+      - name: Start database (PostGIS + pg_cron)
+        run: |
+          docker compose build db
+          docker compose up -d db
+
+      - name: Wait for database readiness
+        run: |
+          for i in {1..60}; do
+            if PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -d postgres -c "SELECT 1" >/dev/null 2>&1; then
+              exit 0
+            fi
+            sleep 2
+          done
+          echo "Database did not become ready in time"
+          exit 1
+
       - name: Install uv
         uses: astral-sh/setup-uv@v7.3.0
         with:
@@ -149,10 +162,16 @@ jobs:
       - name: Show Alembic heads
         run: uv run alembic heads
 
-      - name: Create test database
+      - name: Create test database and extensions
         run: |
-          PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -c "CREATE DATABASE ocotilloapi_test"
+          PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -tc "SELECT 1 FROM pg_database WHERE datname = 'ocotilloapi_test'" | grep -q 1 || \
+            PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -c "CREATE DATABASE ocotilloapi_test"
           PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -d ocotilloapi_test -c "CREATE EXTENSION IF NOT EXISTS postgis"
+          PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -d ocotilloapi_test -c "CREATE EXTENSION IF NOT EXISTS pg_cron"
 
       - name: Run BDD tests
         run: uv run behave tests/features --tags="@backend and @production and not @skip" --no-capture
+
+      - name: Stop database
+        if: always()
+        run: docker compose down -v

.gitignore

@@ -46,6 +46,6 @@ run_bdd-local.sh
 .pre-commit-config.local.yaml
 .serena/
 cli/logs
-
+.pygeoapi/
 # deployment files
 app.yaml

CLAUDE.md

@@ -237,6 +237,6 @@ GitHub Actions workflows (`.github/workflows/`):
 ## Additional Resources
 
 - **API Docs**: `http://localhost:8000/docs` (Swagger UI) or `/redoc` (ReDoc)
-- **OGC API**: `http://localhost:8000/ogc` for OGC API - Features endpoints
+- **OGC API**: `http://localhost:8000/ogcapi` for OGC API - Features endpoints
 - **CLI**: `oco --help` for Ocotillo CLI commands
 - **Sentry**: Error tracking and performance monitoring integrated

README.md

@@ -27,50 +27,45 @@ supports research, field operations, and public data delivery for the Bureau of
 
 ## 🗺️ OGC API - Features
 
-The API exposes OGC API - Features endpoints under `/ogc`.
+The API exposes OGC API - Features endpoints under `/ogcapi` using `pygeoapi`.
 
 ### Landing & metadata
 
 ```bash
-curl http://localhost:8000/ogc
-curl http://localhost:8000/ogc/conformance
-curl http://localhost:8000/ogc/collections
-curl http://localhost:8000/ogc/collections/locations
+curl http://localhost:8000/ogcapi
+curl http://localhost:8000/ogcapi/conformance
+curl http://localhost:8000/ogcapi/collections
+curl http://localhost:8000/ogcapi/collections/locations
 ```
 
 ### Items (GeoJSON)
 
 ```bash
-curl "http://localhost:8000/ogc/collections/locations/items?limit=10&offset=0"
-curl "http://localhost:8000/ogc/collections/wells/items?limit=5"
-curl "http://localhost:8000/ogc/collections/springs/items?limit=5"
-curl "http://localhost:8000/ogc/collections/locations/items/123"
+curl "http://localhost:8000/ogcapi/collections/locations/items?limit=10&offset=0"
+curl "http://localhost:8000/ogcapi/collections/wells/items?limit=5"
+curl "http://localhost:8000/ogcapi/collections/springs/items?limit=5"
+curl "http://localhost:8000/ogcapi/collections/locations/items/123"
 ```
 
 ### BBOX + datetime filters
 
 ```bash
-curl "http://localhost:8000/ogc/collections/locations/items?bbox=-107.9,33.8,-107.8,33.9"
-curl "http://localhost:8000/ogc/collections/wells/items?datetime=2020-01-01/2024-01-01"
+curl "http://localhost:8000/ogcapi/collections/locations/items?bbox=-107.9,33.8,-107.8,33.9"
+curl "http://localhost:8000/ogcapi/collections/wells/items?datetime=2020-01-01/2024-01-01"
 ```
 
 ### Polygon filter (CQL2 text)
 
 Use `filter` + `filter-lang=cql2-text` with `WITHIN(...)`:
 
 ```bash
-curl "http://localhost:8000/ogc/collections/locations/items?filter=WITHIN(geometry,POLYGON((-107.9 33.8,-107.8 33.8,-107.8 33.9,-107.9 33.9,-107.9 33.8)))&filter-lang=cql2-text"
+curl "http://localhost:8000/ogcapi/collections/locations/items?filter=WITHIN(geometry,POLYGON((-107.9 33.8,-107.8 33.8,-107.8 33.9,-107.9 33.9,-107.9 33.8)))&filter-lang=cql2-text"
 ```
 
-### Property filter (CQL)
-
-Basic property filters are supported with `properties`:
+### OpenAPI UI
 
 ```bash
-curl "http://localhost:8000/ogc/collections/wells/items?properties=thing_type='water well' AND well_depth>=100 AND well_depth<=200"
-curl "http://localhost:8000/ogc/collections/wells/items?properties=well_purposes IN ('domestic','irrigation')"
-curl "http://localhost:8000/ogc/collections/wells/items?properties=well_casing_materials='PVC'"
-curl "http://localhost:8000/ogc/collections/wells/items?properties=well_screen_type='Steel'"
+curl "http://localhost:8000/ogcapi/openapi?ui=swagger"
 ```