langchain-mcp-tools 0.2.4__py3-none-any.whl → 0.2.5__py3-none-any.whl

langchain_mcp_tools/langchain_mcp_tools.py

@@ -15,6 +15,7 @@ from typing import (
     TypedDict,
 )
 from urllib.parse import urlparse
+import time
 
 # Third-party imports
 try:
@@ -22,12 +23,15 @@ try:
         MemoryObjectReceiveStream,
         MemoryObjectSendStream,
     )
+    import httpx
     from jsonschema_pydantic import jsonschema_to_pydantic  # type: ignore
     from langchain_core.tools import BaseTool, ToolException
     from mcp import ClientSession
     from mcp.client.sse import sse_client
     from mcp.client.stdio import stdio_client, StdioServerParameters
+    from mcp.client.streamable_http import streamablehttp_client
     from mcp.client.websocket import websocket_client
+    from mcp.shared._httpx_utils import McpHttpClientFactory
     import mcp.types as mcp_types
     from pydantic import BaseModel
     # from pydantic_core import to_json
@@ -37,6 +41,19 @@ except ImportError as e:
     sys.exit(1)
 
 
+class McpInitializationError(Exception):
+    """Raised when MCP server initialization fails."""
+    
+    def __init__(self, message: str, server_name: str | None = None):
+        self.server_name = server_name
+        super().__init__(message)
+    
+    def __str__(self) -> str:
+        if self.server_name:
+            return f'MCP server "{self.server_name}": {super().__str__()}'
+        return super().__str__()
+
+
 class McpServerCommandBasedConfig(TypedDict):
     """Configuration for an MCP server launched via command line.
 
@@ -74,30 +91,70 @@ class McpServerUrlBasedConfig(TypedDict):
     """Configuration for a remote MCP server accessed via URL.
 
     This configuration is used for remote MCP servers that are accessed via
-    HTTP/HTTPS (Server-Sent Events) or WebSocket connections. It defines the
-    URL to connect to and optional HTTP headers for authentication.
+    HTTP/HTTPS (Streamable HTTP, Server-Sent Events) or WebSocket connections.
+    It defines the URL to connect to and optional HTTP headers for authentication.
+
+    Note: Per MCP spec, clients should try Streamable HTTP first, then fallback 
+    to SSE on 4xx errors for maximum compatibility.
 
     Attributes:
-        url: The URL of the remote MCP server. For SSE servers,
+        url: The URL of the remote MCP server. For HTTP/HTTPS servers,
                 use http:// or https:// prefix. For WebSocket servers,
                 use ws:// or wss:// prefix.
+        transport: Optional transport type. Supported values:
+                "streamable_http" or "http" (recommended, attempted first), 
+                "sse" (deprecated, fallback), "websocket"
+        type: Optional alternative field name for transport (for compatibility)
         headers: Optional dictionary of HTTP headers to include in the request,
                 typically used for authentication (e.g., bearer tokens).
+        timeout: Optional timeout for HTTP requests (default: 30.0 seconds).
+        sse_read_timeout: Optional timeout for SSE connections (SSE only).
+        terminate_on_close: Optional flag to terminate on connection close.
+        httpx_client_factory: Optional factory for creating HTTP clients.
+        auth: Optional httpx authentication for requests.
+        __pre_validate_authentication: Optional flag to skip auth validation
+                (default: True). Set to False for OAuth flows that require
+                complex authentication flows.
+
+    Example for auto-detection (recommended):
+        {
+            "url": "https://api.example.com/mcp",
+            # Auto-tries Streamable HTTP first, falls back to SSE on 4xx
+            "headers": {"Authorization": "Bearer token123"},
+            "timeout": 60.0
+        }
+
+    Example for explicit Streamable HTTP:
+        {
+            "url": "https://api.example.com/mcp",
+            "transport": "streamable_http",
+            "headers": {"Authorization": "Bearer token123"},
+            "timeout": 60.0
+        }
 
-    Example for SSE server:
+    Example for explicit SSE (legacy):
         {
             "url": "https://example.com/mcp/sse",
+            "transport": "sse",
             "headers": {"Authorization": "Bearer token123"}
         }
 
