durable-workflow 0.4.89__tar.gz → 0.4.90__tar.gz

{durable_workflow-0.4.89/src/durable_workflow.egg-info → durable_workflow-0.4.90}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: durable-workflow
-Version: 0.4.89
+Version: 0.4.90
 Summary: Python SDK for the Durable Workflow server (language-neutral HTTP protocol)
 Author: Durable Workflow Contributors
 License-Expression: MIT

{durable_workflow-0.4.89 → durable_workflow-0.4.90}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "durable-workflow"
-version = "0.4.89"
+version = "0.4.90"
 description = "Python SDK for the Durable Workflow server (language-neutral HTTP protocol)"
 readme = "README.md"
 requires-python = ">=3.10"

{durable_workflow-0.4.89 → durable_workflow-0.4.90}/src/durable_workflow/workflow.py

@@ -2762,7 +2762,17 @@ def _replay_state(
                             exception_type=type(exc).__name__,
                         )])
                     if resolution == "satisfied":
-                        terminal_condition_reopen_cmd = None
+                        if has_reopened_same_wait:
+                            if not satisfied:
+                                consumed_reopen_for_current_wait = True
+                                wait_yield_count = next_wait_index
+                                continue
+
+                        terminal_condition_reopen_cmd = (
+                            cmd
+                            if has_reopened_same_wait and consumed_reopen_for_current_wait
+                            else None
+                        )
                         next_value = True
                         wait_yield_count += 1
                         break

{durable_workflow-0.4.89 → durable_workflow-0.4.90/src/durable_workflow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: durable-workflow
-Version: 0.4.89
+Version: 0.4.90
 Summary: Python SDK for the Durable Workflow server (language-neutral HTTP protocol)
 Author: Durable Workflow Contributors
 License-Expression: MIT

{durable_workflow-0.4.89 → durable_workflow-0.4.90}/tests/test_wait_condition.py

@@ -172,6 +172,41 @@ class SignalCounterUntilFinished:
         return self.current()
 
 
+@workflow.defn(name="signal-counter-single-predicate-per-reopen")
+class SignalCounterSinglePredicatePerReopen:
+    def __init__(self) -> None:
+        self.count = 0
+        self.done = False
+        self.receiver_generation = 0
+        self.last_predicate_generation: int | None = None
+        self.predicate_calls = 0
+
+    @workflow.signal("increment")
+    def increment(self, amount: int) -> None:
+        self.count += amount
+        self.receiver_generation += 1
+
+    @workflow.signal("finish")
+    def finish(self) -> None:
+        self.done = True
+        self.receiver_generation += 1
+
+    def done_once_per_receiver(self) -> bool:
+        self.predicate_calls += 1
+        if self.last_predicate_generation == self.receiver_generation:
+            raise RuntimeError("predicate re-evaluated before replay advanced")
+        self.last_predicate_generation = self.receiver_generation
+        return self.done
+
+    def run(self, ctx: WorkflowContext):  # type: ignore[no-untyped-def]
+        satisfied = yield ctx.wait_condition(self.done_once_per_receiver, key="done")
+        return {
+            "count": self.count,
+            "satisfied": satisfied,
+            "predicate_calls": self.predicate_calls,
+        }
+
+
 @workflow.defn(name="two-same-key-signal-waits")
 class TwoSameKeySignalWaits:
     def __init__(self) -> None:
@@ -455,6 +490,38 @@ class TestReplayWaitCondition:
             ],
         }
 
