temp

Author: Yuri Zmytrakov

stac_fastapi/core/stac_fastapi/core/core.py

@@ -24,7 +24,12 @@
 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 connect_redis, get_prev_link, save_self_link
+from stac_fastapi.core.redis_utils import (
+    connect_redis,
+    get_prev_link,
+    handle_redis_pagination,
+    save_self_link,
+)
 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
@@ -332,17 +337,6 @@ async def all_collections(
         current_url = str(request.url)
         redis_enable = get_bool_env("REDIS_ENABLE", default=False)
 
-        redis = None
-        if redis_enable:
-            try:
-                redis = await connect_redis()
-                logger.info("Redis connection established successfully")
-            except Exception as e:
-                redis = None
-                logger.warning(
-                    f"Redis connection failed, continuing without Redis: {e}"
-                )
-
         # Convert q to a list if it's a string
         q_list = None
         if q is not None:
@@ -441,6 +435,17 @@ async def all_collections(
             },
         ]
 
+        redis = None
+        if redis_enable:
+            try:
+                redis = await connect_redis()
+                logger.info("Redis connection established successfully")
+            except Exception as e:
+                redis = None
+                logger.warning(
+                    f"Redis connection failed, continuing without Redis: {e}"
+                )
+
         if redis_enable and redis:
             if next_token:
                 await save_self_link(redis, next_token, current_url)
@@ -775,7 +780,6 @@ async def post_search(
             HTTPException: If there is an error with the cql2_json filter.
         """
         base_url = str(request.base_url)
-        redis_enable = get_bool_env("REDIS_ENABLE", default=False)
 
         search = self.database.make_search()
 
@@ -900,30 +904,33 @@ async def post_search(
                     ]
                 )
         links.extend(collection_links)
+        redis_enable = get_bool_env("REDIS_ENABLE", default=False)
 
-        if redis_enable:
-            redis = None
-            try:
-                redis = await connect_redis()
-                logger.info("Redis connection established successfully")
-                self_link = str(request.url)
-                await save_self_link(redis, next_token, self_link)
-
-                prev_link = await get_prev_link(redis, token_param)
-                if prev_link:
-                    links.insert(
-                        0,
-                        {
-                            "rel": "prev",
-                            "type": "application/json",
-                            "method": "GET",
-                            "href": prev_link,
-                        },
-                    )
-            except Exception as e:
-                logger.warning(
-                    f"Redis connection failed, continuing without Redis: {e}"
-                )
+        handle_redis_pagination(request, links, next_token, token_param, redis_enable)
+
+        # if redis_enable:
+        #     redis = None
+        #     try:
+        #         redis = await connect_redis()
+        #         logger.info("Redis connection established successfully")
+        #         self_link = str(request.url)
+        #         await save_self_link(redis, next_token, self_link)
+
+        #         prev_link = await get_prev_link(redis, token_param)
+        #         if prev_link:
+        #             links.insert(
+        #                 0,
+        #                 {
+        #                     "rel": "prev",
+        #                     "type": "application/json",
+        #                     "method": "GET",
+        #                     "href": prev_link,
+        #                 },
+        #             )
+        #     except Exception as e:
+        #         logger.warning(
+        #             f"Redis connection failed, continuing without Redis: {e}"
+        #         )
 
         return stac_types.ItemCollection(
             type="FeatureCollection",

stac_fastapi/core/stac_fastapi/core/redis_utils.py

@@ -1,13 +1,19 @@
 """Utilities for connecting to and managing Redis connections."""
 
-from typing import Optional
+import logging
+from typing import Dict, List, Optional
 
+from fastapi import Request
 from pydantic_settings import BaseSettings
 from redis import asyncio as aioredis
 from redis.asyncio.sentinel import Sentinel
 
+from stac_fastapi.core.utilities import get_bool_env
+
 redis_pool: Optional[aioredis.Redis] = None
 
+logger = logging.getLogger(__name__)
+
 
 class RedisSentinelSettings(BaseSettings):
     """Configuration for connecting to Redis Sentinel."""
@@ -122,3 +128,53 @@ async def get_prev_link(redis: aioredis.Redis, token: Optional[str]) -> Optional
     if not token:
         return None
     return await redis.get(f"nav:self:{token}")
+
+
+async def handle_redis_pagination(
+    request: Request,
+    links: List[Dict],
+    next_token: Optional[str] = None,
+    current_token: Optional[str] = None,
+    redis_enable: Optional[bool] = None,
+) -> None:
+    """
+    Handle Redis-based pagination for both items and collections.
+
+    Args:
+        request: FastAPI request object
+        links: Links array to modify
+        next_token: Token for the next page (used to save current URL)
+        current_token: Current page token (used to retrieve previous page)
+        redis_enable: Whether Redis is enabled (auto-detected if None)
+    """
+    # Auto-detect Redis enablement if not provided
+    if redis_enable is None:
+        redis_enable = get_bool_env("REDIS_ENABLE", default=False)
+
+    if not redis_enable:
+        return
+
+    try:
+        redis = await connect_redis()
+        logger.info("Redis connection established successfully")
+
+        # Save current URL for next page's previous link
+        if next_token:
+            self_link = str(request.url)
+            await save_self_link(redis, next_token, self_link)
+
+        # Get previous page link if available
+        if current_token:
+            prev_link = await get_prev_link(redis, current_token)
+            if prev_link:
+                links.insert(
+                    0,
+                    {
+                        "rel": "prev",
+                        "type": "application/json",
+                        "method": "GET",
+                        "href": prev_link,
+                    },
+                )
+    except Exception as e:
+        logger.warning(f"Redis connection failed, continuing without Redis: {e}")