-    Example for WebSocket server:
+    Example for WebSocket:
         {
-            "url": "wss://example.com/mcp/ws"
+            "url": "wss://example.com/mcp/ws",
+            "transport": "websocket"
         }
     """
     url: str
+    transport: NotRequired[str]  # Preferred field name
+    type: NotRequired[str]  # Alternative field name for compatibility
     headers: NotRequired[dict[str, str] | None]
-
+    timeout: NotRequired[float]
+    sse_read_timeout: NotRequired[float]
+    terminate_on_close: NotRequired[bool]
+    httpx_client_factory: NotRequired[McpHttpClientFactory]
+    auth: NotRequired[httpx.Auth]
+    __prevalidate_authentication: NotRequired[bool]
 
 # Type for a single MCP server configuration, which can be either
 # command-based or URL-based.
@@ -132,8 +189,15 @@ Example:
             "command": "uvx",
             "args": ["mcp-server-fetch"]
         },
-        "remote-server": {
-            "url": "https://example.com/mcp/sse",
+        "auto-detection-server": {
+            "url": "https://api.example.com/mcp",
+            # Will try Streamable HTTP first, fallback to SSE on 4xx
+            "headers": {"Authorization": "Bearer token123"},
+            "timeout": 60.0
+        },
+        "explicit-sse-server": {
+            "url": "https://legacy.example.com/mcp/sse",
+            "transport": "sse",
             "headers": {"Authorization": "Bearer token123"}
         }
     }
@@ -158,67 +222,570 @@ def fix_schema(schema: dict) -> dict:
     return schema
 
 
-# Type alias for the bidirectional communication channels with the MCP server
-# FIXME: not defined in mcp.types, really?
+# Type alias for bidirectional communication channels with MCP servers
+# Note: This type is not officially exported by mcp.types but represents
+# the standard transport interface used by all MCP client implementations
 Transport: TypeAlias = tuple[
     MemoryObjectReceiveStream[mcp_types.JSONRPCMessage | Exception],
     MemoryObjectSendStream[mcp_types.JSONRPCMessage]
 ]
 
 
-async def spawn_mcp_server_and_get_transport(
+def is_4xx_error(error: Exception) -> bool:
+    """Enhanced 4xx error detection matching TypeScript implementation.
+    
+    Used to decide whether to fall back from Streamable HTTP to SSE transport
+    per MCP specification. Handles various error types and patterns that indicate
+    4xx-like conditions.
+    
+    Args:
+        error: The error to check
+        
+    Returns:
+        True if the error represents a 4xx HTTP status or equivalent
+    """
+    if not error:
+        return False
+    
+    # Handle ExceptionGroup (Python 3.11+) by checking sub-exceptions
+    if hasattr(error, 'exceptions'):
+        return any(is_4xx_error(sub_error) for sub_error in error.exceptions)
+    
+    # Check for explicit HTTP status codes
+    if hasattr(error, 'status') and isinstance(error.status, int):
+        return 400 <= error.status < 500
+    
+    # Check for httpx response errors
+    if hasattr(error, 'response') and hasattr(error.response, 'status_code'):
+        return 400 <= error.response.status_code < 500
+    
+    # Check error message for 4xx patterns
+    error_str = str(error).lower()
+    
+    # Look for specific 4xx status codes (enhanced pattern matching)
+    if any(code in error_str for code in ['400', '401', '402', '403', '404', '405', '406', '407', '408', '409']):
+        return True
+    
+    # Look for 4xx error names (expanded list matching TypeScript version)
+    return any(pattern in error_str for pattern in [
+        'bad request',
+        'unauthorized',
+        'forbidden', 
+        'not found',
+        'method not allowed',
+        'not acceptable',
+        'request timeout',
+        'conflict'
+    ])
+
+
+async def validate_auth_before_connection(
+    url_str: str, 
+    headers: dict[str, str] | None = None, 
+    timeout: float = 30.0,
+    auth: httpx.Auth | None = None,
+    logger: logging.Logger = logging.getLogger(__name__)
+) -> tuple[bool, str]:
+    """Pre-validate authentication with a simple HTTP request before creating MCP connection.
+    
+    This function helps avoid async generator cleanup bugs in the MCP client library
+    by detecting authentication failures early, before the problematic MCP transport
+    creation process begins.
+    
+    For OAuth authentication, this function skips validation since OAuth requires
+    a complex flow that cannot be pre-validated with a simple HTTP request.
+    Use __pre_validate_authentication=False to skip this validation.
+    
+    Args:
+        url_str: The MCP server URL to test
+        headers: Optional HTTP headers (typically containing Authorization)
+        timeout: Request timeout in seconds
+        auth: Optional httpx authentication object (OAuth providers are skipped)
+        logger: Logger for debugging
+        
+    Returns:
+        Tuple of (success: bool, message: str) where:
+        - success=True means authentication is valid or OAuth (skipped)
+        - success=False means authentication failed with descriptive message
+        
+    Note:
+        This function only validates simple authentication (401, 402, 403 errors).
+        OAuth authentication is skipped since it requires complex flows.
+    """
+    
+    # Skip auth validation for all httpx.Auth providers
+    if auth is not None:
+        auth_class_name = auth.__class__.__name__
+        logger.info(f"Skipping auth validation for httpx.Auth provider: {auth_class_name}")
+        return True, "httpx.Auth authentication skipped (requires full flow)"
+    
+    # Create InitializeRequest as per MCP specification (similar to test_streamable_http_support)
+    init_request = {
+        "jsonrpc": "2.0",
+        "id": f"auth-test-{int(time.time() * 1000)}",
+        "method": "initialize", 
+        "params": {
+            "protocolVersion": "2024-11-05",
+            "capabilities": {},
+            "clientInfo": {
+                "name": "mcp-auth-test",
+                "version": "1.0.0"
+            }
+        }
+    }
+    
+    # Required headers per MCP specification
+    request_headers = {
+        'Content-Type': 'application/json',
+        'Accept': 'application/json, text/event-stream'
+    }
+    if headers:
+        request_headers.update(headers)
+    
+    try:
+        async with httpx.AsyncClient() as client:
+            logger.debug(f"Pre-validating authentication for: {url_str}")
+            response = await client.post(
+                url_str,
+                json=init_request,
+                headers=request_headers,
+                timeout=timeout,
+                auth=auth
+            )
+            
+            if response.status_code == 401:
+                return False, f"Authentication failed (401 Unauthorized): {response.text if hasattr(response, 'text') else 'Unknown error'}"
+            elif response.status_code == 402:
+                return False, f"Authentication failed (402 Payment Required): {response.text if hasattr(response, 'text') else 'Unknown error'}"
+            elif response.status_code == 403:
+                return False, f"Authentication failed (403 Forbidden): {response.text if hasattr(response, 'text') else 'Unknown error'}"
+
+            logger.info(f"Authentication validation passed: {response.status_code}")
+            return True, "Authentication validation passed"
+            
+    except httpx.HTTPStatusError as e:
+        return False, f"HTTP Error ({e.response.status_code}): {e}"
+    except (httpx.ConnectError, httpx.TimeoutException) as e:
+        return False, f"Connection failed: {e}"
+    except Exception as e:
+        return False, f"Unexpected error during auth validation: {e}"
+
+
+async def test_streamable_http_support(
+    url: str, 
+    headers: dict[str, str] | None = None,
+    timeout: float = 30.0,
+    auth: httpx.Auth | None = None,
+    logger: logging.Logger = logging.getLogger(__name__)
+) -> bool:
+    """Test if URL supports Streamable HTTP per official MCP specification.
+    
+    Follows the MCP specification's recommended approach for backwards compatibility.
+    Uses proper InitializeRequest with official protocol version and required headers.
+    
+    See: https://modelcontextprotocol.io/specification/2025-03-26/basic/transports#backwards-compatibility
+    
+    Args:
+        url: The MCP server URL to test
+        headers: Optional HTTP headers
+        timeout: Request timeout
+        auth: Optional httpx authentication
+        logger: Logger for debugging
+        
+    Returns:
+        True if Streamable HTTP is supported, False if should fallback to SSE
+        
+    Raises:
+        Exception: For non-4xx errors that should be re-raised
+    """
+    # Create InitializeRequest as per MCP specification
+    init_request = {
+        "jsonrpc": "2.0",
+        "id": f"transport-test-{int(time.time() * 1000)}",  # Use milliseconds like TS version
+        "method": "initialize", 
+        "params": {
+            "protocolVersion": "2024-11-05",  # Official MCP Protocol version
+            "capabilities": {},
+            "clientInfo": {
+                "name": "mcp-transport-test",
+                "version": "1.0.0"
+            }
+        }
+    }
+    
+    # Required headers per MCP specification
+    request_headers = {
+        'Content-Type': 'application/json',
+        'Accept': 'application/json, text/event-stream'  # Required by spec
+    }
+    if headers:
+        request_headers.update(headers)
+    
+    try:
+        async with httpx.AsyncClient(follow_redirects=True) as client:
+            logger.debug(f"Testing Streamable HTTP: POST InitializeRequest to {url}")
+            response = await client.post(
+                url,
+                json=init_request,
+                headers=request_headers,
+                timeout=timeout,
+                auth=auth
+            )
+            
+            logger.debug(f"Transport test response: {response.status_code} {response.headers.get('content-type', 'N/A')}")
+            
+            if response.status_code == 200:
+                # Success indicates Streamable HTTP support
+                logger.debug("Streamable HTTP test successful")
+                return True
+            elif 400 <= response.status_code < 500:
+                # 4xx error indicates fallback to SSE per MCP spec
+                logger.debug(f"Received {response.status_code}, should fallback to SSE")
+                return False
+            else:
+                # Other errors should be re-raised
+                response.raise_for_status()
+                return True  # If we get here, it succeeded
+                
+    except httpx.TimeoutException:
+        logger.debug("Request timeout - treating as connection error")
+        raise
+    except httpx.ConnectError:
+        logger.debug("Connection error")
+        raise
+    except Exception as e:
+        # Check if it's a 4xx-like error using improved detection
+        if is_4xx_error(e):
+            logger.debug(f"4xx-like error detected: {e}")
+            return False
+        raise
+
+
+def validate_mcp_server_config(
+    server_name: str,
+    server_config: SingleMcpServerConfig,
+    logger: logging.Logger
+) -> None:
+    """Validates MCP server configuration following TypeScript transport selection logic.
+    
+    Transport Selection Priority:
+    1. Explicit transport/type field (must match URL protocol if URL provided)
+    2. URL protocol auto-detection (http/https → StreamableHTTP, ws/wss → WebSocket)
+    3. Command presence → Stdio transport
+    4. Error if none of the above match
+    
+    Conflicts that cause errors:
+    - Both url and command specified
+    - transport/type doesn't match URL protocol
+    - transport requires URL but no URL provided
+    - transport requires command but no command provided
+    
+    Args:
+        server_name: Server instance name for error messages
+        server_config: Configuration to validate
+        logger: Logger for warnings
+        
+    Raises:
+        McpInitializationError: If configuration is invalid
+    """
+    has_url = "url" in server_config and server_config["url"] is not None
+    has_command = "command" in server_config and server_config["command"] is not None
+    
+    # Get transport type (prefer 'transport' over 'type' for compatibility)
+    transport_type = server_config.get("transport") or server_config.get("type")
+    
+    # Conflict check: Both url and command specified
+    if has_url and has_command:
+        raise McpInitializationError(
+            f'Cannot specify both "url" ({server_config["url"]}) '
+            f'and "command" ({server_config["command"]}). Use "url" for remote servers '
+            f'or "command" for local servers.',
+            server_name=server_name
+        )
+    
+    # Must have either URL or command
+    if not has_url and not has_command:
+        raise McpInitializationError(
+            'Either "url" or "command" must be specified',
+            server_name=server_name
+        )
+    
+    if has_url:
+        url_str = str(server_config["url"])
+        try:
+            parsed_url = urlparse(url_str)
+            url_scheme = parsed_url.scheme.lower()
+        except Exception:
+            raise McpInitializationError(
+                f'Invalid URL format: {url_str}',
+                server_name=server_name
+            )
+        
+        if transport_type:
+            transport_lower = transport_type.lower()
+            
+            # Check transport/URL protocol compatibility
+            if transport_lower in ["http", "streamable_http"] and url_scheme not in ["http", "https"]:
+                raise McpInitializationError(
+                    f'Transport "{transport_type}" requires '
+                    f'http:// or https:// URL, but got: {url_scheme}://',
+                    server_name=server_name
+                )
+            elif transport_lower == "sse" and url_scheme not in ["http", "https"]:
+                raise McpInitializationError(
+                    f'Transport "sse" requires '
+                    f'http:// or https:// URL, but got: {url_scheme}://',
+                    server_name=server_name
+                )
+            elif transport_lower in ["ws", "websocket"] and url_scheme not in ["ws", "wss"]:
+                raise McpInitializationError(
+                    f'Transport "{transport_type}" requires '
+                    f'ws:// or wss:// URL, but got: {url_scheme}://',
+                    server_name=server_name
+                )
+            elif transport_lower == "stdio":
+                raise McpInitializationError(
+                    f'Transport "stdio" requires "command", '
+                    f'but "url" was provided',
+                    server_name=server_name
+                )
+        
+        # Validate URL scheme is supported
+        if url_scheme not in ["http", "https", "ws", "wss"]:
+            raise McpInitializationError(
+                f'Unsupported URL scheme "{url_scheme}". '
+                f'Supported schemes: http, https, ws, wss',
+                server_name=server_name
+            )
+    
+    elif has_command:
+        if transport_type:
+            transport_lower = transport_type.lower()
+            
+            # Check transport requires command
+            if transport_lower == "stdio":
+                pass  # Valid
+            elif transport_lower in ["http", "streamable_http", "sse", "ws", "websocket"]:
+                raise McpInitializationError(
+                    f'Transport "{transport_type}" requires "url", '
+                    f'but "command" was provided',
+                    server_name=server_name
+                )
+            else:
+                logger.warning(
+                    f'MCP server "{server_name}": Unknown transport type "{transport_type}", '
+                    f'treating as stdio'
+                )
+
+
+async def connect_to_mcp_server(
     server_name: str,
     server_config: SingleMcpServerConfig,
     exit_stack: AsyncExitStack,
     logger: logging.Logger = logging.getLogger(__name__)
 ) -> Transport:
-    """Spawns an MCP server process and establishes communication channels.
+    """Establishes a connection to an MCP server with robust error handling.
+
+    Implements consistent transport selection logic and includes authentication
+    pre-validation to prevent async generator cleanup bugs in the MCP client library.
+    
+    Transport Selection Priority:
+    1. Explicit transport/type field (must match URL protocol if URL provided)
+    2. URL protocol auto-detection (http/https → StreamableHTTP, ws/wss → WebSocket)
+    3. Command presence → Stdio transport
+    4. Error if none of the above match
+    
+    For HTTP URLs without explicit transport, follows MCP specification backwards
+    compatibility: try Streamable HTTP first, fallback to SSE on 4xx errors.
+    
+    Authentication Pre-validation:
+    For HTTP/HTTPS servers, authentication is pre-validated before attempting
+    the actual MCP connection to avoid async generator cleanup issues that can
+    occur in the underlying MCP client library when authentication fails.
+
+    Supports multiple transport types:
+    - stdio: For local command-based servers
+    - streamable_http, http: For Streamable HTTP servers
+    - sse: For Server-Sent Events HTTP servers (legacy)
+    - websocket, ws: For WebSocket servers
 
     Args:
-        server_name: Server instance name to use for better logging
+        server_name: Server instance name to use for better logging and error context
         server_config: Configuration dictionary for server setup
-        exit_stack: Context manager for cleanup handling
+        exit_stack: AsyncExitStack for managing transport lifecycle and cleanup
         logger: Logger instance for debugging and monitoring
 
     Returns:
-        A tuple of receive and send streams for server communication
+        A Transport tuple containing receive and send streams for server communication
 
     Raises:
-        Exception: If server spawning fails
+        McpInitializationError: If configuration is invalid or server initialization fails
+        Exception: If unexpected errors occur during connection
     """
     try:
         logger.info(f'MCP server "{server_name}": '
                     f"initializing with: {server_config}")
 
