Minor fixes

Author: vblagoje

integrations/mcp/src/haystack_integrations/tools/mcp/mcp_tool.py

@@ -26,7 +26,11 @@
 from mcp import ClientSession, StdioServerParameters, types
 from mcp.client.sse import sse_client
 from mcp.client.stdio import stdio_client
-from mcp.client.streamable_http import streamablehttp_client
+
+try:
+    from mcp.client.streamable_http import streamablehttp_client
+except ImportError:
+    streamablehttp_client = None
 
 logger = logging.getLogger(__name__)
 
@@ -452,6 +456,13 @@ async def connect(self) -> list[Tool]:
         :returns: List of available tools on the server
         :raises MCPConnectionError: If connection to the server fails
         """
+        if streamablehttp_client is None:
+            message = (
+                "Streamable HTTP client is not available. "
+                "This may require a newer version of the mcp package that includes mcp.client.streamable_http"
+            )
+            raise MCPConnectionError(message=message, operation="streamable_http_connect")
+
         headers = {"Authorization": f"Bearer {self.token}"} if self.token else None
         streamablehttp_transport = await self.exit_stack.enter_async_context(
             streamablehttp_client(url=self.url, headers=headers, timeout=timedelta(seconds=self.timeout))

integrations/mcp/tests/test_mcp_server_info.py

@@ -233,23 +233,12 @@ def test_sse_server_info_with_token_secret_cannot_serialize(self):
         )
 
         # Token-based secrets cannot be serialized
-        with pytest.raises(ValueError, match="Cannot serialize token-based secret"):
+        with pytest.raises(ValueError, match="token"):
             server_info.to_dict()
 
-    def test_streamable_http_server_info_with_token_secret_cannot_serialize(self):
-        """Test that StreamableHttpServerInfo with Secret.from_token cannot be serialized."""
-        server_info = StreamableHttpServerInfo(
-            url="https://localhost:8000/streamable",
-            token=Secret.from_token("secret_token_value"),
-        )
-
-        # Token-based secrets cannot be serialized
-        with pytest.raises(ValueError, match="Cannot serialize token-based secret"):
-            server_info.to_dict()
-
-    def test_secret_deserialization_handles_any_secret_type(self):
+    def test_secret_deserialization_handles_any_secret_type(self, monkeypatch):
         """Test that our deserialization can handle any Secret type, not just env_vars."""
-        # Simulate a serialized Secret with just "type" field (like a hypothetical future Secret type)
+        monkeypatch.setenv("TEST_VAR", "test_var_value")
         fake_secret_dict = {"type": "env_var", "env_vars": ["TEST_VAR"], "strict": True}  # Valid Secret type
 
         server_info_dict = {
@@ -263,6 +252,7 @@ def test_secret_deserialization_handles_any_secret_type(self):
         # This should work - our condition only checks for "type" field
         deserialized = SSEServerInfo.from_dict(server_info_dict)
         assert isinstance(deserialized.token, Secret)
+        assert deserialized.token.resolve_value() == "test_var_value"
         assert deserialized.url == "https://localhost:8000/sse"
 
     def test_non_secret_dict_with_type_field_not_deserialized(self):