From ececd2177eb7df7c203ec621fc6a75feebce9684 Mon Sep 17 00:00:00 2001 From: Stijn Caerts Date: Tue, 9 Dec 2025 11:29:42 +0100 Subject: [PATCH 1/2] fix: parse ES_TIMEOUT env var to int --- compose.yml | 2 ++ stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/config.py | 2 +- stac_fastapi/opensearch/stac_fastapi/opensearch/config.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index 00fb5938b..23c9a1011 100644 --- a/compose.yml +++ b/compose.yml @@ -20,6 +20,7 @@ services: - ES_PORT=9200 - ES_USE_SSL=false - ES_VERIFY_CERTS=false + - ES_TIMEOUT=30 - BACKEND=elasticsearch - DATABASE_REFRESH=true - ENABLE_COLLECTIONS_SEARCH_ROUTE=true @@ -60,6 +61,7 @@ services: - ES_PORT=9202 - ES_USE_SSL=false - ES_VERIFY_CERTS=false + - ES_TIMEOUT=30 - BACKEND=opensearch - STAC_FASTAPI_RATE_LIMIT=200/minute - ENABLE_COLLECTIONS_SEARCH_ROUTE=true diff --git a/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/config.py b/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/config.py index c5b6e3dd5..3ea42b3af 100644 --- a/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/config.py +++ b/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/config.py @@ -58,7 +58,7 @@ def _es_config() -> Dict[str, Any]: # Include timeout setting if set if request_timeout := os.getenv("ES_TIMEOUT"): - config["request_timeout"] = request_timeout + config["request_timeout"] = int(request_timeout) # Explicitly exclude SSL settings when not using SSL if not use_ssl: diff --git a/stac_fastapi/opensearch/stac_fastapi/opensearch/config.py b/stac_fastapi/opensearch/stac_fastapi/opensearch/config.py index ec8fb90bf..a87f2a985 100644 --- a/stac_fastapi/opensearch/stac_fastapi/opensearch/config.py +++ b/stac_fastapi/opensearch/stac_fastapi/opensearch/config.py @@ -56,7 +56,7 @@ def _es_config() -> Dict[str, Any]: # Include timeout setting if set if timeout := os.getenv("ES_TIMEOUT"): - config["timeout"] = timeout + config["timeout"] = int(timeout) # Explicitly exclude SSL settings when not using SSL if not use_ssl: From 2af945b3d7147ebda43214e70a4efe8328a94116 Mon Sep 17 00:00:00 2001 From: Stijn Caerts Date: Tue, 9 Dec 2025 11:37:18 +0100 Subject: [PATCH 2/2] add #556 to CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 679f1ba62..33bb75a4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Fixed - Fix unawaited coroutine in `stac_fastapi.core.core`. [#551](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/551) +- Parse `ES_TIMEOUT` environment variable as an integer. [#556](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/556) ### Removed