Convert nexus_handler_failure_info as nexusrpc.HandlerError

Author: dandavison

temporalio/converter.py

@@ -16,6 +16,7 @@
 from datetime import datetime
 from enum import IntEnum
 from itertools import zip_longest
+from logging import getLogger
 from typing import (
     Any,
     Awaitable,
@@ -40,6 +41,7 @@
 import google.protobuf.json_format
 import google.protobuf.message
 import google.protobuf.symbol_database
+import nexusrpc
 import typing_extensions
 
 import temporalio.api.common.v1
@@ -60,6 +62,8 @@
 if sys.version_info >= (3, 10):
     from types import UnionType
 
+logger = getLogger(__name__)
+
 
 class PayloadConverter(ABC):
     """Base payload converter to/from multiple payloads/values."""
@@ -1014,9 +1018,16 @@ def from_failure(
             )
         elif failure.HasField("nexus_handler_failure_info"):
             nexus_handler_failure_info = failure.nexus_handler_failure_info
-            err = temporalio.exceptions.NexusHandlerError(
+            try:
+                _type = nexusrpc.HandlerErrorType[nexus_handler_failure_info.type]
+            except KeyError:
+                logger.warning(
+                    f"Unknown Nexus HandlerErrorType: {nexus_handler_failure_info.type}"
+                )
+                _type = nexusrpc.HandlerErrorType.INTERNAL
+            return nexusrpc.HandlerError(
                 failure.message or "Nexus handler error",
-                type=nexus_handler_failure_info.type,
+                type=_type,
                 retryable={
                     temporalio.api.enums.v1.NexusHandlerErrorRetryBehavior.NEXUS_HANDLER_ERROR_RETRY_BEHAVIOR_RETRYABLE: True,
                     temporalio.api.enums.v1.NexusHandlerErrorRetryBehavior.NEXUS_HANDLER_ERROR_RETRY_BEHAVIOR_NON_RETRYABLE: False,

temporalio/exceptions.py

@@ -362,22 +362,6 @@ def retry_state(self) -> Optional[RetryState]:
         return self._retry_state
 
 
-class NexusHandlerError(FailureError):
-    """Error raised on Nexus handler failure."""
-
-    def __init__(
-        self,
-        message: str,
-        *,
-        type: str,
-        retryable: Optional[bool] = None,
-    ):
-        """Initialize a Nexus handler error."""
-        super().__init__(message)
-        self._type = type
-        self._retryable = retryable
-
-
 class NexusOperationError(FailureError):
     """Error raised on Nexus operation failure."""
 

tests/nexus/test_workflow_caller.py

@@ -38,7 +38,7 @@
     WorkflowHandle,
 )
 from temporalio.common import WorkflowIDConflictPolicy
-from temporalio.exceptions import CancelledError, NexusHandlerError, NexusOperationError
+from temporalio.exceptions import CancelledError, NexusOperationError
 from temporalio.nexus import WorkflowRunOperationContext, workflow_run_operation
 from temporalio.service import RPCError, RPCStatusCode
 from temporalio.worker import Worker
@@ -479,7 +479,7 @@ async def test_sync_response(
             e = ei.value
             assert isinstance(e, WorkflowFailureError)
             assert isinstance(e.__cause__, NexusOperationError)
-            assert isinstance(e.__cause__.__cause__, NexusHandlerError)
+            assert isinstance(e.__cause__.__cause__, nexusrpc.HandlerError)
             # ID of first command
             assert e.__cause__.scheduled_event_id == 5
             assert e.__cause__.endpoint == make_nexus_endpoint_name(task_queue)
@@ -532,7 +532,7 @@ async def test_async_response(
             e = ei.value
             assert isinstance(e, WorkflowFailureError)
             assert isinstance(e.__cause__, NexusOperationError)
-            assert isinstance(e.__cause__.__cause__, NexusHandlerError)
+            assert isinstance(e.__cause__.__cause__, nexusrpc.HandlerError)
             # ID of first command after update accepted
             assert e.__cause__.scheduled_event_id == 6
             assert e.__cause__.endpoint == make_nexus_endpoint_name(task_queue)
@@ -709,7 +709,7 @@ async def test_untyped_caller(
             e = ei.value
             assert isinstance(e, WorkflowFailureError)
             assert isinstance(e.__cause__, NexusOperationError)
-            assert isinstance(e.__cause__.__cause__, NexusHandlerError)
+            assert isinstance(e.__cause__.__cause__, nexusrpc.HandlerError)
         else:
             result = await caller_wf_handle.result()
             assert result.op_output.value == (
@@ -1167,7 +1167,7 @@ async def test_errors_raised_by_nexus_operation(
             task_queue=task_queue,
         )
         if action_in_sync_op == "raise_handler_error":
-            assert result == ["NexusOperationError", "NexusHandlerError"]
+            assert result == ["NexusOperationError", "HandlerError"]
         elif action_in_sync_op == "raise_operation_error":
             assert result == ["NexusOperationError", "ApplicationError"]
         else: