Update app.py

app.py

@@ -5,9 +5,9 @@ import datetime
 import copy
 
 # Absolute Date [or pieces of it]
-mdy_abs_1 = re.compile('[0-9]{1,2}[-\/.][0-9]{1,2}([-\/.][0-9]{4})?', re.IGNORECASE) #12-13-2023"
-mdy_abs_2 = re.compile('(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec|january|february|march|april|may|june|july|august|sept|september|october|november|december)\.? ?[0-9]{1,2}(th|st|nd|rd)*,? ?([0-9]{4})?', re.IGNORECASE) # July 3
-mdy_abs_3 = re.compile('[0-9]{1,2}(th|st|nd|rd)* ?(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec|january|february|march|april|may|june|july|august|sept|september|october|november|december),? ?([0-9]{4})?', re.IGNORECASE)
+mdy_abs_1 = re.compile('[^0-9][0-9]{1,2}[-\/.][0-9]{1,2}([-\/.][0-9]{4})?([^a-z]|$)', re.IGNORECASE) #12-13-2023, and no digits before"
+mdy_abs_3 = re.compile('(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec|january|february|march|april|may|june|july|august|sept|september|october|november|december)\.? ?[0-9]{1,2}(th|st|nd|rd)*,? ?([0-9]{4})?', re.IGNORECASE) # July 3
+mdy_abs_2 = re.compile('[0-9]{1,2}(th|st|nd|rd)* ?(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec|january|february|march|april|may|june|july|august|sept|september|october|november|december),? ?([0-9]{4})?', re.IGNORECASE)
 m_abs_1 = re.compile('(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec|january|february|march|april|may|june|july|august|sept|september|october|november|december)', re.IGNORECASE) # Just month
 d_abs_1 = re.compile('[0-9]{1,2}(th|st|nd|rd)*', re.IGNORECASE) # Just date
 
