PR suggestion improvements

Author: andystaples

azure/durable_functions/models/DurableOrchestrationContext.py

@@ -64,7 +64,7 @@ def __init__(self,
             self._maximum_short_timer_duration = max_short_duration
         self._long_timer_interval_duration: datetime.timedelta
         if longRunningTimerIntervalDuration is not None:
-            long_interval_duration = parse_timespan_attrib(longRunningTimerIntervalDuration)
+            long_interval_duration = datetime.timedelta(seconds=10) # parse_timespan_attrib(longRunningTimerIntervalDuration)
             self._long_timer_interval_duration = long_interval_duration
         self._custom_status: Any = None
         self._new_uuid_counter: int = 0
@@ -80,9 +80,12 @@ def __init__(self,
         self._sequence_number = 0
         self._replay_schema = ReplaySchema(upperSchemaVersion)
         if (upperSchemaVersionNew is not None
-                and upperSchemaVersionNew > self._replay_schema.value
-                and upperSchemaVersionNew in ReplaySchema._value2member_map_):
-            self._replay_schema = ReplaySchema(upperSchemaVersionNew)
+                and upperSchemaVersionNew > self._replay_schema.value):
+            valid_schema_values = [enum_member.value for enum_member in ReplaySchema]
+            if upperSchemaVersionNew in valid_schema_values:
+                self._replay_schema = ReplaySchema(upperSchemaVersionNew)
+            else:
+                self._replay_schema = ReplaySchema(max(valid_schema_values))
 
         self._action_payload_v1: List[List[Action]] = []
         self._action_payload_v2: List[Action] = []

azure/durable_functions/models/Task.py

@@ -337,8 +337,8 @@ def __init__(self, id, action: CreateTimerAction, orchestration_context):
         final_fire_time = action.fire_at
         duration_until_fire = final_fire_time - current_time
 
-        if duration_until_fire > self.orchestration_context.maximum_timer_length:
-            next_fire_time = current_time + self.orchestration_context.long_running_timer_duration
+        if duration_until_fire > orchestration_context.maximum_short_timer_duration:
+            next_fire_time = current_time + orchestration_context.long_timer_interval_duration
         else:
             next_fire_time = final_fire_time
 
@@ -349,8 +349,8 @@ def __init__(self, id, action: CreateTimerAction, orchestration_context):
         self.id = id
         self.action = action
         self.orchestration_context = orchestration_context
-        self.maximum_timer_length = self.orchestration_context.maximum_timer_length
-        self.long_running_timer_duration = self.orchestration_context.long_running_timer_duration
+        self.maximum_short_timer_duration = self.orchestration_context.maximum_short_timer_duration
+        self.long_timer_interval_duration = self.orchestration_context.long_timer_interval_duration
 
     def is_canceled(self) -> bool:
         """Check if the LongTimer is cancelled.
@@ -408,8 +408,8 @@ def get_next_timer_task(self, final_fire_time: datetime, current_time: datetime)
             A TimerTask representing the next interval of the LongTimer
         """
         duration_until_fire = final_fire_time - current_time
-        if duration_until_fire > self.maximum_timer_length:
-            next_fire_time = current_time + self.long_running_timer_duration
+        if duration_until_fire > self.maximum_short_timer_duration:
+            next_fire_time = current_time + self.long_timer_interval_duration
         else:
             next_fire_time = final_fire_time
         return TimerTask(None, CreateTimerAction(next_fire_time))

azure/durable_functions/models/utils/json_utils.py

@@ -57,17 +57,20 @@ def parse_timespan_attrib(from_str: str) -> datetime.timedelta:
         The TimeSpan expressed as a Python datetime.timedelta
 
     """
-    expr = r"^(-)?(?:([0-9]*)\.)?([0-9]{2}):([0-9]{2}):([0-9]{2})(?:\.([0-9]{7}))?$"
-    match = re.match(expr, from_str)
+    match = re.match(r"^(?P<negative>-)?(?:(?P<days>[0-9]*)\.)?"
+                     r"(?P<hours>[0-9]{2}):(?P<minutes>[0-9]{2})"
+                     r":(?P<seconds>[0-9]{2})(?:\.(?P<ticks>[0-9]{7}))?$",
+                     from_str)
     if match:
+        groups = match.groupdict()
         span = datetime.timedelta(
-            days=int(match.group(2) or "0"),
-            hours=int(match.group(3)),
-            minutes=int(match.group(4)),
-            seconds=int(match.group(5)),
-            microseconds=int(match.group(6) or "0") // 10)
+            days=int(groups['days'] or "0"),
+            hours=int(groups['hours']),
+            minutes=int(groups['minutes']),
+            seconds=int(groups['seconds']),
+            microseconds=int(groups['ticks'] or "0") // 10)
 
-        if match.group(1):
+        if groups['negative'] == '-':
             span = -span
         return span
     else: