Update to use elif on oneof fields

Author: tconley1428

scripts/gen_visitors.py

@@ -113,10 +113,25 @@ def walk(self, desc: Descriptor) -> bool:
             lines.append("        if self.skip_search_attributes:")
             lines.append("            return")
 
+        # Group fields by oneof to generate if/elif chains
+        oneof_fields: dict[int, list[FieldDescriptor]] = {}
+        regular_fields: list[FieldDescriptor] = []
+        
         for field in desc.fields:
             if field.type != FieldDescriptor.TYPE_MESSAGE:
                 continue
+            
+            # Skip synthetic oneofs (proto3 optional fields)
+            if field.containing_oneof is not None:
+                oneof_idx = field.containing_oneof.index
+                if oneof_idx not in oneof_fields:
+                    oneof_fields[oneof_idx] = []
+                oneof_fields[oneof_idx].append(field)
+            else:
+                regular_fields.append(field)
 
+        # Process regular fields first
+        for field in regular_fields:
             # Repeated fields (including maps which are represented as repeated messages)
             if field.label == FieldDescriptor.LABEL_REPEATED:
                 if (
@@ -174,6 +189,24 @@ def walk(self, desc: Descriptor) -> bool:
                         )
                     )
 
+        # Process oneof fields as if/elif chains
+        for oneof_idx, fields in oneof_fields.items():
+            oneof_lines = []
+            first = True
+            for field in fields:
+                child_desc = field.message_type
+                child_needed = self.walk(child_desc)
+                needed |= child_needed
+                if child_needed:
+                    if_word = "if" if first else "elif"
+                    first = False
+                    line = emit_singular(
+                        field.name, f"o.{field.name}", name_for(child_desc), True
+                    ).replace("        if", f"        {if_word}", 1)
+                    oneof_lines.append(line)
+            if oneof_lines:
+                lines.extend(oneof_lines)
+
         self.generated[key] = needed
         self.in_progress.discard(key)
         if needed:

temporalio/bridge/_visitor.py

@@ -73,15 +73,15 @@ async def _visit_temporal_api_failure_v1_Failure(self, fs, o):
             await self._visit_temporal_api_failure_v1_ApplicationFailureInfo(
                 fs, o.application_failure_info
             )
-        if o.HasField("timeout_failure_info"):
+        elif o.HasField("timeout_failure_info"):
             await self._visit_temporal_api_failure_v1_TimeoutFailureInfo(
                 fs, o.timeout_failure_info
             )
-        if o.HasField("canceled_failure_info"):
+        elif o.HasField("canceled_failure_info"):
             await self._visit_temporal_api_failure_v1_CanceledFailureInfo(
                 fs, o.canceled_failure_info
             )
-        if o.HasField("reset_workflow_failure_info"):
+        elif o.HasField("reset_workflow_failure_info"):
             await self._visit_temporal_api_failure_v1_ResetWorkflowFailureInfo(
                 fs, o.reset_workflow_failure_info
             )
@@ -141,9 +141,9 @@ async def _visit_coresdk_activity_result_Cancellation(self, fs, o):
     async def _visit_coresdk_activity_result_ActivityResolution(self, fs, o):
         if o.HasField("completed"):
             await self._visit_coresdk_activity_result_Success(fs, o.completed)
-        if o.HasField("failed"):
+        elif o.HasField("failed"):
             await self._visit_coresdk_activity_result_Failure(fs, o.failed)
-        if o.HasField("cancelled"):
+        elif o.HasField("cancelled"):
             await self._visit_coresdk_activity_result_Cancellation(fs, o.cancelled)
 
     async def _visit_coresdk_workflow_activation_ResolveActivity(self, fs, o):
@@ -179,9 +179,9 @@ async def _visit_coresdk_child_workflow_Cancellation(self, fs, o):
     async def _visit_coresdk_child_workflow_ChildWorkflowResult(self, fs, o):
         if o.HasField("completed"):
             await self._visit_coresdk_child_workflow_Success(fs, o.completed)
-        if o.HasField("failed"):
+        elif o.HasField("failed"):
             await self._visit_coresdk_child_workflow_Failure(fs, o.failed)
