Merge branch 'main' into fix-tag-pattern

deepset-ai · Nov 21, 2024 · 01284a9 · 01284a9
2 parents ede34fc + c28b834
commit 01284a9
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 3 deletions.
diff --git a/...n_bedrock/src/haystack_integrations/components/generators/amazon_bedrock/chat/adapters.py b/...n_bedrock/src/haystack_integrations/components/generators/amazon_bedrock/chat/adapters.py
@@ -212,6 +212,8 @@ def prepare_body(self, messages: List[ChatMessage], **inference_kwargs) -> Dict[
         stop_sequences = inference_kwargs.get("stop_sequences", []) + inference_kwargs.pop("stop_words", [])
         if stop_sequences:
             inference_kwargs["stop_sequences"] = stop_sequences
+        # pop stream kwarg from inference_kwargs as Anthropic does not support it (if provided)
+        inference_kwargs.pop("stream", None)
         params = self._get_params(inference_kwargs, default_params, self.ALLOWED_PARAMS)
         body = {**self.prepare_chat_messages(messages=messages), **params}
         return body
@@ -384,6 +386,10 @@ def prepare_body(self, messages: List[ChatMessage], **inference_kwargs) -> Dict[
         stop_words = inference_kwargs.pop("stop_words", [])
         if stop_words:
             inference_kwargs["stop"] = stop_words
+
+        # pop stream kwarg from inference_kwargs as Mistral does not support it (if provided)
+        inference_kwargs.pop("stream", None)
+
         params = self._get_params(inference_kwargs, default_params, self.ALLOWED_PARAMS)
         body = {"prompt": self.prepare_chat_messages(messages=messages), **params}
         return body

diff --git a/integrations/amazon_bedrock/tests/test_chat_generator.py b/integrations/amazon_bedrock/tests/test_chat_generator.py
@@ -17,7 +17,7 @@
 )
 
 KLASS = "haystack_integrations.components.generators.amazon_bedrock.chat.chat_generator.AmazonBedrockChatGenerator"
-MODELS_TO_TEST = ["anthropic.claude-3-sonnet-20240229-v1:0", "anthropic.claude-v2:1", "meta.llama2-13b-chat-v1"]
+MODELS_TO_TEST = ["anthropic.claude-3-sonnet-20240229-v1:0", "anthropic.claude-v2:1"]
 MODELS_TO_TEST_WITH_TOOLS = ["anthropic.claude-3-haiku-20240307-v1:0"]
 MISTRAL_MODELS = [
     "mistral.mistral-7b-instruct-v0:2",

diff --git a/integrations/anthropic/CHANGELOG.md b/integrations/anthropic/CHANGELOG.md
@@ -1,11 +1,29 @@
 # Changelog
 
+## [unreleased]
+
+### ⚙️ CI
+
+- Adopt uv as installer (#1142)
+
+### 🧹 Chores
+
+- Update ruff linting scripts and settings (#1105)
+
+### 🌀 Miscellaneous
+
+- Add AnthropicVertexChatGenerator component (#1192)
+
 ## [integrations/anthropic-v1.1.0] - 2024-09-20
 
 ### 🚀 Features
 
 - Add Anthropic prompt caching support, add example (#1006)
 
+### 🌀 Miscellaneous
+
+- Chore: Update Anthropic example, use ChatPromptBuilder properly (#978)
+
 ## [integrations/anthropic-v1.0.0] - 2024-08-12
 
 ### 🐛 Bug Fixes
@@ -20,25 +38,43 @@
 
 - Do not retry tests in `hatch run test` command (#954)
 
+
 ## [integrations/anthropic-v0.4.1] - 2024-07-17
 
-### ⚙️ Miscellaneous Tasks
+### 🧹 Chores
 
 - Update ruff invocation to include check parameter (#853)
 
+### 🌀 Miscellaneous
+
+- Ci: install `pytest-rerunfailures` where needed; add retry config to `test-cov` script (#845)
+- Add meta deprecration warning (#910)
+
 ## [integrations/anthropic-v0.4.0] - 2024-06-21
 
 ### 🚀 Features
 
 - Update Anthropic/Cohere for tools use (#790)
 - Update Anthropic default models, pydocs (#839)
 
-### ⚙️ Miscellaneous Tasks
+### ⚙️ CI
 
 - Retry tests to reduce flakyness (#836)
 
+### 🌀 Miscellaneous
+
+- Remove references to Python 3.7 (#601)
+- Chore: add license classifiers (#680)
+- Chore: change the pydoc renderer class (#718)
+- Docs: add missing api references (#728)
+
 ## [integrations/anthropic-v0.2.0] - 2024-03-15
 
+### 🌀 Miscellaneous
+
+- Docs: Replace amazon-bedrock with anthropic in readme (#584)
+- Chore: Use the correct sonnet model name (#587)
+
 ## [integrations/anthropic-v0.1.0] - 2024-03-15
 
 ### 🚀 Features