fix(amazon-bedrock): prevent double-wrapping of tools_cachepoint_config in _format_tools

[Aftabbs]

Summary

Fixes #3181

AmazonBedrockChatGenerator.__init__ pre-formats tools_cachepoint_config via _validate_and_format_cache_point, converting the user-supplied {"type": "default"} to {"cachePoint": {"type": "default"}} and storing it as self.tools_cachepoint_config.

_format_tools then received this already-formatted value and wrapped it a second time:

# before (broken)
tool_specs.append({"cachePoint": tools_cachepoint_config})
# → sent {"cachePoint": {"cachePoint": {"type": "default"}}} to Bedrock → ParamValidationError

Fix: append tools_cachepoint_config as-is since callers always pass the pre-formatted value:

# after (fixed)
tool_specs.append(tools_cachepoint_config)
# → sends {"cachePoint": {"type": "default"}} to Bedrock ✓

Changes

• utils.py: remove the extra {"cachePoint": ...} wrapper in _format_tools
• test_chat_generator_utils.py: update existing test_format_tools to pass the pre-formatted value (matching real call path from __init__); add test_format_tools_does_not_double_wrap_cachepoint regression test that chains _validate_and_format_cache_point → _format_tools and asserts a single non-nested cachePoint entry

How to verify (no API key needed)

from haystack_integrations.components.generators.amazon_bedrock.chat.utils import (
    _validate_and_format_cache_point,
    _format_tools,
)
from haystack.tools import Tool

def think(thought: str) -> str:
    """Think step."""
    return ""

tool = Tool.from_function(think)
formatted = _validate_and_format_cache_point({"type": "default"})
result = _format_tools([tool], tools_cachepoint_config=formatted)
print(result["tools"][-1])
# before fix: {"cachePoint": {"cachePoint": {"type": "default"}}}
# after fix:  {"cachePoint": {"type": "default"}}  ✓

[anakin87]

Thank you!

I also tested it locally and works well.

Just a minor format issue to solve...

[anakin87]

let's move the import at the top of the file

[github-actions]

Coverage report (amazon_bedrock)

Click to see where and how coverage changed

File	Statements	Missing	Coverage	Coverage (new stmts)	Lines missing
integrations/amazon_bedrock/src/haystack_integrations/components/generators/amazon_bedrock/chat
utils.py
Project Total

This report was generated by python-coverage-comment-action

[anakin87]

👍