Merge 1e312b1843 into 2a01fe6e5c

.github/workflows/test-unit.yml

@@ -573,10 +573,12 @@ jobs:
               tests/unit/experimental_mcp_client/test_mcp_client.py
               tests/unit/proxy/_experimental/mcp_server/test_capabilities.py
               tests/unit/proxy/_experimental/mcp_server/test_interactions.py
+              tests/unit/proxy/_experimental/mcp_server/test_litellm_proxy_mcp_handler.py
               tests/unit/proxy/_experimental/mcp_server/test_mcp_elicitation_handler.py
               tests/unit/proxy/_experimental/mcp_server/test_mcp_server_manager.py
               tests/unit/proxy/_experimental/mcp_server/test_mcp_server_tool_calls_and_headers.py
               tests/unit/proxy/_experimental/mcp_server/test_operations.py
+              tests/unit/responses/mcp/test_litellm_proxy_mcp_handler.py
               tests/integration/mcp/test_interactions.py
             python-version: "3.12"
             workers: 2

tests/unit/responses/mcp/test_chat_completions_handler.py

@@ -1070,7 +1070,7 @@ async def test_execute_tool_calls_sets_proxy_server_request_arguments(monkeypatc
     # exported as a function on the top-level `litellm` package, which can confuse
     # pytest's dotted-path resolver.
     mcp_handler_module = importlib.import_module(
-        "litellm.responses.mcp.litellm_proxy_mcp_handler"
+        "litellm.proxy._experimental.mcp_server.litellm_proxy_mcp_handler"
     )
     monkeypatch.setattr(mcp_handler_module, "function_setup", mock_function_setup)
     monkeypatch.setattr(
@@ -1455,7 +1455,7 @@ async def test_request_selected_mcp_guardrail_blocks_before_upstream(monkeypatch
             ),
         ]
     if logging_failure:
-        from litellm.responses.mcp import litellm_proxy_mcp_handler
+        from litellm.proxy._experimental.mcp_server import litellm_proxy_mcp_handler
         def fail_logging(*args, **kwargs):
             raise RuntimeError("logging initialization failed")
         monkeypatch.setattr(litellm_proxy_mcp_handler, "function_setup", fail_logging)