From eedb92d7ce3cb8e3855a69d9751b7e49f5f075ed Mon Sep 17 00:00:00 2001 From: mrinal Date: Fri, 30 Oct 2026 16:04:34 +0000 Subject: [PATCH] fix(mcp): handle SDK rejection logging edge cases Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --- litellm/proxy/mcp_server/operations.py | 2 +- litellm/proxy/mcp_server/server.py | 6 ++- .../unit/proxy/mcp_server/test_mcp_logging.py | 47 ++++++++++++++++++- 3 files changed, 52 insertions(+), 3 deletions(-) diff --git a/litellm/proxy/mcp_server/operations.py b/litellm/proxy/mcp_server/operations.py index aa608e7d00a..3cb6935e46c 100644 --- a/litellm/proxy/mcp_server/operations.py +++ b/litellm/proxy/mcp_server/operations.py @@ -2845,7 +2845,7 @@ async def log_mcp_sdk_rejection( optional_params={}, user=user_api_key_auth.user_id, ) - safe_error: Final = MCPError(code=error_code, message=message) + safe_error: Final = HTTPException(status_code=400, detail=message) end_time: Final = datetime.now() # noqa: DTZ005 # matches the failure logging start time logging_obj.failure_handler(safe_error, "", start_time, end_time) await logging_obj.async_failure_handler(safe_error, "", start_time, end_time) diff --git a/litellm/proxy/mcp_server/server.py b/litellm/proxy/mcp_server/server.py index 575c295fc46..c66f64a3829 100644 --- a/litellm/proxy/mcp_server/server.py +++ b/litellm/proxy/mcp_server/server.py @@ -652,7 +652,11 @@ if MCP_AVAILABLE: return None entry: Final = server.get_request_handler(ctx.method) if entry is None: - if ctx.method != "initialize" and isinstance(error, MCPError) and error.code == METHOD_NOT_FOUND: + if ctx.method == "initialize": + return None + if isinstance(error, ValidationError): + return INVALID_PARAMS + if error.code == METHOD_NOT_FOUND: return METHOD_NOT_FOUND return None if not isinstance(error, ValidationError): diff --git a/tests/unit/proxy/mcp_server/test_mcp_logging.py b/tests/unit/proxy/mcp_server/test_mcp_logging.py index 9fc8ac4a1e4..e4bdc95a6af 100644 --- a/tests/unit/proxy/mcp_server/test_mcp_logging.py +++ b/tests/unit/proxy/mcp_server/test_mcp_logging.py @@ -10,6 +10,7 @@ from typing import Final from unittest.mock import AsyncMock, patch import pytest +from fastapi import HTTPException from mcp import Client from mcp.server.auth.middleware.auth_context import auth_context_var from mcp.shared.exceptions import MCPError @@ -20,7 +21,7 @@ from pydantic import ConfigDict import litellm from litellm.caching.caching import DualCache from litellm.integrations.custom_logger import CustomLogger -from litellm.proxy._types import LiteLLM_ObjectPermissionTable, UserAPIKeyAuth +from litellm.proxy._types import AlertType, LiteLLM_ObjectPermissionTable, UserAPIKeyAuth from litellm.proxy.mcp_server.mcp_server_manager import ( MCPServerManager, ) @@ -36,6 +37,7 @@ class SDKRejectionParams(RequestParams): model_config = ConfigDict(frozen=True) name: int | None = None arguments: dict[str, str] | None = None + level: int | str | None = None class SDKRejectionLogger(CustomLogger): @@ -93,6 +95,9 @@ def sdk_rejection_logger() -> Generator[SDKRejectionLogger, None, None]: ("tools/call-2", {"arguments": {"secret": "DO_NOT_LOG_THIS"}}, -32601, "Method not found"), ("tools/call", {"name": 123, "arguments": {"secret": "DO_NOT_LOG_THIS"}}, -32602, "Invalid request parameters"), ("tools/call", {"arguments": {"secret": "DO_NOT_LOG_THIS"}}, -32602, "Invalid request parameters"), + ("logging/setLevel", {"level": 123}, -32602, "Invalid request parameters"), + ("logging/setLevel", {"level": "info"}, -32601, "Method not found"), + ("completion/complete", {}, -32602, "Invalid request parameters"), ], ) async def test_sdk_rejection_emits_one_redacted_zero_cost_failure( @@ -128,6 +133,46 @@ async def test_sdk_rejection_emits_one_redacted_zero_cost_failure( assert "sk-sdk-rejection-unit-test" not in json.dumps(payload, default=str) +@pytest.mark.asyncio +@pytest.mark.parametrize( + "method,params,code", + [ + ("tools/call-2", {}, -32601), + ("tools/call", {"name": 123}, -32602), + ], +) +async def test_sdk_caller_errors_do_not_trigger_llm_alerts( + sdk_rejection_logger: SDKRejectionLogger, method: str, params: dict[str, object], code: int +) -> None: + from litellm.proxy.proxy_server import proxy_logging_obj + + with ( + patch.object(proxy_logging_obj, "alert_types", [AlertType.llm_exceptions]), + patch.object(proxy_logging_obj, "alerting_handler", new_callable=AsyncMock) as alerts, + ): + async with Client(server, mode="legacy") as client: + with pytest.raises(MCPError) as rejected: + await client.session.send_request( + Request(method=method, params=SDKRejectionParams.model_validate(params)), EmptyResult + ) + assert rejected.value.code == code + await asyncio.sleep(0) + alerts.assert_not_awaited() + assert len(sdk_rejection_logger.failures) == 1 + assert sdk_rejection_logger.post_failures == 1 + assert sdk_rejection_logger.pre_calls == 0 + + await proxy_logging_obj.post_call_failure_hook( + request_data={}, + original_exception=HTTPException(status_code=500, detail="upstream unavailable"), + user_api_key_dict=UserAPIKeyAuth(), + ) + await asyncio.sleep(0) + alerts.assert_awaited_once() + assert alerts.await_args.kwargs["level"] == "High" + assert alerts.await_args.kwargs["alert_type"] == AlertType.llm_exceptions + + @pytest.mark.asyncio async def test_sdk_response_survives_failure_callback_error(sdk_rejection_logger: SDKRejectionLogger) -> None: sdk_rejection_logger.fail_post_hook = True