fix: fixes for failures in build

Signed-off-by: Samantha Coyle <sam@diagrid.io>

Author: sicoyle

durabletask/task.py

@@ -434,31 +434,26 @@ def compute_next_delay(self) -> Optional[timedelta]:
         else:
             backoff_coefficient = self._retry_policy.backoff_coefficient
 
-        # Compute a deterministic "logical now" based on start time and accumulated delays,
-        # rather than wall-clock time, to avoid non-determinism during replay.
+        # Compute the next delay and the logical start time of the next attempt
+        # deterministically from accumulated delays, avoiding non-determinism during replay.
+        # range(1, attempt_count + 1) sums all delays up to and including the one about to
+        # be taken, so we're checking whether attempt N+1 would start within the timeout.
         total_elapsed_seconds = 0.0
-        for i in range(1, self._attempt_count):
-            attempt_delay = (
+        next_delay_f = 0.0
+        for i in range(1, self._attempt_count + 1):
+            next_delay_f = (
                 math.pow(backoff_coefficient, i - 1)
                 * self._retry_policy.first_retry_interval.total_seconds()
             )
             if self._retry_policy.max_retry_interval is not None:
-                attempt_delay = min(
-                    attempt_delay,
+                next_delay_f = min(
+                    next_delay_f,
                     self._retry_policy.max_retry_interval.total_seconds(),
                 )
-            total_elapsed_seconds += attempt_delay
-        logical_now = self._start_time + timedelta(seconds=total_elapsed_seconds)
-        if logical_now < retry_expiration:
-            next_delay_f = (
-                math.pow(backoff_coefficient, self._attempt_count - 1)
-                * self._retry_policy.first_retry_interval.total_seconds()
-            )
+            total_elapsed_seconds += next_delay_f
 
-            if self._retry_policy.max_retry_interval is not None:
-                next_delay_f = min(
-                    next_delay_f, self._retry_policy.max_retry_interval.total_seconds()
-                )
+        logical_next_attempt_start = self._start_time + timedelta(seconds=total_elapsed_seconds)
+        if logical_next_attempt_start < retry_expiration:
             return timedelta(seconds=next_delay_f)
 
         return None

durabletask_tests/durabletask/test_orchestration_e2e_async.py

@@ -322,7 +322,9 @@ def child(ctx: task.OrchestrationContext, _):
             assert state.runtime_status == OrchestrationStatus.TERMINATED
 
             # Verify that child orchestration is also terminated
-            child_state = await client.wait_for_orchestration_completion(child_instance_id, timeout=30)
+            child_state = await client.wait_for_orchestration_completion(
+                child_instance_id, timeout=30
+            )
             assert child_state is not None
             assert child_state.runtime_status == OrchestrationStatus.TERMINATED
 

ext/dapr-ext-workflow/dapr/ext/workflow/aio/dapr_workflow_client.py

@@ -24,7 +24,10 @@
 from dapr.ext.workflow.workflow_state import WorkflowState
 from grpc.aio import AioRpcError
 
-import durabletask.internal.protos as pb
+try:
+    import durabletask.internal.protos as pb
+except ImportError:
+    import durabletask.internal.orchestrator_service_pb2 as pb  # type: ignore[no-redef]
 from dapr.clients import DaprInternalError
 from dapr.clients.http.client import DAPR_API_TOKEN_HEADER
 from dapr.conf import settings

ext/dapr-ext-workflow/dapr/ext/workflow/dapr_workflow_client.py

@@ -24,7 +24,10 @@
 from dapr.ext.workflow.workflow_state import WorkflowState
 from grpc import RpcError
 
-import durabletask.internal.protos as pb
+try:
+    import durabletask.internal.protos as pb
+except ImportError:
+    import durabletask.internal.orchestrator_service_pb2 as pb  # type: ignore[no-redef]
 from dapr.clients import DaprInternalError
 from dapr.clients.http.client import DAPR_API_TOKEN_HEADER
 from dapr.conf import settings

ext/dapr-ext-workflow/tests/test_workflow_client.py

@@ -22,7 +22,10 @@
 from dapr.ext.workflow.dapr_workflow_context import DaprWorkflowContext
 from grpc import RpcError
 
-import durabletask.internal.protos as pb
+try:
+    import durabletask.internal.protos as pb
+except ImportError:
+    import durabletask.internal.orchestrator_service_pb2 as pb  # type: ignore[no-redef]
 from durabletask import client
 
 mock_schedule_result = 'workflow001'

ext/dapr-ext-workflow/tests/test_workflow_client_aio.py

@@ -22,7 +22,10 @@
 from dapr.ext.workflow.dapr_workflow_context import DaprWorkflowContext
 from grpc.aio import AioRpcError
 
-import durabletask.internal.protos as pb
+try:
+    import durabletask.internal.protos as pb
+except ImportError:
+    import durabletask.internal.orchestrator_service_pb2 as pb  # type: ignore[no-redef]
 from durabletask import client
 
 mock_schedule_result = 'workflow001'