Skip to content

Commit 78d8f5c

Browse files
dandavisondandavison
committed
Revert "Code golf"
This reverts commit e8e62bf6db3d5d054f31fa03141bb18c39a4bdb1.
1 parent 4ba9ddb commit 78d8f5c

File tree

1 file changed

+52
-53
lines changed

1 file changed

+52
-53
lines changed

‎temporalio/worker/_command_aware_visitor.py‎

Lines changed: 52 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"""Visitor that sets command context during payload traversal."""
22

33
import contextvars
4-
import sys
54
from contextlib import contextmanager
65
from dataclasses import dataclass
76
from typing import Any, Iterator, Optional, Type
@@ -52,103 +51,103 @@ class CommandAwarePayloadVisitor(PayloadVisitor):
5251
async def _visit_coresdk_workflow_commands_ScheduleActivity(
5352
self, fs: VisitorFunctions, o: ScheduleActivity
5453
) -> None:
55-
await self._visit_with_context(
56-
CommandType.COMMAND_TYPE_SCHEDULE_ACTIVITY_TASK, o.seq, fs, o
57-
)
54+
with current_command(CommandType.COMMAND_TYPE_SCHEDULE_ACTIVITY_TASK, o.seq):
55+
await super()._visit_coresdk_workflow_commands_ScheduleActivity(fs, o)
5856

5957
async def _visit_coresdk_workflow_commands_ScheduleLocalActivity(
6058
self, fs: VisitorFunctions, o: ScheduleLocalActivity
6159
) -> None:
62-
await self._visit_with_context(
63-
CommandType.COMMAND_TYPE_SCHEDULE_ACTIVITY_TASK, o.seq, fs, o
64-
)
60+
with current_command(CommandType.COMMAND_TYPE_SCHEDULE_ACTIVITY_TASK, o.seq):
61+
await super()._visit_coresdk_workflow_commands_ScheduleLocalActivity(fs, o)
6562

6663
async def _visit_coresdk_workflow_commands_StartChildWorkflowExecution(
6764
self, fs: VisitorFunctions, o: StartChildWorkflowExecution
6865
) -> None:
69-
await self._visit_with_context(
70-
CommandType.COMMAND_TYPE_START_CHILD_WORKFLOW_EXECUTION, o.seq, fs, o
71-
)
66+
with current_command(
67+
CommandType.COMMAND_TYPE_START_CHILD_WORKFLOW_EXECUTION, o.seq
68+
):
69+
await super()._visit_coresdk_workflow_commands_StartChildWorkflowExecution(
70+
fs, o
71+
)
7272

7373
async def _visit_coresdk_workflow_commands_SignalExternalWorkflowExecution(
7474
self, fs: VisitorFunctions, o: SignalExternalWorkflowExecution
7575
) -> None:
76-
await self._visit_with_context(
77-
CommandType.COMMAND_TYPE_SIGNAL_EXTERNAL_WORKFLOW_EXECUTION, o.seq, fs, o
78-
)
76+
with current_command(
77+
CommandType.COMMAND_TYPE_SIGNAL_EXTERNAL_WORKFLOW_EXECUTION, o.seq
78+
):
79+
await super()._visit_coresdk_workflow_commands_SignalExternalWorkflowExecution(
80+
fs, o
81+
)
7982

8083
async def _visit_coresdk_workflow_commands_ScheduleNexusOperation(
8184
self, fs: VisitorFunctions, o: ScheduleNexusOperation
8285
) -> None:
83-
await self._visit_with_context(
84-
CommandType.COMMAND_TYPE_SCHEDULE_NEXUS_OPERATION, o.seq, fs, o
85-
)
86+
with current_command(CommandType.COMMAND_TYPE_SCHEDULE_NEXUS_OPERATION, o.seq):
87+
await super()._visit_coresdk_workflow_commands_ScheduleNexusOperation(fs, o)
8688

8789
# Workflow activation jobs with payloads
8890
async def _visit_coresdk_workflow_activation_ResolveActivity(
8991
self, fs: VisitorFunctions, o: ResolveActivity
9092
) -> None:
91-
await self._visit_with_context(
92-
CommandType.COMMAND_TYPE_SCHEDULE_ACTIVITY_TASK, o.seq, fs, o
93-
)
93+
with current_command(CommandType.COMMAND_TYPE_SCHEDULE_ACTIVITY_TASK, o.seq):
94+
await super()._visit_coresdk_workflow_activation_ResolveActivity(fs, o)
9495

