update changelog, fixes

Author: jonhealy1

CHANGELOG.md

@@ -16,6 +16,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Fixed
 
+- Fixed filter parameter handling for GET `/collections-search` endpoint. Filter parameters (`filter` and `filter-lang`) are now properly passed through and processed.
+- Fixed `q` parameter in GET `/collections-search` endpoint to be converted to a list format, matching the behavior of the `/collections` endpoint for consistency.
+
 ### Removed
 
 ### Updated

stac_fastapi/core/stac_fastapi/core/extensions/collections_search.py

@@ -22,14 +22,16 @@ class CollectionsSearchRequest(ExtendedSearch):
     query: Optional[
         str
     ] = None  # Legacy query extension (deprecated but still supported)
+    filter_expr: Optional[str] = None
+    filter_lang: Optional[str] = None
 
 
 def build_get_collections_search_doc(original_endpoint):
     """Return a documented GET endpoint wrapper for /collections-search."""
 
     async def documented_endpoint(
         request: Request,
-        q: Optional[str] = Query(
+        q: Optional[Union[str, List[str]]] = Query(
             None,
             description="Free text search query",
         ),
@@ -76,9 +78,50 @@ async def documented_endpoint(
             ),
             alias="fields[]",
         ),
+        filter: Optional[str] = Query(
+            None,
+            description=(
+                "Structured filter expression in CQL2 JSON or CQL2-text format"
+            ),
+            example='{"op": "=", "args": [{"property": "properties.category"}, "level2"]}',
+        ),
+        filter_lang: Optional[str] = Query(
+            None,
+            description=(
+                "Filter language. Must be 'cql2-json' or 'cql2-text' if specified"
+            ),
+            example="cql2-json",
+        ),
     ):
         # Delegate to original endpoint which reads from request.query_params
-        return await original_endpoint(request)
+        # But first, ensure the q parameter is properly handled as a list
+        # since FastAPI extracts it from the URL when it's defined as a function parameter
+
+        # Create a mutable copy of query_params
+        if hasattr(request, "_query_params"):
+            query_params = dict(request._query_params)
+        else:
+            query_params = dict(request.query_params)
+
+        # Add q parameter back to query_params if it was provided
+        # Convert to list format to match /collections behavior
+        if q is not None:
+            if isinstance(q, str):
+                # Single string should become a list with one element
+                query_params["q"] = [q]
+            elif isinstance(q, list):
+                # Already a list, use as-is
+                query_params["q"] = q
+
+        # Temporarily replace request.query_params
+        original_query_params = request.query_params
+        request.query_params = query_params
+
+        try:
+            return await original_endpoint(request)
+        finally:
+            # Restore original query_params
+            request.query_params = original_query_params
 
     documented_endpoint.__name__ = original_endpoint.__name__
     return documented_endpoint
@@ -95,6 +138,8 @@ async def documented_post_endpoint(
                 "Search parameters for collections.\n\n"
                 "- `q`: Free text search query (string or list of strings)\n"
                 "- `query`: Additional filtering expressed as a string (legacy support)\n"
+                "- `filter`: Structured filter expression in CQL2 JSON or CQL2-text format\n"
+                "- `filter_lang`: Filter language. Must be 'cql2-json' or 'cql2-text' if specified\n"
                 "- `limit`: Maximum number of results to return (default: 10)\n"
                 "- `token`: Pagination token for the next page of results\n"
                 "- `bbox`: Bounding box [minx, miny, maxx, maxy] or [minx, miny, minz, maxx, maxy, maxz]\n"
@@ -105,6 +150,11 @@ async def documented_post_endpoint(
             example={
                 "q": "landsat",
                 "query": "platform=landsat AND collection_category=level2",
+                "filter": {
+                    "op": "=",
+                    "args": [{"property": "properties.category"}, "level2"],
+                },
+                "filter_lang": "cql2-json",
                 "limit": 10,
                 "token": "next-page-token",
                 "bbox": [-180, -90, 180, 90],
@@ -243,6 +293,14 @@ async def collections_search_get_endpoint(
             sortby = sortby_str.split(",")
             params["sortby"] = sortby
 
+        # Handle filter parameter mapping (fixed for collections-search)
+        if "filter" in params:
+            params["filter_expr"] = params.pop("filter")
+
+        # Handle filter-lang parameter mapping (fixed for collections-search)
+        if "filter-lang" in params:
+            params["filter_lang"] = params.pop("filter-lang")
+
         collections = await self.client.all_collections(request=request, **params)
         return collections
 

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/app.py

@@ -198,6 +198,7 @@
             FieldsConformanceClasses.COLLECTIONS,
         ],
     )
+    extensions.append(collection_search_ext)
     extensions.append(collections_search_endpoint_ext)