-        url_str = str(server_config.get("url"))  # None becomes "None"
-        headers = (cast(McpServerUrlBasedConfig, server_config)
-                   .get("headers", None))
-        # no exception thrown even for a malformed URL
-        url_scheme = urlparse(url_str).scheme
-
-        if url_scheme in ("http", "https"):
-            transport = await exit_stack.enter_async_context(
-                sse_client(url_str, headers=headers)
-            )
+        # Validate configuration first
+        validate_mcp_server_config(server_name, server_config, logger)
+        
+        # Determine if URL-based or command-based
+        has_url = "url" in server_config and server_config["url"] is not None
+        has_command = "command" in server_config and server_config["command"] is not None
+        
+        # Get transport type (prefer 'transport' over 'type')
+        transport_type = server_config.get("transport") or server_config.get("type")
+        
+        if has_url:
+            # URL-based configuration
+            url_config = cast(McpServerUrlBasedConfig, server_config)
+            url_str = str(url_config["url"])
+            parsed_url = urlparse(url_str)
+            url_scheme = parsed_url.scheme.lower()
+            
+            # Extract common parameters
+            headers = url_config.get("headers", None)
+            timeout = url_config.get("timeout", None)
+            auth = url_config.get("auth", None)
+            
+            if url_scheme in ["http", "https"]:
+                # HTTP/HTTPS: Handle explicit transport or auto-detection
+                if url_config.get("__pre_validate_authentication", True):
+                    # Pre-validate authentication to avoid MCP async generator cleanup bugs
+                    logger.info(f'MCP server "{server_name}": Pre-validating authentication')
+                    auth_valid, auth_message = await validate_auth_before_connection(
+                        url_str,
+                        headers=headers,
+                        timeout=timeout or 30.0,
+                        auth=auth,
+                        logger=logger
+                    )
 
