dapr-ext-workflow-dev 1.17.0.dev102__tar.gz → 1.17.0.dev103__tar.gz

{dapr_ext_workflow_dev-1.17.0.dev102/dapr_ext_workflow_dev.egg-info → dapr_ext_workflow_dev-1.17.0.dev103}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dapr-ext-workflow-dev
-Version: 1.17.0.dev102
+Version: 1.17.0.dev103
 Summary: The developmental release for Dapr Workflow Authoring.
 Home-page: https://dapr.io/
 Author: Dapr Authors

{dapr_ext_workflow_dev-1.17.0.dev102 → dapr_ext_workflow_dev-1.17.0.dev103}/dapr/ext/workflow/_durabletask/internal/helpers.py

@@ -14,6 +14,15 @@ from datetime import datetime
 from typing import Optional
 
 import dapr.ext.workflow._durabletask.internal.protos as pb
+from dapr.ext.workflow._durabletask.internal.timer import (  # noqa: F401
+    OPTIONAL_TIMER_FIRE_AT,
+    TimerOrigin,
+    is_optional_timer_action,
+    is_optional_timer_event,
+    new_create_timer_action,
+    new_timer_created_event,
+    new_timer_fired_event,
+)
 from google.protobuf import timestamp_pb2, wrappers_pb2
 
 # TODO: The new_xxx_event methods are only used by test code and should be moved elsewhere
@@ -40,26 +49,6 @@ def new_execution_started_event(
     )
 
 
-def new_timer_created_event(timer_id: int, fire_at: datetime) -> pb.HistoryEvent:
-    ts = timestamp_pb2.Timestamp()
-    ts.FromDatetime(fire_at)
-    return pb.HistoryEvent(
-        eventId=timer_id,
-        timestamp=timestamp_pb2.Timestamp(),
-        timerCreated=pb.TimerCreatedEvent(fireAt=ts),
-    )
-
-
-def new_timer_fired_event(timer_id: int, fire_at: datetime) -> pb.HistoryEvent:
-    ts = timestamp_pb2.Timestamp()
-    ts.FromDatetime(fire_at)
-    return pb.HistoryEvent(
-        eventId=-1,
-        timestamp=timestamp_pb2.Timestamp(),
-        timerFired=pb.TimerFiredEvent(fireAt=ts, timerId=timer_id),
-    )
-
-
 def new_task_scheduled_event(
     event_id: int, name: str, encoded_input: Optional[str] = None
 ) -> pb.HistoryEvent:
@@ -202,12 +191,6 @@ def new_workflow_version_not_available_action(
     )
 
 