-        if o.HasField("cancelled"):
+        elif o.HasField("cancelled"):
             await self._visit_coresdk_child_workflow_Cancellation(fs, o.cancelled)
 
     async def _visit_coresdk_workflow_activation_ResolveChildWorkflowExecution(
@@ -217,11 +217,11 @@ async def _visit_coresdk_workflow_activation_ResolveNexusOperationStart(
     async def _visit_coresdk_nexus_NexusOperationResult(self, fs, o):
         if o.HasField("completed"):
             await self._visit_temporal_api_common_v1_Payload(fs, o.completed)
-        if o.HasField("failed"):
+        elif o.HasField("failed"):
             await self._visit_temporal_api_failure_v1_Failure(fs, o.failed)
-        if o.HasField("cancelled"):
+        elif o.HasField("cancelled"):
             await self._visit_temporal_api_failure_v1_Failure(fs, o.cancelled)
-        if o.HasField("timed_out"):
+        elif o.HasField("timed_out"):
             await self._visit_temporal_api_failure_v1_Failure(fs, o.timed_out)
 
     async def _visit_coresdk_workflow_activation_ResolveNexusOperation(self, fs, o):
@@ -233,41 +233,41 @@ async def _visit_coresdk_workflow_activation_WorkflowActivationJob(self, fs, o):
             await self._visit_coresdk_workflow_activation_InitializeWorkflow(
                 fs, o.initialize_workflow
             )
-        if o.HasField("query_workflow"):
+        elif o.HasField("query_workflow"):
             await self._visit_coresdk_workflow_activation_QueryWorkflow(
                 fs, o.query_workflow
             )
-        if o.HasField("signal_workflow"):
+        elif o.HasField("signal_workflow"):
             await self._visit_coresdk_workflow_activation_SignalWorkflow(
                 fs, o.signal_workflow
             )
-        if o.HasField("resolve_activity"):
+        elif o.HasField("resolve_activity"):
             await self._visit_coresdk_workflow_activation_ResolveActivity(
                 fs, o.resolve_activity
             )
-        if o.HasField("resolve_child_workflow_execution_start"):
+        elif o.HasField("resolve_child_workflow_execution_start"):
             await self._visit_coresdk_workflow_activation_ResolveChildWorkflowExecutionStart(
                 fs, o.resolve_child_workflow_execution_start
             )
-        if o.HasField("resolve_child_workflow_execution"):
+        elif o.HasField("resolve_child_workflow_execution"):
             await self._visit_coresdk_workflow_activation_ResolveChildWorkflowExecution(
                 fs, o.resolve_child_workflow_execution
             )
-        if o.HasField("resolve_signal_external_workflow"):
+        elif o.HasField("resolve_signal_external_workflow"):
             await self._visit_coresdk_workflow_activation_ResolveSignalExternalWorkflow(
                 fs, o.resolve_signal_external_workflow
             )
-        if o.HasField("resolve_request_cancel_external_workflow"):
+        elif o.HasField("resolve_request_cancel_external_workflow"):
             await self._visit_coresdk_workflow_activation_ResolveRequestCancelExternalWorkflow(
                 fs, o.resolve_request_cancel_external_workflow
             )
-        if o.HasField("do_update"):
+        elif o.HasField("do_update"):
             await self._visit_coresdk_workflow_activation_DoUpdate(fs, o.do_update)
-        if o.HasField("resolve_nexus_operation_start"):
+        elif o.HasField("resolve_nexus_operation_start"):
             await self._visit_coresdk_workflow_activation_ResolveNexusOperationStart(
                 fs, o.resolve_nexus_operation_start
             )
-        if o.HasField("resolve_nexus_operation"):
+        elif o.HasField("resolve_nexus_operation"):
             await self._visit_coresdk_workflow_activation_ResolveNexusOperation(
                 fs, o.resolve_nexus_operation
             )
@@ -295,7 +295,7 @@ async def _visit_coresdk_workflow_commands_QuerySuccess(self, fs, o):
     async def _visit_coresdk_workflow_commands_QueryResult(self, fs, o):
         if o.HasField("succeeded"):
             await self._visit_coresdk_workflow_commands_QuerySuccess(fs, o.succeeded)
-        if o.HasField("failed"):
+        elif o.HasField("failed"):
             await self._visit_temporal_api_failure_v1_Failure(fs, o.failed)
 
     async def _visit_coresdk_workflow_commands_CompleteWorkflowExecution(self, fs, o):
@@ -355,7 +355,7 @@ async def _visit_coresdk_workflow_commands_ModifyWorkflowProperties(self, fs, o)
     async def _visit_coresdk_workflow_commands_UpdateResponse(self, fs, o):
         if o.HasField("rejected"):
             await self._visit_temporal_api_failure_v1_Failure(fs, o.rejected)
-        if o.HasField("completed"):
+        elif o.HasField("completed"):
             await self._visit_temporal_api_common_v1_Payload(fs, o.completed)
 
     async def _visit_coresdk_workflow_commands_ScheduleNexusOperation(self, fs, o):
@@ -369,47 +369,47 @@ async def _visit_coresdk_workflow_commands_WorkflowCommand(self, fs, o):
             await self._visit_coresdk_workflow_commands_ScheduleActivity(
                 fs, o.schedule_activity
             )
-        if o.HasField("respond_to_query"):
+        elif o.HasField("respond_to_query"):
             await self._visit_coresdk_workflow_commands_QueryResult(
                 fs, o.respond_to_query
             )
-        if o.HasField("complete_workflow_execution"):
+        elif o.HasField("complete_workflow_execution"):
             await self._visit_coresdk_workflow_commands_CompleteWorkflowExecution(
                 fs, o.complete_workflow_execution
             )
-        if o.HasField("fail_workflow_execution"):
+        elif o.HasField("fail_workflow_execution"):
             await self._visit_coresdk_workflow_commands_FailWorkflowExecution(
                 fs, o.fail_workflow_execution
             )
-        if o.HasField("continue_as_new_workflow_execution"):
+        elif o.HasField("continue_as_new_workflow_execution"):
             await self._visit_coresdk_workflow_commands_ContinueAsNewWorkflowExecution(
                 fs, o.continue_as_new_workflow_execution
             )
-        if o.HasField("start_child_workflow_execution"):
+        elif o.HasField("start_child_workflow_execution"):
             await self._visit_coresdk_workflow_commands_StartChildWorkflowExecution(
                 fs, o.start_child_workflow_execution
             )
-        if o.HasField("signal_external_workflow_execution"):
+        elif o.HasField("signal_external_workflow_execution"):
             await self._visit_coresdk_workflow_commands_SignalExternalWorkflowExecution(
                 fs, o.signal_external_workflow_execution
             )
-        if o.HasField("schedule_local_activity"):
+        elif o.HasField("schedule_local_activity"):
             await self._visit_coresdk_workflow_commands_ScheduleLocalActivity(
                 fs, o.schedule_local_activity
             )
-        if o.HasField("upsert_workflow_search_attributes"):
+        elif o.HasField("upsert_workflow_search_attributes"):
             await self._visit_coresdk_workflow_commands_UpsertWorkflowSearchAttributes(
                 fs, o.upsert_workflow_search_attributes
             )
-        if o.HasField("modify_workflow_properties"):
+        elif o.HasField("modify_workflow_properties"):
             await self._visit_coresdk_workflow_commands_ModifyWorkflowProperties(
                 fs, o.modify_workflow_properties
             )
-        if o.HasField("update_response"):
+        elif o.HasField("update_response"):
             await self._visit_coresdk_workflow_commands_UpdateResponse(
                 fs, o.update_response
             )
-        if o.HasField("schedule_nexus_operation"):
+        elif o.HasField("schedule_nexus_operation"):
             await self._visit_coresdk_workflow_commands_ScheduleNexusOperation(
                 fs, o.schedule_nexus_operation
             )
@@ -427,5 +427,5 @@ async def _visit_coresdk_workflow_completion_WorkflowActivationCompletion(
     ):
         if o.HasField("successful"):
             await self._visit_coresdk_workflow_completion_Success(fs, o.successful)
-        if o.HasField("failed"):
+        elif o.HasField("failed"):
             await self._visit_coresdk_workflow_completion_Failure(fs, o.failed)