amazon-bedrock-haystack 6.1.1__tar.gz → 6.2.1__tar.gz

{amazon_bedrock_haystack-6.1.1 → amazon_bedrock_haystack-6.2.1}/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [integrations/amazon_bedrock-v6.2.0] - 2026-01-13
+
+### 🚀 Features
+
+- Support flattened generation_kwargs with AmazonBedrockChatGenerator (#2741)
+
+
+## [integrations/amazon_bedrock-v6.1.1] - 2026-01-13
+
+### 🌀 Miscellaneous
+
+- Fix: support global and regional inference profiles in `AmazonBedrockGenerator` (#2725)
+
 ## [integrations/amazon_bedrock-v6.1.0] - 2026-01-13
 
 ### 🐛 Bug Fixes

{amazon_bedrock_haystack-6.1.1 → amazon_bedrock_haystack-6.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amazon-bedrock-haystack
-Version: 6.1.1
+Version: 6.2.1
 Summary: An integration of AWS S3 and Bedrock as a Downloader and Generator components.
 Project-URL: Documentation, https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/amazon_bedrock#readme
 Project-URL: Issues, https://github.com/deepset-ai/haystack-core-integrations/issues

{amazon_bedrock_haystack-6.1.1 → amazon_bedrock_haystack-6.2.1}/src/haystack_integrations/components/generators/amazon_bedrock/chat/chat_generator.py

@@ -372,6 +372,8 @@ class AmazonBedrockChatGenerator:
         merged_kwargs = self.generation_kwargs.copy()
         merged_kwargs.update(generation_kwargs)
 
+        merged_kwargs = self._resolve_flattened_generation_kwargs(merged_kwargs)
+
         # Extract known inference parameters
         # See https://docs.aws.amazon.com/bedrock/latest/APIReference/API_runtime_InferenceConfiguration.html
         inference_config = {
@@ -419,6 +421,36 @@ class AmazonBedrockChatGenerator:
 
         return params, callback
 
+    def _resolve_flattened_generation_kwargs(self, generation_kwargs: dict[str, Any]) -> dict[str, Any]:
+        generation_kwargs = generation_kwargs.copy()
+
+        disable_parallel_tool_use = generation_kwargs.pop("disable_parallel_tool_use", None)
+        parallel_tool_use = generation_kwargs.pop("parallel_tool_use", None)
+
+        if disable_parallel_tool_use is not None and parallel_tool_use is not None:
+            msg = "Cannot set both disable_parallel_tool_use and parallel_tool_use"
+            raise ValueError(msg)
+        elif parallel_tool_use is not None:
+            disable_parallel_tool_use = not parallel_tool_use
+
+        if disable_parallel_tool_use is not None:
+            tool_choice = generation_kwargs.setdefault("tool_choice", {})
+            tool_choice["disable_parallel_tool_use"] = disable_parallel_tool_use
+            tool_choice.setdefault("type", "auto")  # default value
+
+        tool_choice_type = generation_kwargs.pop("tool_choice_type", None)
+        if tool_choice_type is not None:
+            tool_choice = generation_kwargs.setdefault("tool_choice", {})
+            tool_choice["type"] = tool_choice_type
+
+        thinking_budget_tokens = generation_kwargs.pop("thinking_budget_tokens", None)
+        if thinking_budget_tokens is not None:
+            thinking = generation_kwargs.setdefault("thinking", {})
+            thinking["budget_tokens"] = thinking_budget_tokens
+            thinking.setdefault("type", "enabled")
+
+        return generation_kwargs
+
     @component.output_types(replies=list[ChatMessage])
     def run(
         self,

{amazon_bedrock_haystack-6.1.1 → amazon_bedrock_haystack-6.2.1}/tests/test_chat_generator.py

@@ -409,6 +409,69 @@ class TestAmazonBedrockChatGenerator:
             ]
         }
 
+    @pytest.mark.parametrize(
+        "generation_kwargs,additional_model_request_fields",
+        [
+            (
+                {
+                    "parallel_tool_use": False,
+                    "tool_choice_type": "any",
+                    "thinking_budget_tokens": 1024,
+                },
+                {
+                    "tool_choice": {"disable_parallel_tool_use": True, "type": "any"},
+                    "thinking": {"budget_tokens": 1024, "type": "enabled"},
+                },
+            ),
+            (
+                {
+                    "parallel_tool_use": True,
+                    "tool_choice_type": "all",
+                },
+                {
+                    "tool_choice": {"disable_parallel_tool_use": False, "type": "all"},
+                },
+            ),
+            (
+                {
+                    "parallel_tool_use": True,
+                },
+                {
+                    "tool_choice": {"disable_parallel_tool_use": False, "type": "auto"},
+                },
+            ),
+            (
+                {
+                    "disable_parallel_tool_use": True,
+                },
+                {
+                    "tool_choice": {"disable_parallel_tool_use": True, "type": "auto"},
+                },
+            ),
+            (
+                {
+                    "thinking_budget_tokens": None,
+                    "parallel_tool_use": None,
+                    "tool_choice_type": None,
+                },
+                {},
+            ),
+        ],
+    )
+    def test_prepare_request_params_with_flattened_generation_kwargs(
+        self, mock_boto3_session, set_env_variables, generation_kwargs, additional_model_request_fields
+    ):
+        generator = AmazonBedrockChatGenerator(model="anthropic.claude-3-5-sonnet-20240620-v1:0")
+        request_params, _ = generator._prepare_request_params(
+            messages=[ChatMessage.from_user("What's the capital of France?")],
+            generation_kwargs=generation_kwargs,
+        )
+
+        if not additional_model_request_fields:
+            assert "additionalModelRequestFields" not in request_params
+        else:
+            assert request_params["additionalModelRequestFields"] == additional_model_request_fields
+
 
 # In the CI, those tests are skipped if AWS Authentication fails
 @pytest.mark.integration