regex changed in time.py (#2378)

* regex changed in time.py

* comment change

* Update composer/core/time.py

Co-authored-by: Mihir Patel <[email protected]>

---------

Co-authored-by: Mihir Patel <[email protected]>

Author: megha95

composer/core/time.py

@@ -44,12 +44,8 @@ class TimeUnit(StringEnum):
     DURATION = 'dur'
 
 
-# regex for parsing integers / decimals / scientific notation
-_NUM_REGEX = r'-?[\d.]+(?:e-?\d+)?'
-
-# regex for parsing a time string.
-_TIME_STR_REGEX = re.compile(r'^(?:' + r'|'.join(fr'(?:({_NUM_REGEX})({time_unit.value}))' for time_unit in TimeUnit) +
-                             r')$',
+# regex for parsing time string, matches timeunit and chars prior to unit as value
+_TIME_STR_REGEX = re.compile(r'^(.+)(' + r'|'.join([fr'{time_unit.value}' for time_unit in TimeUnit]) + r')$',
                              flags=re.IGNORECASE)
 
 TValue = TypeVar('TValue', int, float)

tests/test_time.py

@@ -12,7 +12,10 @@
     ['1ep', 1, TimeUnit.EPOCH],
     ['2ba', 2, TimeUnit.BATCH],
     ['3e10sp', 3 * 10**10, TimeUnit.SAMPLE],
+    ['3_0e10sp', 30 * 10**10, TimeUnit.SAMPLE],
     ['4tok', 4, TimeUnit.TOKEN],
+    ['4_000tok', 4000, TimeUnit.TOKEN],
+    ['4_00_0tok', 4000, TimeUnit.TOKEN],
     ['0.5dur', 0.5, TimeUnit.DURATION],
 ])
 def test_time_parse(time_string: str, expected_value: int, expected_unit: TimeUnit):