Merge branch 'main' into CAT-1447

YuriZmytrakov · web-flow · commit 6883c6467fa4 · 2025-12-07T20:13:08.000+01:00
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -68,14 +68,14 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+        python-version: [ "3.11", "3.12", "3.13", "3.14"]
         backend: [ "elasticsearch8", "opensearch"]
 
     name: Python ${{ matrix.python-version }} testing with ${{ matrix.backend }}
 
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Python
         uses: actions/setup-python@v6
diff --git a/.github/workflows/deploy_mkdocs.yml b/.github/workflows/deploy_mkdocs.yml
@@ -18,12 +18,12 @@ jobs:
 
     steps:
       - name: Checkout main
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.11
         uses: actions/setup-python@v6
         with:
-          python-version: 3.9
+          python-version: 3.11
 
       - name: Install dependencies
         run: |
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -11,12 +11,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
-      - name: Set up Python 3.10
+      - name: Set up Python 3.11
         uses: actions/setup-python@v6
         with:
-          python-version: "3.10"
+          python-version: "3.11"
 
       - name: Install build dependencies
         run: |
@@ -80,7 +80,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,17 +9,45 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
-- Added retry with back-off logic for Redis related functions. [#528](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/528)
-- Added nanosecond precision datetime filtering that ensures nanosecond precision support in filtering by datetime. This is configured via the `USE_DATETIME_NANOS` environment variable, while maintaining microseconds compatibility for datetime precision. [#529](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/529)
-
 ### Changed
 
 ### Fixed
 
+- Fix unawaited coroutine in `stac_fastapi.core.core`. [#551](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/551)
+
 ### Removed
 
 ### Updated
 
+## [v6.7.6] - 2025-12-04
+
+### Fixed
+
+- Fix incorrect min/max date formatting in `apply_datetime_filter` for `POST` requests. [#539](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/539)
+- Fixed datetime filtering for .0Z milliseconds to preserve precision in apply_filter_datetime, ensuring only items exactly within the specified range are returned. [#535](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/535)
+- Normalize datetime in POST /search requests to match GET /search behavior. [#543](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/543)
+- Fix optional Redis support in core.py. [#549](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/549)
+
+## [v6.7.5] - 2025-11-25
+
+### Added
+
+- Added retry with back-off logic for Redis related functions. [#528](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/528)
+- Added nanosecond precision datetime filtering that ensures nanosecond precision support in filtering by datetime. This is configured via the `USE_DATETIME_NANOS` environment variable, while maintaining microseconds compatibility for datetime precision. [#529](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/529)
+
+### Fixed
+
+- Add Redis to be installed in dev environment for local testing [#536](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/536)
+- Fix Redis optional dependencies in opensearch and elasticsearch packages [#541](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/541)
+
+### Updated
+
+- Upgrade stac-fastapi parent libraries to v6.1.1 [#541](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/541)
+
+### Removed
+
+- Removed support for Python 3.9, 3.10 as they are no longer supported by stac-fastapi parent libraries [#541](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/541)
+
 ## [v6.7.4] - 2025-11-13
 
 ### Added
@@ -640,7 +668,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.4...main
+[Unreleased]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.7.6...main
+[v6.7.6]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.7.5...v6.7.6
+[v6.7.5]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.7.4...v6.7.5
 [v6.7.4]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.7.3...v6.7.4
 [v6.7.3]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.7.2...v6.7.3
 [v6.7.2]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.7.1...v6.7.2
diff --git a/dockerfiles/Dockerfile.deploy.es b/dockerfiles/Dockerfile.deploy.es
@@ -1,4 +1,4 @@
-FROM python:3.10-slim
+FROM python:3.11-slim
 
 RUN apt-get update && \
     apt-get -y upgrade && \
diff --git a/dockerfiles/Dockerfile.deploy.os b/dockerfiles/Dockerfile.deploy.os
@@ -1,4 +1,4 @@
-FROM python:3.10-slim
+FROM python:3.11-slim
 
 RUN apt-get update && \
     apt-get -y upgrade && \
diff --git a/dockerfiles/Dockerfile.dev.es b/dockerfiles/Dockerfile.dev.es
@@ -1,4 +1,4 @@
-FROM python:3.10-slim
+FROM python:3.11-slim
 
 
 # update apt pkgs, and install build-essential for ciso8601
diff --git a/dockerfiles/Dockerfile.dev.os b/dockerfiles/Dockerfile.dev.os
@@ -1,4 +1,4 @@
-FROM python:3.10-slim
+FROM python:3.11-slim
 
 
 # update apt pkgs, and install build-essential for ciso8601
diff --git a/dockerfiles/Dockerfile.docs b/dockerfiles/Dockerfile.docs
@@ -1,4 +1,4 @@
-FROM python:3.9-slim
+FROM python:3.11-slim
 
 # build-essential is required to build a wheel for ciso8601
 RUN apt update && apt install -y build-essential
diff --git a/examples/pip_docker/Dockerfile b/examples/pip_docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.10-slim
+FROM python:3.11-slim
 
 
 # update apt pkgs, and install build-essential for ciso8601
diff --git a/stac_fastapi/core/pyproject.toml b/stac_fastapi/core/pyproject.toml
@@ -6,15 +6,13 @@ build-backend = "hatchling.build"
 name = "stac_fastapi_core"
 description = "Core library for the Elasticsearch and Opensearch stac-fastapi backends."
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.11"
 license = {text = "MIT"}
 authors = []
 classifiers = [
     "Intended Audience :: Developers",
     "Intended Audience :: Information Technology",
     "Intended Audience :: Science/Research",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
@@ -35,17 +33,21 @@ dependencies = [
     "attrs>=23.2.0",
     "pydantic>=2.4.1,<3.0.0",
     "stac_pydantic~=3.3.0",
-    "stac-fastapi.types==6.0.0",
-    "stac-fastapi.api==6.0.0",
-    "stac-fastapi.extensions==6.0.0",
+    "stac-fastapi.types==6.1.1",
+    "stac-fastapi.api==6.1.1",
+    "stac-fastapi.extensions==6.1.1",
     "orjson~=3.11.0",
     "overrides~=7.4.0",
     "geojson-pydantic~=1.0.0",
     "pygeofilter~=0.3.1",
     "jsonschema~=4.0.0",
     "slowapi~=0.1.9",
-    "redis==6.4.0",
-    "retry==0.9.2",
+]
+
+[project.optional-dependencies]
+redis = [
+    "redis~=6.4.0",
+    "retry~=0.9.2",
 ]
 
 [project.urls]
diff --git a/stac_fastapi/core/stac_fastapi/core/core.py b/stac_fastapi/core/stac_fastapi/core/core.py
@@ -24,7 +24,6 @@
 from stac_fastapi.core.base_settings import ApiBaseSettings
 from stac_fastapi.core.datetime_utils import format_datetime_range
 from stac_fastapi.core.models.links import PagingLinks
-from stac_fastapi.core.redis_utils import redis_pagination_links
 from stac_fastapi.core.serializers import CollectionSerializer, ItemSerializer
 from stac_fastapi.core.session import Session
 from stac_fastapi.core.utilities import filter_fields, get_bool_env
@@ -426,6 +425,8 @@ async def all_collections(
         ]
 
         if redis_enable:
+            from stac_fastapi.core.redis_utils import redis_pagination_links
+
             await redis_pagination_links(
                 current_url=str(request.url),
                 token=token,
@@ -758,7 +759,7 @@ async def post_search(
 
         body_limit = None
         try:
-            if request.method == "POST" and request.body():
+            if request.method == "POST" and await request.body():
                 body_data = await request.json()
                 body_limit = body_data.get("limit")
         except Exception:
@@ -790,9 +791,10 @@ async def post_search(
                 search=search, collection_ids=search_request.collections
             )
 
+        datetime_parsed = format_datetime_range(date_str=search_request.datetime)
         try:
             search, datetime_search = self.database.apply_datetime_filter(
-                search=search, datetime=search_request.datetime
+                search=search, datetime=datetime_parsed
             )
         except (ValueError, TypeError) as e:
             # Handle invalid interval formats if return_date fails
@@ -909,6 +911,8 @@ async def post_search(
         links.extend(collection_links)
 
         if redis_enable:
+            from stac_fastapi.core.redis_utils import redis_pagination_links
+
             await redis_pagination_links(
                 current_url=str(request.url),
                 token=token_param,
diff --git a/stac_fastapi/core/stac_fastapi/core/datetime_utils.py b/stac_fastapi/core/stac_fastapi/core/datetime_utils.py
@@ -32,7 +32,10 @@ def normalize(dt):
                 dt_utc = MIN_DATE_NANOS
             if dt_utc > MAX_DATE_NANOS:
                 dt_utc = MAX_DATE_NANOS
-            return dt_utc.isoformat(timespec="auto").replace("+00:00", "Z")
+            dt_normalized = dt_utc.isoformat(timespec="auto").replace("+00:00", "Z")
+            if "." not in dt_normalized:
+                dt_normalized = dt_normalized.replace("Z", ".0Z")
+            return dt_normalized
 
         if not isinstance(date_str, str):
             return f"{MIN_DATE_NANOS.isoformat(timespec='auto').replace('+00:00','Z')}/{MAX_DATE_NANOS.isoformat(timespec='auto').replace('+00:00','Z')}"
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.4"
+__version__ = "6.7.6"
diff --git a/stac_fastapi/elasticsearch/pyproject.toml b/stac_fastapi/elasticsearch/pyproject.toml
@@ -6,15 +6,13 @@ build-backend = "hatchling.build"
 name = "stac_fastapi_elasticsearch"
 description = "An implementation of STAC API based on the FastAPI framework with Elasticsearch."
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.11"
 license = {text = "MIT"}
 authors = []
 classifiers = [
     "Intended Audience :: Developers",
     "Intended Audience :: Information Technology",
     "Intended Audience :: Science/Research",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
@@ -30,8 +28,8 @@ keywords = [
 ]
 dynamic = ["version"]
 dependencies = [
-    "stac-fastapi-core==6.7.4",
-    "sfeos-helpers==6.7.4",
+    "stac-fastapi-core==6.7.6",
+    "sfeos-helpers==6.7.6",
     "elasticsearch[async]~=8.19.1",
     "uvicorn~=0.23.0",
     "starlette>=0.35.0,<0.36.0",
@@ -48,11 +46,19 @@ dev = [
     "pre-commit~=3.0.0",
     "ciso8601~=2.3.0",
     "httpx>=0.24.0,<0.28.0",
+    "redis~=6.4.0",
+    "retry~=0.9.2",
+    "stac-fastapi-core[redis]==6.7.6",
 ]
 docs = [
     "mkdocs~=1.4.0",
     "mkdocs-material~=9.0.0",
     "pdocs~=1.2.0",
+    "redis~=6.4.0",
+    "retry~=0.9.2",
+]
+redis = [
+    "stac-fastapi-core[redis]==6.7.6",
 ]
 server = [
     "uvicorn[standard]~=0.23.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.4"
+__version__ = "6.7.6"
diff --git a/stac_fastapi/opensearch/pyproject.toml b/stac_fastapi/opensearch/pyproject.toml
@@ -6,15 +6,13 @@ build-backend = "hatchling.build"
 name = "stac_fastapi_opensearch"
 description = "An implementation of STAC API based on the FastAPI framework with Opensearch."
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.11"
 license = {text = "MIT"}
 authors = []
 classifiers = [
     "Intended Audience :: Developers",
     "Intended Audience :: Information Technology",
     "Intended Audience :: Science/Research",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
@@ -30,8 +28,8 @@ keywords = [
 ]
 dynamic = ["version"]
 dependencies = [
-    "stac-fastapi-core==6.7.4",
-    "sfeos-helpers==6.7.4",
+    "stac-fastapi-core==6.7.6",
+    "sfeos-helpers==6.7.6",
     "opensearch-py~=2.8.0",
     "opensearch-py[async]~=2.8.0",
     "uvicorn~=0.23.0",
@@ -49,12 +47,18 @@ dev = [
     "pre-commit~=3.0.0",
     "ciso8601~=2.3.0",
     "httpx>=0.24.0,<0.28.0",
+    "redis~=6.4.0",
+    "retry~=0.9.2",
+    "stac-fastapi-core[redis]==6.7.6",
 ]
 docs = [
     "mkdocs~=1.4.0",
     "mkdocs-material~=9.0.0",
     "pdocs~=1.2.0",
 ]
+redis = [
+    "stac-fastapi-core[redis]==6.7.6",
+]
 server = [
     "uvicorn[standard]~=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.4"
+__version__ = "6.7.6"
diff --git a/stac_fastapi/sfeos_helpers/pyproject.toml b/stac_fastapi/sfeos_helpers/pyproject.toml
@@ -6,15 +6,13 @@ build-backend = "hatchling.build"
 name = "sfeos_helpers"
 description = "Helper library for the Elasticsearch and Opensearch stac-fastapi backends."
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.11"
 license = {text = "MIT"}
 authors = []
 classifiers = [
     "Intended Audience :: Developers",
     "Intended Audience :: Information Technology",
     "Intended Audience :: Science/Research",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
@@ -31,7 +29,7 @@ keywords = [
 ]
 dynamic = ["version"]
 dependencies = [
-    "stac-fastapi.core==6.7.4",
+    "stac-fastapi.core==6.7.6",
 ]
 
 [project.urls]
diff --git a/stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/database/datetime.py b/stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/database/datetime.py
diff --git a/stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/version.py b/stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/version.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM python:3.10-slim`
	`1`	`+FROM python:3.11-slim`
`2`	`2`
`3`	`3`	`RUN apt-get update && \`
`4`	`4`	`apt-get -y upgrade && \`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM python:3.9-slim`
	`1`	`+FROM python:3.11-slim`
`2`	`2`
`3`	`3`	`# build-essential is required to build a wheel for ciso8601`
`4`	`4`	`RUN apt update && apt install -y build-essential`