From d401da387904622b5aa6ae6d1f3dbea3e4cc9284 Mon Sep 17 00:00:00 2001
From: Jeremiah Lowin <153965+jlowin@users.noreply.github.com>
Date: Wed, 7 May 2025 12:46:04 -0400
Subject: [PATCH] Merge from PR

---
 src/fastmcp/client/transports.py | 32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/src/fastmcp/client/transports.py b/src/fastmcp/client/transports.py
index 129d368a2..3d5e1e149 100644
--- a/src/fastmcp/client/transports.py
+++ b/src/fastmcp/client/transports.py
@@ -20,7 +20,6 @@ from mcp.client.sse import sse_client
 from mcp.client.stdio import stdio_client
 from mcp.client.streamable_http import streamablehttp_client
 from mcp.client.websocket import websocket_client
-from mcp.client.streamable_http import streamablehttp_client
 from mcp.shared.memory import create_connected_server_and_client_session
 from pydantic import AnyUrl
 from typing_extensions import Unpack
@@ -100,33 +99,6 @@ class WSTransport(ClientTransport):
         return f"<WebSocket(url='{self.url}')>"
 
 
-class StreamableHttpTransport(ClientTransport):
-    """Transport implementation that connects to an MCP server via Streamable HTTP Requests."""
-
-    def __init__(self, url: str | AnyUrl, headers: dict[str, str] | None = None):
-        if isinstance(url, AnyUrl):
-            url = str(url)
-        if not isinstance(url, str) or not url.startswith("http"):
-            raise ValueError("Invalid HTTP/S URL provided for Streamable HTTP.")
-        self.url = url
-        self.headers = headers or {}
-
-    @contextlib.asynccontextmanager
-    async def connect_session(
-        self, **session_kwargs: Unpack[SessionKwargs]
-    ) -> AsyncIterator[ClientSession]:
-        async with streamablehttp_client(self.url, headers=self.headers) as transport:
-            read_stream, write_stream, _ = transport
-            async with ClientSession(
-                read_stream, write_stream, **session_kwargs
-            ) as session:
-                await session.initialize()
-                yield session
-
-    def __repr__(self) -> str:
-        return f"<StreamableHttp(url='{self.url}')>"
-
-
 class SSETransport(ClientTransport):
     """Transport implementation that connects to an MCP server via Server-Sent Events."""
 
@@ -153,6 +125,7 @@ class SSETransport(ClientTransport):
     def __repr__(self) -> str:
         return f"<SSE(url='{self.url}')>"
 
+
 class StreamableHttpTransport(ClientTransport):
     """Transport implementation that connects to an MCP server via Streamable HTTP Requests."""
 
@@ -169,7 +142,7 @@ class StreamableHttpTransport(ClientTransport):
         self, **session_kwargs: Unpack[SessionKwargs]
     ) -> AsyncIterator[ClientSession]:
         async with streamablehttp_client(self.url, headers=self.headers) as transport:
-            read_stream, write_stream = transport
+            read_stream, write_stream, _ = transport
             async with ClientSession(
                 read_stream, write_stream, **session_kwargs
             ) as session:
@@ -180,7 +153,6 @@ class StreamableHttpTransport(ClientTransport):
         return f"<StreamableHttp(url='{self.url}')>"
 
 
-
 class StdioTransport(ClientTransport):
     """
     Base transport for connecting to an MCP server via subprocess with stdio.