9596
async def _visit_coresdk_workflow_activation_ResolveChildWorkflowExecutionStart(
9697
self, fs: VisitorFunctions, o: ResolveChildWorkflowExecutionStart
9798
) -> None:
98-
await self._visit_with_context(
99-
CommandType.COMMAND_TYPE_START_CHILD_WORKFLOW_EXECUTION, o.seq, fs, o
100-
)
99+
with current_command(
100+
CommandType.COMMAND_TYPE_START_CHILD_WORKFLOW_EXECUTION, o.seq
101+
):
102+
await super()._visit_coresdk_workflow_activation_ResolveChildWorkflowExecutionStart(
103+
fs, o
104+
)
101105

102106
async def _visit_coresdk_workflow_activation_ResolveChildWorkflowExecution(
103107
self, fs: VisitorFunctions, o: ResolveChildWorkflowExecution
104108
) -> None:
105-
await self._visit_with_context(
106-
CommandType.COMMAND_TYPE_START_CHILD_WORKFLOW_EXECUTION, o.seq, fs, o
107-
)
109+
with current_command(
110+
CommandType.COMMAND_TYPE_START_CHILD_WORKFLOW_EXECUTION, o.seq
111+
):
112+
await super()._visit_coresdk_workflow_activation_ResolveChildWorkflowExecution(
113+
fs, o
114+
)
108115

109116
async def _visit_coresdk_workflow_activation_ResolveSignalExternalWorkflow(
110117
self, fs: VisitorFunctions, o: ResolveSignalExternalWorkflow
111118
) -> None:
112-
await self._visit_with_context(
113-
CommandType.COMMAND_TYPE_SIGNAL_EXTERNAL_WORKFLOW_EXECUTION, o.seq, fs, o
114-
)
119+
with current_command(
120+
CommandType.COMMAND_TYPE_SIGNAL_EXTERNAL_WORKFLOW_EXECUTION, o.seq
121+
):
122+
await super()._visit_coresdk_workflow_activation_ResolveSignalExternalWorkflow(
123+
fs, o
124+
)
115125

116126
async def _visit_coresdk_workflow_activation_ResolveRequestCancelExternalWorkflow(
117127
self, fs: VisitorFunctions, o: ResolveRequestCancelExternalWorkflow
118128
) -> None:
119-
await self._visit_with_context(
120-
CommandType.COMMAND_TYPE_REQUEST_CANCEL_EXTERNAL_WORKFLOW_EXECUTION,
121-
o.seq,
122-
fs,
123-
o,
124-
)
129+
with current_command(
130+
CommandType.COMMAND_TYPE_REQUEST_CANCEL_EXTERNAL_WORKFLOW_EXECUTION, o.seq
131+
):
132+
await super()._visit_coresdk_workflow_activation_ResolveRequestCancelExternalWorkflow(
133+
fs, o
134+
)
125135

126136
async def _visit_coresdk_workflow_activation_ResolveNexusOperationStart(
127137
self, fs: VisitorFunctions, o: ResolveNexusOperationStart
128138
) -> None:
129-
await self._visit_with_context(
130-
CommandType.COMMAND_TYPE_SCHEDULE_NEXUS_OPERATION, o.seq, fs, o
131-
)
139+
with current_command(CommandType.COMMAND_TYPE_SCHEDULE_NEXUS_OPERATION, o.seq):
140+
await super()._visit_coresdk_workflow_activation_ResolveNexusOperationStart(
141+
fs, o
142+
)
132143

133144
async def _visit_coresdk_workflow_activation_ResolveNexusOperation(
134145
self, fs: VisitorFunctions, o: ResolveNexusOperation
135146
) -> None:
136-
await self._visit_with_context(
137-
CommandType.COMMAND_TYPE_SCHEDULE_NEXUS_OPERATION, o.seq, fs, o
138-
)
139-
140-
async def _visit_with_context(
141-
self,
142-
command_type: CommandType.ValueType,
143-
seq: int,
144-
fs: VisitorFunctions,
145-
o: Any,
146-
) -> None:
147-
"""Helper to call parent method with command context."""
148-
method_name = sys._getframe(1).f_code.co_name
149-
parent_method = getattr(super(), method_name)
150-
with current_command(command_type, seq):
151-
await parent_method(fs, o)
147+
with current_command(CommandType.COMMAND_TYPE_SCHEDULE_NEXUS_OPERATION, o.seq):
148+
await super()._visit_coresdk_workflow_activation_ResolveNexusOperation(
149+
fs, o
150+
)
152151

153152

154153
def _get_workflow_command_protos_with_seq() -> Iterator[Type[Any]]:

0 commit comments

Comments
 (0)