Respond to upstream: retryable_override instead of enum

Author: dandavison

temporalio/converter.py

@@ -945,9 +945,9 @@ def _nexus_handler_error_to_failure(
         failure.nexus_handler_failure_info.type = error.type.name
         failure.nexus_handler_failure_info.retry_behavior = temporalio.api.enums.v1.NexusHandlerErrorRetryBehavior.ValueType(
             temporalio.api.enums.v1.NexusHandlerErrorRetryBehavior.NEXUS_HANDLER_ERROR_RETRY_BEHAVIOR_RETRYABLE
-            if error.retry_behavior == nexusrpc.HandlerErrorRetryBehavior.RETRYABLE
+            if error.retryable_override is True
             else temporalio.api.enums.v1.NexusHandlerErrorRetryBehavior.NEXUS_HANDLER_ERROR_RETRY_BEHAVIOR_NON_RETRYABLE
-            if error.retry_behavior == nexusrpc.HandlerErrorRetryBehavior.NON_RETRYABLE
+            if error.retryable_override is False
             else temporalio.api.enums.v1.NexusHandlerErrorRetryBehavior.NEXUS_HANDLER_ERROR_RETRY_BEHAVIOR_UNSPECIFIED
         )
 
@@ -1054,13 +1054,13 @@ def from_failure(
                     f"Unknown Nexus HandlerErrorType: {nexus_handler_failure_info.type}"
                 )
                 _type = nexusrpc.HandlerErrorType.INTERNAL
-            retry_behavior = (
-                nexusrpc.HandlerErrorRetryBehavior.RETRYABLE
+            retryable_override = (
+                True
                 if (
                     nexus_handler_failure_info.retry_behavior
                     == temporalio.api.enums.v1.NexusHandlerErrorRetryBehavior.NEXUS_HANDLER_ERROR_RETRY_BEHAVIOR_RETRYABLE
                 )
-                else nexusrpc.HandlerErrorRetryBehavior.NON_RETRYABLE
+                else False
                 if (
                     nexus_handler_failure_info.retry_behavior
                     == temporalio.api.enums.v1.NexusHandlerErrorRetryBehavior.NEXUS_HANDLER_ERROR_RETRY_BEHAVIOR_NON_RETRYABLE
@@ -1070,7 +1070,7 @@ def from_failure(
             err = nexusrpc.HandlerError(
                 failure.message or "Nexus handler error",
                 type=_type,
-                retry_behavior=retry_behavior,
+                retryable_override=retryable_override,
             )
         elif failure.HasField("nexus_operation_execution_failure_info"):
             nexus_op_failure_info = failure.nexus_operation_execution_failure_info

temporalio/worker/_nexus.py

@@ -399,15 +399,9 @@ async def _handler_error_to_proto(
         """
         retry_behavior = (
             temporalio.api.enums.v1.NexusHandlerErrorRetryBehavior.NEXUS_HANDLER_ERROR_RETRY_BEHAVIOR_RETRYABLE
-            if (
-                handler_error.retry_behavior
-                == nexusrpc.HandlerErrorRetryBehavior.RETRYABLE
-            )
+            if handler_error.retryable_override is True
             else temporalio.api.enums.v1.NexusHandlerErrorRetryBehavior.NEXUS_HANDLER_ERROR_RETRY_BEHAVIOR_NON_RETRYABLE
-            if (
-                handler_error.retry_behavior
-                == nexusrpc.HandlerErrorRetryBehavior.NON_RETRYABLE
-            )
+            if handler_error.retryable_override is False
             else temporalio.api.enums.v1.NexusHandlerErrorRetryBehavior.NEXUS_HANDLER_ERROR_RETRY_BEHAVIOR_UNSPECIFIED
         )
         return temporalio.api.nexus.v1.HandlerError(
@@ -442,7 +436,7 @@ async def deserialize(
             raise nexusrpc.HandlerError(
                 "Data converter failed to decode Nexus operation input",
                 type=nexusrpc.HandlerErrorType.BAD_REQUEST,
-                retry_behavior=nexusrpc.HandlerErrorRetryBehavior.NON_RETRYABLE,
+                retryable_override=False,
             ) from err
 
 
@@ -457,11 +451,7 @@ def _exception_to_handler_error(err: BaseException) -> nexusrpc.HandlerError:
             # TODO(nexus-preview): confirm what we want as message here
             err.message,
             type=nexusrpc.HandlerErrorType.INTERNAL,
-            retry_behavior=(
-                nexusrpc.HandlerErrorRetryBehavior.NON_RETRYABLE
-                if err.non_retryable
-                else nexusrpc.HandlerErrorRetryBehavior.RETRYABLE
-            ),
+            retryable_override=not err.non_retryable,
         )
     elif isinstance(err, RPCError):
         if err.status == RPCStatusCode.INVALID_ARGUMENT:
@@ -477,7 +467,7 @@ def _exception_to_handler_error(err: BaseException) -> nexusrpc.HandlerError:
             handler_err = nexusrpc.HandlerError(
                 err.message,
                 type=nexusrpc.HandlerErrorType.INTERNAL,
-                retry_behavior=nexusrpc.HandlerErrorRetryBehavior.NON_RETRYABLE,
+                retryable_override=False,
             )
         elif err.status in [RPCStatusCode.ABORTED, RPCStatusCode.UNAVAILABLE]:
             handler_err = nexusrpc.HandlerError(

tests/nexus/test_handler.py

@@ -186,7 +186,7 @@ async def handler_error_internal(
         raise HandlerError(
             message="deliberate internal handler error",
             type=HandlerErrorType.INTERNAL,
-            retry_behavior=nexusrpc.HandlerErrorRetryBehavior.NON_RETRYABLE,
+            retryable_override=False,
         ) from RuntimeError("cause message")
 
     @sync_operation