Eliminate unnecessary modeling of callable types

Author: dandavison

temporalio/worker/_interceptor.py

@@ -29,7 +29,6 @@
 import temporalio.common
 import temporalio.nexus
 import temporalio.workflow
-from temporalio.nexus import WorkflowRunOperationContext
 from temporalio.workflow import VersioningIntent
 
 
@@ -298,22 +297,7 @@ class StartNexusOperationInput(Generic[InputT, OutputT]):
 
     endpoint: str
     service: str
-    operation: Union[
-        nexusrpc.Operation[InputT, OutputT],
-        Callable[[Any], nexusrpc.handler.OperationHandler[InputT, OutputT]],
-        Callable[
-            [
-                Any,
-                Union[
-                    nexusrpc.handler.StartOperationContext,
-                    WorkflowRunOperationContext,
-                ],
-                InputT,
-            ],
-            Awaitable[temporalio.nexus.WorkflowHandle[OutputT]],
-        ],
-        str,
-    ]
+    operation: Union[nexusrpc.Operation[InputT, OutputT], str, Callable[..., Any]]
     input: InputT
     schedule_to_close_timeout: Optional[timedelta]
     headers: Optional[Mapping[str, str]]
@@ -324,13 +308,13 @@ class StartNexusOperationInput(Generic[InputT, OutputT]):
 
     # TODO(nexus-prerelease): update this logic to handle service impl start methods
     def __post_init__(self) -> None:
-        if isinstance(self.operation, str):
-            self._operation_name = self.operation
-            self._input_type = None
-        elif isinstance(self.operation, nexusrpc.Operation):
+        if isinstance(self.operation, nexusrpc.Operation):
             self._operation_name = self.operation.name
             self._input_type = self.operation.input_type
             self.output_type = self.operation.output_type
+        elif isinstance(self.operation, str):
+            self._operation_name = self.operation
+            self._input_type = None
         elif isinstance(self.operation, Callable):
             _, op = nexusrpc.handler.get_operation_factory(self.operation)
             if isinstance(op, nexusrpc.Operation):

temporalio/worker/_workflow_instance.py

@@ -61,7 +61,6 @@
 import temporalio.exceptions
 import temporalio.nexus
 import temporalio.workflow
-from temporalio.nexus import WorkflowRunOperationContext
 from temporalio.service import __version__
 
 from ._interceptor import (
@@ -1499,22 +1498,7 @@ async def workflow_start_nexus_operation(
         self,
         endpoint: str,
         service: str,
-        operation: Union[
-            nexusrpc.Operation[I, O],
-            Callable[[Any], nexusrpc.handler.OperationHandler[I, O]],
-            Callable[
-                [
-                    Any,
-                    Union[
-                        nexusrpc.handler.StartOperationContext,
-                        WorkflowRunOperationContext,
-                    ],
-                    I,
-                ],
-                Awaitable[temporalio.nexus.WorkflowHandle[O]],
-            ],
-            str,
-        ],
+        operation: Union[nexusrpc.Operation[I, O], str, Callable[..., Any]],
         input: Any,
         output_type: Optional[Type[O]] = None,
         schedule_to_close_timeout: Optional[timedelta] = None,

temporalio/workflow.py

@@ -58,7 +58,6 @@
 import temporalio.exceptions
 import temporalio.nexus
 import temporalio.workflow
-from temporalio.nexus import WorkflowRunOperationContext
 
 from .types import (
     AnyType,
@@ -855,22 +854,7 @@ async def workflow_start_nexus_operation(
         self,
         endpoint: str,
         service: str,
-        operation: Union[
-            nexusrpc.Operation[I, O],
-            Callable[[Any], nexusrpc.handler.OperationHandler[I, O]],
-            Callable[
-                [
-                    S,
-                    Union[
-                        nexusrpc.handler.StartOperationContext,
-                        WorkflowRunOperationContext,
-                    ],
-                    I,
-                ],
-                Awaitable[temporalio.nexus.WorkflowHandle[O]],
-            ],
-            str,
-        ],
+        operation: Union[nexusrpc.Operation[I, O], str, Callable[..., Any]],
         input: Any,
         output_type: Optional[Type[O]] = None,
         schedule_to_close_timeout: Optional[timedelta] = None,
@@ -4432,21 +4416,7 @@ def operation_token(self) -> Optional[str]:
 async def start_nexus_operation(
     endpoint: str,
     service: str,
-    operation: Union[
-        nexusrpc.Operation[I, O],
-        Callable[[Any], nexusrpc.handler.OperationHandler[I, O]],
-        Callable[
-            [
-                S,
-                Union[
-                    nexusrpc.handler.StartOperationContext, WorkflowRunOperationContext
-                ],
-                I,
-            ],
-            Awaitable[temporalio.nexus.WorkflowHandle[O]],
-        ],
-        str,
-    ],
+    operation: Union[nexusrpc.Operation[I, O], str, Callable[..., Any]],
     input: Any,
     *,
     output_type: Optional[Type[O]] = None,
@@ -5224,22 +5194,7 @@ def __init__(
     # TODO(nexus-prerelease): should it be an error to use a reference to a method on a class other than that supplied?
     async def start_operation(
         self,
-        operation: Union[
-            nexusrpc.Operation[I, O],
-            Callable[[S], nexusrpc.handler.OperationHandler[I, O]],
-            Callable[
-                [
-                    S,
-                    Union[
-                        nexusrpc.handler.StartOperationContext,
-                        WorkflowRunOperationContext,
-                    ],
-                    I,
-                ],
-                Awaitable[temporalio.nexus.WorkflowHandle[O]],
-            ],
-            str,
-        ],
+        operation: Union[nexusrpc.Operation[I, O], str, Callable[..., Any]],
         input: I,
         *,
         output_type: Optional[Type[O]] = None,
@@ -5259,22 +5214,7 @@ async def start_operation(
     # TODO(nexus-prerelease): overloads: no-input, ret type
     async def execute_operation(
         self,
-        operation: Union[
-            nexusrpc.Operation[I, O],
-            Callable[[S], nexusrpc.handler.OperationHandler[I, O]],
-            Callable[
-                [
-                    S,
-                    Union[
-                        nexusrpc.handler.StartOperationContext,
-                        WorkflowRunOperationContext,
-                    ],
-                    I,
-                ],
-                Awaitable[temporalio.nexus.WorkflowHandle[O]],
-            ],
-            str,
-        ],
+        operation: Union[nexusrpc.Operation[I, O], str, Callable[..., Any]],
         input: I,
         *,
         output_type: Optional[Type[O]] = None,