-def new_create_timer_action(id: int, fire_at: datetime) -> pb.WorkflowAction:
-    timestamp = timestamp_pb2.Timestamp()
-    timestamp.FromDatetime(fire_at)
-    return pb.WorkflowAction(id=id, createTimer=pb.CreateTimerAction(fireAt=timestamp))
-
-
 def new_schedule_task_action(
     id: int,
     name: str,

{dapr_ext_workflow_dev-1.17.0.dev102 → dapr_ext_workflow_dev-1.17.0.dev103}/dapr/ext/workflow/_durabletask/internal/history_events_pb2.py

@@ -27,7 +27,7 @@ from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__
 from google.protobuf import wrappers_pb2 as google_dot_protobuf_dot_wrappers__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14history_events.proto\x1a\x13orchestration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1egoogle/protobuf/wrappers.proto\"\xd6\x03\n\x15\x45xecutionStartedEvent\x12\x0c\n\x04name\x18\x01 \x01(\t\x12-\n\x07version\x18\x02 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12+\n\x05input\x18\x03 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12+\n\x10workflowInstance\x18\x04 \x01(\x0b\x32\x11.WorkflowInstance\x12+\n\x0eparentInstance\x18\x05 \x01(\x0b\x32\x13.ParentInstanceInfo\x12;\n\x17scheduledStartTimestamp\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12)\n\x12parentTraceContext\x18\x07 \x01(\x0b\x32\r.TraceContext\x12\x34\n\x0eworkflowSpanID\x18\x08 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12.\n\x04tags\x18\t \x03(\x0b\x32 .ExecutionStartedEvent.TagsEntry\x1a+\n\tTagsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xa2\x01\n\x17\x45xecutionCompletedEvent\x12,\n\x0eworkflowStatus\x18\x01 \x01(\x0e\x32\x14.OrchestrationStatus\x12,\n\x06result\x18\x02 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12+\n\x0e\x66\x61ilureDetails\x18\x03 \x01(\x0b\x32\x13.TaskFailureDetails\"X\n\x18\x45xecutionTerminatedEvent\x12+\n\x05input\x18\x01 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12\x0f\n\x07recurse\x18\x02 \x01(\x08\"\x9e\x02\n\x12TaskScheduledEvent\x12\x0c\n\x04name\x18\x01 \x01(\t\x12-\n\x07version\x18\x02 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12+\n\x05input\x18\x03 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12)\n\x12parentTraceContext\x18\x04 \x01(\x0b\x32\r.TraceContext\x12\x17\n\x0ftaskExecutionId\x18\x05 \x01(\t\x12>\n\x17rerunParentInstanceInfo\x18\x06 \x01(\x0b\x32\x18.RerunParentInstanceInfoH\x00\x88\x01\x01\x42\x1a\n\x18_rerunParentInstanceInfo\"t\n\x12TaskCompletedEvent\x12\x17\n\x0ftaskScheduledId\x18\x01 \x01(\x05\x12,\n\x06result\x18\x02 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12\x17\n\x0ftaskExecutionId\x18\x03 \x01(\t\"p\n\x0fTaskFailedEvent\x12\x17\n\x0ftaskScheduledId\x18\x01 \x01(\x05\x12+\n\x0e\x66\x61ilureDetails\x18\x02 \x01(\x0b\x32\x13.TaskFailureDetails\x12\x17\n\x0ftaskExecutionId\x18\x03 \x01(\t\"\xa8\x02\n!ChildWorkflowInstanceCreatedEvent\x12\x12\n\ninstanceId\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12-\n\x07version\x18\x03 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12+\n\x05input\x18\x04 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12)\n\x12parentTraceContext\x18\x05 \x01(\x0b\x32\r.TraceContext\x12>\n\x17rerunParentInstanceInfo\x18\x06 \x01(\x0b\x32\x18.RerunParentInstanceInfoH\x00\x88\x01\x01\x42\x1a\n\x18_rerunParentInstanceInfo\"l\n#ChildWorkflowInstanceCompletedEvent\x12\x17\n\x0ftaskScheduledId\x18\x01 \x01(\x05\x12,\n\x06result\x18\x02 \x01(\x0b\x32\x1c.google.protobuf.StringValue\"h\n ChildWorkflowInstanceFailedEvent\x12\x17\n\x0ftaskScheduledId\x18\x01 \x01(\x05\x12+\n\x0e\x66\x61ilureDetails\x18\x02 \x01(\x0b\x32\x13.TaskFailureDetails\"\x18\n\x16TimerOriginCreateTimer\"(\n\x18TimerOriginExternalEvent\x12\x0c\n\x04name\x18\x01 \x01(\t\"\xa5\x02\n\x11TimerCreatedEvent\x12*\n\x06\x66ireAt\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x11\n\x04name\x18\x02 \x01(\tH\x01\x88\x01\x01\x12>\n\x17rerunParentInstanceInfo\x18\x03 \x01(\x0b\x32\x18.RerunParentInstanceInfoH\x02\x88\x01\x01\x12.\n\x0b\x63reateTimer\x18\x04 \x01(\x0b\x32\x17.TimerOriginCreateTimerH\x00\x12\x32\n\rexternalEvent\x18\x05 \x01(\x0b\x32\x19.TimerOriginExternalEventH\x00\x42\x08\n\x06originB\x07\n\x05_nameB\x1a\n\x18_rerunParentInstanceInfo\"N\n\x0fTimerFiredEvent\x12*\n\x06\x66ireAt\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x0f\n\x07timerId\x18\x02 \x01(\x05\"J\n\x14WorkflowStartedEvent\x12&\n\x07version\x18\x01 \x01(\x0b\x32\x10.WorkflowVersionH\x00\x88\x01\x01\x42\n\n\x08_version\"\x18\n\x16WorkflowCompletedEvent\"_\n\x0e\x45ventSentEvent\x12\x12\n\ninstanceId\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12+\n\x05input\x18\x03 \x01(\x0b\x32\x1c.google.protobuf.StringValue\"M\n\x10\x45ventRaisedEvent\x12\x0c\n\x04name\x18\x01 \x01(\t\x12+\n\x05input\x18\x02 \x01(\x0b\x32\x1c.google.protobuf.StringValue\"A\n\x12\x43ontinueAsNewEvent\x12+\n\x05input\x18\x01 \x01(\x0b\x32\x1c.google.protobuf.StringValue\"F\n\x17\x45xecutionSuspendedEvent\x12+\n\x05input\x18\x01 \x01(\x0b\x32\x1c.google.protobuf.StringValue\"D\n\x15\x45xecutionResumedEvent\x12+\n\x05input\x18\x01 \x01(\x0b\x32\x1c.google.protobuf.StringValue\"a\n\x15\x45xecutionStalledEvent\x12\x1e\n\x06reason\x18\x01 \x01(\x0e\x32\x0e.StalledReason\x12\x18\n\x0b\x64\x65scription\x18\x02 \x01(\tH\x00\x88\x01\x01\x42\x0e\n\x0c_description\"\xa8\t\n\x0cHistoryEvent\x12\x0f\n\x07\x65ventId\x18\x01 \x01(\x05\x12-\n\ttimestamp\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x32\n\x10\x65xecutionStarted\x18\x03 \x01(\x0b\x32\x16.ExecutionStartedEventH\x00\x12\x36\n\x12\x65xecutionCompleted\x18\x04 \x01(\x0b\x32\x18.ExecutionCompletedEventH\x00\x12\x38\n\x13\x65xecutionTerminated\x18\x05 \x01(\x0b\x32\x19.ExecutionTerminatedEventH\x00\x12,\n\rtaskScheduled\x18\x06 \x01(\x0b\x32\x13.TaskScheduledEventH\x00\x12,\n\rtaskCompleted\x18\x07 \x01(\x0b\x32\x13.TaskCompletedEventH\x00\x12&\n\ntaskFailed\x18\x08 \x01(\x0b\x32\x10.TaskFailedEventH\x00\x12J\n\x1c\x63hildWorkflowInstanceCreated\x18\t \x01(\x0b\x32\".ChildWorkflowInstanceCreatedEventH\x00\x12N\n\x1e\x63hildWorkflowInstanceCompleted\x18\n \x01(\x0b\x32$.ChildWorkflowInstanceCompletedEventH\x00\x12H\n\x1b\x63hildWorkflowInstanceFailed\x18\x0b \x01(\x0b\x32!.ChildWorkflowInstanceFailedEventH\x00\x12*\n\x0ctimerCreated\x18\x0c \x01(\x0b\x32\x12.TimerCreatedEventH\x00\x12&\n\ntimerFired\x18\r \x01(\x0b\x32\x10.TimerFiredEventH\x00\x12\x30\n\x0fworkflowStarted\x18\x0e \x01(\x0b\x32\x15.WorkflowStartedEventH\x00\x12\x34\n\x11workflowCompleted\x18\x0f \x01(\x0b\x32\x17.WorkflowCompletedEventH\x00\x12$\n\teventSent\x18\x10 \x01(\x0b\x32\x0f.EventSentEventH\x00\x12(\n\x0b\x65ventRaised\x18\x11 \x01(\x0b\x32\x11.EventRaisedEventH\x00\x12,\n\rcontinueAsNew\x18\x14 \x01(\x0b\x32\x13.ContinueAsNewEventH\x00\x12\x36\n\x12\x65xecutionSuspended\x18\x15 \x01(\x0b\x32\x18.ExecutionSuspendedEventH\x00\x12\x32\n\x10\x65xecutionResumed\x18\x16 \x01(\x0b\x32\x16.ExecutionResumedEventH\x00\x12\x32\n\x10\x65xecutionStalled\x18\x1f \x01(\x0b\x32\x16.ExecutionStalledEventH\x00\x12 \n\x06router\x18\x1e \x01(\x0b\x32\x0b.TaskRouterH\x01\x88\x01\x01\x42\x0b\n\teventTypeB\t\n\x07_routerJ\x04\x08\x12\x10\x13J\x04\x08\x13\x10\x14J\x04\x08\x17\x10\x18J\x04\x08\x18\x10\x19J\x04\x08\x19\x10\x1aJ\x04\x08\x1a\x10\x1bJ\x04\x08\x1b\x10\x1cJ\x04\x08\x1c\x10\x1dJ\x04\x08\x1d\x10\x1e\x42V\n+io.dapr.durabletask.implementation.protobufZ\x0b/api/protos\xaa\x02\x19\x44\x61pr.DurableTask.Protobufb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14history_events.proto\x1a\x13orchestration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1egoogle/protobuf/wrappers.proto\"\xd6\x03\n\x15\x45xecutionStartedEvent\x12\x0c\n\x04name\x18\x01 \x01(\t\x12-\n\x07version\x18\x02 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12+\n\x05input\x18\x03 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12+\n\x10workflowInstance\x18\x04 \x01(\x0b\x32\x11.WorkflowInstance\x12+\n\x0eparentInstance\x18\x05 \x01(\x0b\x32\x13.ParentInstanceInfo\x12;\n\x17scheduledStartTimestamp\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12)\n\x12parentTraceContext\x18\x07 \x01(\x0b\x32\r.TraceContext\x12\x34\n\x0eworkflowSpanID\x18\x08 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12.\n\x04tags\x18\t \x03(\x0b\x32 .ExecutionStartedEvent.TagsEntry\x1a+\n\tTagsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xa2\x01\n\x17\x45xecutionCompletedEvent\x12,\n\x0eworkflowStatus\x18\x01 \x01(\x0e\x32\x14.OrchestrationStatus\x12,\n\x06result\x18\x02 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12+\n\x0e\x66\x61ilureDetails\x18\x03 \x01(\x0b\x32\x13.TaskFailureDetails\"X\n\x18\x45xecutionTerminatedEvent\x12+\n\x05input\x18\x01 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12\x0f\n\x07recurse\x18\x02 \x01(\x08\"\x9e\x02\n\x12TaskScheduledEvent\x12\x0c\n\x04name\x18\x01 \x01(\t\x12-\n\x07version\x18\x02 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12+\n\x05input\x18\x03 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12)\n\x12parentTraceContext\x18\x04 \x01(\x0b\x32\r.TraceContext\x12\x17\n\x0ftaskExecutionId\x18\x05 \x01(\t\x12>\n\x17rerunParentInstanceInfo\x18\x06 \x01(\x0b\x32\x18.RerunParentInstanceInfoH\x00\x88\x01\x01\x42\x1a\n\x18_rerunParentInstanceInfo\"t\n\x12TaskCompletedEvent\x12\x17\n\x0ftaskScheduledId\x18\x01 \x01(\x05\x12,\n\x06result\x18\x02 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12\x17\n\x0ftaskExecutionId\x18\x03 \x01(\t\"p\n\x0fTaskFailedEvent\x12\x17\n\x0ftaskScheduledId\x18\x01 \x01(\x05\x12+\n\x0e\x66\x61ilureDetails\x18\x02 \x01(\x0b\x32\x13.TaskFailureDetails\x12\x17\n\x0ftaskExecutionId\x18\x03 \x01(\t\"\xa8\x02\n!ChildWorkflowInstanceCreatedEvent\x12\x12\n\ninstanceId\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12-\n\x07version\x18\x03 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12+\n\x05input\x18\x04 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12)\n\x12parentTraceContext\x18\x05 \x01(\x0b\x32\r.TraceContext\x12>\n\x17rerunParentInstanceInfo\x18\x06 \x01(\x0b\x32\x18.RerunParentInstanceInfoH\x00\x88\x01\x01\x42\x1a\n\x18_rerunParentInstanceInfo\"l\n#ChildWorkflowInstanceCompletedEvent\x12\x17\n\x0ftaskScheduledId\x18\x01 \x01(\x05\x12,\n\x06result\x18\x02 \x01(\x0b\x32\x1c.google.protobuf.StringValue\"h\n ChildWorkflowInstanceFailedEvent\x12\x17\n\x0ftaskScheduledId\x18\x01 \x01(\x05\x12+\n\x0e\x66\x61ilureDetails\x18\x02 \x01(\x0b\x32\x13.TaskFailureDetails\"\x18\n\x16TimerOriginCreateTimer\"(\n\x18TimerOriginExternalEvent\x12\x0c\n\x04name\x18\x01 \x01(\t\"3\n\x18TimerOriginActivityRetry\x12\x17\n\x0ftaskExecutionId\x18\x01 \x01(\t\"3\n\x1dTimerOriginChildWorkflowRetry\x12\x12\n\ninstanceId\x18\x01 \x01(\t\"\x97\x03\n\x11TimerCreatedEvent\x12*\n\x06\x66ireAt\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x11\n\x04name\x18\x02 \x01(\tH\x01\x88\x01\x01\x12>\n\x17rerunParentInstanceInfo\x18\x03 \x01(\x0b\x32\x18.RerunParentInstanceInfoH\x02\x88\x01\x01\x12.\n\x0b\x63reateTimer\x18\x04 \x01(\x0b\x32\x17.TimerOriginCreateTimerH\x00\x12\x32\n\rexternalEvent\x18\x05 \x01(\x0b\x32\x19.TimerOriginExternalEventH\x00\x12\x32\n\ractivityRetry\x18\x06 \x01(\x0b\x32\x19.TimerOriginActivityRetryH\x00\x12<\n\x12\x63hildWorkflowRetry\x18\x07 \x01(\x0b\x32\x1e.TimerOriginChildWorkflowRetryH\x00\x42\x08\n\x06originB\x07\n\x05_nameB\x1a\n\x18_rerunParentInstanceInfo\"N\n\x0fTimerFiredEvent\x12*\n\x06\x66ireAt\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x0f\n\x07timerId\x18\x02 \x01(\x05\"J\n\x14WorkflowStartedEvent\x12&\n\x07version\x18\x01 \x01(\x0b\x32\x10.WorkflowVersionH\x00\x88\x01\x01\x42\n\n\x08_version\"\x18\n\x16WorkflowCompletedEvent\"_\n\x0e\x45ventSentEvent\x12\x12\n\ninstanceId\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12+\n\x05input\x18\x03 \x01(\x0b\x32\x1c.google.protobuf.StringValue\"M\n\x10\x45ventRaisedEvent\x12\x0c\n\x04name\x18\x01 \x01(\t\x12+\n\x05input\x18\x02 \x01(\x0b\x32\x1c.google.protobuf.StringValue\"A\n\x12\x43ontinueAsNewEvent\x12+\n\x05input\x18\x01 \x01(\x0b\x32\x1c.google.protobuf.StringValue\"F\n\x17\x45xecutionSuspendedEvent\x12+\n\x05input\x18\x01 \x01(\x0b\x32\x1c.google.protobuf.StringValue\"D\n\x15\x45xecutionResumedEvent\x12+\n\x05input\x18\x01 \x01(\x0b\x32\x1c.google.protobuf.StringValue\"a\n\x15\x45xecutionStalledEvent\x12\x1e\n\x06reason\x18\x01 \x01(\x0e\x32\x0e.StalledReason\x12\x18\n\x0b\x64\x65scription\x18\x02 \x01(\tH\x00\x88\x01\x01\x42\x0e\n\x0c_description\"\xa8\t\n\x0cHistoryEvent\x12\x0f\n\x07\x65ventId\x18\x01 \x01(\x05\x12-\n\ttimestamp\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x32\n\x10\x65xecutionStarted\x18\x03 \x01(\x0b\x32\x16.ExecutionStartedEventH\x00\x12\x36\n\x12\x65xecutionCompleted\x18\x04 \x01(\x0b\x32\x18.ExecutionCompletedEventH\x00\x12\x38\n\x13\x65xecutionTerminated\x18\x05 \x01(\x0b\x32\x19.ExecutionTerminatedEventH\x00\x12,\n\rtaskScheduled\x18\x06 \x01(\x0b\x32\x13.TaskScheduledEventH\x00\x12,\n\rtaskCompleted\x18\x07 \x01(\x0b\x32\x13.TaskCompletedEventH\x00\x12&\n\ntaskFailed\x18\x08 \x01(\x0b\x32\x10.TaskFailedEventH\x00\x12J\n\x1c\x63hildWorkflowInstanceCreated\x18\t \x01(\x0b\x32\".ChildWorkflowInstanceCreatedEventH\x00\x12N\n\x1e\x63hildWorkflowInstanceCompleted\x18\n \x01(\x0b\x32$.ChildWorkflowInstanceCompletedEventH\x00\x12H\n\x1b\x63hildWorkflowInstanceFailed\x18\x0b \x01(\x0b\x32!.ChildWorkflowInstanceFailedEventH\x00\x12*\n\x0ctimerCreated\x18\x0c \x01(\x0b\x32\x12.TimerCreatedEventH\x00\x12&\n\ntimerFired\x18\r \x01(\x0b\x32\x10.TimerFiredEventH\x00\x12\x30\n\x0fworkflowStarted\x18\x0e \x01(\x0b\x32\x15.WorkflowStartedEventH\x00\x12\x34\n\x11workflowCompleted\x18\x0f \x01(\x0b\x32\x17.WorkflowCompletedEventH\x00\x12$\n\teventSent\x18\x10 \x01(\x0b\x32\x0f.EventSentEventH\x00\x12(\n\x0b\x65ventRaised\x18\x11 \x01(\x0b\x32\x11.EventRaisedEventH\x00\x12,\n\rcontinueAsNew\x18\x14 \x01(\x0b\x32\x13.ContinueAsNewEventH\x00\x12\x36\n\x12\x65xecutionSuspended\x18\x15 \x01(\x0b\x32\x18.ExecutionSuspendedEventH\x00\x12\x32\n\x10\x65xecutionResumed\x18\x16 \x01(\x0b\x32\x16.ExecutionResumedEventH\x00\x12\x32\n\x10\x65xecutionStalled\x18\x1f \x01(\x0b\x32\x16.ExecutionStalledEventH\x00\x12 \n\x06router\x18\x1e \x01(\x0b\x32\x0b.TaskRouterH\x01\x88\x01\x01\x42\x0b\n\teventTypeB\t\n\x07_routerJ\x04\x08\x12\x10\x13J\x04\x08\x13\x10\x14J\x04\x08\x17\x10\x18J\x04\x08\x18\x10\x19J\x04\x08\x19\x10\x1aJ\x04\x08\x1a\x10\x1bJ\x04\x08\x1b\x10\x1cJ\x04\x08\x1c\x10\x1dJ\x04\x08\x1d\x10\x1e\x42V\n+io.dapr.durabletask.implementation.protobufZ\x0b/api/protos\xaa\x02\x19\x44\x61pr.DurableTask.Protobufb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -61,26 +61,30 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _globals['_TIMERORIGINCREATETIMER']._serialized_end=1898
   _globals['_TIMERORIGINEXTERNALEVENT']._serialized_start=1900
   _globals['_TIMERORIGINEXTERNALEVENT']._serialized_end=1940
-  _globals['_TIMERCREATEDEVENT']._serialized_start=1943
-  _globals['_TIMERCREATEDEVENT']._serialized_end=2236
-  _globals['_TIMERFIREDEVENT']._serialized_start=2238
-  _globals['_TIMERFIREDEVENT']._serialized_end=2316
-  _globals['_WORKFLOWSTARTEDEVENT']._serialized_start=2318
-  _globals['_WORKFLOWSTARTEDEVENT']._serialized_end=2392
-  _globals['_WORKFLOWCOMPLETEDEVENT']._serialized_start=2394
-  _globals['_WORKFLOWCOMPLETEDEVENT']._serialized_end=2418
-  _globals['_EVENTSENTEVENT']._serialized_start=2420
-  _globals['_EVENTSENTEVENT']._serialized_end=2515
-  _globals['_EVENTRAISEDEVENT']._serialized_start=2517
-  _globals['_EVENTRAISEDEVENT']._serialized_end=2594
-  _globals['_CONTINUEASNEWEVENT']._serialized_start=2596
-  _globals['_CONTINUEASNEWEVENT']._serialized_end=2661
-  _globals['_EXECUTIONSUSPENDEDEVENT']._serialized_start=2663
-  _globals['_EXECUTIONSUSPENDEDEVENT']._serialized_end=2733
-  _globals['_EXECUTIONRESUMEDEVENT']._serialized_start=2735
-  _globals['_EXECUTIONRESUMEDEVENT']._serialized_end=2803
-  _globals['_EXECUTIONSTALLEDEVENT']._serialized_start=2805
-  _globals['_EXECUTIONSTALLEDEVENT']._serialized_end=2902
-  _globals['_HISTORYEVENT']._serialized_start=2905
-  _globals['_HISTORYEVENT']._serialized_end=4097
+  _globals['_TIMERORIGINACTIVITYRETRY']._serialized_start=1942
+  _globals['_TIMERORIGINACTIVITYRETRY']._serialized_end=1993
+  _globals['_TIMERORIGINCHILDWORKFLOWRETRY']._serialized_start=1995
+  _globals['_TIMERORIGINCHILDWORKFLOWRETRY']._serialized_end=2046
+  _globals['_TIMERCREATEDEVENT']._serialized_start=2049
+  _globals['_TIMERCREATEDEVENT']._serialized_end=2456
+  _globals['_TIMERFIREDEVENT']._serialized_start=2458
+  _globals['_TIMERFIREDEVENT']._serialized_end=2536
+  _globals['_WORKFLOWSTARTEDEVENT']._serialized_start=2538
+  _globals['_WORKFLOWSTARTEDEVENT']._serialized_end=2612
+  _globals['_WORKFLOWCOMPLETEDEVENT']._serialized_start=2614
+  _globals['_WORKFLOWCOMPLETEDEVENT']._serialized_end=2638
+  _globals['_EVENTSENTEVENT']._serialized_start=2640
+  _globals['_EVENTSENTEVENT']._serialized_end=2735
+  _globals['_EVENTRAISEDEVENT']._serialized_start=2737
+  _globals['_EVENTRAISEDEVENT']._serialized_end=2814
+  _globals['_CONTINUEASNEWEVENT']._serialized_start=2816
+  _globals['_CONTINUEASNEWEVENT']._serialized_end=2881
+  _globals['_EXECUTIONSUSPENDEDEVENT']._serialized_start=2883
+  _globals['_EXECUTIONSUSPENDEDEVENT']._serialized_end=2953
+  _globals['_EXECUTIONRESUMEDEVENT']._serialized_start=2955
+  _globals['_EXECUTIONRESUMEDEVENT']._serialized_end=3023
+  _globals['_EXECUTIONSTALLEDEVENT']._serialized_start=3025
+  _globals['_EXECUTIONSTALLEDEVENT']._serialized_end=3122
+  _globals['_HISTORYEVENT']._serialized_start=3125
+  _globals['_HISTORYEVENT']._serialized_end=4317
 # @@protoc_insertion_point(module_scope)

{dapr_ext_workflow_dev-1.17.0.dev102 → dapr_ext_workflow_dev-1.17.0.dev103}/dapr/ext/workflow/_durabletask/internal/history_events_pb2.pyi

@@ -351,6 +351,44 @@ class TimerOriginExternalEvent(_message.Message):
 
 Global___TimerOriginExternalEvent: _TypeAlias = TimerOriginExternalEvent  # noqa: Y015
 
+@_typing.final
+class TimerOriginActivityRetry(_message.Message):
+    """Indicates the timer was created as a retry delay for an activity execution."""
+
+    DESCRIPTOR: _descriptor.Descriptor
+
+    TASKEXECUTIONID_FIELD_NUMBER: _builtins.int
+    taskExecutionId: _builtins.str
+    """The task execution ID of the activity being retried."""
+    def __init__(
+        self,
+        *,
+        taskExecutionId: _builtins.str = ...,
+    ) -> None: ...
+    _ClearFieldArgType: _TypeAlias = _typing.Literal["taskExecutionId", b"taskExecutionId"]  # noqa: Y015
+    def ClearField(self, field_name: _ClearFieldArgType) -> None: ...
+
+Global___TimerOriginActivityRetry: _TypeAlias = TimerOriginActivityRetry  # noqa: Y015
+
+@_typing.final
+class TimerOriginChildWorkflowRetry(_message.Message):
+    """Indicates the timer was created as a retry delay for a child workflow execution."""
+
+    DESCRIPTOR: _descriptor.Descriptor
+
+    INSTANCEID_FIELD_NUMBER: _builtins.int
+    instanceId: _builtins.str
+    """The instance ID of the workflow being retried."""
+    def __init__(
+        self,
+        *,
+        instanceId: _builtins.str = ...,
+    ) -> None: ...
+    _ClearFieldArgType: _TypeAlias = _typing.Literal["instanceId", b"instanceId"]  # noqa: Y015
+    def ClearField(self, field_name: _ClearFieldArgType) -> None: ...
+
+Global___TimerOriginChildWorkflowRetry: _TypeAlias = TimerOriginChildWorkflowRetry  # noqa: Y015
+
 @_typing.final
 class TimerCreatedEvent(_message.Message):
     DESCRIPTOR: _descriptor.Descriptor
@@ -360,6 +398,8 @@ class TimerCreatedEvent(_message.Message):
     RERUNPARENTINSTANCEINFO_FIELD_NUMBER: _builtins.int
     CREATETIMER_FIELD_NUMBER: _builtins.int
     EXTERNALEVENT_FIELD_NUMBER: _builtins.int
+    ACTIVITYRETRY_FIELD_NUMBER: _builtins.int
+    CHILDWORKFLOWRETRY_FIELD_NUMBER: _builtins.int
     name: _builtins.str
     @_builtins.property
     def fireAt(self) -> _timestamp_pb2.Timestamp: ...
@@ -373,6 +413,10 @@ class TimerCreatedEvent(_message.Message):
     def createTimer(self) -> Global___TimerOriginCreateTimer: ...
     @_builtins.property
     def externalEvent(self) -> Global___TimerOriginExternalEvent: ...
+    @_builtins.property
+    def activityRetry(self) -> Global___TimerOriginActivityRetry: ...
+    @_builtins.property
+    def childWorkflowRetry(self) -> Global___TimerOriginChildWorkflowRetry: ...
     def __init__(
         self,
         *,
@@ -381,16 +425,18 @@ class TimerCreatedEvent(_message.Message):
         rerunParentInstanceInfo: _orchestration_pb2.RerunParentInstanceInfo | None = ...,
         createTimer: Global___TimerOriginCreateTimer | None = ...,
         externalEvent: Global___TimerOriginExternalEvent | None = ...,
+        activityRetry: Global___TimerOriginActivityRetry | None = ...,
+        childWorkflowRetry: Global___TimerOriginChildWorkflowRetry | None = ...,
     ) -> None: ...
-    _HasFieldArgType: _TypeAlias = _typing.Literal["_name", b"_name", "_rerunParentInstanceInfo", b"_rerunParentInstanceInfo", "createTimer", b"createTimer", "externalEvent", b"externalEvent", "fireAt", b"fireAt", "name", b"name", "origin", b"origin", "rerunParentInstanceInfo", b"rerunParentInstanceInfo"]  # noqa: Y015
+    _HasFieldArgType: _TypeAlias = _typing.Literal["_name", b"_name", "_rerunParentInstanceInfo", b"_rerunParentInstanceInfo", "activityRetry", b"activityRetry", "childWorkflowRetry", b"childWorkflowRetry", "createTimer", b"createTimer", "externalEvent", b"externalEvent", "fireAt", b"fireAt", "name", b"name", "origin", b"origin", "rerunParentInstanceInfo", b"rerunParentInstanceInfo"]  # noqa: Y015
     def HasField(self, field_name: _HasFieldArgType) -> _builtins.bool: ...
-    _ClearFieldArgType: _TypeAlias = _typing.Literal["_name", b"_name", "_rerunParentInstanceInfo", b"_rerunParentInstanceInfo", "createTimer", b"createTimer", "externalEvent", b"externalEvent", "fireAt", b"fireAt", "name", b"name", "origin", b"origin", "rerunParentInstanceInfo", b"rerunParentInstanceInfo"]  # noqa: Y015
+    _ClearFieldArgType: _TypeAlias = _typing.Literal["_name", b"_name", "_rerunParentInstanceInfo", b"_rerunParentInstanceInfo", "activityRetry", b"activityRetry", "childWorkflowRetry", b"childWorkflowRetry", "createTimer", b"createTimer", "externalEvent", b"externalEvent", "fireAt", b"fireAt", "name", b"name", "origin", b"origin", "rerunParentInstanceInfo", b"rerunParentInstanceInfo"]  # noqa: Y015
     def ClearField(self, field_name: _ClearFieldArgType) -> None: ...
     _WhichOneofReturnType__name: _TypeAlias = _typing.Literal["name"]  # noqa: Y015
     _WhichOneofArgType__name: _TypeAlias = _typing.Literal["_name", b"_name"]  # noqa: Y015
     _WhichOneofReturnType__rerunParentInstanceInfo: _TypeAlias = _typing.Literal["rerunParentInstanceInfo"]  # noqa: Y015
     _WhichOneofArgType__rerunParentInstanceInfo: _TypeAlias = _typing.Literal["_rerunParentInstanceInfo", b"_rerunParentInstanceInfo"]  # noqa: Y015
-    _WhichOneofReturnType_origin: _TypeAlias = _typing.Literal["createTimer", "externalEvent"]  # noqa: Y015
+    _WhichOneofReturnType_origin: _TypeAlias = _typing.Literal["createTimer", "externalEvent", "activityRetry", "childWorkflowRetry"]  # noqa: Y015
     _WhichOneofArgType_origin: _TypeAlias = _typing.Literal["origin", b"origin"]  # noqa: Y015
     @_typing.overload
     def WhichOneof(self, oneof_group: _WhichOneofArgType__name) -> _WhichOneofReturnType__name | None: ...

{dapr_ext_workflow_dev-1.17.0.dev102 → dapr_ext_workflow_dev-1.17.0.dev103}/dapr/ext/workflow/_durabletask/internal/orchestrator_actions_pb2.py

@@ -28,7 +28,7 @@ from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__
 from google.protobuf import wrappers_pb2 as google_dot_protobuf_dot_wrappers__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1aorchestrator_actions.proto\x1a\x13orchestration.proto\x1a\x14history_events.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1egoogle/protobuf/wrappers.proto\"\xc4\x01\n\x12ScheduleTaskAction\x12\x0c\n\x04name\x18\x01 \x01(\t\x12-\n\x07version\x18\x02 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12+\n\x05input\x18\x03 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12 \n\x06router\x18\x04 \x01(\x0b\x32\x0b.TaskRouterH\x00\x88\x01\x01\x12\x17\n\x0ftaskExecutionId\x18\x05 \x01(\tB\t\n\x07_router\"\xc6\x01\n\x19\x43reateChildWorkflowAction\x12\x12\n\ninstanceId\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12-\n\x07version\x18\x03 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12+\n\x05input\x18\x04 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12 \n\x06router\x18\x05 \x01(\x0b\x32\x0b.TaskRouterH\x00\x88\x01\x01\x42\t\n\x07_router\"\xc9\x01\n\x11\x43reateTimerAction\x12*\n\x06\x66ireAt\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x11\n\x04name\x18\x02 \x01(\tH\x01\x88\x01\x01\x12.\n\x0b\x63reateTimer\x18\x03 \x01(\x0b\x32\x17.TimerOriginCreateTimerH\x00\x12\x32\n\rexternalEvent\x18\x04 \x01(\x0b\x32\x19.TimerOriginExternalEventH\x00\x42\x08\n\x06originB\x07\n\x05_name\"p\n\x0fSendEventAction\x12#\n\x08instance\x18\x01 \x01(\x0b\x32\x11.WorkflowInstance\x12\x0c\n\x04name\x18\x02 \x01(\t\x12*\n\x04\x64\x61ta\x18\x03 \x01(\x0b\x32\x1c.google.protobuf.StringValue\"\xaa\x02\n\x16\x43ompleteWorkflowAction\x12,\n\x0eworkflowStatus\x18\x01 \x01(\x0e\x32\x14.OrchestrationStatus\x12,\n\x06result\x18\x02 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12-\n\x07\x64\x65tails\x18\x03 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12\x30\n\nnewVersion\x18\x04 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12&\n\x0f\x63\x61rryoverEvents\x18\x05 \x03(\x0b\x32\r.HistoryEvent\x12+\n\x0e\x66\x61ilureDetails\x18\x06 \x01(\x0b\x32\x13.TaskFailureDetails\"l\n\x17TerminateWorkflowAction\x12\x12\n\ninstanceId\x18\x01 \x01(\t\x12,\n\x06reason\x18\x02 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12\x0f\n\x07recurse\x18\x03 \x01(\x08\"#\n!WorkflowVersionNotAvailableAction\"\xd6\x03\n\x0eWorkflowAction\x12\n\n\x02id\x18\x01 \x01(\x05\x12+\n\x0cscheduleTask\x18\x02 \x01(\x0b\x32\x13.ScheduleTaskActionH\x00\x12\x39\n\x13\x63reateChildWorkflow\x18\x03 \x01(\x0b\x32\x1a.CreateChildWorkflowActionH\x00\x12)\n\x0b\x63reateTimer\x18\x04 \x01(\x0b\x32\x12.CreateTimerActionH\x00\x12%\n\tsendEvent\x18\x05 \x01(\x0b\x32\x10.SendEventActionH\x00\x12\x33\n\x10\x63ompleteWorkflow\x18\x06 \x01(\x0b\x32\x17.CompleteWorkflowActionH\x00\x12\x35\n\x11terminateWorkflow\x18\x07 \x01(\x0b\x32\x18.TerminateWorkflowActionH\x00\x12I\n\x1bworkflowVersionNotAvailable\x18\n \x01(\x0b\x32\".WorkflowVersionNotAvailableActionH\x00\x12 \n\x06router\x18\t \x01(\x0b\x32\x0b.TaskRouterH\x01\x88\x01\x01\x42\x14\n\x12workflowActionTypeB\t\n\x07_routerJ\x04\x08\x08\x10\tBV\n+io.dapr.durabletask.implementation.protobufZ\x0b/api/protos\xaa\x02\x19\x44\x61pr.DurableTask.Protobufb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1aorchestrator_actions.proto\x1a\x13orchestration.proto\x1a\x14history_events.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1egoogle/protobuf/wrappers.proto\"\xc4\x01\n\x12ScheduleTaskAction\x12\x0c\n\x04name\x18\x01 \x01(\t\x12-\n\x07version\x18\x02 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12+\n\x05input\x18\x03 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12 \n\x06router\x18\x04 \x01(\x0b\x32\x0b.TaskRouterH\x00\x88\x01\x01\x12\x17\n\x0ftaskExecutionId\x18\x05 \x01(\tB\t\n\x07_router\"\xc6\x01\n\x19\x43reateChildWorkflowAction\x12\x12\n\ninstanceId\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12-\n\x07version\x18\x03 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12+\n\x05input\x18\x04 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12 \n\x06router\x18\x05 \x01(\x0b\x32\x0b.TaskRouterH\x00\x88\x01\x01\x42\t\n\x07_router\"\xbb\x02\n\x11\x43reateTimerAction\x12*\n\x06\x66ireAt\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x11\n\x04name\x18\x02 \x01(\tH\x01\x88\x01\x01\x12.\n\x0b\x63reateTimer\x18\x03 \x01(\x0b\x32\x17.TimerOriginCreateTimerH\x00\x12\x32\n\rexternalEvent\x18\x04 \x01(\x0b\x32\x19.TimerOriginExternalEventH\x00\x12\x32\n\ractivityRetry\x18\x05 \x01(\x0b\x32\x19.TimerOriginActivityRetryH\x00\x12<\n\x12\x63hildWorkflowRetry\x18\x06 \x01(\x0b\x32\x1e.TimerOriginChildWorkflowRetryH\x00\x42\x08\n\x06originB\x07\n\x05_name\"p\n\x0fSendEventAction\x12#\n\x08instance\x18\x01 \x01(\x0b\x32\x11.WorkflowInstance\x12\x0c\n\x04name\x18\x02 \x01(\t\x12*\n\x04\x64\x61ta\x18\x03 \x01(\x0b\x32\x1c.google.protobuf.StringValue\"\xaa\x02\n\x16\x43ompleteWorkflowAction\x12,\n\x0eworkflowStatus\x18\x01 \x01(\x0e\x32\x14.OrchestrationStatus\x12,\n\x06result\x18\x02 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12-\n\x07\x64\x65tails\x18\x03 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12\x30\n\nnewVersion\x18\x04 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12&\n\x0f\x63\x61rryoverEvents\x18\x05 \x03(\x0b\x32\r.HistoryEvent\x12+\n\x0e\x66\x61ilureDetails\x18\x06 \x01(\x0b\x32\x13.TaskFailureDetails\"l\n\x17TerminateWorkflowAction\x12\x12\n\ninstanceId\x18\x01 \x01(\t\x12,\n\x06reason\x18\x02 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12\x0f\n\x07recurse\x18\x03 \x01(\x08\"#\n!WorkflowVersionNotAvailableAction\"\xd6\x03\n\x0eWorkflowAction\x12\n\n\x02id\x18\x01 \x01(\x05\x12+\n\x0cscheduleTask\x18\x02 \x01(\x0b\x32\x13.ScheduleTaskActionH\x00\x12\x39\n\x13\x63reateChildWorkflow\x18\x03 \x01(\x0b\x32\x1a.CreateChildWorkflowActionH\x00\x12)\n\x0b\x63reateTimer\x18\x04 \x01(\x0b\x32\x12.CreateTimerActionH\x00\x12%\n\tsendEvent\x18\x05 \x01(\x0b\x32\x10.SendEventActionH\x00\x12\x33\n\x10\x63ompleteWorkflow\x18\x06 \x01(\x0b\x32\x17.CompleteWorkflowActionH\x00\x12\x35\n\x11terminateWorkflow\x18\x07 \x01(\x0b\x32\x18.TerminateWorkflowActionH\x00\x12I\n\x1bworkflowVersionNotAvailable\x18\n \x01(\x0b\x32\".WorkflowVersionNotAvailableActionH\x00\x12 \n\x06router\x18\t \x01(\x0b\x32\x0b.TaskRouterH\x01\x88\x01\x01\x42\x14\n\x12workflowActionTypeB\t\n\x07_routerJ\x04\x08\x08\x10\tBV\n+io.dapr.durabletask.implementation.protobufZ\x0b/api/protos\xaa\x02\x19\x44\x61pr.DurableTask.Protobufb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -41,15 +41,15 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _globals['_CREATECHILDWORKFLOWACTION']._serialized_start=338
   _globals['_CREATECHILDWORKFLOWACTION']._serialized_end=536
   _globals['_CREATETIMERACTION']._serialized_start=539
-  _globals['_CREATETIMERACTION']._serialized_end=740
-  _globals['_SENDEVENTACTION']._serialized_start=742
-  _globals['_SENDEVENTACTION']._serialized_end=854
-  _globals['_COMPLETEWORKFLOWACTION']._serialized_start=857
-  _globals['_COMPLETEWORKFLOWACTION']._serialized_end=1155
-  _globals['_TERMINATEWORKFLOWACTION']._serialized_start=1157
-  _globals['_TERMINATEWORKFLOWACTION']._serialized_end=1265
-  _globals['_WORKFLOWVERSIONNOTAVAILABLEACTION']._serialized_start=1267
-  _globals['_WORKFLOWVERSIONNOTAVAILABLEACTION']._serialized_end=1302
-  _globals['_WORKFLOWACTION']._serialized_start=1305
-  _globals['_WORKFLOWACTION']._serialized_end=1775
+  _globals['_CREATETIMERACTION']._serialized_end=854
+  _globals['_SENDEVENTACTION']._serialized_start=856
+  _globals['_SENDEVENTACTION']._serialized_end=968
+  _globals['_COMPLETEWORKFLOWACTION']._serialized_start=971
+  _globals['_COMPLETEWORKFLOWACTION']._serialized_end=1269
+  _globals['_TERMINATEWORKFLOWACTION']._serialized_start=1271
+  _globals['_TERMINATEWORKFLOWACTION']._serialized_end=1379
+  _globals['_WORKFLOWVERSIONNOTAVAILABLEACTION']._serialized_start=1381
+  _globals['_WORKFLOWVERSIONNOTAVAILABLEACTION']._serialized_end=1416
+  _globals['_WORKFLOWACTION']._serialized_start=1419
+  _globals['_WORKFLOWACTION']._serialized_end=1889
 # @@protoc_insertion_point(module_scope)

{dapr_ext_workflow_dev-1.17.0.dev102 → dapr_ext_workflow_dev-1.17.0.dev103}/dapr/ext/workflow/_durabletask/internal/orchestrator_actions_pb2.pyi

@@ -104,6 +104,8 @@ class CreateTimerAction(_message.Message):
     NAME_FIELD_NUMBER: _builtins.int
     CREATETIMER_FIELD_NUMBER: _builtins.int
     EXTERNALEVENT_FIELD_NUMBER: _builtins.int
+    ACTIVITYRETRY_FIELD_NUMBER: _builtins.int
+    CHILDWORKFLOWRETRY_FIELD_NUMBER: _builtins.int
     name: _builtins.str
     @_builtins.property
     def fireAt(self) -> _timestamp_pb2.Timestamp: ...
@@ -111,6 +113,10 @@ class CreateTimerAction(_message.Message):
     def createTimer(self) -> _history_events_pb2.TimerOriginCreateTimer: ...
     @_builtins.property
     def externalEvent(self) -> _history_events_pb2.TimerOriginExternalEvent: ...
+    @_builtins.property
+    def activityRetry(self) -> _history_events_pb2.TimerOriginActivityRetry: ...
+    @_builtins.property
+    def childWorkflowRetry(self) -> _history_events_pb2.TimerOriginChildWorkflowRetry: ...
     def __init__(
         self,
         *,
@@ -118,14 +124,16 @@ class CreateTimerAction(_message.Message):
         name: _builtins.str | None = ...,
         createTimer: _history_events_pb2.TimerOriginCreateTimer | None = ...,
         externalEvent: _history_events_pb2.TimerOriginExternalEvent | None = ...,
+        activityRetry: _history_events_pb2.TimerOriginActivityRetry | None = ...,
+        childWorkflowRetry: _history_events_pb2.TimerOriginChildWorkflowRetry | None = ...,
     ) -> None: ...
-    _HasFieldArgType: _TypeAlias = _typing.Literal["_name", b"_name", "createTimer", b"createTimer", "externalEvent", b"externalEvent", "fireAt", b"fireAt", "name", b"name", "origin", b"origin"]  # noqa: Y015
+    _HasFieldArgType: _TypeAlias = _typing.Literal["_name", b"_name", "activityRetry", b"activityRetry", "childWorkflowRetry", b"childWorkflowRetry", "createTimer", b"createTimer", "externalEvent", b"externalEvent", "fireAt", b"fireAt", "name", b"name", "origin", b"origin"]  # noqa: Y015
     def HasField(self, field_name: _HasFieldArgType) -> _builtins.bool: ...
-    _ClearFieldArgType: _TypeAlias = _typing.Literal["_name", b"_name", "createTimer", b"createTimer", "externalEvent", b"externalEvent", "fireAt", b"fireAt", "name", b"name", "origin", b"origin"]  # noqa: Y015
+    _ClearFieldArgType: _TypeAlias = _typing.Literal["_name", b"_name", "activityRetry", b"activityRetry", "childWorkflowRetry", b"childWorkflowRetry", "createTimer", b"createTimer", "externalEvent", b"externalEvent", "fireAt", b"fireAt", "name", b"name", "origin", b"origin"]  # noqa: Y015
     def ClearField(self, field_name: _ClearFieldArgType) -> None: ...
     _WhichOneofReturnType__name: _TypeAlias = _typing.Literal["name"]  # noqa: Y015
     _WhichOneofArgType__name: _TypeAlias = _typing.Literal["_name", b"_name"]  # noqa: Y015
-    _WhichOneofReturnType_origin: _TypeAlias = _typing.Literal["createTimer", "externalEvent"]  # noqa: Y015
+    _WhichOneofReturnType_origin: _TypeAlias = _typing.Literal["createTimer", "externalEvent", "activityRetry", "childWorkflowRetry"]  # noqa: Y015
     _WhichOneofArgType_origin: _TypeAlias = _typing.Literal["origin", b"origin"]  # noqa: Y015
     @_typing.overload
     def WhichOneof(self, oneof_group: _WhichOneofArgType__name) -> _WhichOneofReturnType__name | None: ...

dapr_ext_workflow_dev-1.17.0.dev103/dapr/ext/workflow/_durabletask/internal/timer.py

@@ -0,0 +1,142 @@
+# Copyright 2026 The Dapr Authors
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#     http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Timer-related helpers for the durabletask workflow SDK.
+
+This module keeps all timer / TimerOrigin concerns in one place, separate from
+the generic action/event helpers in ``helpers.py``.
+"""
+
+from datetime import datetime
+from typing import Optional, Union
+
+import dapr.ext.workflow._durabletask.internal.protos as pb
+from google.protobuf import timestamp_pb2
+
+TimerOrigin = Union[
+    pb.TimerOriginCreateTimer,
+    pb.TimerOriginExternalEvent,
+    pb.TimerOriginActivityRetry,
+    pb.TimerOriginChildWorkflowRetry,
+]
+
+_ORIGIN_FIELD: dict[type, str] = {
+    pb.TimerOriginCreateTimer: 'createTimer',
+    pb.TimerOriginExternalEvent: 'externalEvent',
+    pb.TimerOriginActivityRetry: 'activityRetry',
+    pb.TimerOriginChildWorkflowRetry: 'childWorkflowRetry',
+}
+
+# Sentinel fireAt used for "optional" TimerOriginExternalEvent timers that back
+# an indefinite wait_for_external_event. The sentinel is
+# 9999-12-31T23:59:59.999999999Z (nanosecond precision — Python's ``datetime``
+# is only microsecond-precision, so we build the Timestamp directly).
+OPTIONAL_TIMER_FIRE_AT: timestamp_pb2.Timestamp = timestamp_pb2.Timestamp(
+    seconds=253402300799, nanos=999999999
+)
+
+
+def _origin_kwargs(origin: Optional[TimerOrigin]) -> dict:
+    """Build keyword args that set the correct origin oneof field on a
+    ``CreateTimerAction`` / ``TimerCreatedEvent`` proto."""
+    if origin is None:
+        return {}
+    return {_ORIGIN_FIELD[type(origin)]: origin}
+
+
+def _to_timestamp(
+    fire_at: Union[datetime, timestamp_pb2.Timestamp],
+) -> timestamp_pb2.Timestamp:
+    """Normalize a ``fire_at`` argument to a protobuf ``Timestamp``."""
+    if isinstance(fire_at, timestamp_pb2.Timestamp):
+        return fire_at
+    ts = timestamp_pb2.Timestamp()
+    ts.FromDatetime(fire_at)
+    return ts
+
+
+def _fire_at_matches_sentinel(ts: timestamp_pb2.Timestamp) -> bool:
+    """Return True iff ``ts`` exactly matches :data:`OPTIONAL_TIMER_FIRE_AT`.
+
+    Both ``seconds`` and ``nanos`` are proto3 scalars that are always present
+    (default 0 when unset), so unconditional field access is safe.
+    """
+    return ts.seconds == OPTIONAL_TIMER_FIRE_AT.seconds and ts.nanos == OPTIONAL_TIMER_FIRE_AT.nanos
+
+
+def is_optional_timer_action(action: pb.WorkflowAction) -> bool:
+    """Returns True if the action is an optional TimerOriginExternalEvent timer
+    with the sentinel fireAt — i.e. created by an indefinite wait_for_external_event.
+
+    Pre-patch histories (from prior SDK versions that didn't schedule a timer
+    for indefinite waits) won't carry a matching TimerCreatedEvent; the replay
+    logic uses this check to drop the optional action and shift sequence ids.
+    """
+    if not action.HasField('createTimer'):
+        return False
+    timer = action.createTimer
+    if timer.WhichOneof('origin') != 'externalEvent':
+        return False
+    return _fire_at_matches_sentinel(timer.fireAt)
+
+
+def is_optional_timer_event(event: pb.HistoryEvent) -> bool:
+    """Returns True if a TimerCreatedEvent is the optional sentinel timer.
+
+    For replay compatibility, treat a timerCreated event with the sentinel
+    fireAt as optional even if the proto3 ``origin`` oneof is unset (e.g. when
+    reading histories emitted by older sidecars that didn't populate it). When
+    ``origin`` *is* populated, it must match TimerOriginExternalEvent.
+    """
+    if not event.HasField('timerCreated'):
+        return False
+    timer = event.timerCreated
+    if not _fire_at_matches_sentinel(timer.fireAt):
+        return False
+    origin = timer.WhichOneof('origin')
+    return origin in (None, 'externalEvent')
+
+
+def new_create_timer_action(
+    timer_id: int,
+    fire_at: Union[datetime, timestamp_pb2.Timestamp],
+    origin: Optional[TimerOrigin] = None,
+) -> pb.WorkflowAction:
+    ts = _to_timestamp(fire_at)
+    return pb.WorkflowAction(
+        id=timer_id,
+        createTimer=pb.CreateTimerAction(fireAt=ts, **_origin_kwargs(origin)),
+    )
+
+
+def new_timer_created_event(
+    timer_id: int,
+    fire_at: Union[datetime, timestamp_pb2.Timestamp],
+    origin: Optional[TimerOrigin] = None,
+) -> pb.HistoryEvent:
+    ts = _to_timestamp(fire_at)
+    return pb.HistoryEvent(
+        eventId=timer_id,
+        timestamp=timestamp_pb2.Timestamp(),
+        timerCreated=pb.TimerCreatedEvent(fireAt=ts, **_origin_kwargs(origin)),
+    )
+
+
+def new_timer_fired_event(
+    timer_id: int,
+    fire_at: Union[datetime, timestamp_pb2.Timestamp],
+) -> pb.HistoryEvent:
+    ts = _to_timestamp(fire_at)
+    return pb.HistoryEvent(
+        eventId=-1,
+        timestamp=timestamp_pb2.Timestamp(),
+        timerFired=pb.TimerFiredEvent(fireAt=ts, timerId=timer_id),
+    )

{dapr_ext_workflow_dev-1.17.0.dev102 → dapr_ext_workflow_dev-1.17.0.dev103}/dapr/ext/workflow/_durabletask/task.py

@@ -166,21 +166,35 @@ class OrchestrationContext(ABC):
         """
         pass
 
-    # TODO: Add a timeout parameter, which allows the task to be canceled if the event is
-    # not received within the specified timeout. This requires support for task cancellation.
     @abstractmethod
-    def wait_for_external_event(self, name: str) -> Task:
+    def wait_for_external_event(
+        self, name: str, *, timeout: Optional[Union[datetime, timedelta]] = None
+    ) -> Task:
         """Wait asynchronously for an event to be raised with the name `name`.
 
         Parameters
         ----------
         name : str
             The event name of the event that the task is waiting for.
+        timeout : datetime | timedelta | None
+            Controls how long to wait for the event. Accepts only ``datetime``
+            or ``timedelta`` — a plain numeric ``0`` is **not** a valid value
+            (use ``timedelta(0)`` explicitly). Three shapes:
+
+            * ``None`` (default) or a *negative* ``timedelta`` — wait indefinitely.
+              An optional sentinel timer is scheduled internally for runtime
+              tracking, but ``TimeoutError`` is never raised on its own.
+            * ``timedelta(0)`` — do not wait at all. The returned task fails
+              immediately with ``TimeoutError``.
+            * A future ``datetime`` or a positive ``timedelta`` — wait until
+              that deadline / for that duration; ``TimeoutError`` is raised if
+              the event has not been received in time.
 
         Returns
         -------
         Task[TOutput]
-            A Durable Task that completes when the event is received.
+            A Durable Task that completes when the event is received or fails
+            with ``TimeoutError`` if the timeout fires first.
         """
         pass
 
@@ -284,7 +298,7 @@ class Task(ABC, Generic[T]):
     """Abstract base class for asynchronous tasks in a durable orchestration."""
 
     _result: T
-    _exception: Optional[TaskFailedError]
+    _exception: Optional[Exception]
     _parent: Optional[CompositeTask[T]]
 
     def __init__(self) -> None:
@@ -311,7 +325,7 @@ class Task(ABC, Generic[T]):
             raise self._exception
         return self._result
 
-    def get_exception(self) -> TaskFailedError:
+    def get_exception(self) -> Exception:
         """Returns the exception that caused the task to fail."""
         if self._exception is None:
             raise ValueError('The task has not failed.')
@@ -400,6 +414,23 @@ class CompletableTask(Task[T]):
         if self._parent is not None:
             self._parent.on_child_completed(self)
 
+    def cancel(self, exc: Exception) -> None:
+        """Mark this task as completed with the given exception.
+
+        Used for non-runtime failures such as a zero-timeout
+        wait_for_external_event being canceled before any history event arrives.
+
+        Idempotent: a noop if the task has already completed (success or
+        failure), which matches the common semantics of ``cancel()`` in
+        asyncio / threading APIs.
+        """
+        if self._is_complete:
+            return
+        self._exception = exc
+        self._is_complete = True
+        if self._parent is not None:
+            self._parent.on_child_completed(self)
+
 
 class RetryableTask(CompletableTask[T]):
     """A task that can be retried according to a retry policy."""
@@ -497,6 +528,54 @@ class WhenAnyTask(CompositeTask[Task]):
                 self._parent.on_child_completed(self)
 
 
+class ExternalEventWithTimeoutTask(CompositeTask[T]):
+    """A task that waits for an external event with a timeout.
+
+    Completes with the event data if the event arrives first, or raises
+    ``TimeoutError`` if the timer fires first.
+
+    When the timer wins, the optional ``on_timeout`` callback is invoked so the
+    caller can unregister the stale event task from ``_pending_events``, ensuring
+    that a late ``eventRaised`` for the same name is buffered rather than consumed
+    by the now-obsolete waiter.
+    """
+
+    def __init__(
+        self,
+        event_task: CompletableTask,
+        timer_task: TimerTask,
+        event_name: str,
+        timeout: Optional[Union[datetime, timedelta]] = None,
+        on_timeout: Optional[Callable[[], None]] = None,
+    ):
+        self._event_task = event_task
+        self._timer_task = timer_task
+        self._event_name = event_name
+        self._timeout = timeout
+        self._on_timeout = on_timeout
+        super().__init__([event_task, timer_task])
+
+    def on_child_completed(self, completed_task: Task):
+        if self.is_complete:
+            return
+        if completed_task is self._event_task:
+            if completed_task.is_failed:
+                self._exception = completed_task.get_exception()
+            else:
+                self._result = completed_task.get_result()
+            self._is_complete = True
+        elif completed_task is self._timer_task:
+            if self._on_timeout is not None:
+                self._on_timeout()
+            after = f' after {self._timeout!r}' if self._timeout is not None else ''
+            self._exception = TimeoutError(
+                f'Timed out{after} waiting for external event {self._event_name!r}'
+            )
+            self._is_complete = True
+        if self._is_complete and self._parent is not None:
+            self._parent.on_child_completed(self)
+
+
 def when_all(tasks: list[Task[T]]) -> WhenAllTask[T]:
     """Returns a task that completes when all of the provided tasks complete or when one of the tasks fail."""
     return WhenAllTask(tasks)

{dapr_ext_workflow_dev-1.17.0.dev102 → dapr_ext_workflow_dev-1.17.0.dev103}/dapr/ext/workflow/_durabletask/worker.py

@@ -30,7 +30,7 @@ import dapr.ext.workflow._durabletask.internal.shared as shared
 import grpc
 from dapr.ext.workflow._durabletask import deterministic, task
 from dapr.ext.workflow._durabletask.internal.grpc_interceptor import DefaultClientInterceptorImpl
-from google.protobuf import empty_pb2
+from google.protobuf import empty_pb2, timestamp_pb2
 
 TInput = TypeVar('TInput')
 TOutput = TypeVar('TOutput')
@@ -1068,6 +1068,11 @@ class _RuntimeOrchestrationContext(
         task = next(generator)  # this starts the generator
         # TODO: Check if the task is null?
         self._previous_task = task
+        # If the first yielded task is already complete (e.g. wait_for_external_event
+        # with timeout=0 returns an immediately-canceled task), drive the generator
+        # forward now so the orchestrator doesn't get stuck waiting for an event.
+        if self._previous_task is not None and self._previous_task.is_complete:
+            self.resume()
 
     def resume(self):
         if self._generator is None:
@@ -1183,6 +1188,40 @@ class _RuntimeOrchestrationContext(
         self._sequence_number += 1
         return self._sequence_number
 
+    def _drop_optional_pending_at(self, action_id: int) -> bool:
+        """Drop the pending optional timer action at ``action_id`` and shift every
+        pending action and pending task with id greater than ``action_id`` down by
+        one, also decrementing the sequence counter.
+
+        Returns True if the action at ``action_id`` was an optional timer and was
+        dropped; False otherwise (caller should fall through to the normal
+        non-determinism error path).
+
+        This preserves sequence-id determinism when replaying a pre-patch history
+        where an indefinite wait_for_external_event did not reserve a sequence
+        number for its optional timer.
+        """
+        action = self._pending_actions.get(action_id)
+        if action is None or not ph.is_optional_timer_action(action):
+            return False
+
+        del self._pending_actions[action_id]
+        self._pending_tasks.pop(action_id, None)
+
+        # Shift every id > action_id down by one.
+        higher_action_ids = sorted(k for k in self._pending_actions if k > action_id)
+        for old_id in higher_action_ids:
+            a = self._pending_actions.pop(old_id)
+            a.id = old_id - 1
+            self._pending_actions[old_id - 1] = a
+        higher_task_ids = sorted(k for k in self._pending_tasks if k > action_id)
+        for old_id in higher_task_ids:
+            t = self._pending_tasks.pop(old_id)
+            self._pending_tasks[old_id - 1] = t
+
+        self._sequence_number -= 1
+        return True
+
     @property
     def app_id(self) -> str:
         return self._app_id
@@ -1216,17 +1255,21 @@ class _RuntimeOrchestrationContext(
             self._encoded_custom_status = custom_status
 
     def create_timer(self, fire_at: Union[datetime, timedelta]) -> task.Task:
-        return self.create_timer_internal(fire_at)
+        return self.create_timer_internal(
+            fire_at,
+            origin=pb.TimerOriginCreateTimer(),
+        )
 
     def create_timer_internal(
         self,
-        fire_at: Union[datetime, timedelta],
+        fire_at: Union[datetime, timedelta, timestamp_pb2.Timestamp],
         retryable_task: Optional[task.RetryableTask] = None,
-    ) -> task.Task:
+        origin: Optional[ph.TimerOrigin] = None,
+    ) -> task.TimerTask:
         id = self.next_sequence_number()
         if isinstance(fire_at, timedelta):
             fire_at = self.current_utc_datetime + fire_at
-        action = ph.new_create_timer_action(id, fire_at)
+        action = ph.new_create_timer_action(id, fire_at, origin=origin)
         self._pending_actions[id] = action
 
         timer_task: task.TimerTask = task.TimerTask()
@@ -1345,7 +1388,12 @@ class _RuntimeOrchestrationContext(
                 )
         self._pending_tasks[id] = fn_task
 
-    def wait_for_external_event(self, name: str) -> task.Task:
+    def wait_for_external_event(
+        self,
+        name: str,
+        *,
+        timeout: Optional[Union[datetime, timedelta]] = None,
+    ) -> task.Task:
         # Check to see if this event has already been received, in which case we
         # can return it immediately. Otherwise, record out intent to receive an
         # event with the given name so that we can resume the generator when it
@@ -1365,7 +1413,64 @@ class _RuntimeOrchestrationContext(
                 task_list = []
                 self._pending_events[event_name] = task_list
             task_list.append(external_event_task)
-        return external_event_task
+
+        if external_event_task.is_complete:
+            return external_event_task
+
+        # Three timeout shapes:
+        #   - timedelta(0):     immediately-canceled task (no timer)
+        #   - positive:         normal TimerOriginExternalEvent timer
+        #   - None or negative: indefinite wait — an OPTIONAL timer is scheduled
+        #                       with a sentinel fireAt. See ph.OPTIONAL_TIMER_FIRE_AT
+        #                       and the replay-shift logic for how older histories
+        #                       (which didn't schedule the timer) are tolerated.
+        if isinstance(timeout, timedelta) and timeout == timedelta(0):
+            # Remove the task we just registered in _pending_events so the event
+            # doesn't try to complete it later.
+            pending = self._pending_events.get(event_name)
+            if pending and external_event_task in pending:
+                pending.remove(external_event_task)
+                if not pending:
+                    del self._pending_events[event_name]
+            external_event_task.cancel(
+                TimeoutError(
+                    f'Wait for external event {name!r} canceled immediately due to zero timeout'
+                )
+            )
+            return external_event_task
+
+        is_indefinite = timeout is None or (
+            isinstance(timeout, timedelta) and timeout < timedelta(0)
+        )
+        fire_at: Union[datetime, timedelta, timestamp_pb2.Timestamp]
+        if is_indefinite:
+            fire_at = ph.OPTIONAL_TIMER_FIRE_AT
+        else:
+            # Narrowed by ``is_indefinite``: timeout is a positive timedelta or a datetime here.
+            assert timeout is not None
+            fire_at = timeout
+
+        timer_task = self.create_timer_internal(
+            fire_at,
+            origin=pb.TimerOriginExternalEvent(name=name),
+        )
+
+        def _unregister_stale_event_task() -> None:
+            """Remove the event task from _pending_events so late eventRaised
+            messages are buffered instead of consumed by this timed-out waiter."""
+            pending = self._pending_events.get(event_name)
+            if pending and external_event_task in pending:
+                pending.remove(external_event_task)
+                if not pending:
+                    del self._pending_events[event_name]
+
+        return task.ExternalEventWithTimeoutTask(
+            external_event_task,
+            timer_task,
+            event_name=name,
+            timeout=None if is_indefinite else timeout,
+            on_timeout=_unregister_stale_event_task,
+        )
 
     def continue_as_new(self, new_input, *, save_events: bool = False) -> None:
         if self._is_complete:
@@ -1543,6 +1648,29 @@ class _OrchestrationExecutor:
                 # This history event confirms that the timer was successfully scheduled.
                 # Remove the timerCreated event from the pending action list so we don't schedule it again.
                 timer_id = event.eventId
+                # Asymmetric case: pending is an optional timer but the incoming
+                # TimerCreated is a different (non-optional) timer — e.g., a user
+                # CreateTimer emitted by pre-patch code right after an indefinite
+                # wait_for_external_event. Drop the optional and shift so the
+                # real timer matches at the same id.
+                pending = ctx._pending_actions.get(timer_id)
+                if (
+                    pending is not None
+                    and ph.is_optional_timer_action(pending)
+                    and not ph.is_optional_timer_event(event)
+                ):
+                    ctx._drop_optional_pending_at(timer_id)
+                    pending = ctx._pending_actions.get(timer_id)
+                # Reverse asymmetric: the incoming TimerCreated is an optional timer
+                # from an older code version, but the current code has a different
+                # action at this id (or none at all). This happens when a patch adds
+                # new actions before the wait_for_external_event that originally
+                # produced the timer. Silently drop the stale optional event; the
+                # pending action stays in place to match its own future event.
+                if ph.is_optional_timer_event(event) and (
+                    pending is None or not ph.is_optional_timer_action(pending)
+                ):
+                    return
                 action = ctx._pending_actions.pop(timer_id, None)
                 if not action:
                     raise _get_non_determinism_error(timer_id, task.get_name(ctx.create_timer))
@@ -1580,6 +1708,13 @@ class _OrchestrationExecutor:
                 # This history event confirms that the activity execution was successfully scheduled.
                 # Remove the taskScheduled event from the pending action list so we don't schedule it again.
                 task_id = event.eventId
+                # If the pending action at this id is an optional timer from an
+                # indefinite wait_for_external_event that wasn't present in the
+                # pre-patch history, drop it and shift so this schedule matches.
+                if task_id in ctx._pending_actions and ph.is_optional_timer_action(
+                    ctx._pending_actions[task_id]
+                ):
+                    ctx._drop_optional_pending_at(task_id)
                 action = ctx._pending_actions.pop(task_id, None)
                 activity_task = ctx._pending_tasks.get(task_id, None)
                 if not action:
@@ -1642,7 +1777,13 @@ class _OrchestrationExecutor:
                                 ctx.resume()
                             else:
                                 activity_task.increment_attempt_count()
-                                ctx.create_timer_internal(next_delay, activity_task)
+                                ctx.create_timer_internal(
+                                    next_delay,
+                                    activity_task,
+                                    origin=pb.TimerOriginActivityRetry(
+                                        taskExecutionId=activity_task._task_execution_id,
+                                    ),
+                                )
                 elif isinstance(activity_task, task.CompletableTask):
                     activity_task.fail(
                         f'{ctx.instance_id}: Activity task #{task_id} failed: {event.taskFailed.failureDetails.errorMessage}',
@@ -1655,6 +1796,11 @@ class _OrchestrationExecutor:
                 # This history event confirms that the sub-orchestration execution was successfully scheduled.
                 # Remove the childWorkflowInstanceCreated event from the pending action list so we don't schedule it again.
                 task_id = event.eventId
+                # If the pending action at this id is an optional timer, drop+shift.
+                if task_id in ctx._pending_actions and ph.is_optional_timer_action(
+                    ctx._pending_actions[task_id]
+                ):
+                    ctx._drop_optional_pending_at(task_id)
                 action = ctx._pending_actions.pop(task_id, None)
                 if not action:
                     raise _get_non_determinism_error(
@@ -1717,7 +1863,13 @@ class _OrchestrationExecutor:
                                 ctx.resume()
                             else:
                                 sub_orch_task.increment_attempt_count()
-                                ctx.create_timer_internal(next_delay, sub_orch_task)
+                                ctx.create_timer_internal(
+                                    next_delay,
+                                    sub_orch_task,
+                                    origin=pb.TimerOriginChildWorkflowRetry(
+                                        instanceId=sub_orch_task._instance_id,
+                                    ),
+                                )
                 elif isinstance(sub_orch_task, task.CompletableTask):
                     sub_orch_task.fail(
                         f'Sub-orchestration task #{task_id} failed: {failedEvent.failureDetails.errorMessage}',

{dapr_ext_workflow_dev-1.17.0.dev102 → dapr_ext_workflow_dev-1.17.0.dev103}/dapr/ext/workflow/dapr_workflow_context.py

@@ -145,9 +145,14 @@ class DaprWorkflowContext(WorkflowContext):
             wf, input=input, instance_id=instance_id, retry_policy=retry_policy.obj, app_id=app_id
         )
 
-    def wait_for_external_event(self, name: str) -> task.Task:
+    def wait_for_external_event(
+        self,
+        name: str,
+        *,
+        timeout: Optional[Union[datetime, timedelta]] = None,
+    ) -> task.Task:
         self._logger.debug(f'{self.instance_id}: Waiting for external event {name}')
-        return self.__obj.wait_for_external_event(name)
+        return self.__obj.wait_for_external_event(name, timeout=timeout)
 
     def continue_as_new(self, new_input: Any, *, save_events: bool = False) -> None:
         self._logger.debug(f'{self.instance_id}: Continuing as new')

{dapr_ext_workflow_dev-1.17.0.dev102 → dapr_ext_workflow_dev-1.17.0.dev103}/dapr/ext/workflow/workflow_context.py

@@ -162,18 +162,37 @@ class WorkflowContext(ABC):
         pass
 
     @abstractmethod
-    def wait_for_external_event(self, name: str) -> task.Task:
+    def wait_for_external_event(
+        self,
+        name: str,
+        *,
+        timeout: Optional[Union[datetime, timedelta]] = None,
+    ) -> task.Task:
         """Wait asynchronously for an event to be raised with the name `name`.
 
         Parameters
         ----------
         name : str
             The event name of the event that the task is waiting for.
+        timeout : datetime | timedelta | None
+            Controls how long to wait for the event. Accepts only ``datetime``
+            or ``timedelta`` — a plain numeric ``0`` is **not** a valid value
+            (use ``timedelta(0)`` explicitly). Three shapes:
+
+            * ``None`` (default) or a *negative* ``timedelta`` — wait indefinitely.
+              An optional sentinel timer is scheduled internally for runtime
+              tracking, but ``TimeoutError`` is never raised on its own.
+            * ``timedelta(0)`` — do not wait at all. The returned task fails
+              immediately with ``TimeoutError``.
+            * A future ``datetime`` or a positive ``timedelta`` — wait until
+              that deadline / for that duration; ``TimeoutError`` is raised if
+              the event has not been received in time.
 
         Returns
         -------
         Task[TOutput]
-            A Durable Task that completes when the event is received.
+            A Durable Task that completes when the event is received or fails
+            with ``TimeoutError`` if the timeout fires first.
         """
         pass
 

{dapr_ext_workflow_dev-1.17.0.dev102 → dapr_ext_workflow_dev-1.17.0.dev103/dapr_ext_workflow_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dapr-ext-workflow-dev
-Version: 1.17.0.dev102
+Version: 1.17.0.dev103
 Summary: The developmental release for Dapr Workflow Authoring.
 Home-page: https://dapr.io/
 Author: Dapr Authors

{dapr_ext_workflow_dev-1.17.0.dev102 → dapr_ext_workflow_dev-1.17.0.dev103}/dapr_ext_workflow_dev.egg-info/SOURCES.txt

@@ -46,6 +46,7 @@ dapr/ext/workflow/_durabletask/internal/runtime_state_pb2.py
 dapr/ext/workflow/_durabletask/internal/runtime_state_pb2.pyi
 dapr/ext/workflow/_durabletask/internal/runtime_state_pb2_grpc.py
 dapr/ext/workflow/_durabletask/internal/shared.py
+dapr/ext/workflow/_durabletask/internal/timer.py
 dapr/ext/workflow/aio/__init__.py
 dapr/ext/workflow/aio/dapr_workflow_client.py
 dapr/ext/workflow/logger/__init__.py