feat: add response_format param to OllamaChatGenerator

.github/workflows/CI_license_compliance.yml

@@ -76,7 +76,7 @@ jobs:
 
       # We keep the license inventory on FOSSA
       - name: Send license report to Fossa
-        uses: fossas/fossa-action@v1.4.0
+        uses: fossas/fossa-action@v1.5.0
         continue-on-error: true # not critical
         with:
           api-key: ${{ secrets.FOSSA_LICENSE_SCAN_TOKEN }}

.github/workflows/ollama.yml

@@ -21,7 +21,7 @@ concurrency:
 env:
   PYTHONUNBUFFERED: "1"
   FORCE_COLOR: "1"
-  LLM_FOR_TESTS: "orca-mini"
+  LLM_FOR_TESTS: "llama3.2:3b"
   EMBEDDER_FOR_TESTS: "nomic-embed-text"
 
 jobs:

integrations/amazon_bedrock/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [integrations/amazon_bedrock-v3.0.0] - 2025-01-23
+
+### 🚀 Features
+
+- *(AWS Bedrock)* Add Cohere Reranker (#1291)
+- AmazonBedrockChatGenerator - add tools support (#1304)
+
+### 🚜 Refactor
+
+- [**breaking**] AmazonBedrockGenerator - remove truncation  (#1314)
+
+
+## [integrations/amazon_bedrock-v2.1.3] - 2025-01-21
+
+### 🧹 Chores
+
+- Bedrock - pin `transformers!=4.48.*` (#1306)
+
+
+## [integrations/amazon_bedrock-v2.1.2] - 2025-01-20
+
+### 🌀 Miscellaneous
+
+- Fix: Bedrock - pin `transformers!=4.48.0` (#1302)
+
 ## [integrations/amazon_bedrock-v2.1.1] - 2024-12-18
 
 ### 🐛 Bug Fixes

integrations/amazon_bedrock/examples/bedrock_ranker_example.py

@@ -0,0 +1,32 @@
+import os
+
+from haystack import Document
+from haystack.utils import Secret
+
+from haystack_integrations.components.rankers.amazon_bedrock import BedrockRanker
+
+# Set up AWS credentials
+# You can also set these as environment variables
+aws_profile_name = os.environ.get("AWS_PROFILE") or "default"
+aws_region_name = os.environ.get("AWS_DEFAULT_REGION") or "eu-central-1"
+# Initialize the BedrockRanker with AWS credentials
+ranker = BedrockRanker(
+    model="cohere.rerank-v3-5:0",
+    top_k=2,
+    aws_profile_name=Secret.from_token(aws_profile_name),
+    aws_region_name=Secret.from_token(aws_region_name),
+)
+
+# Create some sample documents
+docs = [
+    Document(content="Paris is the capital of France."),
+    Document(content="Berlin is the capital of Germany."),
+    Document(content="London is the capital of the United Kingdom."),
+    Document(content="Rome is the capital of Italy."),
+]
+
+# Define a query
+query = "What is the capital of Germany?"
+
+# Run the ranker
+output = ranker.run(query=query, documents=docs)

integrations/amazon_bedrock/pydoc/config.yml

@@ -2,13 +2,14 @@ loaders:
   - type: haystack_pydoc_tools.loaders.CustomPythonLoader
     search_path: [../src]
     modules: [
+      "haystack_integrations.common.amazon_bedrock.errors",
+      "haystack_integrations.components.embedders.amazon_bedrock.document_embedder",
+      "haystack_integrations.components.embedders.amazon_bedrock.text_embedder",
       "haystack_integrations.components.generators.amazon_bedrock.generator",
       "haystack_integrations.components.generators.amazon_bedrock.adapters",
       "haystack_integrations.common.amazon_bedrock.errors",
-      "haystack_integrations.components.generators.amazon_bedrock.handlers",
       "haystack_integrations.components.generators.amazon_bedrock.chat.chat_generator",
-      "haystack_integrations.components.embedders.amazon_bedrock.text_embedder",
-      "haystack_integrations.components.embedders.amazon_bedrock.document_embedder",
+      "haystack_integrations.components.rankers.amazon_bedrock.ranker",
     ]
     ignore_when_discovered: ["__init__"]
 processors:

integrations/amazon_bedrock/pyproject.toml

@@ -23,7 +23,7 @@ classifiers = [
   "Programming Language :: Python :: Implementation :: CPython",
   "Programming Language :: Python :: Implementation :: PyPy",
 ]
-dependencies = ["haystack-ai", "boto3>=1.28.57", "transformers"]
+dependencies = ["haystack-ai", "boto3>=1.28.57"]
 
 [project.urls]
 Documentation = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/amazon_bedrock#readme"
@@ -48,6 +48,7 @@ dependencies = [
   "pytest",
   "pytest-rerunfailures",
   "haystack-pydoc-tools",
+  "jsonschema",
 ]
 [tool.hatch.envs.default.scripts]
 test = "pytest {args:tests}"
@@ -155,7 +156,6 @@ exclude_lines = ["no cov", "if __name__ == .__main__.:", "if TYPE_CHECKING:"]
 [[tool.mypy.overrides]]
 module = [
   "botocore.*",
-  "transformers.*",
   "boto3.*",
   "haystack.*",
   "haystack_integrations.*",