Update app.py

app.py

@@ -363,28 +363,58 @@ def extract_month_year(q):
     yr = int(ym.group()) if ym else None
     return mon, yr
 
+# def extract_date_range(query):
+#     """
+#     Extracts a start and end month-year from a question like 'from Jan 2024 to May 2025'
+#     """
+#     month_map = {
+#         "january": 1, "february": 2, "march": 3, "april": 4, "may": 5, "june": 6,
+#         "july": 7, "august": 8, "september": 9, "october": 10, "november": 11, "december": 12
+#     }
+#     # pattern = r"(?i)from\s+([a-zA-Z]+)\s+(\d{4})\s+(to|until)\s+([a-zA-Z]+)\s+(\d{4})"
+#     pattern = [
+#         r"(?i)(from|between)?\s*([a-zA-Z]+)\s+(\d{4})\s*(to|through|and|-)\s*([a-zA-Z]+)\s+(\d{4})",
+#     ]
+#     match = re.search(pattern, query)
+#     if match:
+#         start_month_str, start_year = match.group(1).lower(), int(match.group(2))
+#         end_month_str, end_year = match.group(4).lower(), int(match.group(5))
+#         start_month = month_map.get(start_month_str)
+#         end_month = month_map.get(end_month_str)
+#         if start_month and end_month:
+#             start_date = datetime(start_year, start_month, 1)
+#             end_date = datetime(end_year, end_month, 28) 
+#             return start_date, end_date
+#     return None, None
+
 def extract_date_range(query):
     """
     Extracts a start and end month-year from a question like 'from Jan 2024 to May 2025'
+    Supports patterns like 'from', 'between', 'to', 'through', 'and', '-'.
     """
     month_map = {
         "january": 1, "february": 2, "march": 3, "april": 4, "may": 5, "june": 6,
         "july": 7, "august": 8, "september": 9, "october": 10, "november": 11, "december": 12
     }
-    # pattern = r"(?i)from\s+([a-zA-Z]+)\s+(\d{4})\s+(to|until)\s+([a-zA-Z]+)\s+(\d{4})"
-    pattern = [
-        r"(?i)(from|between)?\s*([a-zA-Z]+)\s+(\d{4})\s*(to|through|and|-)\s*([a-zA-Z]+)\s+(\d{4})",
+
+    patterns = [
+        r"(?i)(?:from|between)?\s*([a-zA-Z]+)\s+(\d{4})\s*(?:to|through|and|-)\s*([a-zA-Z]+)\s+(\d{4})",
     ]
-    match = re.search(pattern, query)
-    if match:
-        start_month_str, start_year = match.group(1).lower(), int(match.group(2))
-        end_month_str, end_year = match.group(4).lower(), int(match.group(5))
-        start_month = month_map.get(start_month_str)
-        end_month = month_map.get(end_month_str)
-        if start_month and end_month:
-            start_date = datetime(start_year, start_month, 1)
-            end_date = datetime(end_year, end_month, 28) 
-            return start_date, end_date
+
+    for pattern in patterns:
+        match = re.search(pattern, query)
+        if match:
+            start_month_str, start_year = match.group(1).lower(), int(match.group(2))
+            end_month_str, end_year = match.group(3).lower(), int(match.group(4))
+
+            start_month = month_map.get(start_month_str)
+            end_month = month_map.get(end_month_str)
+
+            if start_month and end_month:
+                start_date = datetime(start_year, start_month, 1)
+                end_date = datetime(end_year, end_month, 28)  # safe default
+                return start_date, end_date
+
     return None, None
 
 def extract_topic_match(query, df):