amazon-bedrock-haystack 4.2.0__tar.gz → 5.0.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/CHANGELOG.md +6 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/PKG-INFO +1 -1
- amazon_bedrock_haystack-5.0.0/src/haystack_integrations/components/rankers/amazon_bedrock/__init__.py +3 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/components/rankers/amazon_bedrock/ranker.py +0 -18
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/tests/test_ranker.py +2 -2
- amazon_bedrock_haystack-4.2.0/src/haystack_integrations/components/rankers/amazon_bedrock/__init__.py +0 -3
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/.gitignore +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/LICENSE.txt +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/README.md +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/examples/bedrock_ranker_example.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/examples/chatgenerator_example.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/examples/embedders_generator_with_rag_example.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/examples/s3_downloader_example.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/pydoc/config.yml +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/pyproject.toml +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/common/amazon_bedrock/__init__.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/common/amazon_bedrock/errors.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/common/amazon_bedrock/utils.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/common/py.typed +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/common/s3/__init__.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/common/s3/errors.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/common/s3/utils.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/components/downloaders/py.typed +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/components/downloaders/s3/__init__.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/components/downloaders/s3/s3_downloader.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/components/embedders/amazon_bedrock/__init__.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/components/embedders/amazon_bedrock/document_embedder.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/components/embedders/amazon_bedrock/document_image_embedder.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/components/embedders/amazon_bedrock/text_embedder.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/components/embedders/py.typed +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/components/generators/amazon_bedrock/__init__.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/components/generators/amazon_bedrock/adapters.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/components/generators/amazon_bedrock/chat/__init__.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/components/generators/amazon_bedrock/chat/chat_generator.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/components/generators/amazon_bedrock/chat/utils.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/components/generators/amazon_bedrock/generator.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/components/generators/py.typed +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/src/haystack_integrations/components/rankers/py.typed +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/tests/__init__.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/tests/conftest.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/tests/test_chat_generator.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/tests/test_chat_generator_utils.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/tests/test_document_embedder.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/tests/test_document_image_embedder.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/tests/test_files/apple.jpg +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/tests/test_files/haystack-logo.png +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/tests/test_files/sample_pdf_1.pdf +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/tests/test_generator.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/tests/test_s3_downloader.py +0 -0
- {amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/tests/test_text_embedder.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: amazon-bedrock-haystack
|
|
3
|
-
Version:
|
|
3
|
+
Version: 5.0.0
|
|
4
4
|
Summary: An integration of AWS S3 and Bedrock as a Downloader and Generator components.
|
|
5
5
|
Project-URL: Documentation, https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/amazon_bedrock#readme
|
|
6
6
|
Project-URL: Issues, https://github.com/deepset-ai/haystack-core-integrations/issues
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import warnings
|
|
2
1
|
from typing import Any, Dict, List, Optional
|
|
3
2
|
|
|
4
3
|
from botocore.exceptions import ClientError
|
|
@@ -265,20 +264,3 @@ class AmazonBedrockRanker:
|
|
|
265
264
|
except Exception as exception:
|
|
266
265
|
msg = f"Error during Amazon Bedrock API call: {exception}"
|
|
267
266
|
raise AmazonBedrockInferenceError(msg) from exception
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
class BedrockRanker(AmazonBedrockRanker):
|
|
271
|
-
"""
|
|
272
|
-
Deprecated alias for AmazonBedrockRanker.
|
|
273
|
-
This class will be removed in a future version.
|
|
274
|
-
Please use AmazonBedrockRanker instead.
|
|
275
|
-
"""
|
|
276
|
-
|
|
277
|
-
def __init__(self, *args, **kwargs):
|
|
278
|
-
warnings.warn(
|
|
279
|
-
"BedrockRanker is deprecated and will be removed in a future version. "
|
|
280
|
-
"Please use AmazonBedrockRanker instead.",
|
|
281
|
-
DeprecationWarning,
|
|
282
|
-
stacklevel=2,
|
|
283
|
-
)
|
|
284
|
-
super().__init__(*args, **kwargs)
|
|
@@ -7,7 +7,7 @@ from haystack.utils import Secret
|
|
|
7
7
|
from haystack_integrations.common.amazon_bedrock.errors import (
|
|
8
8
|
AmazonBedrockInferenceError,
|
|
9
9
|
)
|
|
10
|
-
from haystack_integrations.components.rankers.amazon_bedrock import AmazonBedrockRanker
|
|
10
|
+
from haystack_integrations.components.rankers.amazon_bedrock import AmazonBedrockRanker
|
|
11
11
|
|
|
12
12
|
|
|
13
13
|
@pytest.fixture
|
|
@@ -31,7 +31,7 @@ def test_amazon_bedrock_ranker_initialization(mock_aws_session):
|
|
|
31
31
|
|
|
32
32
|
|
|
33
33
|
def test_bedrock_ranker_run(mock_aws_session):
|
|
34
|
-
ranker =
|
|
34
|
+
ranker = AmazonBedrockRanker(
|
|
35
35
|
model="cohere.rerank-v3-5:0",
|
|
36
36
|
top_k=2,
|
|
37
37
|
aws_access_key_id=Secret.from_token("test_access_key"),
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/examples/bedrock_ranker_example.py
RENAMED
|
File without changes
|
{amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/examples/chatgenerator_example.py
RENAMED
|
File without changes
|
|
File without changes
|
{amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/examples/s3_downloader_example.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/tests/test_chat_generator.py
RENAMED
|
File without changes
|
{amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/tests/test_chat_generator_utils.py
RENAMED
|
File without changes
|
{amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/tests/test_document_embedder.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/tests/test_files/haystack-logo.png
RENAMED
|
File without changes
|
{amazon_bedrock_haystack-4.2.0 → amazon_bedrock_haystack-5.0.0}/tests/test_files/sample_pdf_1.pdf
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|