Fixing serialization issues

Author: tconley1428

temporalio/contrib/openai_agents/_invoke_model_activity.py

@@ -4,6 +4,7 @@
 """
 
 import enum
+import json
 from dataclasses import dataclass
 from datetime import timedelta
 from typing import Any, Optional, Union
@@ -32,6 +33,7 @@
     AsyncOpenAI,
 )
 from openai.types.responses.tool_param import Mcp
+from pydantic_core import to_json
 from typing_extensions import Required, TypedDict
 
 from temporalio import activity
@@ -170,6 +172,11 @@ async def empty_on_invoke_handoff(
         ) -> Any:
             return None
 
+        # workaround for https://github.com/pydantic/pydantic/issues/9541
+        # ValidatorIterator returned
+        input_json = to_json(input["input"])
+        input_input = json.loads(input_json)
+
         def make_tool(tool: ToolInput) -> Tool:
             if isinstance(
                 tool,
@@ -212,7 +219,7 @@ def make_tool(tool: ToolInput) -> Tool:
         try:
             return await model.get_response(
                 system_instructions=input.get("system_instructions"),
-                input=input["input"],
+                input=input_input,
                 model_settings=input["model_settings"],
                 tools=tools,
                 output_schema=input.get("output_schema"),

temporalio/contrib/openai_agents/_temporal_openai_agents.py

@@ -34,9 +34,17 @@
 from temporalio.contrib.openai_agents._trace_interceptor import (
     OpenAIAgentsTracingInterceptor,
 )
-from temporalio.contrib.pydantic import pydantic_data_converter
+from temporalio.converter import DataConverter
+from temporalio.contrib.pydantic import PydanticJSONPlainPayloadConverter, PydanticPayloadConverter
 from temporalio.worker import Worker, WorkerConfig
 
+from temporalio.converter import (
+    CompositePayloadConverter,
+    DataConverter,
+    DefaultPayloadConverter,
+    EncodingPayloadConverter,
+    JSONPlainPayloadConverter,
+)
 
 @contextmanager
 def set_open_ai_agent_temporal_overrides(
@@ -136,6 +144,9 @@ def stream_response(
         """Get a streamed response from the model. Unimplemented."""
         raise NotImplementedError()
 
+class _OpenAIPayloadConverter(PydanticPayloadConverter):
+    def __init__(self) -> None:
+        super().__init__(exclude_unset=True)
 
 class OpenAIAgentsPlugin(temporalio.client.Plugin, temporalio.worker.Plugin):
     """Temporal plugin for integrating OpenAI agents with Temporal workflows.
@@ -232,7 +243,9 @@ def configure_client(self, config: ClientConfig) -> ClientConfig:
         Returns:
             The modified client configuration.
         """
-        config["data_converter"] = pydantic_data_converter
+        config["data_converter"] = DataConverter(
+            payload_converter_class=_OpenAIPayloadConverter
+        )
         return super().configure_client(config)
 
     def configure_worker(self, config: WorkerConfig) -> WorkerConfig:

temporalio/contrib/pydantic.py

@@ -16,7 +16,8 @@
 from typing import Any, Optional, Type
 
 from pydantic import TypeAdapter
-from pydantic_core import to_json
+from pydantic_core import to_json, SchemaSerializer
+from pydantic_core.core_schema import any_schema
 
 import temporalio.api.common.v1
 from temporalio.converter import (
@@ -44,6 +45,10 @@ class PydanticJSONPlainPayloadConverter(EncodingPayloadConverter):
     See https://docs.pydantic.dev/latest/api/standard_library_types/
     """
 
+    def __init__(self, exclude_unset = False):
+        self._schema_serializer = SchemaSerializer(any_schema())
+        self._exclude_unset = exclude_unset
+
     @property
     def encoding(self) -> str:
         """See base class."""
@@ -57,8 +62,9 @@ def to_payload(self, value: Any) -> Optional[temporalio.api.common.v1.Payload]:
         See
         https://docs.pydantic.dev/latest/api/pydantic_core/#pydantic_core.to_json.
         """
+        data = self._schema_serializer.to_json(value, exclude_unset=self._exclude_unset) if self._exclude_unset else to_json(value)
         return temporalio.api.common.v1.Payload(
-            metadata={"encoding": self.encoding.encode()}, data=to_json(value)
+            metadata={"encoding": self.encoding.encode()}, data=data
         )
 
     def from_payload(
@@ -85,9 +91,9 @@ class PydanticPayloadConverter(CompositePayloadConverter):
     :py:class:`PydanticJSONPlainPayloadConverter`.
     """
 
-    def __init__(self) -> None:
+    def __init__(self, exclude_unset=False) -> None:
         """Initialize object"""
-        json_payload_converter = PydanticJSONPlainPayloadConverter()
+        json_payload_converter = PydanticJSONPlainPayloadConverter(exclude_unset=exclude_unset)
         super().__init__(
             *(
                 c