From 21c7c38331c73227124dedc08c12b50d7ac99123 Mon Sep 17 00:00:00 2001 From: mateo-berri <277851410+mateo-berri@users.noreply.github.com> Date: Thu, 4 Jun 2026 04:20:01 +0000 Subject: [PATCH] fix(mcp): extract env var resolution to satisfy ruff PLR0915 --- .../mcp_server/mcp_server_manager.py | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py b/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py index a24bedb1a8f..422610cef24 100644 --- a/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py +++ b/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py @@ -868,6 +868,21 @@ class MCPServerManager: f"Server ID {mcp_server.server_id} not found in registry" ) + def _resolve_env_vars_list( + self, + mcp_server: LiteLLM_MCPServerTable, + *, + credentials_are_encrypted: bool, + ) -> Optional[List[Dict[str, Any]]]: + env_vars_list = _deserialize_json_list(getattr(mcp_server, "env_vars", None)) + if credentials_are_encrypted: + from litellm.proxy._experimental.mcp_server.db import ( # noqa: PLC0415 + decrypt_global_env_var_values, + ) + + decrypt_global_env_var_values(env_vars_list) + return env_vars_list + async def build_mcp_server_from_table( self, mcp_server: LiteLLM_MCPServerTable, @@ -879,13 +894,9 @@ class MCPServerManager: static_headers_dict = _deserialize_json_dict( getattr(mcp_server, "static_headers", None) ) - env_vars_list = _deserialize_json_list(getattr(mcp_server, "env_vars", None)) - if credentials_are_encrypted: - from litellm.proxy._experimental.mcp_server.db import ( # noqa: PLC0415 - decrypt_global_env_var_values, - ) - - decrypt_global_env_var_values(env_vars_list) + env_vars_list = self._resolve_env_vars_list( + mcp_server, credentials_are_encrypted=credentials_are_encrypted + ) credentials_dict = _deserialize_json_dict( getattr(mcp_server, "credentials", None) )