-        elif url_scheme in ("ws", "wss"):
-            transport = await exit_stack.enter_async_context(
-                websocket_client(url_str)
-            )
+                    if not auth_valid:
+                        # logger.error(f'MCP server "{server_name}": {auth_message}')
+                        raise McpInitializationError(auth_message, server_name=server_name)
+
+                # Now proceed with the original connection logic
+                if transport_type and transport_type.lower() in ["streamable_http", "http"]:
+                    # Explicit Streamable HTTP (no fallback)
+                    logger.info(f'MCP server "{server_name}": '
+                               f"connecting via Streamable HTTP (explicit) to {url_str}")
+                    
+                    kwargs = {}
+                    if headers is not None:
+                        kwargs["headers"] = headers
+                    if timeout is not None:
+                        kwargs["timeout"] = timeout
+                    if auth is not None:
+                        kwargs["auth"] = auth
+                    
+                    transport = await exit_stack.enter_async_context(
+                        streamablehttp_client(url_str, **kwargs)
+                    )
+                    
+                elif transport_type and transport_type.lower() == "sse":
+                    # Explicit SSE (no fallback)
+                    logger.info(f'MCP server "{server_name}": '
+                               f"connecting via SSE (explicit) to {url_str}")
+                    logger.warning(f'MCP server "{server_name}": '
+                                  f"Using SSE transport (deprecated as of MCP 2025-03-26), consider migrating to streamable_http")
+                    
+                    transport = await exit_stack.enter_async_context(
+                        sse_client(url_str, headers=headers)
+                    )
+                    
+                else:
+                    # Auto-detection: URL protocol suggests HTTP transport, try Streamable HTTP first
+                    logger.debug(f'MCP server "{server_name}": '
+                                f"auto-detecting HTTP transport using MCP specification method")
+                    
+                    try:
+                        logger.info(f'MCP server "{server_name}": '
+                                   f"testing Streamable HTTP support for {url_str}")
+                        
+                        supports_streamable = await test_streamable_http_support(
+                            url_str, 
+                            headers=headers,
+                            timeout=timeout,
+                            auth=auth,
+                            logger=logger
+                        )
+                        
+                        if supports_streamable:
+                            logger.info(f'MCP server "{server_name}": '
+                                       f"detected Streamable HTTP transport support")
+                            
+                            kwargs = {}
+                            if headers is not None:
+                                kwargs["headers"] = headers
+                            if timeout is not None:
+                                kwargs["timeout"] = timeout
+                            if auth is not None:
+                                kwargs["auth"] = auth
+                            
+                            transport = await exit_stack.enter_async_context(
+                                streamablehttp_client(url_str, **kwargs)
+                            )
 
-        else:
+                        else:
+                            logger.info(f'MCP server "{server_name}": '
+                                       f"received 4xx error, falling back to SSE transport")
+                            logger.warning(f'MCP server "{server_name}": '
+                                          f"Using SSE transport (deprecated as of MCP 2025-03-26), server should support Streamable HTTP")
+                            
+                            transport = await exit_stack.enter_async_context(
+                                sse_client(url_str, headers=headers)
+                            )
+                            
+                    except Exception as error:
+                        logger.error(f'MCP server "{server_name}": '
+                                    f"transport detection failed: {error}")
+                        raise
+                        
+            elif url_scheme in ["ws", "wss"]:
+                # WebSocket transport
+                if transport_type and transport_type.lower() not in ["websocket", "ws"]:
+                    logger.warning(f'MCP server "{server_name}": '
+                                  f'URL scheme "{url_scheme}" suggests WebSocket, '
+                                  f'but transport "{transport_type}" specified')
+                
+                logger.info(f'MCP server "{server_name}": '
+                           f"connecting via WebSocket to {url_str}")
+                
+                transport = await exit_stack.enter_async_context(
+                    websocket_client(url_str)
+                )
+                
+            else:
+                # This should be caught by validation, but include for safety
+                raise McpInitializationError(
+                    f'Unsupported URL scheme "{url_scheme}". '
+                    f'Supported schemes: http/https (for streamable_http/sse), ws/wss (for websocket)',
+                    server_name=server_name
+                )
+                
+        elif has_command:
+            # Command-based configuration (stdio transport)
+            if transport_type and transport_type.lower() not in ["stdio", ""]:
+                logger.warning(f'MCP server "{server_name}": '
+                              f'Command provided suggests stdio transport, '
+                              f'but transport "{transport_type}" specified')
+            
+            logger.info(f'MCP server "{server_name}": '
+                        f"spawning local process via stdio")
+            
             # NOTE: `uv` and `npx` seem to require PATH to be set.
             # To avoid confusion, it was decided to automatically append it
             # to the env if not explicitly set by the config.
             config = cast(McpServerCommandBasedConfig, server_config)
-            # env = config.get("env", {}) does't work since it can yield None
+            # env = config.get("env", {}) doesn't work since it can yield None
             env_val = config.get("env")
             env = {} if env_val is None else dict(env_val)
             if "PATH" not in env:
                 env["PATH"] = os.environ.get("PATH", "")
 
             # Use stdio client for commands
-            # args = config.get("args", []) does't work since it can yield None
+            # args = config.get("args", []) doesn't work since it can yield None
             args_val = config.get("args")
             args = [] if args_val is None else list(args_val)
             server_parameters = StdioServerParameters(
@@ -228,23 +795,23 @@ async def spawn_mcp_server_and_get_transport(
                 cwd=config.get("cwd", None)
             )
 
-            # Initialize stdio client and register it with exit stack for
-            # cleanup
-            # NOTE: Why the key name `errlog` for `server_config` was chosen:
-            # Unlike TypeScript SDK's `StdioServerParameters`, the Python
-            # SDK's `StdioServerParameters` doesn't include `stderr: int`.
-            # Instead, it calls `stdio_client()` with a separate argument
-            # `errlog: TextIO`.  I once included `stderr: int` for
-            # compatibility with the TypeScript version, but decided to
-            # follow the Python SDK more closely.
-            errlog_val = (cast(McpServerCommandBasedConfig, server_config)
-                          .get("errlog"))
+            # Initialize stdio client and register it with exit stack for cleanup
+            errlog_val = config.get("errlog")
             kwargs = {"errlog": errlog_val} if errlog_val is not None else {}
             transport = await exit_stack.enter_async_context(
                 stdio_client(server_parameters, **kwargs)
             )
+        
+        else:
+            # This should be caught by validation, but include for safety
+            raise McpInitializationError(
+                'Invalid configuration - '
+                'either "url" or "command" must be specified',
+                server_name=server_name
+            )
+            
     except Exception as e:
-        logger.error(f"Error spawning MCP server: {str(e)}")
+        logger.error(f'MCP server "{server_name}": error during initialization: {str(e)}')
         raise
 
     return transport
@@ -256,22 +823,44 @@ async def get_mcp_server_tools(
     exit_stack: AsyncExitStack,
     logger: logging.Logger = logging.getLogger(__name__)
 ) -> list[BaseTool]:
-    """Retrieves and converts MCP server tools to LangChain format.
+    """Retrieves and converts MCP server tools to LangChain BaseTool format.
+    
+    Establishes a client session with the MCP server, lists available tools,
+    and wraps each tool in a LangChain-compatible adapter class. The adapter
+    handles async execution, error handling, and result formatting.
+    
+    Tool Conversion Features:
+    - JSON Schema to Pydantic model conversion for argument validation
+    - Async-only execution (raises NotImplementedError for sync calls)
+    - Automatic result formatting from MCP TextContent to strings
+    - Error handling with ToolException for MCP tool failures
+    - Comprehensive logging of tool input/output and execution metrics
 
     Args:
-        server_name: Server instance name to use for better logging
-        transport: Communication channels tuple
-        exit_stack: Context manager for cleanup handling
+        server_name: Server instance name for logging and error context
+        transport: Communication channels tuple (2-tuple for SSE/stdio, 3-tuple for streamable HTTP)
+        exit_stack: AsyncExitStack for managing session lifecycle and cleanup
         logger: Logger instance for debugging and monitoring
 
     Returns:
-        List of LangChain tools converted from MCP tools
+        List of LangChain BaseTool instances that wrap MCP server tools
 
     Raises:
-        Exception: If tool conversion fails
+        McpInitializationError: If transport format is unexpected or session initialization fails
+        Exception: If tool retrieval or conversion fails
     """
     try:
-        read, write = transport
+        # Handle both 2-tuple (SSE, stdio) and 3-tuple (streamable HTTP) returns
+        # Third element in streamable HTTP contains session info/metadata
+        if len(transport) == 2:
+            read, write = transport
+        elif len(transport) == 3:
+            read, write, _ = transport  # Third element is session info/metadata
+        else:
+            raise McpInitializationError(
+                f"Unexpected transport tuple length: {len(transport)}",
+                server_name=server_name
+            )
 
         # Use an intermediate `asynccontextmanager` to log the cleanup message
         @asynccontextmanager
@@ -330,7 +919,7 @@ async def get_mcp_server_tools(
                     Raises:
                         ToolException: If the tool execution fails
                     """
-                    logger.info(f'MCP tool "{server_name}"/"{tool.name}" '
+                    logger.info(f'MCP tool "{server_name}"/"{self.name}" '
                                 f"received input: {kwargs}")
 
                     try:
@@ -366,7 +955,7 @@ async def get_mcp_server_tools(
 
                         # Log rough result size for monitoring
                         size = len(result_content_text.encode())
-                        logger.info(f'MCP tool "{server_name}"/"{tool.name}" '
+                        logger.info(f'MCP tool "{server_name}"/"{self.name}" '
                                     f"received result (size: {size})")
 
                         # If no text content, return a clear message
@@ -380,7 +969,7 @@ async def get_mcp_server_tools(
 
                     except Exception as e:
                         logger.warn(
-                            f'MCP tool "{server_name}"/"{tool.name}" '
+                            f'MCP tool "{server_name}"/"{self.name}" '
                             f"caused error:  {str(e)}"
                         )
                         if self.handle_tool_error:
@@ -409,25 +998,39 @@ def init_logger() -> logging.Logger:
         A configured Logger instance
     """
     logging.basicConfig(
-        level=logging.INFO,  # logging.DEBUG,
+        level=logging.INFO,  # More reasonable default level
         format="\x1b[90m[%(levelname)s]\x1b[0m %(message)s"
     )
-    return logging.getLogger()
+    # Only set MCP-related loggers to DEBUG for better MCP visibility
+    logger = logging.getLogger()
+    logging.getLogger("langchain_mcp_tools").setLevel(logging.DEBUG)
+    
+    # Keep HTTP libraries quieter
+    for lib in ["httpx", "urllib3", "requests", "anthropic", "openai"]:
+        logging.getLogger(lib).setLevel(logging.WARNING)
+    
+    return logger
 
 
 # Type hint for cleanup function
 McpServerCleanupFn = Callable[[], Awaitable[None]]
-"""Type for the async cleanup function returned by
-    convert_mcp_to_langchain_tools.
+"""Type for the async cleanup function returned by convert_mcp_to_langchain_tools.
+
+This function encapsulates the cleanup of all MCP server connections managed by
+the AsyncExitStack. When called, it properly closes all transport connections,
+sessions, and resources in the correct order.
 
-This represents an asynchronous function that takes no arguments and returns
-nothing. It's used to properly shut down all MCP server connections and clean
-up resources when the tools are no longer needed.
+Important: Always call this function when you're done using the tools to prevent
+resource leaks and ensure graceful shutdown of MCP server connections.
 
 Example usage:
     tools, cleanup = await convert_mcp_to_langchain_tools(server_configs)
-    # Use tools...
-    await cleanup()  # Clean up resources when done
+    try:
+        # Use tools with your LangChain application...
+        result = await tools[0].arun(param="value")
+    finally:
+        # Always cleanup, even if exceptions occur
+        await cleanup()
 """
 
 
@@ -435,43 +1038,73 @@ async def convert_mcp_to_langchain_tools(
     server_configs: McpServersConfig,
     logger: logging.Logger | None = None
 ) -> tuple[list[BaseTool], McpServerCleanupFn]:
-    """Initialize multiple MCP servers and convert their tools to
-    LangChain format.
-
-    This async function manages parallel initialization of multiple MCP
-    servers, converts their tools to LangChain format, and provides a cleanup
-    mechanism. It orchestrates the full lifecycle of multiple servers.
+    """Initialize multiple MCP servers and convert their tools to LangChain format.
+
+    This is the main entry point for the library. It orchestrates the complete
+    lifecycle of multiple MCP server connections, from initialization through
+    tool conversion to cleanup. Provides robust error handling and authentication
+    pre-validation to prevent common MCP client library issues.
+
+    Key Features:
+    - Parallel initialization of multiple servers for efficiency
+    - Authentication pre-validation for HTTP servers to prevent async generator bugs
+    - Automatic transport selection and fallback per MCP specification
+    - Comprehensive error handling with McpInitializationError
+    - User-controlled cleanup via returned async function
+    - Support for both local (stdio) and remote (HTTP/WebSocket) servers
+
+    Transport Support:
+    - stdio: Local command-based servers (npx, uvx, python, etc.)
+    - streamable_http: Modern HTTP servers (recommended, tried first)
+    - sse: Legacy Server-Sent Events HTTP servers (fallback)
+    - websocket: WebSocket servers for real-time communication
+
+    Error Handling:
+    All configuration and connection errors are wrapped in McpInitializationError
+    with server context for easy debugging. Authentication failures are detected
+    early to prevent async generator cleanup issues in the MCP client library.
 
     Args:
-        server_configs: Dictionary mapping server names to their
-            configurations, where each configuration contains command, args,
-            and env settings
-        logger: Logger instance to use for logging events and errors.
-            If None, uses module logger with fallback to a pre-configured
-            logger when no root handlers exist.
+        server_configs: Dictionary mapping server names to configurations.
+            Each config can be either McpServerCommandBasedConfig for local
+            servers or McpServerUrlBasedConfig for remote servers.
+        logger: Optional logger instance. If None, creates a pre-configured
+            logger with appropriate levels for MCP debugging.
 
     Returns:
         A tuple containing:
+        - List[BaseTool]: All tools from all servers, ready for LangChain use
+        - McpServerCleanupFn: Async function to properly shutdown all connections
 
-        * List of converted LangChain tools from all servers
-        * Async cleanup function to properly shutdown all server connections
+    Raises:
+        McpInitializationError: If any server fails to initialize with detailed context
 
     Example:
-
         server_configs = {
-            "fetch": {
-                "command": "uvx", "args": ["mcp-server-fetch"]
+            "local-filesystem": {
+                "command": "npx",
+                "args": ["-y", "@modelcontextprotocol/server-filesystem", "."]
             },
-            "weather": {
-                "command": "npx", "args": ["-y","@h1deya/mcp-server-weather"]
+            "remote-api": {
+                "url": "https://api.example.com/mcp",
+                "headers": {"Authorization": "Bearer your-token"},
+                "timeout": 30.0
             }
         }
 
-        tools, cleanup = await convert_mcp_to_langchain_tools(server_configs)
-
-        # Use tools...
-
-        await cleanup()
+        try:
+            tools, cleanup = await convert_mcp_to_langchain_tools(server_configs)
+            
+            # Use tools with your LangChain application
+            for tool in tools:
+                result = await tool.arun(**tool_args)
+                
+        except McpInitializationError as e:
+            print(f"Failed to initialize MCP server '{e.server_name}': {e}")
+            
+        finally:
+            # Always cleanup when done
+            await cleanup()
     """
 
     if logger is None:
@@ -485,13 +1118,14 @@ async def convert_mcp_to_langchain_tools(
     transports: list[Transport] = []
     async_exit_stack = AsyncExitStack()
 
-    # Spawn all MCP servers concurrently
+    # Initialize all MCP servers concurrently
     for server_name, server_config in server_configs.items():
-        # NOTE: the following `await` only blocks until the server subprocess
+        # NOTE for stdio MCP servers:
+        # the following `await` only blocks until the server subprocess
         # is spawned, i.e. after returning from the `await`, the spawned
         # subprocess starts its initialization independently of (so in
         # parallel with) the Python execution of the following lines.
-        transport = await spawn_mcp_server_and_get_transport(
+        transport = await connect_to_mcp_server(
             server_name,
             server_config,
             async_exit_stack,