mcp-haystack 1.5.1__tar.gz → 2.0.0__tar.gz

{mcp_haystack-1.5.1 → mcp_haystack-2.0.0}/CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## [integrations/mcp-v1.5.2] - 2026-10-07
+
+### 🐛 Bug Fixes
+
+- MCP - warm_up must reopen connections after close (#4065)
+
+### ⚙️ CI
+
+- Improve changelog generation; fix existing changelogs (#3883)
+
+
+## [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 +133,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 +190,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.1 → mcp_haystack-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: mcp-haystack
-Version: 1.5.1
+Version: 2.0.0
 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
@@ -12,14 +12,13 @@ Keywords: Haystack,MCP,Model Context Protocol
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: Implementation :: CPython
-Requires-Python: >=3.10
-Requires-Dist: exceptiongroup
+Requires-Python: >=3.11
 Requires-Dist: haystack-ai>=2.23.0
 Requires-Dist: mcp>=1.24.0
 Description-Content-Type: text/markdown

{mcp_haystack-1.5.1 → mcp_haystack-2.0.0}/pyproject.toml

@@ -7,7 +7,7 @@ name = "mcp-haystack"
 dynamic = ["version"]
 description = "Haystack integration for Model Context Protocol (MCP)"
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 license = "Apache-2.0"
 keywords = [
     "MCP",
@@ -21,17 +21,16 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License",
     "Development Status :: 4 - Beta",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3.15",
     "Programming Language :: Python :: Implementation :: CPython",
 ]
 dependencies = [
     "mcp>=1.24.0",
     "haystack-ai>=2.23.0",
-    "exceptiongroup",  # Backport of ExceptionGroup for Python < 3.11
 ]
 
 [project.urls]
@@ -88,7 +87,6 @@ disallow_incomplete_defs = true
 
 
 [tool.ruff]
-target-version = "py310"
 line-length = 120
 
 [tool.ruff.lint]

{mcp_haystack-1.5.1 → mcp_haystack-2.0.0}/src/haystack_integrations/tools/mcp/mcp_tool.py

@@ -17,7 +17,6 @@ from contextlib import AsyncExitStack
 from dataclasses import dataclass, fields
 from typing import Any, cast
 
-from exceptiongroup import ExceptionGroup
 from haystack import logging
 from haystack.core.serialization import generate_qualified_class_name, import_class_by_name
 from haystack.tools import Tool
@@ -1121,7 +1120,7 @@ class MCPTool(Tool):
                 return _extract_first_text_element(result)
 
             return result
-        except asyncio.TimeoutError as e:
+        except TimeoutError as e:
             message = f"Tool invocation timed out after {self._invocation_timeout} seconds"
             raise TimeoutError(message) from e
         except Exception as e:
@@ -1155,7 +1154,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 +1265,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.1 → mcp_haystack-2.0.0}/src/haystack_integrations/tools/mcp/mcp_toolset.py

@@ -7,7 +7,6 @@ from collections.abc import Callable
 from typing import Any, cast
 from urllib.parse import urlparse
 
-from exceptiongroup import ExceptionGroup
 from haystack import logging
 from haystack.core.serialization import generate_qualified_class_name, import_class_by_name
 from haystack.tools import Tool, Toolset
@@ -244,6 +243,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 +261,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 +511,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.1 → mcp_haystack-2.0.0}/tests/test_mcp_tool.py

@@ -6,7 +6,6 @@ from types import SimpleNamespace
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
-from exceptiongroup import ExceptionGroup
 from haystack.components.agents import Agent
 from haystack.components.generators.chat import OpenAIChatGenerator
 from haystack.core.pipeline import Pipeline
@@ -17,6 +16,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 +365,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.1 → mcp_haystack-2.0.0}/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