scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-09-30 01:52:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 70

refactor(mcp): capture persistent session outcomes as values instead of blind excepts

Browse source 
Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
Devin AI 2026-09-23 15:33:52 +00:00
parent dc10e0f4ea
commit 9203232ae6
1 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
litellm/experimental_mcp_client/client.py
View file

@ -1220,31 +1220,30 @@ class PersistentMCPSession:
if future.done():
continue
self._active = future
try:
result: Final = await operation(session)
except Exception as e:
if not future.done():
future.set_exception(e)
if isinstance(e, (ValueError, httpx2.HTTPError, OSError, MCPError)):
return
else:
if not future.done():
future.set_result(result)
(outcome,) = await asyncio.gather(operation(session), return_exceptions=True)
if not future.done():
if isinstance(outcome, BaseException):
future.set_exception(outcome)
else:
future.set_result(outcome)
if isinstance(outcome, (ValueError, httpx2.HTTPError, OSError, MCPError)):
return
self._active = None
try:
await self._client.run_with_session(drain, quiet_on_error=True)
except Exception as e:
if not self._ready.done():
self._ready.set_exception(e)
finally:
self._fail_waiters()
(ended,) = await asyncio.gather(
self._client.run_with_session(drain, quiet_on_error=True), return_exceptions=True
)
except asyncio.CancelledError:
self._fail_waiters(None)
raise
self._fail_waiters(ended if isinstance(ended, BaseException) else None)
def _fail_waiters(self) -> None:
def _fail_waiters(self, cause: BaseException | None) -> None:
pending: Final = (self._ready, self._active, *(future for _, future in self._drained()))
for future in pending:
if future is not None and not future.done():
future.set_exception(RuntimeError("upstream MCP session closed"))
future.set_exception(RuntimeError("upstream MCP session closed") if cause is None else cause)
def _drained(self) -> tuple[_PendingOperation, ...]:
return tuple(self._queue.get_nowait() for _ in range(self._queue.qsize()))