Address PR feedback

Author: VegetarianOrc

temporalio/nexus/_link_conversion.py

@@ -99,7 +99,8 @@ def temporal_link_to_nexus_link(
 
     Returns None when the Temporal link variant is missing.
     """
-    match temporal_link.WhichOneof("variant"):
+    variant = temporal_link.WhichOneof("variant")
+    match variant:
         case "workflow_event":
             return workflow_event_to_nexus_link(temporal_link.workflow_event)
 
@@ -111,7 +112,7 @@ def temporal_link_to_nexus_link(
 
         case "batch_job" | "workflow":
             raise NotImplementedError(
-                "only workflow_event, activity and nexus_operation links are supported"
+                f"only workflow_event, activity and nexus_operation links are supported, got {variant}"
             )
 
         case None:

temporalio/nexus/_operation_handlers.py

@@ -208,7 +208,8 @@ async def cancel(self, ctx: CancelOperationContext, token: str) -> None:
                 if not operation_token.workflow_id:
                     raise HandlerError(
                         "Invalid workflow run operation token: missing workflow ID",
-                        type=HandlerErrorType.NOT_FOUND,
+                        type=HandlerErrorType.INTERNAL,
+                        retryable_override=False,
                     )
                 wf_cancel_opts = CancelWorkflowRunOptions(
                     workflow_id=operation_token.workflow_id
@@ -219,12 +220,14 @@ async def cancel(self, ctx: CancelOperationContext, token: str) -> None:
                 if not operation_token.activity_id:
                     raise HandlerError(
                         "Invalid activity operation token: missing activity ID",
-                        type=HandlerErrorType.NOT_FOUND,
+                        type=HandlerErrorType.INTERNAL,
+                        retryable_override=False,
                     )
                 if not operation_token.run_id:
                     raise HandlerError(
                         "Invalid activity operation token: missing run ID",
-                        type=HandlerErrorType.NOT_FOUND,
+                        type=HandlerErrorType.INTERNAL,
+                        retryable_override=False,
                     )
                 activity_cancel_opts = CancelActivityOptions(
                     activity_id=operation_token.activity_id,

temporalio/nexus/_token.py

@@ -113,10 +113,16 @@ def decode(cls, token: str) -> Self:
                 f"invalid token: expected run id to be a string, got {type(run_id)}"
             )
 
-        if token_type == OperationTokenType.ACTIVITY and not activity_id:
-            raise TypeError(
-                "invalid token: expected non-empty activity id for token type `ACTIVITY`"
-            )
+        if token_type == OperationTokenType.ACTIVITY:
+            if not activity_id:
+                raise TypeError(
+                    "invalid token: expected non-empty activity id for token type `ACTIVITY`"
+                )
+
+            if not run_id:
+                raise TypeError(
+                    "invalid token: expected non-empty run id for token type `ACTIVITY`"
+                )
 
         namespace = token_details.get("ns")
         if not isinstance(namespace, str):

tests/nexus/test_operation_token.py

@@ -124,14 +124,6 @@ def test_workflow_handle_to_from_token_round_trip():
                 run_id="run-id",
             ),
         ),
-        (
-            _encode_json_token({"t": 2, "ns": "", "aid": "activity-id"}),
-            OperationToken(
-                type=OperationTokenType.ACTIVITY,
-                namespace="",
-                activity_id="activity-id",
-            ),
-        ),
         (
             _encode_json_token(
                 {"t": 2, "ns": "", "aid": "activity-id", "rid": "run-id"}