token fix

Author: jonhealy1

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -228,8 +228,21 @@ async def get_all_collections(
             "size": limit,
         }
 
+        # Handle search_after token - split by '|' to get all sort values
+        search_after = None
         if token:
-            body["search_after"] = [token]
+            try:
+                # The token should be a pipe-separated string of sort values
+                # e.g., "2023-01-01T00:00:00Z|collection-1"
+                search_after = token.split("|")
+                # If the number of sort fields doesn't match token parts, ignore the token
+                if len(search_after) != len(formatted_sort):
+                    search_after = None
+            except Exception:
+                search_after = None
+
+            if search_after is not None:
+                body["search_after"] = search_after
 
         # Build the query part of the body
         query_parts = []
@@ -353,7 +366,8 @@ async def get_all_collections(
         if len(hits) == limit:
             next_token_values = hits[-1].get("sort")
             if next_token_values:
-                next_token = next_token_values[0]
+                # Join all sort values with '|' to create the token
+                next_token = "|".join(str(val) for val in next_token_values)
 
         # Get the total count of collections
         matched = (

stac_fastapi/opensearch/stac_fastapi/opensearch/database_logic.py

@@ -164,17 +164,16 @@ async def get_all_collections(
         query: Optional[Dict[str, Dict[str, Any]]] = None,
         datetime: Optional[str] = None,
     ) -> Tuple[List[Dict[str, Any]], Optional[str], Optional[int]]:
-        """
-        Retrieve a list of collections from Opensearch, supporting pagination.
+        """Retrieve a list of collections from OpenSearch, supporting pagination.
 
         Args:
             token (Optional[str]): The pagination token.
             limit (int): The number of results to return.
             request (Request): The FastAPI request object.
             sort (Optional[List[Dict[str, Any]]]): Optional sort parameter from the request.
             q (Optional[List[str]]): Free text search terms.
-            filter (Optional[Dict[str, Any]]): Structured filter in CQL2 format.
             query (Optional[Dict[str, Dict[str, Any]]]): Query extension parameters.
+            filter (Optional[Dict[str, Any]]): Structured query in CQL2 format.
             datetime (Optional[str]): Temporal filter.
 
         Returns:
@@ -213,8 +212,21 @@ async def get_all_collections(
             "size": limit,
         }
 
+        # Handle search_after token - split by '|' to get all sort values
+        search_after = None
         if token:
-            body["search_after"] = [token]
+            try:
+                # The token should be a pipe-separated string of sort values
+                # e.g., "2023-01-01T00:00:00Z|collection-1"
+                search_after = token.split("|")
+                # If the number of sort fields doesn't match token parts, ignore the token
+                if len(search_after) != len(formatted_sort):
+                    search_after = None
+            except Exception:
+                search_after = None
+
+            if search_after is not None:
+                body["search_after"] = search_after
 
         # Build the query part of the body
         query_parts = []
@@ -279,13 +291,15 @@ async def get_all_collections(
                 search_dict = search.to_dict()
                 if "query" in search_dict:
                     query_parts.append(search_dict["query"])
+
             except Exception as e:
                 logger = logging.getLogger(__name__)
                 logger.error(f"Error converting query to OpenSearch: {e}")
                 # If there's an error, add a query that matches nothing
                 query_parts.append({"bool": {"must_not": {"match_all": {}}}})
                 raise
 
+        # Combine all query parts with AND logic if there are multiple
         datetime_filter = None
         if datetime:
             datetime_filter = self._apply_collection_datetime_filter(datetime)
@@ -336,7 +350,8 @@ async def get_all_collections(
         if len(hits) == limit:
             next_token_values = hits[-1].get("sort")
             if next_token_values:
-                next_token = next_token_values[0]
+                # Join all sort values with '|' to create the token
+                next_token = "|".join(str(val) for val in next_token_values)
 
         # Get the total count of collections
         matched = (