Merge branch 'main' of https://github.com/stac-utils/stac-fastapi-pgstac into refactor/optional-writer-connection-pool

Author: vincentsarago

CHANGES.md

@@ -37,6 +37,7 @@
 - disable transaction and bulk_transactions extensions by default **breaking change**
 - update `stac-fastapi-*` version requirements to `>=5.2,<6.0`
 - add pgstac health-check in `/_mgmt/health`
+- switch from using pygeofilter to cql2
 
 ### Added
 

setup.py

@@ -15,7 +15,7 @@
     "asyncpg",
     "buildpg",
     "brotli_asgi",
-    "pygeofilter>=0.2",
+    "cql2>=0.3.6",
     "pypgstac>=0.8,<0.10",
     "typing_extensions>=4.9.0",
 ]

stac_fastapi/pgstac/core.py

@@ -9,10 +9,9 @@
 import orjson
 from asyncpg.exceptions import InvalidDatetimeFormatError
 from buildpg import render
+from cql2 import Expr
 from fastapi import HTTPException, Request
 from pydantic import ValidationError
-from pygeofilter.backends.cql2_json import to_cql2
-from pygeofilter.parsers.cql2_text import parse as parse_cql2_text
 from pypgstac.hydration import hydrate
 from stac_fastapi.api.models import JSONResponse
 from stac_fastapi.types.core import AsyncBaseCoreClient, Relations
@@ -556,11 +555,12 @@ def _clean_search_args(  # noqa: C901
         """Clean up search arguments to match format expected by pgstac"""
         if filter_query:
             if filter_lang == "cql2-text":
-                filter_query = to_cql2(parse_cql2_text(filter_query))
-                filter_lang = "cql2-json"
-
-            base_args["filter"] = orjson.loads(filter_query)
-            base_args["filter_lang"] = filter_lang
+                e = Expr(filter_query)
+                base_args["filter"] = e.to_json()
+                base_args["filter_lang"] = "cql2-json"
+            else:
+                base_args["filter"] = orjson.loads(filter_query)
+                base_args["filter_lang"] = filter_lang
 
         if datetime:
             base_args["datetime"] = datetime

tests/resources/test_item.py

@@ -850,6 +850,12 @@ async def test_item_search_post_filter_extension_cql2(
     )
     assert resp.status_code == 201
 
+    # make sure we have 2 items
+    resp = await app_client.post("/search", json={})
+    resp_json = resp.json()
+    assert resp.status_code == 200
+    assert len(resp_json.get("features")) == 2
+
     # EPSG is a JSONB key
     params = {
         "collections": [test_item["collection"]],
@@ -887,6 +893,39 @@ async def test_item_search_post_filter_extension_cql2(
         == test_item["properties"]["proj:epsg"]
     )
 
+    # Test IN operator
+    params = {
+        "collections": [test_item["collection"]],
+        "filter-lang": "cql2-json",
+        "filter": {
+            "op": "in",
+            "args": [
+                {"property": "proj:epsg"},
+                [test_item["properties"]["proj:epsg"]],
+            ],
+        },
+    }
+    resp = await app_client.post("/search", json=params)
+    resp_json = resp.json()
+    assert resp.status_code == 200
+    assert len(resp_json.get("features")) == 1
+
+    params = {
+        "collections": [test_item["collection"]],
+        "filter-lang": "cql2-json",
+        "filter": {
+            "op": "in",
+            "args": [
+                {"property": "proj:epsg"},
+                [test_item["properties"]["proj:epsg"] + 1],
+            ],
+        },
+    }
+    resp = await app_client.post("/search", json=params)
+    resp_json = resp.json()
+    assert resp.status_code == 200
+    assert len(resp_json.get("features")) == 0
+
 
 async def test_item_search_post_filter_extension_cql2_with_query_fails(
     app_client, load_test_data, load_test_collection
@@ -904,7 +943,7 @@ async def test_item_search_post_filter_extension_cql2_with_query_fails(
     )
     assert resp.status_code == 201
 
-    # EPSG is a JSONB key
+    # Cannot use `query` and `filter`
     params = {
         "collections": [test_item["collection"]],
         "filter-lang": "cql2-json",