+    def test_satisfied_reopened_wait_reuses_current_predicate_result(self) -> None:
+        history = [
+            {
+                "event_type": "ConditionWaitOpened",
+                "payload": {"condition_wait_id": "wait-count", "condition_key": "done"},
+            },
+            _signal_received_event("increment", [3]),
+            {
+                "event_type": "ConditionWaitSatisfied",
+                "payload": {"condition_wait_id": "wait-count", "condition_key": "done"},
+            },
+            {
+                "event_type": "ConditionWaitOpened",
+                "payload": {"condition_wait_id": "wait-finish", "condition_key": "done"},
+            },
+            _signal_received_event("finish", []),
+            {
+                "event_type": "ConditionWaitSatisfied",
+                "payload": {"condition_wait_id": "wait-finish", "condition_key": "done"},
+            },
+        ]
+
+        outcome = replay(SignalCounterSinglePredicatePerReopen, history, [])
+
+        assert len(outcome.commands) == 1
+        assert isinstance(outcome.commands[0], CompleteWorkflow)
+        assert outcome.commands[0].result == {
+            "count": 3,
+            "satisfied": True,
+            "predicate_calls": 2,
+        }
+
     def test_signal_received_before_next_wait_uses_declared_workflow_sequence(self) -> None:
         history = [
             {

{durable_workflow-0.4.89 → durable_workflow-0.4.90}/tests/test_worker.py

@@ -1443,6 +1443,118 @@ class TestWorkflowTaskExecution:
         )
         mock_client.fail_query_task.assert_not_called()
 
+    @pytest.mark.asyncio
+    async def test_query_task_replays_signal_woken_false_wait_reopens(
+        self, mock_client: AsyncMock
+    ) -> None:
+        worker = Worker(mock_client, task_queue="q1", workflows=[CounterQueryWorkflow], activities=[])
+        first_signal_arguments = serializer.encode([3], codec="json")
+        second_signal_arguments = serializer.encode([5], codec="json")
+        task = {
+            "query_task_id": "qt-false-wait-reopens",
+            "query_task_attempt": 1,
+            "workflow_type": "counter-query-wf",
+            "workflow_id": "wf-counter",
+            "run_id": "run-counter",
+            "query_name": "current",
+            "history_events": [
+                {
+                    "event_type": "ConditionWaitOpened",
+                    "payload": {
+                        "condition_wait_id": "wait-count-0",
+                        "condition_key": "done",
+                    },
+                },
+                {
+                    "event_type": "SignalReceived",
+                    "workflow_command_id": "cmd-increment-3",
+                    "payload": {
+                        "signal_id": "sig-increment-3",
+                        "workflow_command_id": "cmd-increment-3",
+                        "signal_name": "increment",
+                    },
+                },
+                {
+                    "event_type": "ConditionWaitSatisfied",
+                    "payload": {
+                        "condition_wait_id": "wait-count-0",
+                        "condition_key": "done",
+                        "workflow_signal_id": "sig-increment-3",
+                        "signal_name": "increment",
+                    },
+                },
+                {
+                    "event_type": "ConditionWaitOpened",
+                    "payload": {
+                        "condition_wait_id": "wait-count-3",
+                        "condition_key": "done",
+                    },
+                },
+                {
+                    "event_type": "SignalReceived",
+                    "workflow_command_id": "cmd-increment-5",
+                    "payload": {
+                        "signal_id": "sig-increment-5",
+                        "workflow_command_id": "cmd-increment-5",
+                        "signal_name": "increment",
+                    },
+                },
+                {
+                    "event_type": "ConditionWaitSatisfied",
+                    "payload": {
+                        "condition_wait_id": "wait-count-3",
+                        "condition_key": "done",
+                        "workflow_signal_id": "sig-increment-5",
+                        "signal_name": "increment",
+                    },
+                },
+                {
+                    "event_type": "ConditionWaitOpened",
+                    "payload": {
+                        "condition_wait_id": "wait-count-8",
+                        "condition_key": "done",
+                    },
+                },
+            ],
+            "history_export": {
+                "payloads": {"codec": "json"},
+                "signals": [
+                    {
+                        "id": "sig-increment-3",
+                        "command_id": "cmd-increment-3",
+                        "name": "increment",
+                        "payload_codec": "json",
+                        "arguments": first_signal_arguments,
+                    },
+                    {
+                        "id": "sig-increment-5",
+                        "command_id": "cmd-increment-5",
+                        "name": "increment",
+                        "payload_codec": "json",
+                        "arguments": second_signal_arguments,
+                    },
+                ],
+            },
+            "workflow_arguments": serializer.envelope([], codec="json"),
+            "query_arguments": serializer.envelope([], codec="json"),
+            "payload_codec": "json",
+        }
+
+        outcome = await worker._run_query_task(task)
+
+        assert outcome == "completed"
+        mock_client.complete_query_task.assert_awaited_once_with(
+            query_task_id="qt-false-wait-reopens",
+            lease_owner=worker.worker_id,
+            query_task_attempt=1,
+            result=8,
+            codec="json",
+            workflow_id="wf-counter",
+            run_id="run-counter",
+            query_name="current",
+        )
+        mock_client.fail_query_task.assert_not_called()
+
     @pytest.mark.asyncio
     async def test_query_task_replays_history_from_export_after_worker_restart(
         self, mock_client: AsyncMock