Unify Payload Visitation

scripts/gen_payload_visitor.py

@@ -425,28 +425,18 @@ def walk(self, desc: Descriptor) -> bool:
 def write_bridge_visitors() -> None:
     out_path = base_dir / "temporalio" / "bridge" / "_visitor.py"
 
-    # Build root descriptors: WorkflowActivation, WorkflowActivationCompletion,
-    # and all messages from selected API modules
     roots: list[Descriptor] = [
         WorkflowActivation.DESCRIPTOR,
         WorkflowActivationCompletion.DESCRIPTOR,
-    ]
+    ] + discover_system_nexus_roots()
 
     code = VisitorGenerator().generate(roots)
     out_path.write_text(code)
 
 
-def write_system_nexus_payload_visitors() -> None:
-    out_path = base_dir / "temporalio" / "nexus" / "system" / "_payload_visitor.py"
-    code = VisitorGenerator().generate(discover_system_nexus_roots())
-    out_path.write_text(code)
-
-
 if __name__ == "__main__":
     print("Generating temporalio/bridge/_visitor.py...", file=sys.stderr)
     write_bridge_visitors()
-    print("Generating temporalio/nexus/system/_payload_visitor.py...", file=sys.stderr)
-    write_system_nexus_payload_visitors()
     subprocess.run(
         [
             "uv",
@@ -457,7 +447,6 @@ def write_system_nexus_payload_visitors() -> None:
             "I",
             "--fix",
             "temporalio/bridge/_visitor.py",
-            "temporalio/nexus/system/_payload_visitor.py",
         ],
         cwd=base_dir,
         check=True,
@@ -469,7 +458,6 @@ def write_system_nexus_payload_visitors() -> None:
             "ruff",
             "format",
             "temporalio/bridge/_visitor.py",
-            "temporalio/nexus/system/_payload_visitor.py",
         ],
         cwd=base_dir,
         check=True,

temporalio/bridge/_visitor.py

@@ -549,3 +549,25 @@ async def _visit_coresdk_workflow_completion_WorkflowActivationCompletion(
             await self._visit_coresdk_workflow_completion_Success(fs, o.successful)
         elif o.HasField("failed"):
             await self._visit_coresdk_workflow_completion_Failure(fs, o.failed)
+
+    async def _visit_temporal_api_common_v1_Header(self, fs: VisitorFunctions, o: Any):
+        for v in o.fields.values():
+            await self._visit_temporal_api_common_v1_Payload(fs, v)
+
+    async def _visit_temporal_api_workflowservice_v1_SignalWithStartWorkflowExecutionRequest(
+        self, fs: VisitorFunctions, o: Any
+    ):
+        if o.HasField("input"):
+            await self._visit_temporal_api_common_v1_Payloads(fs, o.input)
+        if o.HasField("signal_input"):
+            await self._visit_temporal_api_common_v1_Payloads(fs, o.signal_input)
+        if o.HasField("memo"):
+            await self._visit_temporal_api_common_v1_Memo(fs, o.memo)
+        if o.HasField("search_attributes"):
+            await self._visit_temporal_api_common_v1_SearchAttributes(
+                fs, o.search_attributes
+            )
+        if o.HasField("header"):
+            await self._visit_temporal_api_common_v1_Header(fs, o.header)
+        if o.HasField("user_metadata"):
+            await self._visit_temporal_api_sdk_v1_UserMetadata(fs, o.user_metadata)

temporalio/nexus/system/__init__.py

@@ -106,7 +106,7 @@ async def _maybe_visit_payload(  # pyright: ignore[reportUnusedFunction]
 
     payload_converter = _SystemNexusOuterPayloadConverter()
     value = payload_converter.from_payload(payload)
-    from ._payload_visitor import PayloadVisitor
+    from temporalio.bridge._visitor import PayloadVisitor
 
     await PayloadVisitor(skip_search_attributes=skip_search_attributes).visit(
         visitor_functions, value