Merge branch 'main' into CAT-1522

Author: YuriZmytrakov

CHANGELOG.md

@@ -17,6 +17,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Updated
 
+## [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
@@ -609,7 +615,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.7.0...main
+[Unreleased]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.7.1...main
+[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

stac_fastapi/core/stac_fastapi/core/redis_utils.py

@@ -5,7 +5,7 @@
 from typing import List, Optional, Tuple
 from urllib.parse import parse_qs, urlencode, urlparse, urlunparse
 
-from pydantic import field_validator
+from pydantic import Field, field_validator
 from pydantic_settings import BaseSettings
 from redis import asyncio as aioredis
 from redis.asyncio.sentinel import Sentinel
@@ -21,11 +21,11 @@ class RedisSentinelSettings(BaseSettings):
     REDIS_SENTINEL_MASTER_NAME: str = "master"
     REDIS_DB: int = 15
 
-    REDIS_MAX_CONNECTIONS: int = 10
+    REDIS_MAX_CONNECTIONS: Optional[int] = None
     REDIS_RETRY_TIMEOUT: bool = True
     REDIS_DECODE_RESPONSES: bool = True
     REDIS_CLIENT_NAME: str = "stac-fastapi-app"
-    REDIS_HEALTH_CHECK_INTERVAL: int = 30
+    REDIS_HEALTH_CHECK_INTERVAL: int = Field(default=30, gt=0)
     REDIS_SELF_LINK_TTL: int = 1800
 
     @field_validator("REDIS_DB")
@@ -36,22 +36,6 @@ def validate_db_sentinel(cls, v: int) -> int:
             raise ValueError("REDIS_DB must be a positive integer")
         return v
 
-    @field_validator("REDIS_MAX_CONNECTIONS")
-    @classmethod
-    def validate_max_connections_sentinel(cls, v: int) -> int:
-        """Validate REDIS_MAX_CONNECTIONS is at least 1."""
-        if v < 1:
-            raise ValueError("REDIS_MAX_CONNECTIONS must be at least 1")
-        return v
-
-    @field_validator("REDIS_HEALTH_CHECK_INTERVAL")
-    @classmethod
-    def validate_health_check_interval_sentinel(cls, v: int) -> int:
-        """Validate REDIS_HEALTH_CHECK_INTERVAL is not negative integer."""
-        if v < 0:
-            raise ValueError("REDIS_HEALTH_CHECK_INTERVAL must be a positive integer")
-        return v
-
     @field_validator("REDIS_SELF_LINK_TTL")
     @classmethod
     def validate_self_link_ttl_sentinel(cls, v: int) -> int:
@@ -111,11 +95,11 @@ class RedisSettings(BaseSettings):
     REDIS_PORT: int = 6379
     REDIS_DB: int = 15
 
-    REDIS_MAX_CONNECTIONS: int = 10
+    REDIS_MAX_CONNECTIONS: Optional[int] = None
     REDIS_RETRY_TIMEOUT: bool = True
     REDIS_DECODE_RESPONSES: bool = True
     REDIS_CLIENT_NAME: str = "stac-fastapi-app"
-    REDIS_HEALTH_CHECK_INTERVAL: int = 30
+    REDIS_HEALTH_CHECK_INTERVAL: int = Field(default=30, gt=0)
     REDIS_SELF_LINK_TTL: int = 1800
 
     @field_validator("REDIS_PORT")
@@ -134,22 +118,6 @@ def validate_db_standalone(cls, v: int) -> int:
             raise ValueError("REDIS_DB must be a positive integer")
         return v
 
-    @field_validator("REDIS_MAX_CONNECTIONS")
-    @classmethod
-    def validate_max_connections_standalone(cls, v: int) -> int:
-        """Validate REDIS_MAX_CONNECTIONS is at least 1."""
-        if v < 1:
-            raise ValueError("REDIS_MAX_CONNECTIONS must be at least 1")
-        return v
-
-    @field_validator("REDIS_HEALTH_CHECK_INTERVAL")
-    @classmethod
-    def validate_health_check_interval_standalone(cls, v: int) -> int:
-        """Validate REDIS_HEALTH_CHECK_INTERVAL is not a negative."""
-        if v < 0:
-            raise ValueError("REDIS_HEALTH_CHECK_INTERVAL must be a positive integer")
-        return v
-
     @field_validator("REDIS_SELF_LINK_TTL")
     @classmethod
     def validate_self_link_ttl_standalone(cls, v: int) -> int:

stac_fastapi/core/stac_fastapi/core/version.py

@@ -1,2 +1,2 @@
 """library version."""
-__version__ = "6.7.0"
+__version__ = "6.7.1"

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.1",
+    "sfeos-helpers==6.7.1",
     "elasticsearch[async]~=8.19.1",
     "uvicorn~=0.23.0",
     "starlette>=0.35.0,<0.36.0",

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/version.py

@@ -1,2 +1,2 @@
 """library version."""
-__version__ = "6.7.0"
+__version__ = "6.7.1"

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.1",
+    "sfeos-helpers==6.7.1",
     "opensearch-py~=2.8.0",
     "opensearch-py[async]~=2.8.0",
     "uvicorn~=0.23.0",

stac_fastapi/opensearch/stac_fastapi/opensearch/version.py

@@ -1,2 +1,2 @@
 """library version."""
-__version__ = "6.7.0"
+__version__ = "6.7.1"

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.1",
 ]
 
 [project.urls]

stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/version.py

@@ -1,2 +1,2 @@
 """library version."""
-__version__ = "6.7.0"
+__version__ = "6.7.1"