amazon-bedrock-haystack 5.3.0__tar.gz → 5.3.1__tar.gz

{amazon_bedrock_haystack-5.3.0 → amazon_bedrock_haystack-5.3.1}/CHANGELOG.md

@@ -1,38 +1,49 @@
 # Changelog
 
-## [integrations/amazon_bedrock-v5.2.0] - 2025-10-22
+## [integrations/amazon_bedrock-v5.3.0] - 2025-12-17
 
 ### 🚀 Features
 
 - `AmazonBedrockChatGenerator` update tools param to ToolsType (#2415)
+- Cohere Embed v4 support in Bedrock (#2612)
 
-## [integrations/amazon_bedrock-v5.1.0] - 2025-09-29
+### 📚 Documentation
 
-### 🚀 Features
+- Add pydoc configurations for Docusaurus (#2411)
 
-- S3Downloader - add `s3_key_generation_function` param to customize S3 key generation (#2343)
+### ⚙️ CI
 
-## [integrations/amazon_bedrock-v5.0.0] - 2025-09-22
+- Change pytest command (#2475)
 
 ### 🧹 Chores
 
-- [**breaking**] Remove deprecated `BedrockRanker` (use `AmazonBedrockRanker` instead) (#2287)
+- Remove Readme API CI workflow and configs (#2573)
+
+### 🌀 Miscellaneous
+
+- Adopt PEP 585 type hinting (part 2) (#2508)
 
-## [integrations/amazon_bedrock-v4.2.0] - 2025-09-19
+## [integrations/amazon_bedrock-v5.1.0] - 2025-09-29
 
 ### 🚀 Features
 
-- Add a new `S3Downloader` component (#2192)
+- S3Downloader - add `s3_key_generation_function` param to customize S3 key generation (#2343)
 
-## [integrations/amazon_bedrock-v4.1.0] - 2025-09-19
+
+## [integrations/amazon_bedrock-v5.0.0] - 2025-09-22
 
 ### 🚀 Features
 
 - Support AWS Bedrock Guardrails in `AmazonBedrockChatGenerator` (#2284)
+- Add a new `S3Downloader` component (#2192)
+
+### 📚 Documentation
+
 
 ### 🧹 Chores
 
 - Bedrock - remove unused `stop_words` init parameter (#2275)
+- [**breaking**] Remove deprecated `BedrockRanker` (use `AmazonBedrockRanker` instead) (#2287)
 
 ### 🌀 Miscellaneous
 

{amazon_bedrock_haystack-5.3.0 → amazon_bedrock_haystack-5.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amazon-bedrock-haystack
-Version: 5.3.0
+Version: 5.3.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-5.3.0 → amazon_bedrock_haystack-5.3.1}/src/haystack_integrations/components/embedders/amazon_bedrock/document_embedder.py

@@ -1,5 +1,5 @@
 import json
-from typing import Any, Literal, Optional
+from typing import Any, Optional
 
 from botocore.config import Config
 from botocore.exceptions import ClientError
@@ -16,15 +16,6 @@ from haystack_integrations.common.amazon_bedrock.utils import get_aws_session
 
 logger = logging.getLogger(__name__)
 
-SUPPORTED_EMBEDDING_MODELS = [
-    "amazon.titan-embed-text-v1",
-    "amazon.titan-embed-text-v2:0",
-    "amazon.titan-embed-image-v1",
-    "cohere.embed-english-v3",
-    "cohere.embed-multilingual-v3",
-    "cohere.embed-v4:0",
-]
-
 
 @component
 class AmazonBedrockDocumentEmbedder:
@@ -58,14 +49,7 @@ class AmazonBedrockDocumentEmbedder:
 
     def __init__(
         self,
-        model: Literal[
-            "amazon.titan-embed-text-v1",
-            "amazon.titan-embed-text-v2:0",
-            "amazon.titan-embed-image-v1",
-            "cohere.embed-english-v3",
-            "cohere.embed-multilingual-v3",
-            "cohere.embed-v4:0",
-        ],
+        model: str,
         aws_access_key_id: Optional[Secret] = Secret.from_env_var("AWS_ACCESS_KEY_ID", strict=False),  # noqa: B008
         aws_secret_access_key: Optional[Secret] = Secret.from_env_var(  # noqa: B008
             "AWS_SECRET_ACCESS_KEY", strict=False
@@ -90,8 +74,13 @@ class AmazonBedrockDocumentEmbedder:
         constructor. Aside from model, three required parameters are `aws_access_key_id`, `aws_secret_access_key`,
          and `aws_region_name`.
 
-        :param model: The embedding model to use. The model has to be specified in the format outlined in the Amazon
-            Bedrock [documentation](https://docs.aws.amazon.com/bedrock/latest/userguide/model-ids.html).
+        :param model: The embedding model to use.
+            Amazon Titan and Cohere embedding models are supported, for example:
+            "amazon.titan-embed-text-v1", "amazon.titan-embed-text-v2:0", "amazon.titan-embed-image-v1",
+            "cohere.embed-english-v3", "cohere.embed-multilingual-v3", "cohere.embed-v4:0".
+            To find all supported models, refer to the Amazon Bedrock
+            [documentation](https://docs.aws.amazon.com/bedrock/latest/userguide/models-supported.html) and
+            filter for "embedding", then select models from the Amazon Titan and Cohere series.
         :param aws_access_key_id: AWS access key ID.
         :param aws_secret_access_key: AWS secret access key.
         :param aws_session_token: AWS session token.
@@ -109,11 +98,8 @@ class AmazonBedrockDocumentEmbedder:
         :raises ValueError: If the model is not supported.
         :raises AmazonBedrockConfigurationError: If the AWS environment is not configured correctly.
         """
-
-        if not model or model not in SUPPORTED_EMBEDDING_MODELS:
-            msg = "Please provide a valid model from the list of supported models: " + ", ".join(
-                SUPPORTED_EMBEDDING_MODELS
-            )
+        if "titan" not in model and "cohere" not in model:
+            msg = f"Model {model} is not supported. Only Amazon Titan and Cohere embedding models are supported."
             raise ValueError(msg)
 
         self.model = model
@@ -254,7 +240,7 @@ class AmazonBedrockDocumentEmbedder:
         elif "titan" in self.model:
             documents_with_embeddings = self._embed_titan(documents=documents)
         else:
-            msg = f"Model {self.model} is not supported. Supported models are: {', '.join(SUPPORTED_EMBEDDING_MODELS)}."
+            msg = f"Model {self.model} is not supported. Only Amazon Titan and Cohere embedding models are supported."
             raise ValueError(msg)
 
         return {"documents": documents_with_embeddings}

{amazon_bedrock_haystack-5.3.0 → amazon_bedrock_haystack-5.3.1}/src/haystack_integrations/components/embedders/amazon_bedrock/document_image_embedder.py

@@ -4,7 +4,7 @@
 
 import json
 from dataclasses import replace
-from typing import Any, Literal, Optional
+from typing import Any, Optional
 
 from botocore.config import Config
 from botocore.exceptions import ClientError
@@ -27,13 +27,6 @@ from haystack_integrations.common.amazon_bedrock.utils import get_aws_session
 
 logger = logging.getLogger(__name__)
 
-SUPPORTED_EMBEDDING_MODELS = [
-    "amazon.titan-embed-image-v1",
-    "cohere.embed-english-v3",
-    "cohere.embed-multilingual-v3",
-    "cohere.embed-v4:0",
-]
-
 
 @component
 class AmazonBedrockDocumentImageEmbedder:
@@ -74,12 +67,7 @@ class AmazonBedrockDocumentImageEmbedder:
     def __init__(
         self,
         *,
-        model: Literal[
-            "amazon.titan-embed-image-v1",
-            "cohere.embed-english-v3",
-            "cohere.embed-multilingual-v3",
-            "cohere.embed-v4:0",
-        ],
+        model: str,
         aws_access_key_id: Optional[Secret] = Secret.from_env_var("AWS_ACCESS_KEY_ID", strict=False),  # noqa: B008
         aws_secret_access_key: Optional[Secret] = Secret.from_env_var(  # noqa: B008
             "AWS_SECRET_ACCESS_KEY", strict=False
@@ -97,13 +85,13 @@ class AmazonBedrockDocumentImageEmbedder:
         """
         Creates a AmazonBedrockDocumentImageEmbedder component.
 
-        :param model:
-            The Bedrock model to use for calculating embeddings. Pass a valid model ID.
-            Supported models:
-            - "amazon.titan-embed-image-v1"
-            - "cohere.embed-english-v3"
-            - "cohere.embed-multilingual-v3"
-            - "cohere.embed-v4:0"
+        :param model: The embedding model to use.
+            Amazon Titan and Cohere multimodal embedding models are supported, for example:
+            "amazon.titan-embed-image-v1", "cohere.embed-english-v3", "cohere.embed-multilingual-v3",
+            "cohere.embed-v4:0".
+            To find all supported models, refer to the Amazon Bedrock
+            [documentation](https://docs.aws.amazon.com/bedrock/latest/userguide/models-supported.html) and
+            filter for "embedding", then select multimodal models from the Amazon Titan and Cohere series.
         :param aws_access_key_id: AWS access key ID.
         :param aws_secret_access_key: AWS secret access key.
         :param aws_session_token: AWS session token.
@@ -125,9 +113,10 @@ class AmazonBedrockDocumentImageEmbedder:
         :raises ValueError: If the model is not supported.
         :raises AmazonBedrockConfigurationError: If the AWS environment is not configured correctly.
         """
-        if not model or model not in SUPPORTED_EMBEDDING_MODELS:
-            msg = "Please provide a valid model from the list of supported models: " + ", ".join(
-                SUPPORTED_EMBEDDING_MODELS
+        if "titan" not in model and "cohere" not in model:
+            msg = (
+                f"Model {model} is not supported. "
+                "Only Amazon Titan and Cohere multimodal embedding models are supported."
             )
             raise ValueError(msg)
 
@@ -291,7 +280,10 @@ class AmazonBedrockDocumentImageEmbedder:
         elif "titan" in self.model:
             embeddings = self._embed_titan(images=images_to_embed)
         else:
-            msg = f"Model {self.model} is not supported. Supported models are: {', '.join(SUPPORTED_EMBEDDING_MODELS)}."
+            msg = (
+                f"Model {self.model} is not supported. "
+                "Only Amazon Titan and Cohere multimodal embedding models are supported."
+            )
             raise ValueError(msg)
 
         docs_with_embeddings = []

{amazon_bedrock_haystack-5.3.0 → amazon_bedrock_haystack-5.3.1}/src/haystack_integrations/components/embedders/amazon_bedrock/text_embedder.py

@@ -1,5 +1,5 @@
 import json
-from typing import Any, Literal, Optional
+from typing import Any, Optional
 
 from botocore.config import Config
 from botocore.exceptions import ClientError
@@ -14,15 +14,6 @@ from haystack_integrations.common.amazon_bedrock.utils import get_aws_session
 
 logger = logging.getLogger(__name__)
 
-SUPPORTED_EMBEDDING_MODELS = [
-    "amazon.titan-embed-text-v1",
-    "amazon.titan-embed-text-v2:0",
-    "amazon.titan-embed-image-v1",
-    "cohere.embed-english-v3",
-    "cohere.embed-multilingual-v3",
-    "cohere.embed-v4:0",
-]
-
 
 @component
 class AmazonBedrockTextEmbedder:
@@ -51,14 +42,7 @@ class AmazonBedrockTextEmbedder:
 
     def __init__(
         self,
-        model: Literal[
-            "amazon.titan-embed-text-v1",
-            "amazon.titan-embed-text-v2:0",
-            "amazon.titan-embed-image-v1",
-            "cohere.embed-english-v3",
-            "cohere.embed-multilingual-v3",
-            "cohere.embed-v4:0",
-        ],
+        model: str,
         aws_access_key_id: Optional[Secret] = Secret.from_env_var("AWS_ACCESS_KEY_ID", strict=False),  # noqa: B008
         aws_secret_access_key: Optional[Secret] = Secret.from_env_var(  # noqa: B008
             "AWS_SECRET_ACCESS_KEY", strict=False
@@ -79,8 +63,13 @@ class AmazonBedrockTextEmbedder:
         constructor. Aside from model, three required parameters are `aws_access_key_id`, `aws_secret_access_key`,
          and `aws_region_name`.
 
-        :param model: The embedding model to use. The model has to be specified in the format outlined in the Amazon
-            Bedrock [documentation](https://docs.aws.amazon.com/bedrock/latest/userguide/model-ids.html).
+        :param model: The embedding model to use.
+            Amazon Titan and Cohere embedding models are supported, for example:
+            "amazon.titan-embed-text-v1", "amazon.titan-embed-text-v2:0", "amazon.titan-embed-image-v1",
+            "cohere.embed-english-v3", "cohere.embed-multilingual-v3", "cohere.embed-v4:0".
+            To find all supported models, refer to the Amazon Bedrock
+            [documentation](https://docs.aws.amazon.com/bedrock/latest/userguide/models-supported.html) and
+            filter for "embedding", then select models from the Amazon Titan and Cohere series.
         :param aws_access_key_id: AWS access key ID.
         :param aws_secret_access_key: AWS secret access key.
         :param aws_session_token: AWS session token.
@@ -92,10 +81,8 @@ class AmazonBedrockTextEmbedder:
         :raises ValueError: If the model is not supported.
         :raises AmazonBedrockConfigurationError: If the AWS environment is not configured correctly.
         """
-        if not model or model not in SUPPORTED_EMBEDDING_MODELS:
-            msg = "Please provide a valid model from the list of supported models: " + ", ".join(
-                SUPPORTED_EMBEDDING_MODELS
-            )
+        if "titan" not in model and "cohere" not in model:
+            msg = f"Model {model} is not supported. Only Amazon Titan and Cohere embedding models are supported."
             raise ValueError(msg)
 
         self.model = model
@@ -179,7 +166,7 @@ class AmazonBedrockTextEmbedder:
         elif "titan" in self.model:
             embedding = response_body["embedding"]
         else:
-            msg = f"Unsupported model {self.model}. Supported models are: {', '.join(SUPPORTED_EMBEDDING_MODELS)}"
+            msg = f"Model {self.model} is not supported. Only Amazon Titan and Cohere embedding models are supported."
             raise ValueError(msg)
 
         return {"embedding": embedding}