From 327447cb175f1cc75617f30d9cd0d72a459e7e54 Mon Sep 17 00:00:00 2001 From: Krrish Dholakia Date: Sat, 27 Sep 2025 17:58:11 -0700 Subject: [PATCH] fix(mcp/): rename param to be 'extra_headers', instead of 'forwardable_headers' --- .../proxy/_experimental/mcp_server/mcp_server_manager.py | 8 ++++---- litellm/proxy/_experimental/mcp_server/server.py | 4 ++-- litellm/proxy/_new_secret_config.yaml | 2 +- litellm/types/mcp_server/mcp_server_manager.py | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py b/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py index c971abe4303..a3a5d93a3fd 100644 --- a/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py +++ b/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py @@ -212,7 +212,7 @@ class MCPServerManager: "authentication_token", server_config.get("auth_value", None) ), mcp_info=mcp_info, - forwardable_headers=server_config.get("forwardable_headers", None), + extra_headers=server_config.get("extra_headers", None), access_groups=server_config.get("access_groups", None), ) self.config_mcp_servers[server_id] = new_server @@ -265,7 +265,7 @@ class MCPServerManager: transport=cast(MCPTransportType, mcp_server.transport), auth_type=cast(MCPAuthType, mcp_server.auth_type), mcp_info=mcp_info, - forwardable_headers=getattr(mcp_server, "forwardable_headers", None), + extra_headers=getattr(mcp_server, "extra_headers", None), # oauth specific fields client_id=getattr(mcp_server, "client_id", None), client_secret=getattr(mcp_server, "client_secret", None), @@ -718,10 +718,10 @@ class MCPServerManager: if mcp_server.auth_type == MCPAuth.oauth2: extra_headers = oauth2_headers - if mcp_server.forwardable_headers and raw_headers: + if mcp_server.extra_headers and raw_headers: if extra_headers is None: extra_headers = {} - for header in mcp_server.forwardable_headers: + for header in mcp_server.extra_headers: if header in raw_headers: extra_headers[header] = raw_headers[header] diff --git a/litellm/proxy/_experimental/mcp_server/server.py b/litellm/proxy/_experimental/mcp_server/server.py index 913673f2811..a3e51103ed5 100644 --- a/litellm/proxy/_experimental/mcp_server/server.py +++ b/litellm/proxy/_experimental/mcp_server/server.py @@ -414,10 +414,10 @@ if MCP_AVAILABLE: if server.auth_type == MCPAuth.oauth2: extra_headers = oauth2_headers - if server.forwardable_headers and raw_headers: + if server.extra_headers and raw_headers: if extra_headers is None: extra_headers = {} - for header in server.forwardable_headers: + for header in server.extra_headers: if header in raw_headers: extra_headers[header] = raw_headers[header] diff --git a/litellm/proxy/_new_secret_config.yaml b/litellm/proxy/_new_secret_config.yaml index 533d28395e7..e7494bd0dab 100644 --- a/litellm/proxy/_new_secret_config.yaml +++ b/litellm/proxy/_new_secret_config.yaml @@ -25,7 +25,7 @@ mcp_servers: client_id: os.environ/GITHUB_OAUTH_CLIENT_ID client_secret: os.environ/GITHUB_OAUTH_CLIENT_SECRET scopes: ["public_repo", "user:email"] - forwardable_headers: ["custom_key"] + extra_headers: ["custom_key"] # allowed_tools: ["list_tools"] # disallowed_tools: ["repo_delete"] diff --git a/litellm/types/mcp_server/mcp_server_manager.py b/litellm/types/mcp_server/mcp_server_manager.py index dbd849646d8..4327bd5afe7 100644 --- a/litellm/types/mcp_server/mcp_server_manager.py +++ b/litellm/types/mcp_server/mcp_server_manager.py @@ -20,7 +20,7 @@ class MCPServer(BaseModel): auth_type: Optional[MCPAuthType] = None authentication_token: Optional[str] = None mcp_info: Optional[MCPInfo] = None - forwardable_headers: Optional[List[str]] = ( + extra_headers: Optional[List[str]] = ( None # allow admin to specify which headers to forward to the MCP server ) # OAuth-specific fields