Merge branch 'main' into fix-get-sort

Author: jonhealy1

stac_fastapi/elasticsearch/setup.py

@@ -8,11 +8,11 @@
 install_requires = [
     "fastapi",
     "attrs",
-    "pydantic[dotenv]",
+    "pydantic[dotenv]<2",
     "stac_pydantic==2.0.*",
-    "stac-fastapi.types==2.4.3",
-    "stac-fastapi.api==2.4.3",
-    "stac-fastapi.extensions==2.4.3",
+    "stac-fastapi.types==2.4.8",
+    "stac-fastapi.api==2.4.8",
+    "stac-fastapi.extensions==2.4.8",
     "elasticsearch[async]==7.17.9",
     "elasticsearch-dsl==7.4.1",
     "pystac[validation]",

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/app.py

@@ -1,8 +1,4 @@
 """FastAPI application."""
-from typing import List
-
-import attr
-
 from stac_fastapi.api.app import StacApi
 from stac_fastapi.api.models import create_get_request_model, create_post_request_model
 from stac_fastapi.elasticsearch.config import ElasticsearchSettings
@@ -28,52 +24,15 @@
 settings = ElasticsearchSettings()
 session = Session.create_from_settings(settings)
 
-
-@attr.s
-class FixedSortExtension(SortExtension):
-    """SortExtension class fixed with correct paths, removing extra forward-slash."""
-
-    conformance_classes: List[str] = attr.ib(
-        factory=lambda: ["https://api.stacspec.org/v1.0.0-beta.4/item-search#sort"]
-    )
-
-
-@attr.s
-class FixedFilterExtension(FilterExtension):
-    """FilterExtension class fixed with correct paths, removing extra forward-slash."""
-
-    conformance_classes: List[str] = attr.ib(
-        default=[
-            "https://api.stacspec.org/v1.0.0-rc.1/item-search#filter",
-            "http://www.opengis.net/spec/ogcapi-features-3/1.0/conf/filter",
-            "http://www.opengis.net/spec/ogcapi-features-3/1.0/conf/features-filter",
-            "http://www.opengis.net/spec/cql2/1.0/conf/cql2-text",
-            "http://www.opengis.net/spec/cql2/1.0/conf/cql2-json",
-            "http://www.opengis.net/spec/cql2/1.0/conf/basic-cql2",
-            "http://www.opengis.net/spec/cql2/1.0/conf/basic-spatial-operators",
-        ]
-    )
-    client = attr.ib(factory=EsAsyncBaseFiltersClient)
-
-
-@attr.s
-class FixedQueryExtension(QueryExtension):
-    """Fixed Query Extension string."""
-
-    conformance_classes: List[str] = attr.ib(
-        factory=lambda: ["https://api.stacspec.org/v1.0.0-beta.4/item-search#query"]
-    )
-
-
 extensions = [
     TransactionExtension(client=TransactionsClient(session=session), settings=settings),
     BulkTransactionExtension(client=BulkTransactionsClient(session=session)),
     FieldsExtension(),
-    FixedQueryExtension(),
-    FixedSortExtension(),
+    QueryExtension(),
+    SortExtension(),
     TokenPaginationExtension(),
     ContextExtension(),
-    FixedFilterExtension(),
+    FilterExtension(client=EsAsyncBaseFiltersClient()),
 ]
 
 post_request_model = create_post_request_model(extensions)

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/core.py

@@ -286,6 +286,7 @@ async def get_search(
         token: Optional[str] = None,
         fields: Optional[List[str]] = None,
         sortby: Optional[str] = None,
+        intersects: Optional[str] = None,
         # filter: Optional[str] = None, # todo: requires fastapi > 2.3 unreleased
         # filter_lang: Optional[str] = None, # todo: requires fastapi > 2.3 unreleased
         **kwargs,
@@ -302,6 +303,7 @@ async def get_search(
             token (Optional[str]): Access token to use when searching the catalog.
             fields (Optional[List[str]]): Fields to include or exclude from the results.
             sortby (Optional[str]): Sorting options for the results.
+            intersects (Optional[str]): GeoJSON geometry to search in.
             kwargs: Additional parameters to be passed to the API.
 
         Returns:
@@ -322,6 +324,9 @@ async def get_search(
         if datetime:
             base_args["datetime"] = datetime
 
+        if intersects:
+            base_args["intersects"] = intersects
+
         if sortby:
             # https://github.com/radiantearth/stac-spec/tree/master/api-spec/extensions/sort#http-get-or-post-form
             sort_param = []

stac_fastapi/elasticsearch/tests/api/test_api.py

@@ -205,7 +205,9 @@ async def test_app_query_extension_limit_lt0(app_client):
 
 @pytest.mark.asyncio
 async def test_app_query_extension_limit_gt10000(app_client):
-    assert (await app_client.post("/search", json={"limit": 10001})).status_code == 400
+    resp = await app_client.post("/search", json={"limit": 10001})
+    assert resp.status_code == 200
+    assert resp.json()["context"]["limit"] == 10000
 
 
 @pytest.mark.asyncio

stac_fastapi/elasticsearch/tests/conftest.py

@@ -10,21 +10,19 @@
 
 from stac_fastapi.api.app import StacApi
 from stac_fastapi.api.models import create_get_request_model, create_post_request_model
-from stac_fastapi.elasticsearch.app import (
-    FixedFilterExtension,
-    FixedQueryExtension,
-    FixedSortExtension,
-)
 from stac_fastapi.elasticsearch.config import AsyncElasticsearchSettings
 from stac_fastapi.elasticsearch.core import (
     BulkTransactionsClient,
     CoreClient,
     TransactionsClient,
 )
 from stac_fastapi.elasticsearch.database_logic import create_collection_index
+from stac_fastapi.elasticsearch.extensions import QueryExtension
 from stac_fastapi.extensions.core import (  # FieldsExtension,
     ContextExtension,
     FieldsExtension,
+    FilterExtension,
+    SortExtension,
     TokenPaginationExtension,
     TransactionExtension,
 )
@@ -162,11 +160,11 @@ async def app():
             client=TransactionsClient(session=None), settings=settings
         ),
         ContextExtension(),
-        FixedSortExtension(),
+        SortExtension(),
         FieldsExtension(),
-        FixedQueryExtension(),
+        QueryExtension(),
         TokenPaginationExtension(),
-        FixedFilterExtension(),
+        FilterExtension(),
     ]
 
     post_request_model = create_post_request_model(extensions)