Filter fix.

Author: rhysrevans3

stac_fastapi/core/stac_fastapi/core/core.py

@@ -459,7 +459,7 @@ async def get_search(
         sortby: Optional[str] = None,
         q: Optional[List[str]] = None,
         intersects: Optional[str] = None,
-        filter: Optional[str] = None,
+        filter_expr: Optional[str] = None,
         filter_lang: Optional[str] = None,
         **kwargs,
     ) -> stac_types.ItemCollection:
@@ -507,12 +507,13 @@ async def get_search(
                 for sort in sortby
             ]
 
-        if filter:
+        if filter_expr:
+            print("GET FE", filter_expr)
             base_args["filter-lang"] = "cql2-json"
             base_args["filter"] = orjson.loads(
-                unquote_plus(filter)
+                unquote_plus(filter_expr)
                 if filter_lang == "cql2-json"
-                else to_cql2(parse_cql2_text(filter))
+                else to_cql2(parse_cql2_text(filter_expr))
             )
 
         if fields:
@@ -594,10 +595,11 @@ async def post_search(
                     )
 
         # only cql2_json is supported here
-        if hasattr(search_request, "filter"):
-            cql2_filter = getattr(search_request, "filter", None)
+        if search_request.filter_expr:
             try:
-                search = self.database.apply_cql2_filter(search, cql2_filter)
+                search = self.database.apply_cql2_filter(
+                    search, search_request.filter_expr
+                )
             except Exception as e:
                 raise HTTPException(
                     status_code=400, detail=f"Error with cql2_json filter: {e}"

stac_fastapi/core/stac_fastapi/core/extensions/aggregation.py

@@ -338,7 +338,7 @@ async def aggregate(
         datetime: Optional[DateTimeType] = None,
         intersects: Optional[str] = None,
         filter_lang: Optional[str] = None,
-        filter: Optional[str] = None,
+        filter_expr: Optional[str] = None,
         aggregations: Optional[str] = None,
         ids: Optional[List[str]] = None,
         bbox: Optional[BBox] = None,
@@ -380,8 +380,8 @@ async def aggregate(
             if datetime:
                 base_args["datetime"] = self._format_datetime_range(datetime)
 
-            if filter:
-                base_args["filter"] = self.get_filter(filter, filter_lang)
+            if filter_expr:
+                base_args["filter"] = self.get_filter(filter_expr, filter_lang)
             aggregate_request = EsAggregationExtensionPostRequest(**base_args)
         else:
             # Workaround for optional path param in POST requests

stac_fastapi/core/stac_fastapi/core/utilities.py

@@ -8,12 +8,7 @@
 from typing import Any, Dict, List, Optional, Set, Union
 
 from stac_fastapi.core.models.patch import ElasticPath
-from stac_fastapi.types.stac import (
-    Item,
-    PatchAddReplaceTest,
-    PatchOperation,
-    PatchRemove,
-)
+from stac_fastapi.types.stac import Item, PatchOperation
 
 MAX_LIMIT = 10000
 
@@ -157,7 +152,7 @@ def merge_to_operations(data: Dict) -> List:
     for key, value in data.copy().items():
 
         if value is None:
-            operations.append(PatchRemove(op="remove", path=key))
+            operations.append(PatchOperation(op="remove", path=key))
 
         elif isinstance(value, dict):
             nested_operations = merge_to_operations(value)
@@ -167,7 +162,7 @@ def merge_to_operations(data: Dict) -> List:
                 operations.append(nested_operation)
 
         else:
-            operations.append(PatchAddReplaceTest(op="add", path=key, value=value))
+            operations.append(PatchOperation(op="add", path=key, value=value))
 
     return operations
 

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -619,7 +619,7 @@ def apply_free_text_filter(search: Search, free_text_queries: Optional[List[str]
         return search
 
     @staticmethod
-    def apply_cql2_filter(search: Search, _filter: Optional[Dict[str, Any]]):
+    def apply_cql2_filter(search: Search, filter_expr: Optional[Dict[str, Any]]):
         """
         Apply a CQL2 filter to an Elasticsearch Search object.
 
@@ -638,8 +638,8 @@ def apply_cql2_filter(search: Search, _filter: Optional[Dict[str, Any]]):
             Search: The modified Search object with the filter applied if a filter is provided,
                     otherwise the original Search object.
         """
-        if _filter is not None:
-            es_query = filter.to_es(_filter)
+        if filter_expr is not None:
+            es_query = filter.to_es(filter_expr)
             search = search.query(es_query)
 
         return search