scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-09-13 23:11:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 152

fix(mcp): evict name-cache on toolset mutation, 409 on rename conflict, warning-level list errors

Browse source
This commit is contained in:
Ishaan Jaffer 2026-03-23 15:33:57 -07:00
parent feacbedf57
commit 2824cd195e
3 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -872,10 +872,15 @@ class MCPServerManager:
if toolset_id is None:
keys_to_remove = [k for k in cache_dict if k.startswith("toolset_")]
else:
# Evict permission-cache entries that reference this toolset ID.
# Also evict ALL name-cache entries (toolset_name:*): we can't map
# toolset_id → toolset_name without a DB call, and the name may have
# changed in an update anyway.
keys_to_remove = [
k
for k in cache_dict
if k.startswith("toolset_") and toolset_id in k
if (k.startswith("toolset_perms:") and toolset_id in k)
or k.startswith("toolset_name:")
]
for k in keys_to_remove:
cache_dict.pop(k, None)

2
litellm/proxy/_experimental/mcp_server/toolset_db.py
View file

@ -59,7 +59,7 @@ async def list_mcp_toolsets(
rows = await prisma_client.db.litellm_mcptoolsettable.find_many(where=where)
return [_toolset_from_row(r) for r in rows]
except Exception as e:
verbose_proxy_logger.debug(
verbose_proxy_logger.warning(
"litellm.proxy._experimental.mcp_server.toolset_db::list_mcp_toolsets - {}".format(
str(e)
)

14
litellm/proxy/management_endpoints/mcp_management_endpoints.py
View file

@ -2164,7 +2164,19 @@ if MCP_AVAILABLE:
touched_by = (
litellm_changed_by or user_api_key_dict.user_id or LITELLM_PROXY_ADMIN_NAME
)
result = await update_mcp_toolset(prisma_client, payload, touched_by)
try:
result = await update_mcp_toolset(prisma_client, payload, touched_by)
except UniqueViolationError:
raise HTTPException(
status_code=status.HTTP_409_CONFLICT,
detail={
"error": (
f"A toolset named '{payload.toolset_name}' already exists."
if payload.toolset_name
else "A toolset with that name already exists."
)
},
)
if result is None:
raise HTTPException(
status_code=status.HTTP_404_NOT_FOUND,