Skip to content
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

[Issue 3545] relative date search #3640

Merged
merged 18 commits into from
Jan 28, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add relative dates to filter builder
babebe committed Jan 22, 2025
commit 3c26b4b268a3a48010a6e0bca6e0720e22cba0bf
11 changes: 8 additions & 3 deletions api/src/adapters/search/opensearch_query_builder.py
Original file line number Diff line number Diff line change
@@ -195,7 +195,7 @@ def filter_int_range(
return self

def filter_date_range(
self, field: str, start_date: datetime.date | None, end_date: datetime.date | None
self, field: str, start_date: datetime.date | None, end_date: datetime.date | None, start_date_relative: int | None, end_date_relative: int | None
) -> typing.Self:
"""
For a given field, filter results to a range of dates.
@@ -206,15 +206,20 @@ def filter_date_range(
These filters do not affect the relevancy score, they are purely
a binary filter on the overall results.
"""
if start_date is None and end_date is None:
raise ValueError("Cannot use date range filter if both start and end are None")
if (start_date is None and end_date is None) and (start_date_relative is None and end_date_relative is None):
raise ValueError("Cannot use date range filter if both start and end are None or start_date_relative andend_date_relative are None")

range_filter = {}
if start_date is not None:
range_filter["gte"] = start_date.isoformat()
if end_date is not None:
range_filter["lte"] = end_date.isoformat()

if start_date_relative is not None:
range_filter["gte"] = f"now+{abs(start_date_relative)}d" if start_date_relative >= 0 else f"now-{abs(start_date_relative)}d"
if end_date_relative is not None:
range_filter["lte"] = f"now+{abs(end_date_relative)}d" if end_date_relative >= 0 else f"now-{abs(end_date_relative)}d"

self.filters.append({"range": {field: range_filter}})
return self

Original file line number Diff line number Diff line change
@@ -127,7 +127,7 @@ def _add_search_filters(
builder.filter_int_range(field_name, field_filters.min, field_filters.max)

elif isinstance(field_filters, DateSearchFilter):
builder.filter_date_range(field_name, field_filters.start_date, field_filters.end_date)
builder.filter_date_range(field_name, field_filters.start_date, field_filters.end_date, field_filters.start_date_relative, field_filters.end_date_relative)


def _add_aggregations(builder: search.SearchQueryBuilder) -> None: