Fix problems since MCP doesn't exist on python 3.9

Author: tconley1428

pyproject.toml

@@ -27,7 +27,8 @@ opentelemetry = [
 pydantic = ["pydantic>=2.0.0,<3"]
 openai-agents = [
     "openai-agents >= 0.2.3,<0.3",
-    "eval-type-backport>=0.2.2; python_version < '3.10'"
+    "eval-type-backport>=0.2.2; python_version < '3.10'",
+    "mcp>=1.9.4, <2; python_version >= '3.10'",
 ]
 
 [project.urls]

temporalio/contrib/openai_agents/__init__.py

@@ -8,10 +8,15 @@
     Use with caution in production environments.
 """
 
-from temporalio.contrib.openai_agents._mcp import (
-    TemporalMCPServer,
-    TemporalMCPServerWorkflowShim,
-)
+# Best Effort mcp, as it is not supported on Python 3.9
+try:
+    from temporalio.contrib.openai_agents._mcp import (
+        TemporalMCPServer,
+        TemporalMCPServerWorkflowShim,
+    )
+except ImportError:
+    pass
+
 from temporalio.contrib.openai_agents._model_parameters import ModelActivityParameters
 from temporalio.contrib.openai_agents._temporal_openai_agents import (
     OpenAIAgentsPlugin,

temporalio/contrib/openai_agents/_mcp.py

@@ -3,9 +3,9 @@
 
 from agents import AgentBase, RunContextWrapper
 from agents.mcp import MCPServer
-from mcp import GetPromptResult, ListPromptsResult
-from mcp import Tool as MCPTool
-from mcp.types import CallToolResult
+from mcp import GetPromptResult, ListPromptsResult  # type:ignore
+from mcp import Tool as MCPTool  # type:ignore
+from mcp.types import CallToolResult  # type:ignore
 
 from temporalio import activity, workflow
 from temporalio.workflow import LocalActivityConfig

temporalio/contrib/openai_agents/_temporal_openai_agents.py

@@ -1,6 +1,7 @@
 """Initialize Temporal OpenAI Agents overrides."""
 
 import dataclasses
+import typing
 from contextlib import AsyncExitStack, asynccontextmanager, contextmanager
 from datetime import timedelta
 from typing import AsyncIterator, Callable, Optional, Sequence, Union
@@ -18,7 +19,6 @@
     set_trace_provider,
 )
 from agents.items import TResponseStreamEvent
-from agents.mcp import MCPServer
 from agents.run import get_default_agent_runner, set_default_agent_runner
 from agents.tracing import get_trace_provider
 from agents.tracing.provider import DefaultTraceProvider
@@ -28,7 +28,6 @@
 import temporalio.worker
 from temporalio.client import ClientConfig
 from temporalio.contrib.openai_agents._invoke_model_activity import ModelActivity
-from temporalio.contrib.openai_agents._mcp import TemporalMCPServer
 from temporalio.contrib.openai_agents._model_parameters import ModelActivityParameters
 from temporalio.contrib.openai_agents._openai_runner import TemporalOpenAIRunner
 from temporalio.contrib.openai_agents._temporal_trace_provider import (
@@ -53,6 +52,11 @@
 )
 from temporalio.worker.workflow_sandbox import SandboxedWorkflowRunner
 
+if typing.TYPE_CHECKING:
+    from agents.mcp import MCPServer
+
+    from temporalio.contrib.openai_agents._mcp import TemporalMCPServer
+
 
 @contextmanager
 def set_open_ai_agent_temporal_overrides(
@@ -232,7 +236,7 @@ def __init__(
         self,
         model_params: Optional[ModelActivityParameters] = None,
         model_provider: Optional[ModelProvider] = None,
-        mcp_servers: Sequence[MCPServer] = (),
+        mcp_servers: Sequence["MCPServer"] = (),
     ) -> None:
         """Initialize the OpenAI agents plugin.
 

tests/contrib/openai_agents/test_openai.py

@@ -57,7 +57,6 @@
     TResponseOutputItem,
     TResponseStreamEvent,
 )
-from agents.mcp import MCPServer, MCPServerStdio
 from openai import APIStatusError, AsyncOpenAI, BaseModel
 from openai.types.responses import (
     EasyInputMessageParam,
@@ -87,7 +86,6 @@
 from temporalio.contrib import openai_agents
 from temporalio.contrib.openai_agents import (
     ModelActivityParameters,
-    TemporalMCPServerWorkflowShim,
     TestModel,
     TestModelProvider,
 )
@@ -2512,7 +2510,10 @@ async def test_hosted_mcp_tool(client: Client, use_local_model):
 class McpServerWorkflow:
     @workflow.run
     async def run(self, question: str) -> str:
-        print("Running")
+        from agents.mcp import MCPServer
+
+        from temporalio.contrib.openai_agents import TemporalMCPServerWorkflowShim
+
         server: MCPServer = TemporalMCPServerWorkflowShim("Filesystem Server, via npx")
         agent = Agent[str](
             name="MCP ServerWorkflow",
@@ -2586,9 +2587,13 @@ class McpServerModel(StaticTestModel):
 
 @pytest.mark.parametrize("use_local_model", [True, False])
 async def test_mcp_server(client: Client, use_local_model: bool):
-    if not os.environ.get("OPENAI_API_KEY"):
+    if not use_local_model and not os.environ.get("OPENAI_API_KEY"):
         pytest.skip("No openai API key")
 
+    if sys.version_info < (3, 10):
+        pytest.skip("Mcp not supported on Python 3.9")
+    from agents.mcp import MCPServer, MCPServerStdio
+
     server = MCPServerStdio(
         name="Filesystem Server, via npx",
         params={