fixes, update tests

Author: jonhealy1

CHANGELOG.md

@@ -9,13 +9,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
-- Spatial search support for collections via `bbox` parameter on `/collections` endpoint. Collections are now indexed with a `bbox_shape` field (GeoJSON polygon) derived from their spatial extent for efficient geospatial queries.
-- Migration scripts (`update_collections_mapping.py` and `recreate_collections_index.py`) to help add `bbox_shape` field to existing deployments.
-
 ### Changed
 
 ### Fixed
 
+[v6.5.1] - 2025-09-30
+
+### Fixed
+
 - Issue where token, query param was not being passed to POST collections search logic
 - Issue where datetime param was not being passed from POST collections search logic to Elasticsearch
 - Collections search tests to ensure both GET /collections and POST /collections-search endpoints are tested
@@ -554,7 +555,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Use genexp in execute_search and get_all_collections to return results.
 - Added db_to_stac serializer to item_collection method in core.py.
 
-[Unreleased]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.5.0...main
+[Unreleased]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.5.1...main
+[v6.5.1]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.5.0...v6.5.1
 [v6.5.0]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.4.0...v6.5.0
 [v6.4.0]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.3.0...v6.4.0
 [v6.3.0]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.2.1...v6.3.0

recreate_collections_index.py

@@ -3,8 +3,6 @@
 import abc
 from typing import Any, Dict, Iterable, List, Optional, Tuple
 
-from stac_pydantic.shared import BBox
-
 
 class BaseDatabaseLogic(abc.ABC):
     """
@@ -21,7 +19,6 @@ async def get_all_collections(
         limit: int,
         request: Any = None,
         sort: Optional[List[Dict[str, Any]]] = None,
-        bbox: Optional[BBox] = None,
     ) -> Tuple[List[Dict[str, Any]], Optional[str]]:
         """Retrieve a list of collections from the database, supporting pagination.
 
