Merge branch 'master' into remove/backend-packages

Author: gadomski

CHANGES.md

@@ -2,14 +2,24 @@
 
 ## Unreleased
 
+### Added
+
+* Add support in pgstac backend for /queryables and /collections/{collection_id}/queryables endpoints with functions exposed in pgstac 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
 
-- The SQLAlchemy and PgSTAC backend implementations have been moved to their own repos
+* The SQLAlchemy and PgSTAC backend implementations have been moved to their own repos
   ([stac-utils/stac-fastapi-sqlalchemy](https://github.com/stac-utils/stac-fastapi-sqlalchemy)
   and [stac-utils/stac-fastapi-pgstac](https://github.com/stac-utils/stac-fastapi-pgstac), respectively).
   These backends will be distributed and versioned separately going forward.
   ([#450](https://github.com/stac-utils/stac-fastapi/pull/450))
 
+* 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

stac_fastapi/api/models.py

@@ -13,6 +13,7 @@
     APIRequest,
     BaseSearchGetRequest,
     BaseSearchPostRequest,
+    str2list,
 )
 
 
@@ -123,6 +124,8 @@ class ItemCollectionUri(CollectionUri):
     """Get item collection."""
 
     limit: int = attr.ib(default=10)
+    bbox: Optional[str] = attr.ib(default=None, converter=str2list)
+    datetime: Optional[str] = attr.ib(default=None)
 
 
 class POSTTokenPagination(BaseModel):

stac_fastapi/extensions/core/transaction.py

@@ -18,14 +18,14 @@
 class PostItem(CollectionUri):
     """Create Item."""
 
-    item: stac_types.Item = attr.ib(default=Body())
+    item: stac_types.Item = attr.ib(default=Body(None))
 
 
 @attr.s
 class PutItem(ItemUri):
     """Update Item."""
 
-    item: stac_types.Item = attr.ib(default=Body())
+    item: stac_types.Item = attr.ib(default=Body(None))
 
 
 @attr.s

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

@@ -0,0 +1,41 @@
+"""Get Queryables."""
+from typing import Any, Optional
+
+from buildpg import render
+from fastapi import Request
+from fastapi.responses import JSONResponse
+
+from stac_fastapi.types.core import AsyncBaseFiltersClient
+from stac_fastapi.types.errors import NotFoundError
+
+
+class FiltersClient(AsyncBaseFiltersClient):
+    """Defines a pattern for implementing the STAC filter extension."""
+
+    async def get_queryables(
+        self, request: Request, collection_id: Optional[str] = None, **kwargs: Any
+    ) -> JSONResponse:
+        """Get the queryables available for the given collection_id.
+
+        If collection_id is None, returns the intersection of all
+        queryables over all collections.
+        This base implementation returns a blank queryable schema. This is not allowed
+        under OGC CQL but it is allowed by the STAC API Filter Extension
+        https://github.com/radiantearth/stac-api-spec/tree/master/fragments/filter#queryables
+        """
+        pool = request.app.state.readpool
+
+        async with pool.acquire() as conn:
+            q, p = render(
+                """
+                    SELECT * FROM get_queryables(:collection::text);
+                """,
+                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/types/core.py

@@ -489,7 +489,13 @@ def get_collection(self, collection_id: str, **kwargs) -> stac_types.Collection:
 
     @abc.abstractmethod
     def item_collection(
-        self, collection_id: str, limit: int = 10, token: str = None, **kwargs
+        self,
+        collection_id: str,
+        bbox: Optional[List[NumType]] = None,
+        datetime: Optional[Union[str, datetime]] = None,
+        limit: int = 10,
+        token: str = None,
+        **kwargs,
     ) -> stac_types.ItemCollection:
         """Get all items from a specific collection.
 
@@ -684,7 +690,13 @@ async def get_collection(
 
     @abc.abstractmethod
     async def item_collection(
-        self, collection_id: str, limit: int = 10, token: str = None, **kwargs
+        self,
+        collection_id: str,
+        bbox: Optional[List[NumType]] = None,
+        datetime: Optional[Union[str, datetime]] = None,
+        limit: int = 10,
+        token: str = None,
+        **kwargs,
     ) -> stac_types.ItemCollection:
         """Get all items from a specific collection.