mcp-haystack 1.5.0__tar.gz → 1.5.2__tar.gz

{mcp_haystack-1.5.0 → mcp_haystack-1.5.2}/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [integrations/mcp-v1.5.1] - 2026-09-01
+
+### 🚀 Features
+
+- Support MCP Python SDK v2 - compatibility mode (#3878)
+
+### 🐛 Bug Fixes
+
+- Standardize license files (#3771)
+
+### 🧪 Testing
+
+- MCP - refactor test_toolset_combination for Toolset.__add__ removal (#3877)
+
+### 🧹 Chores
+
+- Re-standardize READMEs (#3768)
+
+
 ## [integrations/mcp-v1.4.1] - 2026-07-29
 
 ### 🐛 Bug Fixes
@@ -103,7 +122,7 @@
 
 - Add MCPTool/MCPToolset warm_up (#2384)
 
-## [integrations/mcp-v0.8.0] - 2025-10-14
+## [integrations/mcp-v0.0.8] - 2025-10-14
 
 ### 🐛 Bug Fixes
 
@@ -160,6 +179,8 @@
 
 - Align core-integrations Hatch scripts (#1898)
 
+## [integrations/mcp-v0.3.1] - 2025-05-28
+
 ### 🌀 Miscellaneous
 
 - App pins for MCP (#1845)

{mcp_haystack-1.5.0 → mcp_haystack-1.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: mcp-haystack
-Version: 1.5.0
+Version: 1.5.2
 Summary: Haystack integration for Model Context Protocol (MCP)
 Project-URL: Documentation, https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/mcp#readme
 Project-URL: Issues, https://github.com/deepset-ai/haystack-core-integrations/issues

{mcp_haystack-1.5.0 → mcp_haystack-1.5.2}/src/haystack_integrations/tools/mcp/mcp_tool.py

@@ -1155,7 +1155,7 @@ class MCPTool(Tool):
         return set(properties.keys())
 
     def warm_up(self) -> None:
-        """Connect and fetch the tool schema if eager_connect is turned off."""
+        """Connect and fetch the tool schema unless already connected."""
         with self._lock:
             if self._client is not None:
                 return
@@ -1266,6 +1266,9 @@ class MCPTool(Tool):
                     self._worker.stop()
             except Exception as e:
                 logger.debug(f"TOOL: Error during synchronous worker stop: {e!s}")
+            finally:
+                self._client = None
+                self._worker = None
 
     def __del__(self) -> None:
         """Cleanup resources when the tool is garbage collected."""

{mcp_haystack-1.5.0 → mcp_haystack-1.5.2}/src/haystack_integrations/tools/mcp/mcp_toolset.py

@@ -244,6 +244,7 @@ class MCPToolset(Toolset):
         self.outputs_to_state = outputs_to_state or {}
         self.outputs_to_string = outputs_to_string or {}
         self._warmup_called = False
+        self._worker: _MCPClientSessionManager | None = None
 
         if not eager_connect:
             # Do not connect during validation; expose a toolset with one fake tool to pass validation
@@ -261,7 +262,7 @@ class MCPToolset(Toolset):
 
     def warm_up(self) -> None:
         """
-        Connect and load tools when eager_connect is turned off.
+        Connect and load tools unless already connected.
 
         This method is automatically called by `Agent.warm_up()` and `Pipeline.warm_up()`.
         You can also call it directly before using the toolset to ensure all tool schemas
@@ -511,6 +512,9 @@ class MCPToolset(Toolset):
                 self._worker.stop()
             except Exception as e:
                 logger.debug(f"TOOLSET: error during worker stop: {e!s}")
+            finally:
+                self._worker = None
+                self._warmup_called = False
 
     def __del__(self) -> None:
         self.close()

{mcp_haystack-1.5.0 → mcp_haystack-1.5.2}/tests/test_mcp_tool.py

@@ -17,6 +17,7 @@ from haystack.tools.from_function import tool
 from haystack_integrations.tools.mcp import (
     MCPTool,
     MCPToolNotFoundError,
+    SSEServerInfo,
     StdioServerInfo,
 )
 from haystack_integrations.tools.mcp.mcp_tool import (
@@ -365,6 +366,20 @@ class TestMCPTool:
         assert "b" in tool.parameters["properties"]
         assert mock_connect.call_count == 1
 
+    @pytest.mark.parametrize("eager_connect", [False, True])
+    def test_mcp_tool_reopens_after_close(self, eager_connect, mcp_calculator_server, mcp_tool_cleanup):
+        port = mcp_calculator_server("sse")
+        server_info = SSEServerInfo(url=f"http://127.0.0.1:{port}/sse", max_retries=0)
+        tool = mcp_tool_cleanup(MCPTool(name="add", server_info=server_info, eager_connect=eager_connect))
+
+        tool.warm_up()
+        assert json.loads(tool.invoke(a=2, b=3))["content"][0]["text"] == "5"
+
+        tool.close()
+
+        tool.warm_up()
+        assert json.loads(tool.invoke(a=2, b=3))["content"][0]["text"] == "5"
+
     @pytest.mark.asyncio
     async def test_mcp_tool_ainvoke_matches_invoke_with_outputs_to_state(self, mcp_tool_cleanup):
         """Test that sync and async invocation paths return the same parsed state output."""

{mcp_haystack-1.5.0 → mcp_haystack-1.5.2}/tests/test_mcp_toolset.py

@@ -195,6 +195,26 @@ class TestMCPToolset:
         toolset.warm_up()
         assert [tool.name for tool in toolset.tools] == warmed_tool_names
 
+    @pytest.mark.parametrize("eager_connect", [False, True])
+    async def test_mcp_toolset_reopens_after_close(self, eager_connect, mcp_calculator_server, mcp_tool_cleanup):
+        port = mcp_calculator_server("sse")
+        server_info = SSEServerInfo(url=f"http://127.0.0.1:{port}/sse", max_retries=0)
+        toolset = mcp_tool_cleanup(MCPToolset(server_info=server_info, eager_connect=eager_connect))
+
+        toolset.warm_up()
+        assert sorted(tool.name for tool in toolset.tools) == ["add", "subtract"]
+        for tool in toolset.tools:
+            expected = "5" if tool.name == "add" else "-1"
+            assert json.loads(tool.invoke(a=2, b=3))["content"][0]["text"] == expected
+
+        toolset.close()
+
+        toolset.warm_up()
+        assert sorted(tool.name for tool in toolset.tools) == ["add", "subtract"]
+        for tool in toolset.tools:
+            expected = "5" if tool.name == "add" else "-1"
+            assert json.loads(tool.invoke(a=2, b=3))["content"][0]["text"] == expected
+
     async def test_toolset_serde(self, calculator_toolset):
         """Test serialization and deserialization of MCPToolset."""
         toolset = calculator_toolset