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_pagination_links,
+    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
@@ -329,20 +334,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 +432,37 @@ async def all_collections(
             },
         ]
 
-        if redis_enable and redis:
-            if next_token:
-                await save_self_link(redis, next_token, current_url)
+        current_url = str(request.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,
-                    },
-                )
+        await handle_pagination_links(current_url, token, next_token, links)
+
+        # 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:
+        #     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,
+        #             },
+        #         )
 
         if next_token:
             next_link = PagingLinks(next=next_token, request=request).link_next()

stac_fastapi/core/stac_fastapi/core/redis_utils.py

@@ -1,11 +1,14 @@
 """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
 
 
@@ -122,3 +125,37 @@ 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}")
+
+
+logger = logging.getLogger(__name__)
+
+
+async def handle_pagination_links(
+    current_url: str, token: str, next_token: str, links: list
+) -> None:
+    """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:
+        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,
+                },
+            )