Merge branch 'main' into CAT-1382-2

YuriZmytrakov · Yuri Zmytrakov · commit dbfe1b267c3c · 2025-10-21T12:55:38.000+02:00
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -16,7 +16,7 @@ jobs:
 
     services:
       elasticsearch_8_svc:
-        image: docker.elastic.co/elasticsearch/elasticsearch:8.11.0
+        image: docker.elastic.co/elasticsearch/elasticsearch:8.19.5
         env:
           cluster.name: stac-cluster
           node.name: es01
@@ -32,25 +32,8 @@ jobs:
         ports:
           - 9200:9200
 
-      elasticsearch_7_svc:
-        image: docker.elastic.co/elasticsearch/elasticsearch:7.17.1
-        env:
-          cluster.name: stac-cluster
-          node.name: es01
-          network.host: 0.0.0.0
-          transport.host: 0.0.0.0
-          discovery.type: single-node
-          http.port: 9400
-          xpack.license.self_generated.type: basic
-          xpack.security.enabled: false
-          xpack.security.transport.ssl.enabled: false
-          ES_JAVA_OPTS: -Xms512m -Xmx1g
-          action.destructive_requires_name: false
-        ports:
-          - 9400:9400
-
-      opensearch_2_11:
-        image: opensearchproject/opensearch:2.11.1
+      opensearch_2_19:
+        image: opensearchproject/opensearch:2.19.3
         env:
           cluster.name: stac-cluster
           node.name: os01
@@ -59,12 +42,19 @@ jobs:
           discovery.type: single-node
           http.port: 9202
           http.cors.enabled: true
-          plugins.security.disabled: true
-          plugins.security.ssl.http.enabled: true
+          DISABLE_SECURITY_PLUGIN: true
+          DISABLE_INSTALL_DEMO_CONFIG: true
           OPENSEARCH_JAVA_OPTS: -Xms512m -Xmx512m
           action.destructive_requires_name: false
         ports:
           - 9202:9202
+        options: >-
+          --health-cmd="curl -f http://localhost:9202/_cluster/health || exit 1"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=10
+          --ulimit nofile=65536:65536
+          --ulimit memlock=-1:-1
 
       redis:
         image: redis:7-alpine
@@ -78,8 +68,8 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13"]
-        backend: [ "elasticsearch7", "elasticsearch8", "opensearch"]
+        python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+        backend: [ "elasticsearch8", "opensearch"]
 
     name: Python ${{ matrix.python-version }} testing with ${{ matrix.backend }}
 
@@ -130,12 +120,12 @@ jobs:
           pipenv run pytest -svvv --timeout=300
         env:
           ENVIRONMENT: testing
-          ES_PORT: ${{ matrix.backend == 'elasticsearch7' && '9400' || matrix.backend == 'elasticsearch8' && '9200' || '9202' }}
+          ES_PORT: ${{ matrix.backend == 'elasticsearch8' && '9200' || '9202' }}
           ES_HOST: 172.17.0.1
           ES_USE_SSL: false
           DATABASE_REFRESH: true
           ES_VERIFY_CERTS: false
-          BACKEND: ${{ matrix.backend == 'elasticsearch7' && 'elasticsearch' || matrix.backend == 'elasticsearch8' && 'elasticsearch' || 'opensearch' }}
           REDIS_ENABLE: true
           REDIS_HOST: localhost
           REDIS_PORT: 6379
