litellm/tests/mcp_tests/test_mcp_logging.py
ryan-crabbe-berri c3bcb6f64f
test(mcp): drain the logging worker after each test so queued callbacks cannot leak into the next test (#38228)
LoggingWorker now carries still-queued coroutines onto the next event loop (12a34a10d8). Under xdist,
a success-logging coroutine queued by test_acompletion_mcp_respects_manual_approval ran nine seconds
later inside test_mcp_tool_call_hook on the same worker, resolved litellm.callbacks at run time and
overwrote that test's captured payload with a gpt-4o-mini completion (assert 1.35e-05 == 1.42).

Run clear_queue() in the suite's autouse teardown so every coroutine a test enqueues finishes before the
next test registers its callbacks, and add a subprocess regression test that runs the real conftest
against a stopped worker with work still queued.
2026-08-25 10:50:35 -07:00

505 lines
18 KiB
Python

import os
import pytest
import asyncio
import subprocess
import sys
from pathlib import Path
from typing import Optional
from unittest.mock import AsyncMock, patch
import litellm
from litellm.types.utils import StandardLoggingPayload
from litellm.integrations.custom_logger import CustomLogger
from litellm.proxy._experimental.mcp_server.server import (
mcp_server_tool_call,
set_auth_context,
)
from litellm.proxy._experimental.mcp_server.mcp_server_manager import (
MCPServerManager,
)
from litellm.proxy._types import LiteLLM_ObjectPermissionTable, UserAPIKeyAuth
from litellm.types.mcp import MCPPostCallResponseObject
from litellm.types.utils import HiddenParams
from mcp.types import Tool as MCPTool, CallToolResult, TextContent
class TestMCPLogger(CustomLogger):
def __init__(self):
self.standard_logging_payload = None
self.mcp_tool_call_payloads = []
super().__init__()
async def async_log_success_event(self, kwargs, response_obj, start_time, end_time):
print("success event")
payload = kwargs.get("standard_logging_object", None)
self.standard_logging_payload = payload
# Async success events from other calls (e.g. a mocked acompletion whose
# log task is delivered late) race with the MCP event for the single
# last-writer slot; keep MCP tool calls in their own list so assertions
# are order-independent.
if payload is not None and payload.get("call_type") == "call_mcp_tool":
self.mcp_tool_call_payloads.append(payload)
print(f"Captured standard_logging_payload: {payload}")
def _set_authorized_user(server_ids):
"""Configure auth context with permission to call the specified servers."""
server_list = list(server_ids)
user_auth = UserAPIKeyAuth(
api_key="test",
user_id="test_user",
object_permission=LiteLLM_ObjectPermissionTable(
object_permission_id="mcp-test-permissions",
mcp_servers=server_list,
),
)
set_auth_context(user_api_key_auth=user_auth, mcp_servers=server_list)
@pytest.mark.asyncio
async def test_mcp_cost_tracking():
# Create a mock tool call result
litellm.logging_callback_manager._reset_all_callbacks()
mock_result = CallToolResult(
content=[TextContent(type="text", text="Test response")], isError=False
)
# Create a mock MCPClient
mock_client = AsyncMock()
mock_client.call_tool = AsyncMock(return_value=mock_result)
mock_client.list_tools = AsyncMock(
return_value=[
MCPTool(
name="add_tools",
description="Test tool",
inputSchema={
"type": "object",
"properties": {"test": {"type": "string"}},
},
)
]
)
# Mock the MCPClient constructor
def mock_client_constructor(*args, **kwargs):
return mock_client
# Initialize the server manager
local_mcp_server_manager = MCPServerManager()
with patch(
"litellm.proxy._experimental.mcp_server.mcp_server_manager.MCPClient",
mock_client_constructor,
):
# Load the server config
await local_mcp_server_manager.load_servers_from_config(
mcp_servers_config={
"zapier_gmail_server": {
"url": os.getenv("ZAPIER_MCP_HTTPS_SERVER_URL"),
"mcp_info": {
"mcp_server_cost_info": {
"default_cost_per_query": 1.2,
}
},
}
}
)
# Set up the test logger
test_logger = TestMCPLogger()
litellm.callbacks = [test_logger]
# Initialize the tool mapping
await local_mcp_server_manager._initialize_tool_name_to_mcp_server_name_mapping()
# Patch the global manager in both modules where it's used
with (
patch(
"litellm.proxy._experimental.mcp_server.mcp_server_manager.global_mcp_server_manager",
local_mcp_server_manager,
),
patch(
"litellm.proxy._experimental.mcp_server.server.global_mcp_server_manager",
local_mcp_server_manager,
),
):
_set_authorized_user(local_mcp_server_manager.get_all_mcp_server_ids())
print(
"tool_name_to_mcp_server_name_mapping",
local_mcp_server_manager.tool_name_to_mcp_server_name_mapping,
)
# Manually add the tool mapping to ensure it's available (since mocking might not capture it properly)
local_mcp_server_manager.tool_name_to_mcp_server_name_mapping[
"add_tools"
] = "zapier_gmail_server"
local_mcp_server_manager.tool_name_to_mcp_server_name_mapping[
"zapier_gmail_server-add_tools"
] = "zapier_gmail_server"
# Call mcp tool
response = await mcp_server_tool_call(
name="zapier_gmail_server-add_tools", # Use correct prefixed name with - separator
arguments={"test": "test"},
)
# wait 1-2 seconds for logging to be processed
await asyncio.sleep(2)
logged_standard_logging_payload = (
test_logger.mcp_tool_call_payloads[-1]
if test_logger.mcp_tool_call_payloads
else None
)
print("logged_standard_logging_payload", logged_standard_logging_payload)
# Add assertions
assert response is not None
# Handle CallToolResult - access .content for the list of content items
if isinstance(response, CallToolResult):
response_list = response.content
else:
response_list = list(
response
) # Convert iterable to list for backward compatibility
assert len(response_list) == 1
assert isinstance(response_list[0], TextContent)
assert response_list[0].text == "Test response"
# Verify client methods were called
mock_client.call_tool.assert_called_once()
######
# verify response cost is 1.2 as set on default_cost_per_query
# Critical - the cost is tracked as $1.2
assert (
logged_standard_logging_payload is not None
), "Standard logging payload should not be None"
assert logged_standard_logging_payload["response_cost"] == 1.2
@pytest.mark.asyncio
async def test_mcp_cost_tracking_per_tool():
"""Test that individual tool costs are tracked correctly when tool_name_to_cost_per_query is configured"""
# Create a mock tool call result
litellm.logging_callback_manager._reset_all_callbacks()
mock_result = CallToolResult(
content=[TextContent(type="text", text="Test response")], isError=False
)
# Create a mock MCPClient
mock_client = AsyncMock()
mock_client.call_tool = AsyncMock(return_value=mock_result)
mock_client.list_tools = AsyncMock(
return_value=[
MCPTool(
name="expensive_tool",
description="Expensive tool",
inputSchema={
"type": "object",
"properties": {"data": {"type": "string"}},
},
),
MCPTool(
name="cheap_tool",
description="Cheap tool",
inputSchema={
"type": "object",
"properties": {"data": {"type": "string"}},
},
),
]
)
# Mock the MCPClient constructor
def mock_client_constructor(*args, **kwargs):
return mock_client
# Initialize the server manager
local_mcp_server_manager = MCPServerManager()
with patch(
"litellm.proxy._experimental.mcp_server.mcp_server_manager.MCPClient",
mock_client_constructor,
):
# Load the server config with per-tool costs
await local_mcp_server_manager.load_servers_from_config(
mcp_servers_config={
"test_server": {
"url": os.getenv("ZAPIER_MCP_HTTPS_SERVER_URL"),
"mcp_info": {
"mcp_server_cost_info": {
"default_cost_per_query": 0.5, # Default cost
"tool_name_to_cost_per_query": {
"expensive_tool": 5.0, # High cost tool
"cheap_tool": 0.1, # Low cost tool
},
}
},
}
}
)
# Set up the test logger
test_logger = TestMCPLogger()
litellm.callbacks = [test_logger]
# Initialize the tool mapping
await local_mcp_server_manager._initialize_tool_name_to_mcp_server_name_mapping()
# Manually add the tool mapping to ensure it's available (since mocking might not capture it properly)
local_mcp_server_manager.tool_name_to_mcp_server_name_mapping[
"expensive_tool"
] = "test_server"
local_mcp_server_manager.tool_name_to_mcp_server_name_mapping[
"test_server-expensive_tool"
] = "test_server"
local_mcp_server_manager.tool_name_to_mcp_server_name_mapping["cheap_tool"] = (
"test_server"
)
local_mcp_server_manager.tool_name_to_mcp_server_name_mapping[
"test_server-cheap_tool"
] = "test_server"
# Patch the global manager in both modules where it's used
with (
patch(
"litellm.proxy._experimental.mcp_server.mcp_server_manager.global_mcp_server_manager",
local_mcp_server_manager,
),
patch(
"litellm.proxy._experimental.mcp_server.server.global_mcp_server_manager",
local_mcp_server_manager,
),
):
_set_authorized_user(local_mcp_server_manager.get_all_mcp_server_ids())
print(
"tool_name_to_mcp_server_name_mapping",
local_mcp_server_manager.tool_name_to_mcp_server_name_mapping,
)
# Test 1: Call expensive_tool - should cost 5.0
response1 = await mcp_server_tool_call(
name="test_server-expensive_tool", # Use correct prefixed name with - separator
arguments={"data": "test_expensive"},
)
# wait for logging to be processed
await asyncio.sleep(2)
logged_standard_logging_payload_1 = (
test_logger.mcp_tool_call_payloads[-1]
if test_logger.mcp_tool_call_payloads
else None
)
print(
"logged_standard_logging_payload_1", logged_standard_logging_payload_1
)
# Verify expensive tool cost
assert (
logged_standard_logging_payload_1 is not None
), "Standard logging payload 1 should not be None"
assert logged_standard_logging_payload_1["response_cost"] == 5.0
# Reset logger for second test
test_logger.standard_logging_payload = None
test_logger.mcp_tool_call_payloads.clear()
# Test 2: Call cheap_tool - should cost 0.1
response2 = await mcp_server_tool_call(
name="test_server-cheap_tool", # Use correct prefixed name with - separator
arguments={"data": "test_cheap"},
)
# wait for logging to be processed
await asyncio.sleep(2)
logged_standard_logging_payload_2 = (
test_logger.mcp_tool_call_payloads[-1]
if test_logger.mcp_tool_call_payloads
else None
)
print(
"logged_standard_logging_payload_2", logged_standard_logging_payload_2
)
# Verify cheap tool cost
assert (
logged_standard_logging_payload_2 is not None
), "Standard logging payload 2 should not be None"
assert logged_standard_logging_payload_2["response_cost"] == 0.1
# Add basic response assertions
assert response1 is not None
assert response2 is not None
response_list_1 = list(response1.content)
response_list_2 = list(response2.content)
assert len(response_list_1) == 1
assert len(response_list_2) == 1
assert isinstance(response_list_1[0], TextContent)
assert isinstance(response_list_2[0], TextContent)
assert response_list_1[0].text == "Test response"
assert response_list_2[0].text == "Test response"
# Verify client methods were called twice
assert mock_client.call_tool.call_count == 2
class MCPLoggerHook(TestMCPLogger):
async def async_post_mcp_tool_call_hook(
self, kwargs, response_obj: MCPPostCallResponseObject, start_time, end_time
) -> Optional[MCPPostCallResponseObject]:
print("post mcp tool call response_obj", response_obj)
# update the MCPPostCallResponseObject with the response_cost
response_obj.hidden_params.response_cost = 1.42
return response_obj
@pytest.mark.asyncio
async def test_mcp_tool_call_hook():
# Create a mock tool call result
litellm.logging_callback_manager._reset_all_callbacks()
mock_result = CallToolResult(
content=[TextContent(type="text", text="Test response")], isError=False
)
# Create a mock MCPClient
mock_client = AsyncMock()
mock_client.call_tool = AsyncMock(return_value=mock_result)
mock_client.list_tools = AsyncMock(
return_value=[
MCPTool(
name="add_tools",
description="Test tool",
inputSchema={
"type": "object",
"properties": {"test": {"type": "string"}},
},
)
]
)
# Mock the MCPClient constructor
def mock_client_constructor(*args, **kwargs):
return mock_client
# Initialize the server manager
local_mcp_server_manager = MCPServerManager()
with patch(
"litellm.proxy._experimental.mcp_server.mcp_server_manager.MCPClient",
mock_client_constructor,
):
# Load the server config
await local_mcp_server_manager.load_servers_from_config(
mcp_servers_config={
"zapier_gmail_server": {
"url": os.getenv("ZAPIER_MCP_HTTPS_SERVER_URL"),
}
}
)
# Set up the test logger
test_logger = MCPLoggerHook()
litellm.callbacks = [test_logger]
# Initialize the tool mapping
await local_mcp_server_manager._initialize_tool_name_to_mcp_server_name_mapping()
# Manually add the tool mapping to ensure it's available (since mocking might not capture it properly)
local_mcp_server_manager.tool_name_to_mcp_server_name_mapping["add_tools"] = (
"zapier_gmail_server"
)
local_mcp_server_manager.tool_name_to_mcp_server_name_mapping[
"zapier_gmail_server-add_tools"
] = "zapier_gmail_server"
# Patch the global manager in both modules where it's used
with (
patch(
"litellm.proxy._experimental.mcp_server.mcp_server_manager.global_mcp_server_manager",
local_mcp_server_manager,
),
patch(
"litellm.proxy._experimental.mcp_server.server.global_mcp_server_manager",
local_mcp_server_manager,
),
):
_set_authorized_user(local_mcp_server_manager.get_all_mcp_server_ids())
print(
"tool_name_to_mcp_server_name_mapping",
local_mcp_server_manager.tool_name_to_mcp_server_name_mapping,
)
# Call mcp tool using the correct separator format (- not /)
response = await mcp_server_tool_call(
name="zapier_gmail_server-add_tools", # Use correct prefixed name with - separator
arguments={"test": "test"},
)
# wait 1-2 seconds for logging to be processed
await asyncio.sleep(2)
# check logged standard logging payload
logged_standard_logging_payload = (
test_logger.mcp_tool_call_payloads[-1]
if test_logger.mcp_tool_call_payloads
else None
)
print("logged_standard_logging_payload", logged_standard_logging_payload)
assert (
logged_standard_logging_payload is not None
), "Standard logging payload should not be None"
assert logged_standard_logging_payload["response_cost"] == 1.42
_QUEUED_LOGGING_OUTLIVES_TEST = '''
import time
from litellm.litellm_core_utils.logging_worker import GLOBAL_LOGGING_WORKER
ran_at = []
async def _record_run():
ran_at.append(time.monotonic())
async def test_1_leaves_logging_queued_behind_a_stopped_worker():
GLOBAL_LOGGING_WORKER.ensure_initialized_and_enqueue(_record_run())
await GLOBAL_LOGGING_WORKER.stop()
assert ran_at == []
async def test_2_starts_after_the_previous_tests_logging_ran():
started_at = time.monotonic()
GLOBAL_LOGGING_WORKER.ensure_initialized_and_enqueue(_record_run())
await GLOBAL_LOGGING_WORKER.flush()
assert [t < started_at for t in ran_at] == [True, False]
'''
def test_logging_queued_by_one_test_is_drained_before_the_next(tmp_path: Path):
"""Regression: a logging coroutine queued by one test must not run inside a later test (it would log into that
test's callbacks, which is how test_mcp_tool_call_hook captured a gpt-4o-mini payload under xdist)."""
(tmp_path / "conftest.py").write_text((Path(__file__).parent / "conftest.py").read_text())
(tmp_path / "pyproject.toml").write_text('[tool.pytest.ini_options]\nasyncio_mode = "auto"\n')
(tmp_path / "test_queued_logging.py").write_text(_QUEUED_LOGGING_OUTLIVES_TEST)
result = subprocess.run(
[sys.executable, "-m", "pytest", "-q", "-p", "no:cacheprovider", "test_queued_logging.py"],
cwd=tmp_path,
capture_output=True,
text=True,
timeout=120,
)
assert result.returncode == 0, result.stdout + result.stderr