scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-10-10 03:28:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 85

fix(mcp): keep the exact-name fallback in the challenge resolver and reformat

Browse source 
get_mcp_server_answering_to now falls back to get_mcp_server_by_name when
no published prefix form matches, preserving the exact-name lookup the
preemptive path had before the router-equivalent resolver. Applies ruff
format to caller_sign_in.py and agent_365.py per the lint gate.

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
yucheng 2026-09-26 10:01:42 +00:00
parent 4cadb402e5
commit df076ce24c
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
litellm/proxy/_experimental/mcp_server/caller_sign_in.py
View file

@ -107,9 +107,7 @@ def caller_sign_in_for(server: MCPServer, user_api_key_auth: UserAPIKeyAuth | No
contribution
for contribution in (
*(
(
CallerSignIn(issuers=jwt_auth_issuers(), scopes=tuple(server.scopes or ())),
)
(CallerSignIn(issuers=jwt_auth_issuers(), scopes=tuple(server.scopes or ())),)
if server.auth_type == MCPAuth.oauth2_token_exchange
else ()
),

5
litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
View file

@ -7193,7 +7193,8 @@ class MCPServerManager:
def get_mcp_server_answering_to(self, name: str, client_ip: str | None = None) -> MCPServer | None:
"""The server a scoped ``/mcp/{name}`` connect resolves to, matched the way the router matches
it: case-insensitive over server_id, name and every published prefix form."""
it: case-insensitive over server_id, name and every published prefix form, then the exact
name lookup as the fallback."""
return next(
(
server
@ -7201,7 +7202,7 @@ class MCPServerManager:
if server_answers_to_name(server, name)
),
None,
)
) or self.get_mcp_server_by_name(name, client_ip=client_ip)
def get_filtered_registry(self, client_ip: str | None = None) -> dict[str, MCPServer]:
"""

9
litellm/proxy/guardrails/guardrail_hooks/agent_365/agent_365.py
View file

@ -445,9 +445,12 @@ class Agent365Guardrail(CustomGuardrail):
"user_api_key_team_metadata": user_api_key_auth.team_metadata, # pyright: ignore[reportUnknownMemberType] # UserAPIKeyAuth.team_metadata is a raw dict
}
}
if self.should_run_guardrail( # pyright: ignore[reportUnknownMemberType, reportUnknownArgumentType] # should_run_guardrail takes an untyped data dict
data=probe, event_type=GuardrailEventHooks.pre_mcp_call
) is not True:
if (
self.should_run_guardrail( # pyright: ignore[reportUnknownMemberType, reportUnknownArgumentType] # should_run_guardrail takes an untyped data dict
data=probe, event_type=GuardrailEventHooks.pre_mcp_call
)
is not True
):
return None
return CallerSignIn(
issuers=(ENTRA_ISSUER_TEMPLATE.format(tenant_id=self.tenant_id),),