amazon-bedrock-haystack 6.1.0__tar.gz → 6.2.0__tar.gz

{amazon_bedrock_haystack-6.1.0 → amazon_bedrock_haystack-6.2.0}/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [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
+
+- AmazonBedrockDocumentEmbedder to not modify Documents in place (#2174) (#2702)
+
+
 ## [integrations/amazon_bedrock-v6.0.0] - 2026-01-09
 
 ### 🧹 Chores

{amazon_bedrock_haystack-6.1.0 → amazon_bedrock_haystack-6.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amazon-bedrock-haystack
-Version: 6.1.0
+Version: 6.2.0
 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.0 → amazon_bedrock_haystack-6.2.0}/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,32 @@ class AmazonBedrockChatGenerator:
 
         return params, callback
 
+    def _resolve_flattened_generation_kwargs(self, generation_kwargs: dict[str, Any]) -> dict[str, Any]:
+        generation_kwargs = generation_kwargs.copy()
+        if "disable_parallel_tool_use" in generation_kwargs:
+            disable_parallel_tool_use = generation_kwargs.pop("disable_parallel_tool_use")
+            tool_choice = generation_kwargs.setdefault("tool_choice", {})
+            tool_choice["disable_parallel_tool_use"] = disable_parallel_tool_use
+
+        if "parallel_tool_use" in generation_kwargs:
+            parallel_tool_use = generation_kwargs.pop("parallel_tool_use")
+            disable_parallel_tool_use = not parallel_tool_use
+            tool_choice = generation_kwargs.setdefault("tool_choice", {})
+            tool_choice["disable_parallel_tool_use"] = disable_parallel_tool_use
+
+        if "tool_choice_type" in generation_kwargs:
+            tool_choice_type = generation_kwargs.pop("tool_choice_type")
+            tool_choice = generation_kwargs.setdefault("tool_choice", {})
+            tool_choice["type"] = tool_choice_type
+
+        if "thinking_budget_tokens" in generation_kwargs:
+            thinking_budget_tokens = generation_kwargs.pop("thinking_budget_tokens")
+            thinking = generation_kwargs.setdefault("thinking", {})
+            thinking["budget_tokens"] = thinking_budget_tokens
+            thinking["type"] = "enabled"
+
+        return generation_kwargs
+
     @component.output_types(replies=list[ChatMessage])
     def run(
         self,

{amazon_bedrock_haystack-6.1.0 → amazon_bedrock_haystack-6.2.0}/src/haystack_integrations/components/generators/amazon_bedrock/generator.py

@@ -63,14 +63,17 @@ class AmazonBedrockGenerator:
     supports Amazon Bedrock.
     """
 
+    # Regex pattern for supported AWS Bedrock region prefixes
+    _REGION_PREFIX_PATTERN = r"((?:global|us-gov|us|eu|apac|au|ca|jp)\.)?"
+
     SUPPORTED_MODEL_PATTERNS: ClassVar[dict[str, type[BedrockModelAdapter]]] = {
-        r"([a-z]{2}\.)?amazon.titan-text.*": AmazonTitanAdapter,
-        r"([a-z]{2}\.)?ai21.j2.*": AI21LabsJurassic2Adapter,
-        r"([a-z]{2}\.)?cohere.command-[^r].*": CohereCommandAdapter,
-        r"([a-z]{2}\.)?cohere.command-r.*": CohereCommandRAdapter,
-        r"([a-z]{2}\.)?anthropic.claude.*": AnthropicClaudeAdapter,
-        r"([a-z]{2}\.)?meta.llama.*": MetaLlamaAdapter,
-        r"([a-z]{2}\.)?mistral.*": MistralAdapter,
+        rf"{_REGION_PREFIX_PATTERN}amazon.titan-text.*": AmazonTitanAdapter,
+        rf"{_REGION_PREFIX_PATTERN}ai21.j2.*": AI21LabsJurassic2Adapter,
+        rf"{_REGION_PREFIX_PATTERN}cohere.command-[^r].*": CohereCommandAdapter,
+        rf"{_REGION_PREFIX_PATTERN}cohere.command-r.*": CohereCommandRAdapter,
+        rf"{_REGION_PREFIX_PATTERN}anthropic.claude.*": AnthropicClaudeAdapter,
+        rf"{_REGION_PREFIX_PATTERN}meta.llama.*": MetaLlamaAdapter,
+        rf"{_REGION_PREFIX_PATTERN}mistral.*": MistralAdapter,
     }
 
     SUPPORTED_MODEL_FAMILIES: ClassVar[dict[str, type[BedrockModelAdapter]]] = {

{amazon_bedrock_haystack-6.1.0 → amazon_bedrock_haystack-6.2.0}/tests/test_chat_generator.py

@@ -409,6 +409,22 @@ class TestAmazonBedrockChatGenerator:
             ]
         }
 
+    def test_prepare_request_params_with_flattened_generation_kwargs(self, mock_boto3_session, set_env_variables):
+        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={
+                "parallel_tool_use": False,
+                "tool_choice_type": "any",
+                "thinking_budget_tokens": 1024,
+            },
+        )
+
+        assert request_params["additionalModelRequestFields"] == {
+            "tool_choice": {"disable_parallel_tool_use": True, "type": "any"},
+            "thinking": {"budget_tokens": 1024, "type": "enabled"},
+        }
+
 
 # In the CI, those tests are skipped if AWS Authentication fails
 @pytest.mark.integration

{amazon_bedrock_haystack-6.1.0 → amazon_bedrock_haystack-6.2.0}/tests/test_generator.py

@@ -129,6 +129,11 @@ def test_constructor_with_empty_model():
         ("anthropic.claude-v2", AnthropicClaudeAdapter),
         ("eu.anthropic.claude-v1", AnthropicClaudeAdapter),  # cross-region inference
         ("us.anthropic.claude-v2", AnthropicClaudeAdapter),  # cross-region inference
+        ("global.anthropic.claude-v2", AnthropicClaudeAdapter),
+        ("us-gov.anthropic.claude-v1", AnthropicClaudeAdapter),
+        ("apac.anthropic.claude-v2", AnthropicClaudeAdapter),
+        ("au.anthropic.claude-v1", AnthropicClaudeAdapter),
+        ("jp.anthropic.claude-v1", AnthropicClaudeAdapter),
         ("anthropic.claude-instant-v1", AnthropicClaudeAdapter),
         ("anthropic.claude-super-v5", AnthropicClaudeAdapter),  # artificial
         ("cohere.command-text-v14", CohereCommandAdapter),
@@ -207,6 +212,20 @@ def test_get_model_adapter_auto_detect_family_fails():
         AmazonBedrockGenerator.get_model_adapter(model="arn:123435423")
 
 
+@pytest.mark.parametrize(
+    "model",
+    [
+        "invalid.anthropic.claude-v2",
+        "xyz.meta.llama2-13b-chat-v1",
+        "fake-region.mistral.mistral-7b-instruct-v0:2",
+        "global.us.anthropic.claude-v2",
+    ],
+)
+def test_get_model_adapter_with_invalid_region_prefix(model: str):
+    with pytest.raises(AmazonBedrockConfigurationError):
+        AmazonBedrockGenerator.get_model_adapter(model=model)
+
+
 def test_get_model_adapter_model_family_over_auto_detection():
     """
     Test that the model_family is used over auto-detection