Merge branch 'master' into master

Author: carderne

CHANGES.md

@@ -5,15 +5,18 @@
 ### Added
 
 * Add support in pgstac backend for /queryables and /collections/{collection_id}/queryables endpoints with functions exposed in pgstac 0.6.8
-* Update pgstac requirement to 0.6.8
 * Add `bbox` and `datetime` query parameters to `/collections/{collection_id}/items`. [476](https://github.com/stac-utils/stac-fastapi/issues/476) [380](https://github.com/stac-utils/stac-fastapi/issues/380)
+* Update pgstac requirement to 0.6.10
 
 ### Changed
 
 ### Removed
 
 ### Fixed
 
+* Fix pgstac backend for /queryables endpoint to return 404 for non-existent collections [#482](https://github.com/stac-utils/stac-fastapi/pull/482)
+
+
 ## [2.4.2]
 
 ### Added

docker-compose.yml

@@ -63,7 +63,7 @@ services:
 
   database:
     container_name: stac-db
-    image: ghcr.io/stac-utils/pgstac:v0.6.8
+    image: ghcr.io/stac-utils/pgstac:v0.6.10
     environment:
       - POSTGRES_USER=username
       - POSTGRES_PASSWORD=password

stac_fastapi/pgstac/stac_fastapi/pgstac/extensions/filter.py

@@ -6,6 +6,7 @@
 from fastapi.responses import JSONResponse
 
 from stac_fastapi.types.core import AsyncBaseFiltersClient
+from stac_fastapi.types.errors import NotFoundError
 
 
 class FiltersClient(AsyncBaseFiltersClient):
@@ -32,6 +33,9 @@ async def get_queryables(
                 collection=collection_id,
             )
             queryables = await conn.fetchval(q, *p)
+            if not queryables:
+                raise NotFoundError(f"Collection {collection_id} not found")
+
             queryables["$id"] = str(request.url)
             headers = {"Content-Type": "application/schema+json"}
             return JSONResponse(queryables, headers=headers)

stac_fastapi/pgstac/tests/api/test_api.py

@@ -463,3 +463,10 @@ async def test_item_collection_filter_datetime(
     assert resp.status_code == 200
     resp_json = resp.json()
     assert len(resp_json["features"]) == 0
+
+@pytest.mark.asyncio
+async def test_bad_collection_queryables(
+    load_test_data, app_client, load_test_collection
+):
+    resp = await app_client.get("/collections/bad-collection/queryables")
+    assert resp.status_code == 404