rebase conflict fixes

Author: THardy98

temporalio/bridge/proto/activity_task/__init__.py

@@ -1,7 +1,14 @@
-from .activity_task_pb2 import ActivityCancelReason, ActivityTask, Cancel, Start
+from .activity_task_pb2 import (
+    ActivityCancellationDetails,
+    ActivityCancelReason,
+    ActivityTask,
+    Cancel,
+    Start,
+)
 
 __all__ = [
     "ActivityCancelReason",
+    "ActivityCancellationDetails",
     "ActivityTask",
     "Cancel",
     "Start",

temporalio/bridge/proto/activity_task/activity_task_pb2.py

@@ -45,6 +45,8 @@ class _ActivityCancelReasonEnumTypeWrapper(
     """Activity timed out"""
     WORKER_SHUTDOWN: _ActivityCancelReason.ValueType  # 3
     """Core is shutting down and the graceful timeout has elapsed"""
+    PAUSED: _ActivityCancelReason.ValueType  # 4
+    """Activity was paused"""
 
 class ActivityCancelReason(
     _ActivityCancelReason, metaclass=_ActivityCancelReasonEnumTypeWrapper
@@ -58,6 +60,8 @@ TIMED_OUT: ActivityCancelReason.ValueType  # 2
 """Activity timed out"""
 WORKER_SHUTDOWN: ActivityCancelReason.ValueType  # 3
 """Core is shutting down and the graceful timeout has elapsed"""
+PAUSED: ActivityCancelReason.ValueType  # 4
+"""Activity was paused"""
 global___ActivityCancelReason = ActivityCancelReason
 
 class ActivityTask(google.protobuf.message.Message):
@@ -320,14 +324,66 @@ class Cancel(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
     REASON_FIELD_NUMBER: builtins.int
+    DETAILS_FIELD_NUMBER: builtins.int
     reason: global___ActivityCancelReason.ValueType
+    """Primary cancellation reason"""
+    @property
+    def details(self) -> global___ActivityCancellationDetails:
+        """Activity cancellation details, surfaces all cancellation reasons."""
     def __init__(
         self,
         *,
         reason: global___ActivityCancelReason.ValueType = ...,
+        details: global___ActivityCancellationDetails | None = ...,
     ) -> None: ...
+    def HasField(
+        self, field_name: typing_extensions.Literal["details", b"details"]
+    ) -> builtins.bool: ...
     def ClearField(
-        self, field_name: typing_extensions.Literal["reason", b"reason"]
+        self,
+        field_name: typing_extensions.Literal[
+            "details", b"details", "reason", b"reason"
+        ],
     ) -> None: ...
 
 global___Cancel = Cancel
+
+class ActivityCancellationDetails(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+
+    IS_NOT_FOUND_FIELD_NUMBER: builtins.int
+    IS_CANCELLED_FIELD_NUMBER: builtins.int
+    IS_PAUSED_FIELD_NUMBER: builtins.int
+    IS_TIMED_OUT_FIELD_NUMBER: builtins.int
+    IS_WORKER_SHUTDOWN_FIELD_NUMBER: builtins.int
+    is_not_found: builtins.bool
+    is_cancelled: builtins.bool
+    is_paused: builtins.bool
+    is_timed_out: builtins.bool
+    is_worker_shutdown: builtins.bool
+    def __init__(
+        self,
+        *,
+        is_not_found: builtins.bool = ...,
+        is_cancelled: builtins.bool = ...,
+        is_paused: builtins.bool = ...,
+        is_timed_out: builtins.bool = ...,
+        is_worker_shutdown: builtins.bool = ...,
+    ) -> None: ...
+    def ClearField(
+        self,
+        field_name: typing_extensions.Literal[
+            "is_cancelled",
+            b"is_cancelled",
+            "is_not_found",
+            b"is_not_found",
+            "is_paused",
+            b"is_paused",
+            "is_timed_out",
+            b"is_timed_out",
+            "is_worker_shutdown",
+            b"is_worker_shutdown",
+        ],
+    ) -> None: ...
+
+global___ActivityCancellationDetails = ActivityCancellationDetails

temporalio/bridge/proto/activity_task/activity_task_pb2.pyi

@@ -80,7 +80,9 @@ def __init__(self) -> None:
 
     def cancel(
         self,
-        cancellation_details: temporalio.activity.ActivityCancellationDetails = temporalio.activity.ActivityCancellationDetails(cancel_requested=True),
+        cancellation_details: temporalio.activity.ActivityCancellationDetails = temporalio.activity.ActivityCancellationDetails(
+            cancel_requested=True
+        ),
     ) -> None:
         """Cancel the activity.
 

temporalio/testing/_activity.py

@@ -223,12 +223,15 @@ async def assert_pending_activity_exists_eventually(
     timeout: timedelta = timedelta(seconds=5),
 ) -> PendingActivityInfo:
     """Wait until a pending activity with the given ID exists and return it."""
+
     async def check() -> Optional[PendingActivityInfo]:
         desc = await handle.describe()
         for act in desc.raw_description.pending_activities:
             if act.activity_id == activity_id:
                 return act
-        raise AssertionError(f"Activity with ID {activity_id} not found in pending activities")
+        raise AssertionError(
+            f"Activity with ID {activity_id} not found in pending activities"
+        )
 
     activity_info = await assert_eventually(check, timeout=timeout)
     return cast(PendingActivityInfo, activity_info)
@@ -273,4 +276,4 @@ async def check_unpaused() -> bool:
         info = await assert_pending_activity_exists_eventually(handle, activity_id)
         return not info.paused
 
-    await assert_eventually(check_unpaused)
+    await assert_eventually(check_unpaused)

tests/helpers/__init__.py

@@ -49,8 +49,8 @@
 from temporalio.api.sdk.v1 import EnhancedStackTrace
 from temporalio.api.workflowservice.v1 import (
     GetWorkflowExecutionHistoryRequest,
+    PauseActivityRequest,
     ResetStickyTaskQueueRequest,
-    PauseActivityRequest
 )
 from temporalio.bridge.proto.workflow_activation import WorkflowActivation
 from temporalio.bridge.proto.workflow_completion import WorkflowActivationCompletion
@@ -95,7 +95,6 @@
     TemporalError,
     TimeoutError,
     WorkflowAlreadyStartedError,
-    ActivityPausedError
 )
 from temporalio.runtime import (
     BUFFERED_METRIC_KIND_COUNTER,
@@ -120,10 +119,10 @@
     admitted_update_task,
     assert_eq_eventually,
     assert_eventually,
+    assert_pending_activity_exists_eventually,
     assert_task_fail_eventually,
     assert_workflow_exists_eventually,
     ensure_search_attributes_present,
-    assert_pending_activity_exists_eventually,
     find_free_port,
     new_worker,
     pause_and_assert,
@@ -7632,9 +7631,6 @@ async def test_workflow_missing_local_activity_no_activities(client: Client):
 
 
 @activity.defn
-async def heartbeat_activity() -> (
-    Optional[temporalio.activity.ActivityCancellationDetails]
-):
 async def heartbeat_activity(
     catch_err: bool = True,
 ) -> Optional[temporalio.activity.ActivityCancellationDetails]: