Merge branch 'main' into stac-fastapi-2.4.3

Author: jonhealy1

CHANGELOG.md

@@ -12,6 +12,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added bbox and datetime parameters and functionality to item_collection https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/127
 - Added collection_id parameter to create_item function https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/127
 - Added item_id and collection_id to update_item https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/127
+- The default Collection objects index can be overridden by the `STAC_COLLECTIONS_INDEX` environment variable.
+- The default Item objects index prefix can be overridden by the `STAC_ITEMS_INDEX_PREFIX` environment variable.
+
 
 ### Changed
 
@@ -23,7 +26,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
-- Filter Extension as GET with CQL2-Text and POST with CQL2-JSON, 
+- Filter Extension as GET with CQL2-Text and POST with CQL2-JSON,
   supporting the Basic CQL2 and Basic Spatial Operators conformance classes.
 - Added Elasticsearch local config to support snapshot/restore to local filesystem
 
@@ -56,7 +59,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Elasticsearch index mappings updated to be more thorough.
 - Endpoints that return items (e.g., /search) now sort the results by 'properties.datetime,id,collection'.
   Previously, there was no sort order defined.
-- Db_to_stac serializer moved to core.py for consistency as it existed in both core and database_logic previously. 
+- Db_to_stac serializer moved to core.py for consistency as it existed in both core and database_logic previously.
 - Use genexp in execute_search and get_all_collections to return results.
 - Added db_to_stac serializer to item_collection method in core.py.
 

stac_fastapi/elasticsearch/setup.py

@@ -13,14 +13,14 @@
     "stac-fastapi.types==2.4.3",
     "stac-fastapi.api==2.4.3",
     "stac-fastapi.extensions==2.4.3",
-    "elasticsearch[async]==7.17.3",
+    "elasticsearch[async]==7.17.8",
     "elasticsearch-dsl==7.4.0",
     "pystac[validation]",
     "uvicorn",
     "overrides",
     "starlette",
     "geojson-pydantic",
-    "pygeofilter==0.1.2",
+    "pygeofilter==0.2.0",
 ]
 
 extra_reqs = {

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -1,6 +1,7 @@
 """Database logic."""
 import asyncio
 import logging
+import os
 from base64 import urlsafe_b64decode, urlsafe_b64encode
 from typing import Any, Dict, Iterable, List, Optional, Protocol, Tuple, Type, Union
 
@@ -21,8 +22,8 @@
 
 NumType = Union[float, int]
 
-COLLECTIONS_INDEX = "collections"
-ITEMS_INDEX_PREFIX = "items_"
+COLLECTIONS_INDEX = os.getenv("STAC_COLLECTIONS_INDEX", "collections")
+ITEMS_INDEX_PREFIX = os.getenv("STAC_ITEMS_INDEX_PREFIX", "items_")
 
 DEFAULT_INDICES = f"*,-*kibana*,-{COLLECTIONS_INDEX}"