Merged
Conversation
Problem: When using MCP tools with and , the following error occurred: RuntimeError: Timeout context manager should be used inside a task
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Relevant issues
#N/A
https://www.loom.com/share/c05d94351ed94dcd8f03d3d64bce5393
Pre-Submission checklist
Please complete all items before asking a LiteLLM maintainer to review your PR
tests/litellm/directory, Adding at least 1 test is a hard requirement - see detailsmake test-unitCI (LiteLLM team)
Branch creation CI run
Link:
CI run for the last commit
Link:
Merge / cherry-pick CI run
Links:
Type
🐛 Bug Fix
✅ Test
Changes
Fix MCP Chat Completions Streaming Error
Problem
When using MCP tools with
/chat/completionsendpoint withstream: true, the request failed with:Example request that failed:
Root Cause
The MCP handler implementation created nested event loops:
acompletion (async context)
→ run_in_executor → completion (new thread)
→ run_async_function (NEW EVENT LOOP in new thread)
→ handle_chat_completion_with_mcp
→ acompletion (ANOTHER EVENT LOOP)
→ streaming response
❌ aiohttp timeout error
This multi-layer nesting caused aiohttp's timeout context manager to fail because it couldn't find a proper asyncio task context during streaming.
The issue only appeared during streaming (not in debug mode with slower execution) due to timing-sensitive asyncio task context resolution.
Solution
Aligned MCP chat completions with the responses API pattern to eliminate event loop nesting:
After fix:
acompletion (async context)
→ run_in_executor → completion (new thread)
→ MCP check → acompletion_with_mcp() coroutine
→ await coroutine in SAME event loop
→ streaming response
✅ works correctly