fix: resolve merge conflicts

Author: Yuri Zmytrakov

.github/workflows/publish.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Install build dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install setuptools wheel twine
+          pip install build twine
 
       - name: Build and publish stac-fastapi-core
         working-directory: stac_fastapi/core
@@ -30,7 +30,7 @@ jobs:
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
         run: |
           # Build package
-          python setup.py sdist bdist_wheel
+          python -m build
 
           # Publish to PyPI
           twine upload dist/*
@@ -42,7 +42,7 @@ jobs:
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
         run: |
           # Build package
-          python setup.py sdist bdist_wheel
+          python -m build
   
           # Publish to PyPI
           twine upload dist/*
@@ -54,7 +54,7 @@ jobs:
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
         run: |
           # Build package
-          python setup.py sdist bdist_wheel
+          python -m build
 
           # Publish to PyPI
           twine upload dist/*
@@ -66,7 +66,7 @@ jobs:
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
         run: |
           # Build package
-          python setup.py sdist bdist_wheel
+          python -m build
 
           # Publish to PyPI
           twine upload dist/*

CHANGELOG.md

@@ -9,6 +9,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
+### Changed
+
+### Fixed
+
+### Removed
+
+### Updated
+
+
+## [v6.6.0] - 2025-10-21
+
+### 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
 - 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]
@@ -22,6 +35,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - 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)
+- Changed to pyproject.toml file from setup.py [#505](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/505)
 
 ### Fixed
 
@@ -577,7 +591,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.5.1...main
+[Unreleased]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.6.0...main
+[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
 [v6.5.0]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.4.0...v6.5.0
 [v6.4.0]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.3.0...v6.4.0

README.md

@@ -356,7 +356,7 @@ These Redis configuration variables to enable proper navigation functionality in
 | `REDIS_HOST`                  | Redis server hostname or IP address for Redis configuration.                                 | `""`                     | Conditional (required for standalone Redis)                                                 |
 | `REDIS_PORT`                  | Redis server port for Redis configuration.                                                   | `6379`                   | Conditional (required for standalone Redis)                                                 |
 | **Both**                      |                                                                                              |                          |                                                                                             |
-| `REDIS_DB`                    | Redis database number to use for caching.                                                    | `0` (Sentinel) / `0` (Standalone) | Optional                                                                                    |
+| `REDIS_DB`                    | Redis database number to use for caching.                                                    | `0` (Sentinel) / `15` (Standalone) | Optional                                                                                    |
 | `REDIS_MAX_CONNECTIONS`       | Maximum number of connections in the Redis connection pool.                                  | `10`                     | Optional                                                                                    |
 | `REDIS_RETRY_TIMEOUT`         | Enable retry on timeout for Redis operations.                                                | `true`                   | Optional                                                                                    |
 | `REDIS_DECODE_RESPONSES`      | Automatically decode Redis responses to strings.                                             | `true`                   | Optional                                                                                    |

stac_fastapi/core/README.md

@@ -0,0 +1,20 @@
+# stac-fastapi-core
+
+Core functionality for stac-fastapi. For full documentation, please see the [main README](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/blob/main/README.md).
+
+## Package Information
+
+- **Package name**: stac-fastapi-core
+- **Description**: Core functionality for STAC API implementations.
+- **Documentation**: [https://stac-utils.github.io/stac-fastapi-elasticsearch-opensearch/](https://stac-utils.github.io/stac-fastapi-elasticsearch-opensearch/)
+- **Source**: [GitHub Repository](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/)
+
+## Installation
+
+```bash
+pip install stac-fastapi-core
+```
+
+## Quick Start
+
+For detailed usage and examples, please refer to the [main documentation](https://stac-utils.github.io/stac-fastapi-elasticsearch-opensearch/).

stac_fastapi/core/README.md

@@ -0,0 +1,60 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "stac_fastapi_core"
+description = "Core library for the Elasticsearch and Opensearch stac-fastapi backends."
+readme = "README.md"
+requires-python = ">=3.9"
+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",
+    "Programming Language :: Python :: 3.14",
+    "License :: OSI Approved :: MIT License",
+]
+keywords = [
+    "STAC",
+    "STAC-API",
+    "FastAPI",
+    "stac-fastapi",
+    "Elasticsearch",
+    "Opensearch",
+]
+dynamic = ["version"]
+dependencies = [
+    "fastapi~=0.109.0",
+    "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",
+    "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",
+]
+
+[project.urls]
+Homepage = "https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch"
+
+[tool.hatch.version]
+path = "stac_fastapi/core/version.py"
+
+[tool.hatch.build.targets.sdist]
+exclude = ["alembic", "tests", "scripts"]
+
+[tool.hatch.build.targets.wheel]
+only-include = ["stac_fastapi"]

stac_fastapi/core/pyproject.toml

@@ -3,6 +3,7 @@
 import json
 import logging
 from typing import List, Optional, Tuple
+from urllib.parse import parse_qs, urlencode, urlparse, urlunparse
 
 from pydantic import field_validator
 from pydantic_settings import BaseSettings
@@ -108,7 +109,7 @@ class RedisSettings(BaseSettings):
 
     REDIS_HOST: str = ""
     REDIS_PORT: int = 6379
-    REDIS_DB: int = 0
+    REDIS_DB: int = 15
 
     REDIS_MAX_CONNECTIONS: int = 10
     REDIS_RETRY_TIMEOUT: bool = True
@@ -218,23 +219,54 @@ async def connect_redis() -> Optional[aioredis.Redis]:
         return None
 
 
-async def save_self_link(
-    redis: aioredis.Redis, token: Optional[str], self_href: str
+def get_redis_key(url: str, token: str) -> str:
+    """Create Redis key using URL path and token."""
+    parsed = urlparse(url)
+    return f"nav:{parsed.path}:{token}"
+
+
+def build_url_with_token(base_url: str, token: str) -> str:
+    """Build URL with token parameter."""
+    parsed = urlparse(base_url)
+    query_params = parse_qs(parsed.query)
+
+    query_params["token"] = [token]
+
+    new_query = urlencode(query_params, doseq=True)
+
+    return urlunparse(
+        (
+            parsed.scheme,
+            parsed.netloc,
+            parsed.path,
+            parsed.params,
+            new_query,
+            parsed.fragment,
+        )
+    )
+
+
+async def save_prev_link(
+    redis: aioredis.Redis, next_url: str, current_url: str, next_token: str
 ) -> None:
-    """Save the self link for the current token."""
-    if token:
+    """Save the current page as the previous link for the next URL."""
+    if next_url and next_token:
         if sentinel_settings.REDIS_SENTINEL_HOSTS:
             ttl_seconds = sentinel_settings.REDIS_SELF_LINK_TTL
         elif standalone_settings.REDIS_HOST:
             ttl_seconds = standalone_settings.REDIS_SELF_LINK_TTL
-        await redis.setex(f"nav:self:{token}", ttl_seconds, self_href)
+        key = get_redis_key(next_url, next_token)
+        await redis.setex(key, ttl_seconds, current_url)
 
 
-async def get_prev_link(redis: aioredis.Redis, token: Optional[str]) -> Optional[str]:
+async def get_prev_link(
+    redis: aioredis.Redis, current_url: str, current_token: str
+) -> Optional[str]:
     """Get the previous page link for the current token."""
-    if not token:
+    if not current_url or not current_token:
         return None
-    return await redis.get(f"nav:self:{token}")
+    key = get_redis_key(current_url, current_token)
+    return await redis.get(key)
 
 
 async def redis_pagination_links(
@@ -248,19 +280,21 @@ async def redis_pagination_links(
 
     try:
         if next_token:
-            await save_self_link(redis, next_token, current_url)
-
-        prev_link = await get_prev_link(redis, token)
-        if prev_link:
-            links.insert(
-                0,
-                {
-                    "rel": "previous",
-                    "type": "application/json",
-                    "method": "GET",
-                    "href": prev_link,
-                },
-            )
+            next_url = build_url_with_token(current_url, next_token)
+            await save_prev_link(redis, next_url, current_url, next_token)
+
+        if token:
+            prev_link = await get_prev_link(redis, current_url, token)
+            if prev_link:
+                links.insert(
+                    0,
+                    {
+                        "rel": "previous",
+                        "type": "application/json",
+                        "method": "GET",
+                        "href": prev_link,
+                    },
+                )
     except Exception as e:
         logger.warning(f"Redis pagination operation failed: {e}")
     finally:

stac_fastapi/core/setup.cfg

@@ -1,2 +1,2 @@
 """library version."""
-__version__ = "6.5.1"
+__version__ = "6.6.0"