Move json options down a level

Author: tconley1428

temporalio/contrib/openai_agents/_temporal_openai_agents.py

@@ -34,17 +34,15 @@
 from temporalio.contrib.openai_agents._trace_interceptor import (
     OpenAIAgentsTracingInterceptor,
 )
-from temporalio.converter import DataConverter
-from temporalio.contrib.pydantic import PydanticJSONPlainPayloadConverter, PydanticPayloadConverter
-from temporalio.worker import Worker, WorkerConfig
-
+from temporalio.contrib.pydantic import (
+    PydanticPayloadConverter,
+    ToJsonOptions,
+)
 from temporalio.converter import (
-    CompositePayloadConverter,
     DataConverter,
-    DefaultPayloadConverter,
-    EncodingPayloadConverter,
-    JSONPlainPayloadConverter,
 )
+from temporalio.worker import Worker, WorkerConfig
+
 
 @contextmanager
 def set_open_ai_agent_temporal_overrides(
@@ -144,9 +142,11 @@ 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)
+        super().__init__(ToJsonOptions(exclude_unset=True))
+
 
 class OpenAIAgentsPlugin(temporalio.client.Plugin, temporalio.worker.Plugin):
     """Temporal plugin for integrating OpenAI agents with Temporal workflows.

temporalio/contrib/pydantic.py

@@ -13,10 +13,11 @@
 Pydantic v1 is not supported.
 """
 
+from dataclasses import dataclass
 from typing import Any, Optional, Type
 
 from pydantic import TypeAdapter
-from pydantic_core import to_json, SchemaSerializer
+from pydantic_core import SchemaSerializer, to_json
 from pydantic_core.core_schema import any_schema
 
 import temporalio.api.common.v1
@@ -32,6 +33,13 @@
 # implements __get_pydantic_core_schema__ so that pydantic unwraps proxied types.
 
 
+@dataclass
+class ToJsonOptions:
+    """Options for converting to JSON with pydantic."""
+
+    exclude_unset: bool = False
+
+
 class PydanticJSONPlainPayloadConverter(EncodingPayloadConverter):
     """Pydantic JSON payload converter.
 
@@ -45,9 +53,10 @@ class PydanticJSONPlainPayloadConverter(EncodingPayloadConverter):
     See https://docs.pydantic.dev/latest/api/standard_library_types/
     """
 
-    def __init__(self, exclude_unset = False):
+    def __init__(self, to_json_options: Optional[ToJsonOptions]):
+        """Create a new payload converter."""
         self._schema_serializer = SchemaSerializer(any_schema())
-        self._exclude_unset = exclude_unset
+        self._to_json_options = to_json_options
 
     @property
     def encoding(self) -> str:
@@ -62,7 +71,13 @@ 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)
+        data = (
+            self._schema_serializer.to_json(
+                value, exclude_unset=self._to_json_options.exclude_unset
+            )
+            if self._to_json_options
+            else to_json(value)
+        )
         return temporalio.api.common.v1.Payload(
             metadata={"encoding": self.encoding.encode()}, data=data
         )
@@ -91,9 +106,9 @@ class PydanticPayloadConverter(CompositePayloadConverter):
     :py:class:`PydanticJSONPlainPayloadConverter`.
     """
 
-    def __init__(self, exclude_unset=False) -> None:
+    def __init__(self, to_json_options: Optional[ToJsonOptions]) -> None:
         """Initialize object"""
-        json_payload_converter = PydanticJSONPlainPayloadConverter(exclude_unset=exclude_unset)
+        json_payload_converter = PydanticJSONPlainPayloadConverter(to_json_options)
         super().__init__(
             *(
                 c