amazon-bedrock-haystack 3.5.0__py3-none-any.whl → 3.5.2__py3-none-any.whl

{amazon_bedrock_haystack-3.5.0.dist-info → amazon_bedrock_haystack-3.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amazon-bedrock-haystack
-Version: 3.5.0
+Version: 3.5.2
 Summary: An integration of Amazon Bedrock as an AmazonBedrockGenerator component.
 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-3.5.0.dist-info → amazon_bedrock_haystack-3.5.2.dist-info}/RECORD

@@ -8,11 +8,11 @@ haystack_integrations/components/generators/amazon_bedrock/__init__.py,sha256=lv
 haystack_integrations/components/generators/amazon_bedrock/adapters.py,sha256=cnlfmie4HfEX4nipSXSDk_3koy7HYZ-ezimGN6BozQ0,19543
 haystack_integrations/components/generators/amazon_bedrock/generator.py,sha256=2L9-ZKJkMI5JxN0xZ8Gn_5MfdjhT4UlFjlrTd9Rdhsg,14514
 haystack_integrations/components/generators/amazon_bedrock/chat/__init__.py,sha256=6GZ8Y3Lw0rLOsOAqi6Tu5mZC977UzQvgDxKpOWr8IQw,110
-haystack_integrations/components/generators/amazon_bedrock/chat/chat_generator.py,sha256=0kwxL-tIdxnohL0QssEbq4LwZPztxtEf1Aux00ndRVA,20527
-haystack_integrations/components/generators/amazon_bedrock/chat/utils.py,sha256=PdfX-z5PYhKCW-jqttxug6UYqAmvtUQS65PFnp8YCjg,11839
+haystack_integrations/components/generators/amazon_bedrock/chat/chat_generator.py,sha256=f60FRraGvPeMBiosclNN3hLv9uQihQcQFETC-gwGieM,20784
+haystack_integrations/components/generators/amazon_bedrock/chat/utils.py,sha256=Dch2YkrDFu-Dvi9i1bE97taAA1Qf3wMQb4wh2T3Z-lw,11789
 haystack_integrations/components/rankers/amazon_bedrock/__init__.py,sha256=DWsCu-dav2wzr13U2H1jlFjdzdjkV0fnJw7DVDRY8RQ,63
 haystack_integrations/components/rankers/amazon_bedrock/ranker.py,sha256=kq9h_ApGXBDs_GW66QQpo8JwW9grLpqpFT9uXiwT8_M,11643
-amazon_bedrock_haystack-3.5.0.dist-info/METADATA,sha256=h8CjuKGcO5zVXC7XTpJlGwhUEHwU7_L_7Ty6FfrS3oY,2217
-amazon_bedrock_haystack-3.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-amazon_bedrock_haystack-3.5.0.dist-info/licenses/LICENSE.txt,sha256=B05uMshqTA74s-0ltyHKI6yoPfJ3zYgQbvcXfDVGFf8,10280
-amazon_bedrock_haystack-3.5.0.dist-info/RECORD,,
+amazon_bedrock_haystack-3.5.2.dist-info/METADATA,sha256=gumDQJXyNSXhdWQFhVuVY1OSmhOGJiXP9re3y2uTVE0,2217
+amazon_bedrock_haystack-3.5.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+amazon_bedrock_haystack-3.5.2.dist-info/licenses/LICENSE.txt,sha256=B05uMshqTA74s-0ltyHKI6yoPfJ3zYgQbvcXfDVGFf8,10280
+amazon_bedrock_haystack-3.5.2.dist-info/RECORD,,

haystack_integrations/components/generators/amazon_bedrock/chat/chat_generator.py

@@ -5,10 +5,16 @@ from botocore.eventstream import EventStream
 from botocore.exceptions import ClientError
 from haystack import component, default_from_dict, default_to_dict, logging
 from haystack.dataclasses import ChatMessage, StreamingCallbackT, select_streaming_callback
-from haystack.tools import Tool, _check_duplicate_tool_names, deserialize_tools_inplace
+from haystack.tools import Tool, _check_duplicate_tool_names
 from haystack.utils.auth import Secret, deserialize_secrets_inplace
 from haystack.utils.callable_serialization import deserialize_callable, serialize_callable
 
+# Compatibility with Haystack 2.12.0 and 2.13.0 - remove after 2.13.0 is released
+try:
+    from haystack.tools import deserialize_tools_or_toolset_inplace
+except ImportError:
+    from haystack.tools import deserialize_tools_inplace as deserialize_tools_or_toolset_inplace
+
 from haystack_integrations.common.amazon_bedrock.errors import (
     AmazonBedrockConfigurationError,
     AmazonBedrockInferenceError,
@@ -287,7 +293,7 @@ class AmazonBedrockChatGenerator:
             data["init_parameters"],
             ["aws_access_key_id", "aws_secret_access_key", "aws_session_token", "aws_region_name", "aws_profile_name"],
         )
-        deserialize_tools_inplace(data["init_parameters"], key="tools")
+        deserialize_tools_or_toolset_inplace(data["init_parameters"], key="tools")
         return default_from_dict(cls, data)
 
     def _prepare_request_params(

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

@@ -146,10 +146,7 @@ def _parse_streaming_response(
     replies = []
     current_content = ""
     current_tool_call: Optional[Dict[str, Any]] = None
-    base_meta = {
-        "model": model,
-        "index": 0,
-    }
+    base_meta = {"model": model, "index": 0}
 
     for event in response_stream:
         if "contentBlockStart" in event:
@@ -170,7 +167,7 @@ def _parse_streaming_response(
             if "text" in delta:
                 delta_text = delta["text"]
                 current_content += delta_text
-                streaming_chunk = StreamingChunk(content=delta_text, meta=None)
+                streaming_chunk = StreamingChunk(content=delta_text, meta={})
                 streaming_callback(streaming_chunk)
             elif "toolUse" in delta and current_tool_call:
                 # Accumulate tool use input deltas
@@ -231,10 +228,7 @@ async def _parse_streaming_response_async(
     replies = []
     current_content = ""
     current_tool_call: Optional[Dict[str, Any]] = None
-    base_meta = {
-        "model": model,
-        "index": 0,
-    }
+    base_meta = {"model": model, "index": 0}
 
     async for event in response_stream:
         if "contentBlockStart" in event:
@@ -255,7 +249,7 @@ async def _parse_streaming_response_async(
             if "text" in delta:
                 delta_text = delta["text"]
                 current_content += delta_text
-                streaming_chunk = StreamingChunk(content=delta_text, meta=None)
+                streaming_chunk = StreamingChunk(content=delta_text, meta={})
                 await streaming_callback(streaming_chunk)
             elif "toolUse" in delta and current_tool_call:
                 # Accumulate tool use input deltas