Merge branch 'main' into CAT-1522

YuriZmytrakov · web-flow · commit ffca51b27329 · 2025-11-05T22:46:36.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 
 - Added environment variables `HIDE_PRIVATE_DATA` and `PRIVATE_DATA_FIELD` to control visibility of private technical data fields in SFEOS responses. [#518](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/518)
+- Added validator for `REDIS_MAX_CONNECTIONS` to handle empty or null-like values ("", "null", None) and return None instead. [#519](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/519)
 
 ### Changed
 
@@ -21,6 +22,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Updated
 
+## [v6.7.2] - 2025-11-04
+
+### Fixed
+
+- Fixed "list index out of range" error when using BETWEEN operator in CQL2-text filters. [#521](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/521)
+
+## [v6.7.1] - 2025-10-31
+
+### Fixed
+
+- Ensure `REDIS_MAX_CONNECTION` can accept `None` and integer value for default number of connection. [#515](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/515)
+
 ## [v6.7.0] - 2025-10-27
 
 ### Added
@@ -613,7 +626,9 @@ 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.7.0...main
+[Unreleased]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.7.2...main
+[v6.7.2]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.7.1...v6.7.2
+[v6.7.1]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.7.0...v6.7.1
 [v6.7.0]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.6.0...v6.7.0
 [v6.6.0]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.5.1...v6.6.0
 [v6.5.1]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.5.0...v6.5.1
diff --git a/stac_fastapi/core/stac_fastapi/core/core.py b/stac_fastapi/core/stac_fastapi/core/core.py
@@ -830,7 +830,7 @@ async def post_search(
                 search = await self.database.apply_cql2_filter(search, cql2_filter)
             except Exception as e:
                 raise HTTPException(
-                    status_code=400, detail=f"Error with cql2_json filter: {e}"
+                    status_code=400, detail=f"Error with cql2 filter: {e}"
                 )
 
         if hasattr(search_request, "q"):
diff --git a/stac_fastapi/core/stac_fastapi/core/redis_utils.py b/stac_fastapi/core/stac_fastapi/core/redis_utils.py
@@ -36,6 +36,14 @@ def validate_db_sentinel(cls, v: int) -> int:
             raise ValueError("REDIS_DB must be a positive integer")
         return v
 
+    @field_validator("REDIS_MAX_CONNECTIONS", mode="before")
+    @classmethod
+    def validate_max_connections(cls, v):
+        """Handle empty/None values for REDIS_MAX_CONNECTIONS."""
+        if v in ["", "null", "Null", "NULL", "none", "None", "NONE", None]:
+            return None
+        return v
+
     @field_validator("REDIS_SELF_LINK_TTL")
     @classmethod
     def validate_self_link_ttl_sentinel(cls, v: int) -> int:
@@ -118,6 +126,14 @@ def validate_db_standalone(cls, v: int) -> int:
             raise ValueError("REDIS_DB must be a positive integer")
         return v
 
+    @field_validator("REDIS_MAX_CONNECTIONS", mode="before")
+    @classmethod
+    def validate_max_connections(cls, v):
+        """Handle empty/None values for REDIS_MAX_CONNECTIONS."""
+        if v in ["", "null", "Null", "NULL", "none", "None", "NONE", None]:
+            return None
+        return v
+
     @field_validator("REDIS_SELF_LINK_TTL")
     @classmethod
     def validate_self_link_ttl_standalone(cls, v: int) -> int:
diff --git a/stac_fastapi/core/stac_fastapi/core/version.py b/stac_fastapi/core/stac_fastapi/core/version.py
@@ -1,2 +1,2 @@
 """library version."""
-__version__ = "6.7.0"
+__version__ = "6.7.2"
diff --git a/stac_fastapi/elasticsearch/pyproject.toml b/stac_fastapi/elasticsearch/pyproject.toml
@@ -30,8 +30,8 @@ keywords = [
 ]
 dynamic = ["version"]
 dependencies = [
-    "stac-fastapi-core==6.7.0",
-    "sfeos-helpers==6.7.0",
+    "stac-fastapi-core==6.7.2",
+    "sfeos-helpers==6.7.2",
     "elasticsearch[async]~=8.19.1",
     "uvicorn~=0.23.0",
     "starlette>=0.35.0,<0.36.0",
diff --git a/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/version.py b/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/version.py
@@ -1,2 +1,2 @@
 """library version."""
-__version__ = "6.7.0"
+__version__ = "6.7.2"
diff --git a/stac_fastapi/opensearch/pyproject.toml b/stac_fastapi/opensearch/pyproject.toml
@@ -30,8 +30,8 @@ keywords = [
 ]
 dynamic = ["version"]
 dependencies = [
-    "stac-fastapi-core==6.7.0",
-    "sfeos-helpers==6.7.0",
+    "stac-fastapi-core==6.7.2",
+    "sfeos-helpers==6.7.2",
     "opensearch-py~=2.8.0",
     "opensearch-py[async]~=2.8.0",
     "uvicorn~=0.23.0",
diff --git a/stac_fastapi/opensearch/stac_fastapi/opensearch/version.py b/stac_fastapi/opensearch/stac_fastapi/opensearch/version.py
@@ -1,2 +1,2 @@
 """library version."""
-__version__ = "6.7.0"
+__version__ = "6.7.2"
diff --git a/stac_fastapi/sfeos_helpers/pyproject.toml b/stac_fastapi/sfeos_helpers/pyproject.toml
@@ -31,7 +31,7 @@ keywords = [
 ]
 dynamic = ["version"]
 dependencies = [
-    "stac-fastapi.core==6.7.0",
+    "stac-fastapi.core==6.7.2",
 ]
 
 [project.urls]
diff --git a/stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/filter/transform.py b/stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/filter/transform.py
@@ -92,7 +92,19 @@ def to_es(queryables_mapping: Dict[str, Any], query: Dict[str, Any]) -> Dict[str
 
     elif query["op"] == AdvancedComparisonOp.BETWEEN:
         field = to_es_field(queryables_mapping, query["args"][0]["property"])
-        gte, lte = query["args"][1], query["args"][2]
+
+        # Handle both formats: [property, [lower, upper]] or [property, lower, upper]
+        if len(query["args"]) == 2 and isinstance(query["args"][1], list):
+            # Format: [{'property': '...'}, [lower, upper]]
+            gte, lte = query["args"][1][0], query["args"][1][1]
+        elif len(query["args"]) == 3:
+            # Format: [{'property': '...'}, lower, upper]
+            gte, lte = query["args"][1], query["args"][2]
+        else:
+            raise ValueError(
+                f"BETWEEN operator expects 2 or 3 args, got {len(query['args'])}"
+            )
+
         if isinstance(gte, dict) and "timestamp" in gte:
             gte = gte["timestamp"]
         if isinstance(lte, dict) and "timestamp" in lte:
diff --git a/stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/version.py b/stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/version.py
@@ -1,2 +1,2 @@
 """library version."""
-__version__ = "6.7.0"
+__version__ = "6.7.2"
diff --git a/stac_fastapi/tests/extensions/test_filter.py b/stac_fastapi/tests/extensions/test_filter.py
@@ -410,7 +410,7 @@ async def test_search_filter_extension_in_no_list(app_client, ctx):
 
     assert resp.status_code == 400
     assert resp.json() == {
-        "detail": f"Error with cql2_json filter: Arg {product_id} is not a list"
+        "detail": f"Error with cql2 filter: Arg {product_id} is not a list"
     }
 
 
@@ -440,6 +440,24 @@ async def test_search_filter_extension_between(app_client, ctx):
     assert len(resp.json()["features"]) == 1
 
 
+@pytest.mark.asyncio
+async def test_search_filter_extension_between_get(app_client, ctx):
+    """Test BETWEEN operator with GET request using CQL2-text format."""
+    sun_elevation = ctx.item["properties"]["view:sun_elevation"]
+    lower_bound = sun_elevation - 0.01
+    upper_bound = sun_elevation + 0.01
+
+    # Use CQL2-text format for GET request
+    filter_expr = f"properties.view:sun_elevation BETWEEN {lower_bound} AND {upper_bound} AND id = '{ctx.item['id']}'"
+
+    resp = await app_client.get(
+        "/search", params={"filter": filter_expr, "filter_lang": "cql2-text"}
+    )
+
+    assert resp.status_code == 200
+    assert len(resp.json()["features"]) == 1
+
+
 @pytest.mark.asyncio
 async def test_search_filter_extension_isnull_post(app_client, ctx):
     # Test for a property that is not null

Original file line number	Diff line number	Diff line change
`@@ -830,7 +830,7 @@ async def post_search(`
`830`	`830`	`search = await self.database.apply_cql2_filter(search, cql2_filter)`
`831`	`831`	`except Exception as e:`
`832`	`832`	`raise HTTPException(`
`833`		`- status_code=400, detail=f"Error with cql2_json filter: {e}"`
	`833`	`+ status_code=400, detail=f"Error with cql2 filter: {e}"`
`834`	`834`	`)`
`835`	`835`
`836`	`836`	`if hasattr(search_request, "q"):`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`"""library version."""`
`2`		`-__version__ = "6.7.0"`
	`2`	`+__version__ = "6.7.2"`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ keywords = [`
`31`	`31`	`]`
`32`	`32`	`dynamic = ["version"]`
`33`	`33`	`dependencies = [`
`34`		`- "stac-fastapi.core==6.7.0",`
	`34`	`+ "stac-fastapi.core==6.7.2",`
`35`	`35`	`]`
`36`	`36`
`37`	`37`	`[project.urls]`