+          BACKEND: ${{ matrix.backend == 'elasticsearch8' && 'elasticsearch' || 'opensearch' }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,20 +9,32 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
-- Spatial search support for collections via `bbox` parameter on `/collections` endpoint. Collections are now indexed with a `bbox_shape` field (GeoJSON polygon) derived from their spatial extent for efficient geospatial queries when created or updated. [#481](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/481)
+- Spatial search support for collections via `bbox` parameter on `/collections` endpoint. Collections are now indexed with a `bbox_shape` field (GeoJSON polygon) derived from their spatial extent for efficient geospatial queries when created or updated. [#481](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/481
 - Introduced SFEOS Tools (`sfeos_tools/`) - An installable Click-based CLI package for managing SFEOS deployments. Initial command `add-bbox-shape` adds the `bbox_shape` field to existing collections for spatial search compatibility. Install with `pip install sfeos-tools[elasticsearch]` or `pip install sfeos-tools[opensearch]`. [#481](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/481)
 - Moved SFEOS Tools to its own repository at [Healy-Hyperspatial/sfeos-tools](https://github.com/Healy-Hyperspatial/sfeos-tools). The CLI package is now maintained separately. [#PR_NUMBER]
 - CloudFerro logo to sponsors and supporters list [#485](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/485)
 - Latest news section to README [#485](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/485)
 - Added Redis caching configuration for navigation pagination support, enabling proper `prev` and `next` links in paginated responses. [#488](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/488)
+- Python 3.14 support [#500](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/500)
 
 ### Changed
 
 - Removed ENV_MAX_LIMIT environment variable; maximum limits are now handled by the default global limit environment variable. [#482](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/482)
 - Changed the default and maximum pagination limits for collections/items endpoints. [#482](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/482)
+- Removed the `rel=child` links to the collections from the landing page, as the listing was incomplete due to pagination. [#496](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/496)
 
 ### Fixed
 
+### Removed
+
+- Removed Elasticsearch 7 from CI/CD test matrix. The project now only tests against Elasticsearch 8 and OpenSearch. [#497](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/497)
+
+### Updated
+
+- Updated Elasticsearch version to 8.19.5 in CI/CD test matrix and compose.yml. [#497](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/497)
+- Updated OpenSearch version to 2.19.3 in CI/CD test matrix and compose.yml. [#499](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/499)
+- Updated elasticsearh python library to 8.19.1 in setup.py. [#499](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/499)
+
 ## [v6.5.1] - 2025-09-30
 
 ### Fixed
diff --git a/README.md b/README.md
@@ -116,6 +116,7 @@ This project is built on the following technologies: STAC, stac-fastapi, FastAPI
   - [Collection Pagination](#collection-pagination)
   - [SFEOS Tools CLI](#sfeos-tools-cli)
   - [Ingesting Sample Data CLI Tool](#ingesting-sample-data-cli-tool)
+  - [Redis for navigation](#redis-for-navigation)
   - [Elasticsearch Mappings](#elasticsearch-mappings)
   - [Managing Elasticsearch Indices](#managing-elasticsearch-indices)
     - [Snapshots](#snapshots)
@@ -341,12 +342,11 @@ You can customize additional settings in your `.env` file:
 > [!NOTE]
 > The variables `ES_HOST`, `ES_PORT`, `ES_USE_SSL`, `ES_VERIFY_CERTS` and `ES_TIMEOUT` apply to both Elasticsearch and OpenSearch backends, so there is no need to rename the key names to `OS_` even if you're using OpenSearch.
 
-## Redis for Navigation:
+## Redis for Navigation environment variables:
 These Redis configuration variables to enable proper navigation functionality in STAC FastAPI.
 
 | Variable                      | Description                                                                                  | Default                  | Required                                                                                     |
 |-------------------------------|----------------------------------------------------------------------------------------------|--------------------------|---------------------------------------------------------------------------------------------|
-| **General**                   |                                                                                              |                          |                                                                                             |
 | `REDIS_ENABLE`                | Enables or disables Redis caching for navigation. Set to `true` to use Redis, or `false` to disable. | `false`                  | **Required** (determines whether Redis is used at all)                                      |
 | **Redis Sentinel**            |                                                                                              |                          |                                                                                             |
 | `REDIS_SENTINEL_HOSTS`        | Comma-separated list of Redis Sentinel hostnames/IP addresses.                               | `""`                     | Conditional (required if using Sentinel)                                                    |
@@ -621,8 +621,12 @@ The Redis cache stores navigation state for paginated results, allowing the syst
 
 Steps to configure:
 1. Ensure that a Redis instance is available, either a standalone server or a Sentinel-managed cluster.
-2. Establish a connection between STAC FastAPI and Redis instance by setting the appropriate [**environment variables**](#redis-for-navigation)These define the Redis host, port, authentication, and optional Sentinel settings.
+2. Establish a connection between STAC FastAPI and Redis instance by setting the appropriate [**environment variables**](#redis-for-navigation-environment-variables). These define the Redis host, port, authentication, and optional Sentinel settings.
 3. Control whether Redis caching is activated using the `REDIS_ENABLE` environment variable to `True` or `False`.
+4. Ensure the appropriate version of `Redis` is installed:
+```
+pip install stac-fastapi-elasticsearch[redis]
+```
 
 ## Elasticsearch Mappings
 
diff --git a/compose.yml b/compose.yml
@@ -79,7 +79,7 @@ services:
 
   elasticsearch:
     container_name: es-container
-    image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-8.11.0}
+    image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-8.19.5}
     hostname: elasticsearch
     environment:
       ES_JAVA_OPTS: -Xms512m -Xmx1g
@@ -92,7 +92,7 @@ services:
 
   opensearch:
     container_name: os-container
-    image: opensearchproject/opensearch:${OPENSEARCH_VERSION:-2.11.1}
+    image: opensearchproject/opensearch:${OPENSEARCH_VERSION:-2.19.3}
     hostname: opensearch
     environment:
       - discovery.type=single-node
diff --git a/stac_fastapi/core/setup.py b/stac_fastapi/core/setup.py
@@ -13,7 +13,7 @@
     "stac-fastapi.types==6.0.0",
     "stac-fastapi.api==6.0.0",
     "stac-fastapi.extensions==6.0.0",
-    "orjson~=3.9.0",
+    "orjson~=3.11.0",
     "overrides~=7.4.0",
     "geojson-pydantic~=1.0.0",
     "pygeofilter~=0.3.1",
@@ -37,6 +37,7 @@
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: 3.13",
+        "Programming Language :: Python :: 3.14",
         "License :: OSI Approved :: MIT License",
     ],
     url="https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch",
diff --git a/stac_fastapi/core/stac_fastapi/core/core.py b/stac_fastapi/core/stac_fastapi/core/core.py
@@ -202,17 +202,6 @@ async def landing_page(self, **kwargs) -> stac_types.LandingPage:
                 ]
             )
 
-        collections = await self.all_collections(request=kwargs["request"])
-        for collection in collections["collections"]:
-            landing_page["links"].append(
-                {
-                    "rel": Relations.child.value,
-                    "type": MimeTypes.json.value,
-                    "title": collection.get("title") or collection.get("id"),
-                    "href": urljoin(base_url, f"collections/{collection['id']}"),
-                }
-            )
-
         # Add OpenAPI URL
         landing_page["links"].append(
             {
@@ -888,7 +877,8 @@ async def post_search(
         links = await PagingLinks(request=request, next=next_token).get_links()
 
         collection_links = []
-        if search_request.collections:
+        # Add "collection" and "parent" rels only for /collections/{collection_id}/items
+        if search_request.collections and "/items" in str(request.url):
             for collection_id in search_request.collections:
                 collection_links.extend(
                     [
diff --git a/stac_fastapi/core/stac_fastapi/core/redis_utils.py b/stac_fastapi/core/stac_fastapi/core/redis_utils.py
@@ -255,7 +255,7 @@ async def redis_pagination_links(
             links.insert(
                 0,
                 {
-                    "rel": "prev",
+                    "rel": "previous",
                     "type": "application/json",
                     "method": "GET",
                     "href": prev_link,
diff --git a/stac_fastapi/elasticsearch/setup.py b/stac_fastapi/elasticsearch/setup.py
@@ -8,14 +8,14 @@
 install_requires = [
     "stac-fastapi-core==6.5.1",
     "sfeos-helpers==6.5.1",
-    "elasticsearch[async]~=8.18.0",
+    "elasticsearch[async]~=8.19.1",
     "uvicorn~=0.23.0",
     "starlette>=0.35.0,<0.36.0",
 ]
 
 extra_reqs = {
     "dev": [
-        "pytest~=7.0.0",
+        "pytest~=8.0",
         "pytest-cov~=4.0.0",
         "pytest-asyncio~=0.21.0",
         "pre-commit~=3.0.0",
@@ -43,6 +43,7 @@
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: 3.13",
+        "Programming Language :: Python :: 3.14",
         "License :: OSI Approved :: MIT License",
     ],
     url="https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch",
diff --git a/stac_fastapi/opensearch/setup.py b/stac_fastapi/opensearch/setup.py
@@ -16,7 +16,7 @@
 
 extra_reqs = {
     "dev": [
-        "pytest~=7.0.0",
+        "pytest~=8.0",
         "pytest-cov~=4.0.0",
         "pytest-asyncio~=0.21.0",
         "pre-commit~=3.0.0",
@@ -44,6 +44,7 @@
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: 3.13",
+        "Programming Language :: Python :: 3.14",
         "License :: OSI Approved :: MIT License",
     ],
     url="https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch",
diff --git a/stac_fastapi/sfeos_helpers/setup.py b/stac_fastapi/sfeos_helpers/setup.py
@@ -24,6 +24,7 @@
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: 3.13",
+        "Programming Language :: Python :: 3.14",
         "License :: OSI Approved :: MIT License",
     ],
     url="https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch",
diff --git a/stac_fastapi/tests/redis/test_redis_pagination.py b/stac_fastapi/tests/redis/test_redis_pagination.py
@@ -39,7 +39,7 @@ async def test_search_pagination_uses_redis_cache(
     resp2_json = resp2.json()
 
     prev_link = next(
-        (link for link in resp2_json["links"] if link["rel"] == "prev"), None
+        (link for link in resp2_json["links"] if link["rel"] == "previous"), None
     )
     assert prev_link is not None
 
@@ -73,6 +73,6 @@ async def test_collections_pagination_uses_redis_cache(
     resp2_json = resp2.json()
 
     prev_link = next(
-        (link for link in resp2_json["links"] if link["rel"] == "prev"), None
+        (link for link in resp2_json["links"] if link["rel"] == "previous"), None
     )
     assert prev_link is not None

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ async def redis_pagination_links(`
`255`	`255`	`links.insert(`
`256`	`256`	`0,`
`257`	`257`	`{`
`258`		`- "rel": "prev",`
	`258`	`+ "rel": "previous",`
`259`	`259`	`"type": "application/json",`
`260`	`260`	`"method": "GET",`
`261`	`261`	`"href": prev_link,`