@@ -30,7 +27,6 @@ async def get_all_collections(
             limit (int): The number of results to return.
             request (Any, optional): The FastAPI request object. Defaults to None.
             sort (Optional[List[Dict[str, Any]]], optional): Optional sort parameter. Defaults to None.
-            bbox (Optional[BBox], optional): Bounding box to filter collections by spatial extent. Defaults to None.
 
         Returns:
             A tuple of (collections, next pagination token if any).

stac_fastapi/core/stac_fastapi/core/base_database_logic.py

@@ -241,7 +241,6 @@ async def landing_page(self, **kwargs) -> stac_types.LandingPage:
     async def all_collections(
         self,
         limit: Optional[int] = None,
-        bbox: Optional[BBox] = None,
         datetime: Optional[str] = None,
         fields: Optional[List[str]] = None,
         sortby: Optional[Union[str, List[str]]] = None,
@@ -402,7 +401,6 @@ async def all_collections(
             limit=limit,
             request=request,
             sort=sort,
-            bbox=bbox,
             q=q_list,
             filter=parsed_filter,
             query=parsed_query,
@@ -504,7 +502,6 @@ async def post_all_collections(
         # Pass all parameters from search_request to all_collections
         return await self.all_collections(
             limit=search_request.limit if hasattr(search_request, "limit") else None,
-            bbox=search_request.bbox if hasattr(search_request, "bbox") else None,
             datetime=search_request.datetime
             if hasattr(search_request, "datetime")
             else None,

stac_fastapi/core/stac_fastapi/core/core.py

@@ -10,7 +10,7 @@
 
 from stac_fastapi.core.datetime_utils import now_to_rfc3339_str
 from stac_fastapi.core.models.links import CollectionLinks
-from stac_fastapi.core.utilities import bbox2polygon, get_bool_env
+from stac_fastapi.core.utilities import get_bool_env
 from stac_fastapi.types import stac as stac_types
 from stac_fastapi.types.links import ItemLinks, resolve_links
 
@@ -144,53 +144,6 @@ def stac_to_db(
             collection.get("links", []), str(request.base_url)
         )
 
-        # Convert bbox to bbox_shape for geospatial queries
-        if "extent" in collection and "spatial" in collection["extent"]:
-            spatial_extent = collection["extent"]["spatial"]
-            if "bbox" in spatial_extent and spatial_extent["bbox"]:
-                # Get the first bbox (collections can have multiple bboxes, but we use the first one)
-                bbox = (
-                    spatial_extent["bbox"][0]
-                    if isinstance(spatial_extent["bbox"][0], list)
-                    else spatial_extent["bbox"]
-                )
-                collection_id = collection.get("id", "unknown")
-                logger.debug(
-                    f"Converting bbox to bbox_shape for collection '{collection_id}': bbox={bbox}"
-                )
-
-                if len(bbox) >= 4:
-                    # Extract 2D coordinates (bbox can be 2D [minx, miny, maxx, maxy] or 3D [minx, miny, minz, maxx, maxy, maxz])
-                    # For 2D polygon, we only need the x,y coordinates and discard altitude (z) values
-                    minx, miny = bbox[0], bbox[1]
-                    if len(bbox) == 4:
-                        # 2D bbox: [minx, miny, maxx, maxy]
-                        maxx, maxy = bbox[2], bbox[3]
-                        logger.debug(
-                            f"Collection '{collection_id}': Processing 2D bbox"
-                        )
-                    else:
-                        # 3D bbox: [minx, miny, minz, maxx, maxy, maxz]
-                        # Extract indices 3,4 for maxx,maxy - discarding altitude at indices 2 (minz) and 5 (maxz)
-                        maxx, maxy = bbox[3], bbox[4]
-                        logger.debug(
-                            f"Collection '{collection_id}': Processing 3D bbox, discarding altitude values at indices 2 and 5"
-                        )
-
-                    # Convert bbox to GeoJSON polygon
-                    bbox_polygon_coords = bbox2polygon(minx, miny, maxx, maxy)
-                    collection["bbox_shape"] = {
-                        "type": "Polygon",
-                        "coordinates": bbox_polygon_coords,
-                    }
-                    logger.info(
-                        f"Collection '{collection_id}': Created bbox_shape from bbox [{minx}, {miny}, {maxx}, {maxy}]"
-                    )
-                else:
-                    logger.warning(
-                        f"Collection '{collection_id}': bbox has insufficient coordinates (length={len(bbox)}), expected at least 4"
-                    )
-
         if get_bool_env("STAC_INDEX_ASSETS"):
             collection["assets"] = [
                 {"es_key": k, **v} for k, v in collection.get("assets", {}).items()
@@ -218,9 +171,6 @@ def db_to_stac(
         # Avoid modifying the input dict in-place ... doing so breaks some tests
         collection = deepcopy(collection)
 
-        # Remove internal bbox_shape field (not part of STAC spec)
-        collection.pop("bbox_shape", None)
-
         # Set defaults
         collection_id = collection.get("id")
         collection.setdefault("type", "Collection")

stac_fastapi/core/stac_fastapi/core/serializers.py

@@ -1,2 +1,2 @@
 """library version."""
-__version__ = "6.5.0"
+__version__ = "6.5.1"

stac_fastapi/core/stac_fastapi/core/version.py

@@ -6,8 +6,8 @@
     desc = f.read()
 
 install_requires = [
-    "stac-fastapi-core==6.5.0",
-    "sfeos-helpers==6.5.0",
+    "stac-fastapi-core==6.5.1",
+    "sfeos-helpers==6.5.1",
     "elasticsearch[async]~=8.18.0",
     "uvicorn~=0.23.0",
     "starlette>=0.35.0,<0.36.0",

stac_fastapi/elasticsearch/setup.py

@@ -175,7 +175,6 @@ async def get_all_collections(
         limit: int,
         request: Request,
         sort: Optional[List[Dict[str, Any]]] = None,
-        bbox: Optional[List[float]] = None,
         q: Optional[List[str]] = None,
         filter: Optional[Dict[str, Any]] = None,
         query: Optional[Dict[str, Dict[str, Any]]] = None,
@@ -188,7 +187,6 @@ async def get_all_collections(
             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.
-            bbox (Optional[List[float]]): Bounding box to filter collections by spatial extent.
             q (Optional[List[str]]): Free text search terms.
             query (Optional[Dict[str, Dict[str, Any]]]): Query extension parameters.
             filter (Optional[Dict[str, Any]]): Structured query in CQL2 format.
@@ -316,44 +314,6 @@ async def get_all_collections(
                 query_parts.append({"bool": {"must_not": {"match_all": {}}}})
                 raise
 
-        # Apply bbox filter if provided
-        if bbox:
-            # Parse bbox if it's a string (from GET requests)
-            if isinstance(bbox, str):
-                try:
-                    bbox = [float(x.strip()) for x in bbox.split(",")]
-                except (ValueError, AttributeError) as e:
-                    logger.error(f"Invalid bbox format: {bbox}, error: {e}")
-                    bbox = None
-
-            if bbox and len(bbox) >= 4:
-                # Extract 2D coordinates (bbox can be 2D [minx, miny, maxx, maxy] or 3D [minx, miny, minz, maxx, maxy, maxz])
-                # For geospatial queries, we discard altitude (z) values
-                minx, miny = bbox[0], bbox[1]
-                if len(bbox) == 4:
-                    # 2D bbox
-                    maxx, maxy = bbox[2], bbox[3]
-                else:
-                    # 3D bbox - extract indices 3,4 for maxx,maxy, discarding altitude at indices 2 (minz) and 5 (maxz)
-                    maxx, maxy = bbox[3], bbox[4]
-
-                # Convert bbox to a polygon for geo_shape query
-                bbox_polygon = {
-                    "type": "Polygon",
-                    "coordinates": bbox2polygon(minx, miny, maxx, maxy),
-                }
-                # Add geo_shape query to filter collections by bbox_shape field
-                query_parts.append(
-                    {
-                        "geo_shape": {
-                            "bbox_shape": {
-                                "shape": bbox_polygon,
-                                "relation": "intersects",
-                            }
-                        }
-                    }
-                )
-
         # Combine all query parts with AND logic if there are multiple
         datetime_filter = None
         if datetime:

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -1,2 +1,2 @@
 """library version."""
-__version__ = "6.5.0"
+__version__ = "6.5.1"

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/version.py

@@ -6,8 +6,8 @@
     desc = f.read()
 
 install_requires = [
-    "stac-fastapi-core==6.5.0",
-    "sfeos-helpers==6.5.0",
+    "stac-fastapi-core==6.5.1",
+    "sfeos-helpers==6.5.1",
     "opensearch-py~=2.8.0",
     "opensearch-py[async]~=2.8.0",
     "uvicorn~=0.23.0",