temp

Author: Yuri Zmytrakov

stac_fastapi/core/stac_fastapi/core/core.py

@@ -24,10 +24,10 @@
 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 handle_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
+from stac_fastapi.core.utilities import filter_fields
 from stac_fastapi.extensions.core.transaction import AsyncBaseTransactionsClient
 from stac_fastapi.extensions.core.transaction.request import (
     PartialCollection,
@@ -329,20 +329,6 @@ async def all_collections(
             if parsed_sort:
                 sort = parsed_sort
 
-        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,21 +427,10 @@ async def all_collections(
             },
         ]
 
-        if redis_enable and redis:
-            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": "prev",
-                        "type": "application/json",
-                        "method": "GET",
-                        "href": prev_link,
-                    },
-                )
+        current_url = str(request.url)
+        await handle_pagination_links(
+            current_url=current_url, token=token, next_token=next_token, links=links
+        )
 
         if next_token:
             next_link = PagingLinks(next=next_token, request=request).link_next()
@@ -775,7 +750,7 @@ 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)
+        # redis_enable = get_bool_env("REDIS_ENABLE", default=False)
 
         search = self.database.make_search()
 
@@ -901,29 +876,13 @@ async def post_search(
                 )
         links.extend(collection_links)
 
-        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}"
-                )
+        current_url = str(request.url)
+        await handle_pagination_links(
+            current_url=current_url,
+            token=token_param,
+            next_token=next_token,
+            links=links,
+        )
 
         return stac_types.ItemCollection(
             type="FeatureCollection",

stac_fastapi/core/stac_fastapi/core/redis_utils.py

@@ -1,13 +1,18 @@
 """Utilities for connecting to and managing Redis connections."""
 
+import logging
 from typing import Optional
 
 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."""
@@ -109,16 +114,37 @@ async def connect_redis_sentinel(
     return redis_pool
 
 
-async def save_self_link(
-    redis: aioredis.Redis, token: Optional[str], self_href: str
+async def handle_pagination_links(
+    current_url: str, token: str, next_token: str, links: list
 ) -> None:
-    """Save the self link for the current token with 30 min TTL."""
-    if token:
-        await redis.setex(f"nav:self:{token}", 1800, self_href)
-
-
-async def get_prev_link(redis: aioredis.Redis, token: Optional[str]) -> Optional[str]:
-    """Get the previous page link for the current token (if exists)."""
-    if not token:
-        return None
-    return await redis.get(f"nav:self:{token}")
+    """Handle Redis pagination."""
+    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}")
+
+    if redis_enable and redis:
+        # Save self link for next token (replaces save_self_link)
+        if next_token:
+            await redis.setex(f"nav:self:{next_token}", 1800, current_url)
+
+        # Get previous link for current token (replaces get_prev_link)
+        prev_link = None
+        if token:
+            prev_link = await redis.get(f"nav:self:{token}")
+
+        if prev_link:
+            links.insert(
+                0,
+                {
+                    "rel": "prev",
+                    "type": "application/json",
+                    "method": "GET",
+                    "href": prev_link,
+                },
+            )