More builtin OpenAI tool types and test for Lite LLM custom provider

pyproject.toml

@@ -57,6 +57,7 @@ dev = [
     "pytest-cov>=6.1.1",
     "httpx>=0.28.1",
     "pytest-pretty>=1.3.0",
+    "openai-agents[litellm] >= 0.2.3,<0.3"
 ]
 
 [tool.poe.tasks]

temporalio/contrib/openai_agents/_invoke_model_activity.py

@@ -4,16 +4,18 @@
 """
 
 import enum
-import json
 from dataclasses import dataclass
 from datetime import timedelta
 from typing import Any, Optional, Union, cast
 
 from agents import (
     AgentOutputSchemaBase,
+    CodeInterpreterTool,
     FileSearchTool,
     FunctionTool,
     Handoff,
+    HostedMCPTool,
+    ImageGenerationTool,
     ModelProvider,
     ModelResponse,
     ModelSettings,
@@ -25,13 +27,11 @@
     UserError,
     WebSearchTool,
 )
-from agents.models.multi_provider import MultiProvider
 from openai import (
     APIStatusError,
     AsyncOpenAI,
-    AuthenticationError,
-    PermissionDeniedError,
 )
+from openai.types.responses.tool_param import Mcp
 from typing_extensions import Required, TypedDict
 
 from temporalio import activity
@@ -60,7 +60,21 @@ class FunctionToolInput:
     strict_json_schema: bool = True
 
 
-ToolInput = Union[FunctionToolInput, FileSearchTool, WebSearchTool]
+@dataclass
+class HostedMCPToolInput:
+    """Data conversion friendly representation of a HostedMCPTool."""
+
+    tool_config: Mcp
+
+
+ToolInput = Union[
+    FunctionToolInput,
+    FileSearchTool,
+    WebSearchTool,
+    ImageGenerationTool,
+    CodeInterpreterTool,
+    HostedMCPToolInput,
+]
 
 
 @dataclass
@@ -150,24 +164,28 @@ async def empty_on_invoke_handoff(
         ) -> Any:
             return None
 
-        # workaround for https://github.com/pydantic/pydantic/issues/9541
-        # ValidatorIterator returned
-        input_json = json.dumps(input["input"], default=str)
-        input_input = json.loads(input_json)
-
         def make_tool(tool: ToolInput) -> Tool:
-            if isinstance(tool, FileSearchTool):
-                return cast(FileSearchTool, tool)
-            elif isinstance(tool, WebSearchTool):
-                return cast(WebSearchTool, tool)
+            if isinstance(
+                tool,
+                (
+                    FileSearchTool,
+                    WebSearchTool,
+                    ImageGenerationTool,
+                    CodeInterpreterTool,
+                ),
+            ):
+                return cast(Tool, tool)
+            elif isinstance(tool, HostedMCPToolInput):
+                return HostedMCPTool(
+                    tool_config=tool.tool_config,
+                )
             elif isinstance(tool, FunctionToolInput):
-                t = cast(FunctionToolInput, tool)
                 return FunctionTool(
-                    name=t.name,
-                    description=t.description,
-                    params_json_schema=t.params_json_schema,
+                    name=tool.name,
+                    description=tool.description,
+                    params_json_schema=tool.params_json_schema,
                     on_invoke_tool=empty_on_invoke_tool,
-                    strict_json_schema=t.strict_json_schema,
+                    strict_json_schema=tool.strict_json_schema,
                 )
             else:
                 raise UserError(f"Unknown tool type: {tool.name}")
@@ -188,7 +206,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_model_stub.py

@@ -13,10 +13,13 @@
 from agents import (
     AgentOutputSchema,
     AgentOutputSchemaBase,
+    CodeInterpreterTool,
     ComputerTool,
     FileSearchTool,
     FunctionTool,
     Handoff,
+    HostedMCPTool,
+    ImageGenerationTool,
     Model,
     ModelResponse,
     ModelSettings,
@@ -33,6 +36,7 @@
     AgentOutputSchemaInput,
     FunctionToolInput,
     HandoffInput,
+    HostedMCPToolInput,
     ModelActivity,
     ModelTracingInput,
     ToolInput,
@@ -87,12 +91,18 @@ def get_summary(
             return ""
 
         def make_tool_info(tool: Tool) -> ToolInput:
-            if isinstance(tool, (FileSearchTool, WebSearchTool)):
+            if isinstance(
+                tool,
+                (
+                    FileSearchTool,
+                    WebSearchTool,
+                    ImageGenerationTool,
+                    CodeInterpreterTool,
+                ),
+            ):
                 return tool
-            elif isinstance(tool, ComputerTool):
-                raise NotImplementedError(
-                    "Computer search preview is not supported in Temporal model"
-                )
+            elif isinstance(tool, HostedMCPTool):
+                return HostedMCPToolInput(tool_config=tool.tool_config)
             elif isinstance(tool, FunctionTool):
                 return FunctionToolInput(
                     name=tool.name,
@@ -101,7 +111,7 @@ def make_tool_info(tool: Tool) -> ToolInput:
                     strict_json_schema=tool.strict_json_schema,
                 )
             else:
-                raise ValueError(f"Unknown tool type: {tool.name}")
+                raise ValueError(f"Unsupported tool type: {tool.name}")
 
         tool_infos = [make_tool_info(x) for x in tools]
         handoff_infos = [