Merge branch 'main' into supabase

Author: davidsbatista

integrations/amazon_bedrock/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [integrations/amazon_bedrock-v6.8.1] - 2026-04-22
+
+### 🐛 Bug Fixes
+
+- *(amazon-bedrock)* Prevent double-wrapping of tools_cachepoint_config in _format_tools (#3199)
+
+### 🧪 Testing
+
+- Bedrock - increase unit tests coverage (#3165)
+
+
 ## [integrations/amazon_bedrock-v6.8.0] - 2026-04-09
 
 ### 🚀 Features

integrations/amazon_bedrock/src/haystack_integrations/components/generators/amazon_bedrock/chat/utils.py

@@ -93,7 +93,7 @@ def _format_tools(
         )
 
     if tools_cachepoint_config:
-        tool_specs.append({"cachePoint": tools_cachepoint_config})
+        tool_specs.append(tools_cachepoint_config)
 
     return {"tools": tool_specs}
 

integrations/amazon_bedrock/tests/test_chat_generator_utils.py

@@ -67,7 +67,7 @@ def tools():
 
 class TestAmazonBedrockChatGeneratorUtils:
     def test_format_tools(self, tools):
-        formatted_tool = _format_tools(tools, tools_cachepoint_config={"type": "default"})
+        formatted_tool = _format_tools(tools, tools_cachepoint_config={"cachePoint": {"type": "default"}})
         assert formatted_tool == {
             "tools": [
                 {
@@ -103,6 +103,19 @@ def test_format_tools(self, tools):
             ],
         }
 
+    def test_format_tools_does_not_double_wrap_cachepoint(self, tools):
+        # Regression test for https://github.com/deepset-ai/haystack-core-integrations/issues/3181
+        # __init__ pre-formats tools_cachepoint_config via _validate_and_format_cache_point,
+        # so _format_tools must append it as-is without an extra cachePoint wrapper.
+
+        formatted_config = _validate_and_format_cache_point({"type": "default"})
+        assert formatted_config == {"cachePoint": {"type": "default"}}
+
+        result = _format_tools(tools, tools_cachepoint_config=formatted_config)
+        cache_entries = [e for e in result["tools"] if "cachePoint" in e]
+        assert len(cache_entries) == 1
+        assert cache_entries[0] == {"cachePoint": {"type": "default"}}
+
     def test_convert_file_content_to_bedrock_format_no_mime_type(self):
         file_content = FileContent(
             base64_data=base64.b64encode(b"This is a test file content."),

integrations/mcp/tests/test_mcp_tool.py

@@ -59,11 +59,11 @@ def test_extract_first_text_element():
 
 
 def test_async_executor_run_raises_timeout_error():
-    async def slow() -> None:
-        await asyncio.sleep(0.05)
+    async def never() -> None:
+        await asyncio.Event().wait()
 
     with pytest.raises(TimeoutError, match="timed out"):
-        AsyncExecutor.get_instance().run(slow(), timeout=0.01)
+        AsyncExecutor.get_instance().run(never(), timeout=0.01)
 
 
 class TestMCPTool:
@@ -468,7 +468,7 @@ async def test_mcp_tool_ainvoke_raises_timeout_error(self, mcp_tool_cleanup):
         mcp_tool_cleanup(tool)
 
         async def hanging(*_args, **_kwargs):
-            await asyncio.sleep(0.05)
+            await asyncio.Event().wait()
 
         tool._client.call_tool = hanging
         tool._invocation_timeout = 0.01