cql2-text support, tests

Author: jonhealy1

stac_fastapi/core/stac_fastapi/core/core.py

@@ -266,7 +266,8 @@ async def all_collections(
                 if field[0] == "-":
                     excludes.add(field[1:])
                 else:
-                    includes.add(field[1:] if field[0] in "+ " else field)
+                    include_field = field[1:] if field[0] in "+ " else field
+                    includes.add(include_field)
 
         sort = None
         if sortby:
@@ -314,34 +315,41 @@ async def all_collections(
                         detail=f"Only 'cql2-json' and 'cql2-text' filter languages are supported for collections. Got '{filter_lang}'.",
                     )
 
-                # Handle different filter formats
-                try:
-                    if filter_lang == "cql2-text" or filter_lang is None:
-                        # For cql2-text or when no filter_lang is specified, try both formats
-                        try:
-                            # First try to parse as JSON
-                            parsed_filter = orjson.loads(unquote_plus(filter_expr))
-                        except Exception:
-                            # If that fails, use pygeofilter to convert CQL2-text to CQL2-JSON
-                            try:
-                                # Parse CQL2-text and convert to CQL2-JSON
-                                text_filter = unquote_plus(filter_expr)
-                                parsed_ast = parse_cql2_text(text_filter)
-                                parsed_filter = to_cql2(parsed_ast)
-                            except Exception as e:
-                                # If parsing fails, provide a helpful error message
-                                raise HTTPException(
-                                    status_code=400,
-                                    detail=f"Invalid CQL2-text filter: {e}. Please check your syntax.",
-                                )
-                    else:
-                        # For explicit cql2-json, parse as JSON
-                        parsed_filter = orjson.loads(unquote_plus(filter_expr))
-                except Exception as e:
-                    # Catch any other parsing errors
-                    raise HTTPException(
-                        status_code=400, detail=f"Error parsing filter: {e}"
-                    )
+                # # Handle different filter formats
+                # try:
+                #     if filter_lang == "cql2-text" or filter_lang is None:
+                #         # For cql2-text or when no filter_lang is specified, try both formats
+                #         try:
+                #             # First try to parse as JSON
+                #             parsed_filter = orjson.loads(unquote_plus(filter_expr))
+                #         except Exception:
+                #             # If that fails, use pygeofilter to convert CQL2-text to CQL2-JSON
+                #             try:
+                #                 # Parse CQL2-text and convert to CQL2-JSON
+                #                 text_filter = unquote_plus(filter_expr)
+                #                 parsed_ast = parse_cql2_text(text_filter)
+                #                 parsed_filter = to_cql2(parsed_ast)
+                #             except Exception as e:
+                #                 # If parsing fails, provide a helpful error message
+                #                 raise HTTPException(
+                #                     status_code=400,
+                #                     detail=f"Invalid CQL2-text filter: {e}. Please check your syntax.",
+                #                 )
+                #     else:
+                #         # For explicit cql2-json, parse as JSON
+                #         parsed_filter = orjson.loads(unquote_plus(filter_expr))
+                # except Exception as e:
+                #     # Catch any other parsing errors
+                #     raise HTTPException(
+                #         status_code=400, detail=f"Error parsing filter: {e}"
+                #     )
+
+                # Handle both cql2-json and cql2-text
+                parsed_filter = orjson.loads(
+                    unquote_plus(filter_expr)
+                    if filter_lang == "cql2-json" or filter_lang is None
+                    else to_cql2(parse_cql2_text(filter_expr))
+                )
             except Exception as e:
                 raise HTTPException(
                     status_code=400, detail=f"Invalid filter parameter: {e}"
@@ -404,31 +412,9 @@ async def post_all_collections(
         Returns:
             A Collections object containing all the collections in the database and links to various resources.
         """
-        # Debug print
-        print("search_request: ", search_request)
-        # Set the postbody attribute on the request object for PagingLinks
         request.postbody = search_request.model_dump(exclude_unset=True)
 
         fields = None
-        # Check for fields attribute (legacy format)
-        if hasattr(search_request, "fields") and search_request.fields:
-            fields = []
-
-            # Handle include fields
-            if (
-                hasattr(search_request.fields, "include")
-                and search_request.fields.include
-            ):
-                for field in search_request.fields.include:
-                    fields.append(f"+{field}")
-
-            # Handle exclude fields
-            if (
-                hasattr(search_request.fields, "exclude")
-                and search_request.fields.exclude
-            ):
-                for field in search_request.fields.exclude:
-                    fields.append(f"-{field}")
 
         # Check for field attribute (ExtendedSearch format)
         if hasattr(search_request, "field") and search_request.field:

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

@@ -151,6 +151,7 @@ async def collections_search_post_endpoint(
         collections = await self.client.post_all_collections(
             search_request=search_request, request=request
         )
+
         return collections
 
     @classmethod

stac_fastapi/tests/api/test_api.py

@@ -48,6 +48,8 @@
     "GET /collections/{collection_id}/aggregate",
     "POST /collections/{collection_id}/aggregations",
     "POST /collections/{collection_id}/aggregate",
+    "GET /collections-search",
+    "POST /collections-search",
 }
 
 

stac_fastapi/tests/api/test_api_search_collections.py

@@ -675,6 +675,69 @@ async def test_collections_post(app_client, txn_client, ctx):
         c for c in resp_json["collections"] if c["id"].startswith(test_prefix)
     ]
 
+    # Debug print to see what's in the collections
+    print(
+        "Collection keys:",
+        test_collections[0].keys() if test_collections else "No collections found",
+    )
+
     # Check that stac_version is excluded from the collections
     for collection in test_collections:
         assert "stac_version" not in collection
+
+
+@pytest.mark.asyncio
+async def test_collections_search_cql2_text(app_client, txn_client, ctx):
+    """Test collections search with CQL2-text filter."""
+    # Create a unique prefix for test collections
+    test_prefix = f"test-{uuid.uuid4()}"
+
+    # Create test collections
+    collection_data = ctx.collection.copy()
+    collection_data["id"] = f"{test_prefix}-collection"
+    await create_collection(txn_client, collection_data)
+    await refresh_indices(txn_client)
+
+    # Test GET search with CQL2-text filter
+    collection_id = collection_data["id"]
+    resp = await app_client.get(
+        f"/collections-search?filter-lang=cql2-text&filter=id='{collection_id}'"
+    )
+    assert resp.status_code == 200
+    resp_json = resp.json()
+
+    # Debug print to see what's in the response
+    print("Collections in response:", [c["id"] for c in resp_json["collections"]])
+
+    # Filter collections to only include the ones with our test prefix
+    filtered_collections = [
+        c for c in resp_json["collections"] if c["id"].startswith(test_prefix)
+    ]
+
+    # Check that only the filtered collection is returned
+    assert len(filtered_collections) == 1
+    assert filtered_collections[0]["id"] == collection_id
+
+    # Test GET search with more complex CQL2-text filter (LIKE operator)
+    test_prefix_escaped = test_prefix.replace("-", "\\-")
+    resp = await app_client.get(
+        f"/collections-search?filter-lang=cql2-text&filter=id LIKE '{test_prefix_escaped}%'"
+    )
+    assert resp.status_code == 200
+    resp_json = resp.json()
+
+    # Debug print to see what's in the response
+    print(
+        "Collections in response (LIKE):", [c["id"] for c in resp_json["collections"]]
+    )
+
+    # Filter collections to only include the ones with our test prefix
+    filtered_collections = [
+        c for c in resp_json["collections"] if c["id"].startswith(test_prefix)
+    ]
+
+    # Check that all test collections are returned
+    assert (
+        len(filtered_collections) == 1
+    )  # We only created one collection with this prefix
+    assert filtered_collections[0]["id"] == collection_id