-
Notifications
You must be signed in to change notification settings - Fork 28
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
Open
GrzegorzPustulka
wants to merge
7
commits into
stac-utils:main
Choose a base branch
from
GrzegorzPustulka:search_optimization
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+2,239
−129
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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, | ||
) | ||
|
||
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 = ( | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
"""database session management.""" | ||
|
||
import logging | ||
|
||
import attr | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Is this needed? We apply the
datetime_search
to thesearch
variable on line 331. If this is optional, could we omit it?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.
This is needed in this function so that you can find which index this product is in.