Skip to content

Commit 98908eb

Browse files
Yuri ZmytrakovYuri Zmytrakov
Yuri Zmytrakov
authored and
Yuri Zmytrakov
committed
temp
1 parent cb7ee7c commit 98908eb

File tree

2 files changed

+97
-54
lines changed

2 files changed

+97
-54
lines changed

‎stac_fastapi/core/stac_fastapi/core/core.py‎

Lines changed: 60 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
from stac_fastapi.core.base_settings import ApiBaseSettings
2525
from stac_fastapi.core.datetime_utils import format_datetime_range
2626
from stac_fastapi.core.models.links import PagingLinks
27-
from stac_fastapi.core.redis_utils import connect_redis, get_prev_link, save_self_link
27+
from stac_fastapi.core.redis_utils import handle_pagination_links
2828
from stac_fastapi.core.serializers import CollectionSerializer, ItemSerializer
2929
from stac_fastapi.core.session import Session
30-
from stac_fastapi.core.utilities import filter_fields, get_bool_env
30+
from stac_fastapi.core.utilities import filter_fields
3131
from stac_fastapi.extensions.core.transaction import AsyncBaseTransactionsClient
3232
from stac_fastapi.extensions.core.transaction.request import (
3333
PartialCollection,
@@ -329,20 +329,6 @@ async def all_collections(
329329
if parsed_sort:
330330
sort = parsed_sort
331331

332-
current_url = str(request.url)
333-
redis_enable = get_bool_env("REDIS_ENABLE", default=False)
334-
335-
redis = None
336-
if redis_enable:
337-
try:
338-
redis = await connect_redis()
339-
logger.info("Redis connection established successfully")
340-
except Exception as e:
341-
redis = None
342-
logger.warning(
343-
f"Redis connection failed, continuing without Redis: {e}"
344-
)
345-
346332
# Convert q to a list if it's a string
347333
q_list = None
348334
if q is not None:
@@ -441,21 +427,37 @@ async def all_collections(
441427
},
442428
]
443429

444-
if redis_enable and redis:
445-
if next_token:
446-
await save_self_link(redis, next_token, current_url)
430+
current_url = str(request.url)
447431

448-
prev_link = await get_prev_link(redis, token)
449-
if prev_link:
450-
links.insert(
451-
0,
452-
{
453-
"rel": "prev",
454-
"type": "application/json",
455-
"method": "GET",
456-
"href": prev_link,
457-
},
458-
)
432+
await handle_pagination_links(current_url, token, next_token, links)
433+
434+
# redis_enable = get_bool_env("REDIS_ENABLE", default=False)
435+
436+
# redis = None
437+
# if redis_enable:
438+
# try:
439+
# redis = await connect_redis()
440+
# logger.info("Redis connection established successfully")
441+
# except Exception as e:
442+
# redis = None
443+
# logger.warning(
444+
# f"Redis connection failed, continuing without Redis: {e}"
445+
# )
446+
# if redis_enable and redis:
447+
# if next_token:
448+
# await save_self_link(redis, next_token, current_url)
449+
450+
# prev_link = await get_prev_link(redis, token)
451+
# if prev_link:
452+
# links.insert(
453+
# 0,
454+
# {
455+
# "rel": "prev",
456+
# "type": "application/json",
457+
# "method": "GET",
458+
# "href": prev_link,
459+
# },
460+
# )
459461

460462
if next_token:
461463
next_link = PagingLinks(next=next_token, request=request).link_next()
@@ -775,7 +777,7 @@ async def post_search(
775777
HTTPException: If there is an error with the cql2_json filter.
776778
"""
777779
base_url = str(request.base_url)
778-
redis_enable = get_bool_env("REDIS_ENABLE", default=False)
780+
# redis_enable = get_bool_env("REDIS_ENABLE", default=False)
779781

780782
search = self.database.make_search()
781783

@@ -901,29 +903,33 @@ async def post_search(
901903
)
902904
links.extend(collection_links)
903905

904-
if redis_enable:
905-
redis = None
906-
try:
907-
redis = await connect_redis()
908-
logger.info("Redis connection established successfully")
909-
self_link = str(request.url)
910-
await save_self_link(redis, next_token, self_link)
911-
912-
prev_link = await get_prev_link(redis, token_param)
913-
if prev_link:
914-
links.insert(
915-
0,
916-
{
917-
"rel": "prev",
918-
"type": "application/json",
919-
"method": "GET",
920-
"href": prev_link,
921-
},
922-
)
923-
except Exception as e:
924-
logger.warning(
925-
f"Redis connection failed, continuing without Redis: {e}"
926-
)
906+
current_url = str(request.url)
907+
908+
await handle_pagination_links(current_url, token_param, next_token, links)
909+
910+
# if redis_enable:
911+
# redis = None
912+
# try:
913+
# redis = await connect_redis()
914+
# logger.info("Redis connection established successfully")
915+
# self_link = str(request.url)
916+
# await save_self_link(redis, next_token, self_link)
917+
918+
# prev_link = await get_prev_link(redis, token_param)
919+
# if prev_link:
920+
# links.insert(
921+
# 0,
922+
# {
923+
# "rel": "prev",
924+
# "type": "application/json",
925+
# "method": "GET",
926+
# "href": prev_link,
927+
# },
928+
# )
929+
# except Exception as e:
930+
# logger.warning(
931+
# f"Redis connection failed, continuing without Redis: {e}"
932+
# )
927933

928934
return stac_types.ItemCollection(
929935
type="FeatureCollection",

‎stac_fastapi/core/stac_fastapi/core/redis_utils.py‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
"""Utilities for connecting to and managing Redis connections."""
22

3+
import logging
34
from typing import Optional
45

56
from pydantic_settings import BaseSettings
67
from redis import asyncio as aioredis
78
from redis.asyncio.sentinel import Sentinel
89

10+
from stac_fastapi.core.utilities import get_bool_env
11+
912
redis_pool: Optional[aioredis.Redis] = None
1013

1114

@@ -122,3 +125,37 @@ async def get_prev_link(redis: aioredis.Redis, token: Optional[str]) -> Optional
122125
if not token:
123126
return None
124127
return await redis.get(f"nav:self:{token}")
128+
129+
130+
logger = logging.getLogger(__name__)
131+
132+
133+
async def handle_pagination_links(
134+
current_url: str, token: str, next_token: str, links: list
135+
) -> None:
136+
"""Handle Redis pagination."""
137+
redis_enable = get_bool_env("REDIS_ENABLE", default=False)
138+
redis = None
139+
if redis_enable:
140+
try:
141+
redis = await connect_redis()
142+
logger.info("Redis connection established successfully")
143+
except Exception as e:
144+
redis = None
145+
logger.warning(f"Redis connection failed, continuing without Redis: {e}")
146+
147+
if redis_enable and redis:
148+
if next_token:
149+
await save_self_link(redis, next_token, current_url)
150+
151+
prev_link = await get_prev_link(redis, token)
152+
if prev_link:
153+
links.insert(
154+
0,
155+
{
156+
"rel": "prev",
157+
"type": "application/json",
158+
"method": "GET",
159+
"href": prev_link,
160+
},
161+
)

0 commit comments

Comments
 (0)