@@ -25,7 +25,6 @@ del_hours_rel_1 = re.compile('([0-9]{1,2}|(|a|the|one|two|three|few|four|five|si
 
 adverbs = re.compile('(from|after|before|next|end|this|past) ', re.IGNORECASE) # Adverbs used to resolve if multiple patterns are "hit". This leads to the "addition" problem (described on notion).
 
-
 def abs_date_parse(snip):
     month_dict = {'jan': 1, 'january': 1, 'feb': 2, 'february': 2, 'mar': 3, 'march': 3, 'apr': 4, 'april': 4, 'may': 5, 'jun': 6, 'june': 6, 'jul': 7, 'july': 7, 'aug': 8, 'august': 8, 'sep': 9, 'sept': 9, 'september': 9, 'oct': 10, 'october': 10, 'nov': 11, 'november': 11, 'dec': 12, 'december': 12}
     month, date, year = None, None, None
@@ -40,6 +39,8 @@ def abs_date_parse(snip):
         for w in words:
             if w in month_dict:
                 month = month_dict[w]
+                continue
+            w = w.replace('st', '').replace('nd', '').replace('rd', '').replace('th', '')
             if w.isdigit() and int(w) > 31:
                 year = int(w)
             if w.isdigit() and int(w) <= 31:
@@ -101,12 +102,15 @@ def rel_date_parse(snip):
     snip = snip.lower()
     d = datetime.datetime.now()
     dow_dict = {'monday':0, 'mon':0, 'tue':1, 'tues':1, 'tuesday':1, 'wed':2, 'weds':2, 'wednesday':2, 'thu':3, 'thurs':3, 'fri':4, 'friday':4, 'sat':5, 'saturday':5, 'sun':6, 'sunday':6}
-    if snip in dow_dict:
-        current_dow = d.weekday()
-        dow = dow_dict[snip]
-        if dow <= current_dow: # If they say same day, should that be next week? Or this week?
-            dow += 7
-        return datetime.timedelta(days=dow-current_dow)
+    dow_list = list(dow_dict.keys())
+    for dow in dow_list:
+        if dow in snip:
+            current_dow = d.weekday()
+            dow = dow_dict[dow]
+            if dow < current_dow: # If they say same day, should that be next week? Or this week?. Need to fix eventyally
+                print("--------------THIS DAY-OF-WEEK HAS PASSED----ADDING +7 DAYS------------------")
+                dow += 7
+            return datetime.timedelta(days=dow-current_dow)
     if "tomorrow" in snip:
         return datetime.timedelta(days=1)
     if "now" in snip or "today" in snip or "tonight" in snip:
@@ -114,23 +118,23 @@ def rel_date_parse(snip):
     if "day" in snip.split(' ') or "days" in snip.split(' '):
         if "one" in snip.split(' ') or " day" and "days" not in snip.split(' '):
             return datetime.timedelta(days=1)
-        if "two" in snip.split(' '):
+        if "two" in snip.split(' ') or "2" in snip.split(' '):
             return datetime.timedelta(days=2)
-        if "three" in snip.split(' '):
+        if "three" in snip.split(' ') or "3" in snip.split(' '):
             return datetime.timedelta(days=3)
-        if "four" in snip.split(' '):
+        if "four" in snip.split(' ') or "4" in snip.split(' '):
             return datetime.timedelta(days=4)
-        if "five" in snip.split(' '):
+        if "five" in snip.split(' ') or "5" in snip.split(' '):
             return datetime.timedelta(days=5)
-        if "six" in snip.split(' '):
+        if "six" in snip.split(' ') or "6" in snip.split(' '):
             return datetime.timedelta(days=6)
-        if "seven" in snip.split(' '):
+        if "seven" in snip.split(' ') or "7" in snip.split(' '):
             return datetime.timedelta(days=7)
-        if "eight" in snip.split(' '):
+        if "eight" in snip.split(' ') or "8" in snip.split(' '):
             return datetime.timedelta(days=8)
-        if "nine" in snip.split(' '):
+        if "nine" in snip.split(' ') or "9" in snip.split(' '):
             return datetime.timedelta(days=9)
-        if "ten" in snip.split(' '):
+        if "ten" in snip.split(' ') or "10" in snip.split(' '):
             return datetime.timedelta(days=10)
 
 def abs_time_parse(snip, inp):
@@ -155,13 +159,8 @@ def abs_time_parse(snip, inp):
     if 'a' in snip and hours >= 12:
         hours  -= 12
     if 'p' not in snip and 'a' not in snip:
-        # print("\nNo 'AM' or 'PM' provided. Making assumptions.")
-        # if ("evening" in inp or "night" in inp or "afternoon" in inp) and hours < 12:
-        #     hours += 12
-        # elif "morning" in inp and hours > 12:
-        #     morning -= 12
-        # else:
-            pass
+        print("\nNo 'AM' or 'PM' provided. Making assumptions.")
+        pass
     return datetime.time(hour=hours, minute=minutes)
 
 def rel_time_parse(snip):
@@ -214,18 +213,21 @@ def rel_rel_date_resolver(inp, term_1, term_2, td_1, td_2, adverbs, adv_inds):
     term_1_start = re.search(re.compile(term_1, re.IGNORECASE), inp).span()[0]
     term_2_start = re.search(re.compile(term_2, re.IGNORECASE), inp).span()[0]
     adv_ind, adv = get_relevant_adverb(inp, term_1, term_2, adverbs, adv_inds)
+    print(adv)
+    print(100000)
     if adv in ["after", "from", "past"]:
-        return td_1 + td_2
+        return td_1 + td_2, adv_ind
     if adv in ["before"]:
         if term_1_start < term_2_start:
-            return td_2-td_1
+            return td_2-td_1, adv_ind
         else:
-            return td_1-td_2
+            return td_1-td_2, adv_ind
     if adv is None:
         if td_1 == td_2: # Assume that they are the same
-            return td_1
+            print("-------------------ASSUMING CONSISTENCY BETWEEN RELATIVES-------------------------")
+            return td_1, adv_ind
         else:
-            raise  Exception("There is a conflict with the datetimes provided. '" + term_1.upper() + "' != '"  + term_2.upper() + "'")
+            raise Exception("There is a conflict with the datetimes provided. '" + term_1.upper() + "' != '"  + term_2.upper() + "'")
 
 def abs_rel_date_resolver(inp, term_abs, term_rel, abs_dt, rel_td, adverbs, adv_inds):
     term_abs_start = re.search(re.compile(term_abs, re.IGNORECASE), inp).span()[0]
@@ -237,7 +239,7 @@ def abs_rel_date_resolver(inp, term_abs, term_rel, abs_dt, rel_td, adverbs, adv_
         return -rel_td
     if adv is None: # Check consistency
         if abs_dt.month == (datetime.datetime.now()+rel_td).month and abs_dt.day == (datetime.datetime.now()+rel_td).day: # The same
-            print("----------------------REDUNDANCY DETECTED-----------------------")
+            print("-------------------------REDUNDANCY DETECTED--------------------------------------")
             return datetime.timedelta(days=0, hours=0, minutes=0)
         else:
             raise Exception("There is a conflict with the datetimes provided. '" + str(abs_dt).upper() + "' != '" + term_rel.upper() + "'")
@@ -286,12 +288,12 @@ def time_parse(inp, debug=False):
         rel_date_extracted = True
         rel_date_extraction.append(inp[match_del_days_rel_1.span()[0]:match_del_days_rel_1.span()[1]].strip())
 
-    adv_ind = []
-    adv = []
+    adv_inds = []
+    advs = []
     if m_adverbs is not None: # Remember, this is used for addition
-        adv_ind = ([(m.start(0), m.end(0)) for m in re.finditer(adverbs,inp)])
-        for (s,e) in adv_ind:
-            adv.append(inp[s:e].strip())
+        adv_inds = ([(m.start(0), m.end(0)) for m in re.finditer(adverbs,inp)])
+        for (s,e) in adv_inds:
+            advs.append(inp[s:e].strip())
 
     purged = inp
     purged = inp.replace(abs_date_extraction, '')
@@ -321,7 +323,7 @@ def time_parse(inp, debug=False):
         print("Rel Date: \t\t" + str(rel_date_extraction))
         print("Abs Time: \t\t" + str(abs_time_extraction))
         print("Rel Time: \t\t" + str(rel_time_extraction))
-        print("Adverbs: \t\t" + str(adv))
+        print("Adverbs: \t\t" + str(advs))
 
     d = datetime.datetime.now()
 
@@ -361,21 +363,38 @@ def time_parse(inp, debug=False):
     if len(rel_time_deltas) == 1 and abs_date is None and len(rel_date_deltas) == 1 and len(abs_times) == 0:
         datetime_request = d + rel_time_deltas[0] + rel_date_deltas[0]
         return datetime_request
-
+    
+    if abs_date is not None and len(rel_date_deltas) == 0: # Regular abs date
+        datetime_request = abs_date
 
     if len(rel_date_deltas) == 1 and abs_date is None:
         datetime_request = d + rel_date_deltas[0]
     if len(rel_date_deltas) == 2 and abs_date is None: # Two conflicting relative
-        datetime_request = d + rel_rel_date_resolver(inp, rel_date_extraction[0], rel_date_extraction[1], rel_date_deltas[0], rel_date_deltas[1], adv, adv_ind)
+        datetime_request = d + rel_rel_date_resolver(inp, rel_date_extraction[0], rel_date_extraction[1], rel_date_deltas[0], rel_date_deltas[1], advs, adv_inds)[0]
     if len(rel_date_deltas) == 1 and abs_date is not None: # Abs date conflicting with rel
-        datetime_request = abs_date + abs_rel_date_resolver(inp, abs_date_extraction, rel_date_extraction[0], abs_date, rel_date_deltas[0], adv, adv_ind)
-
-    # Additional Rules: (1) 3+ Rel-rel date conflicts, (2) 2 rel-rel date + abs date conflicts
-    if len(rel_date_deltas) == 3 or (len(rel_date_deltas) == 2 and abs_date is not None):
-        raise Exception("Have not yet implemented Resolver for 3 rel-rel dates or 2 rel-rel dates + 1 abs date")
+        datetime_request = abs_date + abs_rel_date_resolver(inp, abs_date_extraction, rel_date_extraction[0], abs_date, rel_date_deltas[0], advs, adv_inds)
+      
+    ###### EXPERIMENTAL###########
+    if len(rel_date_deltas) == 2 and abs_date is not None:
+        print("--------------------------------TRYING EXPERIMENTAL CODE (METHOD 1)---------------------------")
+        # Method 1: Resolve rel-rel, then resolve that with abs
+        # Method 2: Resolve rel-abs, then resolve that with additional rel? For now, I only do method 1
+        rel_td_resolved, adv_ind = rel_rel_date_resolver(inp, rel_date_extraction[0], rel_date_extraction[1], rel_date_deltas[0], rel_date_deltas[1], advs, adv_inds)
+        print(rel_td_resolved)
+        if adv_ind is None: # Assuming consistency between adverbs
+            datetime_request = abs_date + abs_rel_date_resolver(inp, abs_date_extraction, rel_date_extraction[0], abs_date, rel_td_resolved, advs, adv_inds)
+        if adv_ind is not None:
+            adv_inds.pop(adv_ind)
+            advs.pop(adv_ind)
+            datetime_request = abs_date + abs_rel_date_resolver(inp, abs_date_extraction, rel_date_extraction[0], abs_date, rel_td_resolved, advs, adv_inds)
+    
+    # Additional Rules: (1) 3+ Rel-rel date conflicts
+    if len(rel_date_deltas) == 3:
+        raise Exception("Have not yet implemented Resolver for 3 rel-rel dates")
 
     # If no date, then assume today
     if datetime_request is None:
+        print("------------------Assuming datetime--------------")
         datetime_request = datetime.datetime.now()
     
     if len(abs_times) == 1 and len(rel_time_deltas) == 0:
@@ -383,11 +402,11 @@ def time_parse(inp, debug=False):
 
     # Final check: if there total time is less, then just add a day?
     if datetime_request < datetime.datetime.now():
+        print("Requested datetime is less than current one. Adding a day")
         datetime_request += datetime.timedelta(days=1)
     return datetime_request
 
 
-
 x = st.text_input("Request", value="")
 st.write(x)
 d = time_parse(x, debug=True)