amazon-bedrock-haystack 6.1.1__py3-none-any.whl → 6.2.1__py3-none-any.whl

{amazon_bedrock_haystack-6.1.1.dist-info → amazon_bedrock_haystack-6.2.1.dist-info}/METADATA

@@ -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.dist-info → amazon_bedrock_haystack-6.2.1.dist-info}/RECORD

@@ -18,12 +18,12 @@ haystack_integrations/components/generators/amazon_bedrock/__init__.py,sha256=lv
 haystack_integrations/components/generators/amazon_bedrock/adapters.py,sha256=4-gIWfw70hGaXMNS30UbJFNFCWK2KG6RMnT_4z5RHxc,19625
 haystack_integrations/components/generators/amazon_bedrock/generator.py,sha256=jz9hT3ZMJtUsQnyeCa1sbeEf7e37t3EktQLAT8J2qpM,14901
 haystack_integrations/components/generators/amazon_bedrock/chat/__init__.py,sha256=6GZ8Y3Lw0rLOsOAqi6Tu5mZC977UzQvgDxKpOWr8IQw,110
-haystack_integrations/components/generators/amazon_bedrock/chat/chat_generator.py,sha256=KJqeKFzM1thG2GSVm51pY5aX6gctmtnJvF_kwOH8gqQ,26143
+haystack_integrations/components/generators/amazon_bedrock/chat/chat_generator.py,sha256=C2hB0Wg_oxSnvPAIrTB4eHqjn8a732HfhbhYmS9eGjc,27731
 haystack_integrations/components/generators/amazon_bedrock/chat/utils.py,sha256=juOaTi8DuXr-i68zzjCnYoc5eNxO1DxcTI9fcNfg4rE,27214
 haystack_integrations/components/rankers/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 haystack_integrations/components/rankers/amazon_bedrock/__init__.py,sha256=mJQKShAP5AfZvfKQisSh7kfKu6RIXzsYdk4eqMtcaEk,75
 haystack_integrations/components/rankers/amazon_bedrock/ranker.py,sha256=L-1AzmsWR8PYb8CEJsfoYK9MBrE2qXFjenfiiGxa6iw,11769
-amazon_bedrock_haystack-6.1.1.dist-info/METADATA,sha256=okatp8ksYtYJPhChO3F17zUct7P-xe-ASokzWSCWYjo,2179
-amazon_bedrock_haystack-6.1.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-amazon_bedrock_haystack-6.1.1.dist-info/licenses/LICENSE.txt,sha256=B05uMshqTA74s-0ltyHKI6yoPfJ3zYgQbvcXfDVGFf8,10280
-amazon_bedrock_haystack-6.1.1.dist-info/RECORD,,
+amazon_bedrock_haystack-6.2.1.dist-info/METADATA,sha256=Fr8kZsEebhQpC-g0uj6-h6cUMv0ZIi5dwTYq2HZSt7w,2179
+amazon_bedrock_haystack-6.2.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+amazon_bedrock_haystack-6.2.1.dist-info/licenses/LICENSE.txt,sha256=B05uMshqTA74s-0ltyHKI6yoPfJ3zYgQbvcXfDVGFf8,10280
+amazon_bedrock_haystack-6.2.1.dist-info/RECORD,,

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,