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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amazon-bedrock-haystack
-Version: 6.0.0
+Version: 6.1.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.0.0.dist-info → amazon_bedrock_haystack-6.1.1.dist-info}/RECORD

@@ -10,20 +10,20 @@ haystack_integrations/components/downloaders/s3/__init__.py,sha256=2BOd3_N0kGqRJ
 haystack_integrations/components/downloaders/s3/s3_downloader.py,sha256=xRvQMXEUi7ysOTX3ylC3qw9t0GU2JzGGt7DQEu5Eu8s,12475
 haystack_integrations/components/embedders/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 haystack_integrations/components/embedders/amazon_bedrock/__init__.py,sha256=7GlhHJ4jFHCxq5QN5losGuGtrGNjvEx2dSQvEYD2yG0,408
-haystack_integrations/components/embedders/amazon_bedrock/document_embedder.py,sha256=nbgbHIjy-medDvKCOBvTpbPCBtWbHV8RQQKT3bsQ_po,13205
+haystack_integrations/components/embedders/amazon_bedrock/document_embedder.py,sha256=s3BxQL_EuSAs9IFHn5qf-4eKelg1lDn6ij7YTvBDVpg,13359
 haystack_integrations/components/embedders/amazon_bedrock/document_image_embedder.py,sha256=qBUo4P2Ccw6ltRXHdrB1HuUo8-9GQLDcuO7VDfBORlQ,16175
 haystack_integrations/components/embedders/amazon_bedrock/text_embedder.py,sha256=RE4rdnUZOm0PL_uf2HTLmsstA2hdMB0Rpz9Ga3VWlF4,9315
 haystack_integrations/components/generators/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 haystack_integrations/components/generators/amazon_bedrock/__init__.py,sha256=lv4NouIVm78YavUssWQrHHP_81u-7j21qW8v1kZMJPQ,284
 haystack_integrations/components/generators/amazon_bedrock/adapters.py,sha256=4-gIWfw70hGaXMNS30UbJFNFCWK2KG6RMnT_4z5RHxc,19625
-haystack_integrations/components/generators/amazon_bedrock/generator.py,sha256=S4uuM4Mi6Z0CSveKTtVySXp12K3tZrhbyRWu19YwVME,14679
+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/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=DuNV-2nxI4D2Mw7Nxq_z-u88_PMAjmQGJGBg1WzfvlQ,11749
-amazon_bedrock_haystack-6.0.0.dist-info/METADATA,sha256=08syh5v_gPM1V9lbXZC0pup1RnX4K9WGxL_qLzBptdY,2179
-amazon_bedrock_haystack-6.0.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-amazon_bedrock_haystack-6.0.0.dist-info/licenses/LICENSE.txt,sha256=B05uMshqTA74s-0ltyHKI6yoPfJ3zYgQbvcXfDVGFf8,10280
-amazon_bedrock_haystack-6.0.0.dist-info/RECORD,,
+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,,

haystack_integrations/components/embedders/amazon_bedrock/document_embedder.py

@@ -1,4 +1,5 @@
 import json
+from dataclasses import replace
 from typing import Any
 
 from botocore.config import Config
@@ -186,10 +187,11 @@ class AmazonBedrockDocumentEmbedder:
             )
             all_embeddings.extend(embeddings_list)
 
+        new_documents = []
         for doc, emb in zip(documents, all_embeddings, strict=True):
-            doc.embedding = emb
+            new_documents.append(replace(doc, embedding=emb))
 
-        return documents
+        return new_documents
 
     def _embed_titan(self, documents: list[Document]) -> list[Document]:
         """
@@ -214,10 +216,11 @@ class AmazonBedrockDocumentEmbedder:
             embedding = response_body["embedding"]
             all_embeddings.append(embedding)
 
+        new_documents = []
         for doc, emb in zip(documents, all_embeddings, strict=True):
-            doc.embedding = emb
+            new_documents.append(replace(doc, embedding=emb))
 
-        return documents
+        return new_documents
 
     @component.output_types(documents=list[Document])
     def run(self, documents: list[Document]) -> dict[str, list[Document]]:

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]]] = {

haystack_integrations/components/rankers/amazon_bedrock/ranker.py

@@ -1,3 +1,4 @@
+from dataclasses import replace
 from typing import Any
 
 from botocore.exceptions import ClientError
@@ -251,8 +252,7 @@ class AmazonBedrockRanker:
                 idx = result["index"]
                 score = result["relevanceScore"]
                 doc = documents[idx]
-                doc.score = score
-                sorted_docs.append(doc)
+                sorted_docs.append(replace(doc, score=score))
 
             return {"documents": sorted_docs}
         except ClientError as client_error: