Serialize "innerTasks" only at the end of the orchestrator invocation (#369)

Author: davidmrdavid

azure/durable_functions/models/actions/CompoundAction.py

@@ -12,8 +12,8 @@ class CompoundAction(Action):
     Provides the information needed by the durable extension to be able to invoke WhenAll tasks.
     """
 
-    def __init__(self, compoundTasks: List[Action]):
-        self.compound_actions = list(map(lambda x: x.to_json(), compoundTasks))
+    def __init__(self, compound_tasks: List[Action]):
+        self.compound_tasks = compound_tasks
 
     @property
     @abstractmethod
@@ -31,5 +31,5 @@ def to_json(self) -> Dict[str, Union[str, int]]:
         """
         json_dict: Dict[str, Union[str, int]] = {}
         add_attrib(json_dict, self, 'action_type', 'actionType')
-        add_attrib(json_dict, self, 'compound_actions', 'compoundActions')
+        json_dict['compoundActions'] = list(map(lambda x: x.to_json(), self.compound_tasks))
         return json_dict

tests/orchestrator/test_create_timer.py

@@ -1,4 +1,5 @@
 from azure.durable_functions.models.ReplaySchema import ReplaySchema
+from azure.durable_functions.models.actions.WhenAnyAction import WhenAnyAction
 from tests.test_utils.ContextBuilder import ContextBuilder
 from .orchestrator_test_utils \
     import get_orchestration_state_result, assert_orchestration_state_equals, assert_valid_schema
@@ -9,7 +10,7 @@
 
 
 def base_expected_state(output=None, replay_schema: ReplaySchema = ReplaySchema.V1) -> OrchestratorState:
-    return OrchestratorState(is_done=False, actions=[], output=output, replay_schema=replay_schema.value)
+    return OrchestratorState(is_done=False, actions=[], output=output, replay_schema=replay_schema)
 
 def add_timer_fired_events(context_builder: ContextBuilder, id_: int, timestamp: str):
     fire_at: str = context_builder.add_timer_created_event(id_, timestamp)
@@ -99,4 +100,28 @@ def test_timers_can_be_cancelled():
     expected = expected_state.to_json()
 
     assert_orchestration_state_equals(expected, result)
-    assert result["actions"][0][1]["isCanceled"]
+    assert result["actions"][0][1]["isCanceled"]
+
+def test_timers_can_be_cancelled_replayV2():
+
+    context_builder = ContextBuilder("test_timers_can_be_cancelled", replay_schema=ReplaySchema.V2)
+    fire_at1 = context_builder.current_datetime + timedelta(minutes=5)
+    fire_at2 = context_builder.current_datetime + timedelta(minutes=10)
+    add_timer_fired_events(context_builder, 0, str(fire_at1))
+    add_timer_fired_events(context_builder, 1, str(fire_at2))
+
+    result = get_orchestration_state_result(
+        context_builder, generator_function_timer_can_be_cancelled)
+
+    expected_state = base_expected_state(output='Done!', replay_schema=ReplaySchema.V2)
+    expected_state._actions = [
+        [WhenAnyAction(
+            [CreateTimerAction(fire_at=fire_at1), CreateTimerAction(fire_at=fire_at2, is_cancelled=True)]
+        )]
+    ]
+
+    expected_state._is_done = True
+    expected = expected_state.to_json()
+
+    assert_orchestration_state_equals(expected, result)
+    assert result["actions"][0][0]['compoundActions'][1]["isCanceled"]