-
Notifications
You must be signed in to change notification settings - Fork 30
Search optimization and indexing based on datetime #405
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 7 commits
590ccb3
c9668ac
db4a4dc
60d517f
f2da9c5
6ba27fd
3159e05
b2ff45b
3ff0a9f
cdceee9
36357c3
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -37,6 +37,7 @@ | |
BulkTransactionMethod, | ||
Items, | ||
) | ||
from stac_fastapi.sfeos_helpers.database import return_date | ||
from stac_fastapi.types import stac as stac_types | ||
from stac_fastapi.types.conformance import BASE_CONFORMANCE_CLASSES | ||
from stac_fastapi.types.core import AsyncBaseCoreClient | ||
|
@@ -324,10 +325,16 @@ async def item_collection( | |
search=search, collection_ids=[collection_id] | ||
) | ||
|
||
if datetime: | ||
try: | ||
datetime_search = return_date(datetime) | ||
search = self.database.apply_datetime_filter( | ||
search=search, interval=datetime | ||
search=search, datetime_search=datetime_search | ||
) | ||
except (ValueError, TypeError) as e: | ||
# Handle invalid interval formats if return_date fails | ||
msg = f"Invalid interval format: {datetime}, error: {e}" | ||
logger.error(msg) | ||
raise HTTPException(status_code=400, detail=msg) | ||
|
||
if bbox: | ||
bbox = [float(x) for x in bbox] | ||
|
@@ -342,6 +349,7 @@ async def item_collection( | |
sort=None, | ||
token=token, | ||
collection_ids=[collection_id], | ||
datetime_search=datetime_search, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this needed? We apply the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is needed in this function so that you can find which index this product is in. |
||
) | ||
|
||
items = [ | ||
|
@@ -500,10 +508,16 @@ async def post_search( | |
search=search, collection_ids=search_request.collections | ||
) | ||
|
||
if search_request.datetime: | ||
try: | ||
datetime_search = return_date(search_request.datetime) | ||
search = self.database.apply_datetime_filter( | ||
search=search, interval=search_request.datetime | ||
search=search, datetime_search=datetime_search | ||
) | ||
except (ValueError, TypeError) as e: | ||
# Handle invalid interval formats if return_date fails | ||
msg = f"Invalid interval format: {search_request.datetime}, error: {e}" | ||
logger.error(msg) | ||
raise HTTPException(status_code=400, detail=msg) | ||
|
||
if search_request.bbox: | ||
bbox = search_request.bbox | ||
|
@@ -560,6 +574,7 @@ async def post_search( | |
token=search_request.token, | ||
sort=sort, | ||
collection_ids=search_request.collections, | ||
datetime_search=datetime_search, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here -- Is this needed? We apply the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. as above |
||
) | ||
|
||
fields = ( | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
"""Serializers.""" | ||
|
||
import abc | ||
from copy import deepcopy | ||
from typing import Any, List, Optional | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
"""database session management.""" | ||
|
||
import logging | ||
|
||
import attr | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The core module should not import from sfeos_helpers. Can we apply this function in Elasticsearch/ Opensearch database_logic.py? Ideally the core module should be database agnostic.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done