Edits, imports

Author: dandavison

hello_nexus/caller/workflows.py

@@ -6,27 +6,27 @@
 NEXUS_ENDPOINT = "hello-nexus-basic-nexus-endpoint"
 
 
-# This is a workflow that calls a nexus operation.
+# This is a workflow that calls two nexus operations.
 @workflow.defn
 class CallerWorkflow:
-    # An __init__ method is always optional on a Workflow class. Here we use it to set the
-    # NexusClient, but that could alternatively be done in the run method.
+    # An __init__ method is always optional on a workflow class. Here we use it to set the
+    # nexus client, but that could alternatively be done in the run method.
     def __init__(self):
         self.nexus_client = workflow.create_nexus_client(
             service=MyNexusService,
             endpoint=NEXUS_ENDPOINT,
         )
 
-    # The Wokflow run method invokes two Nexus operations.
+    # The workflow run method invokes two nexus operations.
     @workflow.run
     async def run(self, name: str) -> tuple[MyOutput, MyOutput]:
-        # Start the Nexus operation and wait for the result in one go, using execute_operation.
+        # Start the nexus operation and wait for the result in one go, using execute_operation.
         wf_result = await self.nexus_client.execute_operation(
             MyNexusService.my_workflow_run_operation,
             MyInput(name),
         )
-        # We could use execute_operation for this one also, but here we demonstrate
-        # obtaining the operation handle and then using it to get the result.
+        # Alternatively, you can use start_operation to obtain the operation handle and
+        # then `await` the handle to obtain the result.
         sync_operation_handle = await self.nexus_client.start_operation(
             MyNexusService.my_sync_operation,
             MyInput(name),

hello_nexus/handler/service_handler.py

@@ -6,15 +6,14 @@
 
 import uuid
 
-from nexusrpc.handler import StartOperationContext, service_handler, sync_operation
+import nexusrpc
 from temporalio import nexus
-from temporalio.nexus import WorkflowRunOperationContext, workflow_run_operation
 
 from hello_nexus.handler.workflows import WorkflowStartedByNexusOperation
 from hello_nexus.service import MyInput, MyNexusService, MyOutput
 
 
-@service_handler(service=MyNexusService)
+@nexusrpc.handler.service_handler(service=MyNexusService)
 class MyNexusServiceHandler:
     # You can create an __init__ method accepting what is needed by your operation
     # handlers to handle requests. You typically instantiate your service handler class
@@ -27,9 +26,9 @@ class MyNexusServiceHandler:
     #
     # The token will be used by the caller if it subsequently wants to cancel the Nexus
     # operation.
-    @workflow_run_operation
+    @nexus.workflow_run_operation
     async def my_workflow_run_operation(
-        self, ctx: WorkflowRunOperationContext, input: MyInput
+        self, ctx: nexus.WorkflowRunOperationContext, input: MyInput
     ) -> nexus.WorkflowHandle[MyOutput]:
         return await ctx.start_workflow(
             WorkflowStartedByNexusOperation.run,
@@ -43,8 +42,8 @@ async def my_workflow_run_operation(
     #
     # Sync operations are free to make arbitrary network calls, or perform CPU-bound
     # computations. Total execution duration must not exceed 10s.
-    @sync_operation
+    @nexusrpc.handler.sync_operation
     async def my_sync_operation(
-        self, ctx: StartOperationContext, input: MyInput
+        self, ctx: nexusrpc.handler.StartOperationContext, input: MyInput
     ) -> MyOutput:
         return MyOutput(message=f"Hello {input.name} from sync operation!")