fix: remove unused stale MCP helper and capture normalized object_permission on key generation

cursoragent · yassin-berriai · cursoragent · commit da7852e314a5 · 2026-05-28T18:58:46.000Z
Co-authored-by: Yassin Kortam &lt;yassin@berri.ai&gt;
diff --git a/litellm/proxy/management_endpoints/key_management_endpoints.py b/litellm/proxy/management_endpoints/key_management_endpoints.py
@@ -833,11 +833,13 @@ async def _common_key_generation_helper(  # noqa: PLR0915
         data_json.pop("tags")
 
     # Validate MCP servers in object_permission are within team scope
-    await validate_key_mcp_servers_against_team(
+    normalized_object_permission = await validate_key_mcp_servers_against_team(
         object_permission=data_json.get("object_permission"),
         team_obj=team_table,
         prisma_client=prisma_client,
     )
+    if normalized_object_permission is not None:
+        data_json["object_permission"] = normalized_object_permission
     await validate_key_search_tools_against_team(
         object_permission=data_json.get("object_permission"),
         team_obj=team_table,
diff --git a/litellm/proxy/management_helpers/object_permission_utils.py b/litellm/proxy/management_helpers/object_permission_utils.py
@@ -458,27 +458,6 @@ def _extract_requested_mcp_toolsets(
     return set()
 
 
-async def _get_stale_mcp_server_ids(
-    requested_servers: Set[str],
-    prisma_client: Optional[PrismaClient],
-) -> Set[str]:
-    """
-    Return the subset of *requested_servers* that no longer exist.
-
-    Queries the DB when *prisma_client* is available (authoritative); falls back
-    to the in-memory registry for config-only deployments without a DB.
-    """
-    identifier_to_server_ids = await _resolve_mcp_server_identifiers_to_ids(
-        identifiers=requested_servers,
-        prisma_client=prisma_client,
-    )
-    return {
-        identifier
-        for identifier in requested_servers
-        if not identifier_to_server_ids.get(identifier)
-    }
-
-
 async def validate_key_mcp_servers_against_team(
     object_permission: Optional[dict],
     team_obj: Optional["LiteLLM_TeamTableCachedObj"],
