sij/khoj
1
0
Fork 0
mirror of https://github.com/khoj-ai/khoj.git synced 2025-02-17 08:04:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make date_filter.extract_date_range method always return a list type

Browse source
This commit is contained in:
Debanjum Singh Solanky 2023-08-27 19:17:53 -07:00
parent d5a2de6222
commit 794bad8bcb
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/khoj/search_filter/date_filter.py
View file

@ -63,7 +63,7 @@ class DateFilter(BaseFilter):
query_daterange = self.extract_date_range(query) query_daterange = self.extract_date_range(query)
# if no date in query, return all entries # if no date in query, return all entries
if query_daterange is None: if query_daterange == []:
return query, set(range(len(entries))) return query, set(range(len(entries)))
query = self.defilter(query) query = self.defilter(query)
@ -96,7 +96,7 @@ class DateFilter(BaseFilter):
date_range_matches = re.findall(self.date_regex, query) date_range_matches = re.findall(self.date_regex, query)
if len(date_range_matches) == 0: if len(date_range_matches) == 0:
return None return []
# extract, parse natural dates ranges from date range filter passed in query # extract, parse natural dates ranges from date range filter passed in query
# e.g today maps to (start_of_day, start_of_tomorrow) # e.g today maps to (start_of_day, start_of_tomorrow)
@ -111,7 +111,7 @@ class DateFilter(BaseFilter):
# >=yesterday maps to [start_of_yesterday, inf) # >=yesterday maps to [start_of_yesterday, inf)
# <tomorrow maps to [0, start_of_tomorrow) # <tomorrow maps to [0, start_of_tomorrow)
# --- # ---
effective_date_range = [0, inf] effective_date_range: List = [0, inf]
date_range_considering_comparator = [] date_range_considering_comparator = []
for cmp, (dtrange_start, dtrange_end) in date_ranges_from_filter: for cmp, (dtrange_start, dtrange_end) in date_ranges_from_filter:
if cmp == ">": if cmp == ">":
@ -136,7 +136,7 @@ class DateFilter(BaseFilter):
] ]
if effective_date_range == [0, inf] or effective_date_range[0] > effective_date_range[1]: if effective_date_range == [0, inf] or effective_date_range[0] > effective_date_range[1]:
return None return []
else: else:
return effective_date_range return effective_date_range

6
tests/test_date_filter.py
View file

@ -68,13 +68,13 @@ def test_extract_date_range():
] ]
# Unparseable date filter specified in query # Unparseable date filter specified in query
assert DateFilter().extract_date_range('head dt:"Summer of 69" tail') == None assert DateFilter().extract_date_range('head dt:"Summer of 69" tail') == []
# No date filter specified in query # No date filter specified in query
assert DateFilter().extract_date_range("head tail") == None assert DateFilter().extract_date_range("head tail") == []
# Non intersecting date ranges # Non intersecting date ranges
assert DateFilter().extract_date_range('head dt>"1984-01-01" dt<"1984-01-01" tail') == None assert DateFilter().extract_date_range('head dt>"1984-01-01" dt<"1984-01-01" tail') == []
@pytest.mark.filterwarnings("ignore:The localize method is no longer necessary.") @pytest.mark.filterwarnings("ignore:The localize method is no longer necessary.")