Switch pygeofilter to cql2 (#242)

* switch pygeofilter to cql2

* update changelog

Author: bitner

CHANGES.md

@@ -8,6 +8,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
 
 ## [5.0.2] - 2025-04-07
 

setup.py

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

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