From 794bad8bcb28dc8a30eb5fd3063a130cd3b6b92b Mon Sep 17 00:00:00 2001 From: Debanjum Singh Solanky Date: Sun, 27 Aug 2023 19:17:53 -0700 Subject: [PATCH] Make date_filter.extract_date_range method always return a list type --- src/khoj/search_filter/date_filter.py | 8 ++++---- tests/test_date_filter.py | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/khoj/search_filter/date_filter.py b/src/khoj/search_filter/date_filter.py index ca35f7c7..16a418be 100644 --- a/src/khoj/search_filter/date_filter.py +++ b/src/khoj/search_filter/date_filter.py @@ -63,7 +63,7 @@ class DateFilter(BaseFilter): query_daterange = self.extract_date_range(query) # if no date in query, return all entries - if query_daterange is None: + if query_daterange == []: return query, set(range(len(entries))) query = self.defilter(query) @@ -96,7 +96,7 @@ class DateFilter(BaseFilter): date_range_matches = re.findall(self.date_regex, query) if len(date_range_matches) == 0: - return None + return [] # extract, parse natural dates ranges from date range filter passed in query # 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) # ": @@ -136,7 +136,7 @@ class DateFilter(BaseFilter): ] if effective_date_range == [0, inf] or effective_date_range[0] > effective_date_range[1]: - return None + return [] else: return effective_date_range diff --git a/tests/test_date_filter.py b/tests/test_date_filter.py index 90cc5b93..00e6bfa3 100644 --- a/tests/test_date_filter.py +++ b/tests/test_date_filter.py @@ -68,13 +68,13 @@ def test_extract_date_range(): ] # 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 - assert DateFilter().extract_date_range("head tail") == None + assert DateFilter().extract_date_range("head tail") == [] # 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.")