Some cleanup

Author: tconley1428

temporalio/contrib/openai_agents/_openai_runner.py

@@ -1,5 +1,6 @@
 import json
 import typing
+import warnings
 from dataclasses import replace
 from typing import Any, Union
 
@@ -54,10 +55,11 @@ async def run(
                     "Provided tool is not a tool type. If using an activity, make sure to wrap it with openai_agents.workflow.activity_as_tool."
                 )
 
-        # if starting_agent.mcp_servers:
-        #     raise ValueError(
-        #         "Temporal OpenAI agent does not support on demand MCP servers."
-        #     )
+        if starting_agent.mcp_servers:
+            from temporalio.contrib.openai_agents import (StatelessTemporalMCPServer, StatefulTemporalMCPServer)
+            for s in starting_agent.mcp_servers:
+                if not isinstance(s, (StatelessTemporalMCPServer, StatefulTemporalMCPServer)):
+                    warnings.warn("Unknown mcp_server type {} may not work durably.".format(type(s)))
 
         # workaround for https://github.com/pydantic/pydantic/issues/9541
         # ValidatorIterator returned

temporalio/contrib/openai_agents/_temporal_openai_agents.py

@@ -195,7 +195,7 @@ class OpenAIAgentsPlugin(temporalio.client.Plugin, temporalio.worker.Plugin):
     Example:
         >>> from temporalio.client import Client
         >>> from temporalio.worker import Worker
-        >>> from temporalio.contrib.openai_agents import OpenAIAgentsPlugin, ModelActivityParameters
+        >>> from temporalio.contrib.openai_agents import OpenAIAgentsPlugin, ModelActivityParameters, StatelessTemporalMCPServer
         >>> from agents.mcp import MCPServerStdio
         >>> from datetime import timedelta
         >>>
@@ -206,10 +206,10 @@ class OpenAIAgentsPlugin(temporalio.client.Plugin, temporalio.worker.Plugin):
         ... )
         >>>
         >>> # Create MCP servers
-        >>> filesystem_server = MCPServerStdio(
+        >>> filesystem_server = StatelessTemporalMCPServer(MCPServerStdio(
         ...     name="Filesystem Server",
         ...     params={"command": "npx", "args": ["-y", "@modelcontextprotocol/server-filesystem", "."]}
-        ... )
+        ... ))
         >>>
         >>> # Create plugin with MCP servers
         >>> plugin = OpenAIAgentsPlugin(
@@ -265,29 +265,8 @@ def __init__(
 
         self._model_params = model_params
         self._model_provider = model_provider
+        self._mcp_servers = mcp_servers
 
-        if mcp_servers:
-            from temporalio.contrib.openai_agents._mcp import (
-                StatefulTemporalMCPServer,
-                StatelessTemporalMCPServer,
-            )
-
-            def _transform_mcp_server(server: "MCPServer") -> "MCPServer":
-                if not (
-                    isinstance(server, StatelessTemporalMCPServer)
-                    or isinstance(server, StatefulTemporalMCPServer)
-                ):
-                    warnings.warn(
-                        f"Unsupported mcp server type {type(server)} is not guaranteed to behave reasonably."
-                    )
-
-                return server
-
-            self._mcp_servers = [
-                _transform_mcp_server(server) for server in mcp_servers
-            ]
-        else:
-            self._mcp_servers = []
 
     def init_client_plugin(self, next: temporalio.client.Plugin) -> None:
         """Set the next client plugin"""

tests/contrib/openai_agents/test_openai.py

@@ -2245,7 +2245,6 @@ async def test_stateful_mcp_server_no_worker(client: Client):
     # Override the connect activity to not actually start a worker
     @activity.defn(name="Filesystem-Server-stateful-connect")
     async def connect() -> None:
-        print("Override connect")
         await asyncio.sleep(30)
 
     def override_get_activities() -> Sequence[Callable]: