cohere-haystack 2.0.1__tar.gz → 2.0.2__tar.gz

{cohere_haystack-2.0.1 → cohere_haystack-2.0.2}/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [integrations/cohere-v2.0.1] - 2024-12-09
+
+### ⚙️ CI
+
+- Adopt uv as installer (#1142)
+
+### 🧹 Chores
+
+- Update ruff linting scripts and settings (#1105)
+- Fix linting/isort (#1215)
+
+### 🌀 Miscellaneous
+
+- Chore: use class methods to create `ChatMessage` (#1222)
+- Chore: use `text` instead of `content` for `ChatMessage` in Cohere and Anthropic (#1237)
+
 ## [integrations/cohere-v2.0.0] - 2024-09-16
 
 ### 🚀 Features
@@ -16,28 +32,49 @@
 
 - Do not retry tests in `hatch run test` command (#954)
 
-### ⚙️ Miscellaneous Tasks
+### ⚙️ CI
 
 - Retry tests to reduce flakyness (#836)
+
+### 🧹 Chores
+
 - Update ruff invocation to include check parameter (#853)
 
-### Docs
+### 🌀 Miscellaneous
 
+- Ci: install `pytest-rerunfailures` where needed; add retry config to `test-cov` script (#845)
 - Update CohereChatGenerator docstrings (#958)
 - Update CohereGenerator docstrings (#960)
 
 ## [integrations/cohere-v1.1.1] - 2024-06-12
 
+### 🌀 Miscellaneous
+
+- Chore: `CohereGenerator` - remove warning about `generate` API (#805)
+
 ## [integrations/cohere-v1.1.0] - 2024-05-24
 
 ### 🐛 Bug Fixes
 
 - Remove support for generate API (#755)
 
+### 🌀 Miscellaneous
+
+- Chore: change the pydoc renderer class (#718)
+
 ## [integrations/cohere-v1.0.0] - 2024-05-03
 
+### 🌀 Miscellaneous
+
+- Follow up: update Cohere integration to use Cohere SDK v5 (#711)
+
 ## [integrations/cohere-v0.7.0] - 2024-05-02
 
+### 🌀 Miscellaneous
+
+- Chore: add license classifiers (#680)
+- Update Cohere integration to use Cohere SDK v5 (#702)
+
 ## [integrations/cohere-v0.6.0] - 2024-04-08
 
 ### 🚀 Features
@@ -46,21 +83,17 @@
 
 ## [integrations/cohere-v0.5.0] - 2024-03-29
 
+### 🌀 Miscellaneous
+
+- Add the Cohere client name to cohere requests  (#362)
+
 ## [integrations/cohere-v0.4.1] - 2024-03-21
 
 ### 🐛 Bug Fixes
 
 - Fix order of API docs (#447)
-
-This PR will also push the docs to Readme
 - Fix tests (#561)
 
-* fix unit tests
-
-* try
-
-* remove flaky check
-
 ### 📚 Documentation
 
 - Update category slug (#442)
@@ -68,14 +101,20 @@ This PR will also push the docs to Readme
 - Small consistency improvements (#536)
 - Disable-class-def (#556)
 
-### ⚙️ Miscellaneous Tasks
+### 🧹 Chores
 
 - Update Cohere integration to use new generic callable (de)serializers for their callback handlers (#453)
 - Use `serialize_callable` instead of `serialize_callback_handler` in Cohere  (#460)
 
-### Cohere
+### 🌀 Miscellaneous
 
+- Choere - remove matching error message from tests (#419)
 - Fix linting (#509)
+- Make tests show coverage (#566)
+- Refactor tests (#574)
+- Test: relax test constraints (#591)
+- Remove references to Python 3.7 (#601)
+- Fix: Pin cohere version (#609)
 
 ## [integrations/cohere-v0.4.0] - 2024-02-12
 
@@ -92,32 +131,57 @@ This PR will also push the docs to Readme
 
 - Fix failing `TestCohereChatGenerator.test_from_dict_fail_wo_env_var` test (#393)
 
-## [integrations/cohere-v0.3.0] - 2024-01-25
+### 🌀 Miscellaneous
 
-### 🐛 Bug Fixes
+- Cohere: generate api docs (#321)
+- Fix: update to latest haystack-ai version (#348)
 
-- Fix project urls (#96)
+## [integrations/cohere-v0.3.0] - 2024-01-25
 
+### 🐛 Bug Fixes
 
+- Fix project URLs (#96)
 - Cohere namespace reorg (#271)
 
 ### 🚜 Refactor
 
 - Use `hatch_vcs` to manage integrations versioning (#103)
 
-### ⚙️ Miscellaneous Tasks
+### 🧹 Chores
 
 - [**breaking**] Rename `model_name` to `model` in the Cohere integration (#222)
 - Cohere namespace change (#247)
 
+### 🌀 Miscellaneous
+
+- Cohere: remove unused constant (#91)
+- Change default 'input_type' for CohereTextEmbedder (#99)
+- Change metadata to meta (#152)
+- Add cohere chat generator (#88)
+- Optimize API key reading (#162)
+- Cohere - change metadata to meta (#178)
+
 ## [integrations/cohere-v0.2.0] - 2023-12-11
 
 ### 🚀 Features
 
 - Add support for V3 Embed models to CohereEmbedders (#89)
 
+### 🌀 Miscellaneous
+
+- Cohere: increase version to prepare release (#92)
+
 ## [integrations/cohere-v0.1.1] - 2023-12-07
 
+### 🌀 Miscellaneous
+
+- [cohere] Add text and document embedders (#80)
+- [cohere] fix cohere pypi version badge and add Embedder note (#86)
+
 ## [integrations/cohere-v0.0.1] - 2023-12-04
 
+### 🌀 Miscellaneous
+
+- Add `cohere_haystack` integration package (#75)
+
 <!-- generated by git-cliff -->

{cohere_haystack-2.0.1 → cohere_haystack-2.0.2}/PKG-INFO

@@ -1,11 +1,12 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: cohere-haystack
-Version: 2.0.1
+Version: 2.0.2
 Project-URL: Documentation, https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/cohere#readme
 Project-URL: Issues, https://github.com/deepset-ai/haystack-core-integrations/issues
 Project-URL: Source, https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/cohere
 Author-email: deepset GmbH <info@deepset.ai>
-License: Apache-2.0
+License-Expression: Apache-2.0
+License-File: LICENSE.txt
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python

{cohere_haystack-2.0.1 → cohere_haystack-2.0.2}/src/haystack_integrations/components/generators/cohere/chat/chat_generator.py

@@ -172,7 +172,7 @@ class CohereChatGenerator:
                     response_text += event.text
                 elif event.event_type == "stream-end":
                     finish_response = event.response
-            chat_message = ChatMessage.from_assistant(content=response_text)
+            chat_message = ChatMessage.from_assistant(response_text)
 
             if finish_response and finish_response.meta:
                 if finish_response.meta.billed_units:
@@ -219,7 +219,7 @@ class CohereChatGenerator:
             # TODO revisit to see if we need to handle multiple tool calls
             message = ChatMessage.from_assistant(cohere_response.tool_calls[0].json())
         elif cohere_response.text:
-            message = ChatMessage.from_assistant(content=cohere_response.text)
+            message = ChatMessage.from_assistant(cohere_response.text)
         message.meta.update(
             {
                 "model": self.model,

{cohere_haystack-2.0.1 → cohere_haystack-2.0.2}/tests/test_cohere_chat_generator.py

@@ -27,7 +27,7 @@ def streaming_chunk(text: str):
 
 @pytest.fixture
 def chat_messages():
-    return [ChatMessage.from_assistant(content="What's the capital of France")]
+    return [ChatMessage.from_assistant("What's the capital of France")]
 
 
 class TestCohereChatGenerator:
@@ -98,26 +98,6 @@ class TestCohereChatGenerator:
             },
         }
 
-    def test_to_dict_with_lambda_streaming_callback(self, monkeypatch):
-        monkeypatch.setenv("COHERE_API_KEY", "test-api-key")
-        component = CohereChatGenerator(
-            model="command-r",
-            streaming_callback=lambda x: x,
-            api_base_url="test-base-url",
-            generation_kwargs={"max_tokens": 10, "some_test_param": "test-params"},
-        )
-        data = component.to_dict()
-        assert data == {
-            "type": "haystack_integrations.components.generators.cohere.chat.chat_generator.CohereChatGenerator",
-            "init_parameters": {
-                "model": "command-r",
-                "api_base_url": "test-base-url",
-                "api_key": {"env_vars": ["COHERE_API_KEY", "CO_API_KEY"], "strict": True, "type": "env_var"},
-                "streaming_callback": "tests.test_cohere_chat_generator.<lambda>",
-                "generation_kwargs": {"max_tokens": 10, "some_test_param": "test-params"},
-            },
-        }
-
     def test_from_dict(self, monkeypatch):
         monkeypatch.setenv("COHERE_API_KEY", "fake-api-key")
         monkeypatch.setenv("CO_API_KEY", "fake-api-key")
@@ -164,7 +144,7 @@ class TestCohereChatGenerator:
     )
     @pytest.mark.integration
     def test_live_run(self):
-        chat_messages = [ChatMessage.from_user(content="What's the capital of France")]
+        chat_messages = [ChatMessage.from_user("What's the capital of France")]
         component = CohereChatGenerator(generation_kwargs={"temperature": 0.8})
         results = component.run(chat_messages)
         assert len(results["replies"]) == 1
@@ -201,7 +181,7 @@ class TestCohereChatGenerator:
 
         callback = Callback()
         component = CohereChatGenerator(streaming_callback=callback)
-        results = component.run([ChatMessage.from_user(content="What's the capital of France? answer in a word")])
+        results = component.run([ChatMessage.from_user("What's the capital of France? answer in a word")])
 
         assert len(results["replies"]) == 1
         message: ChatMessage = results["replies"][0]
@@ -222,7 +202,7 @@ class TestCohereChatGenerator:
     )
     @pytest.mark.integration
     def test_live_run_with_connector(self):
-        chat_messages = [ChatMessage.from_user(content="What's the capital of France")]
+        chat_messages = [ChatMessage.from_user("What's the capital of France")]
         component = CohereChatGenerator(generation_kwargs={"temperature": 0.8})
         results = component.run(chat_messages, generation_kwargs={"connectors": [{"id": "web-search"}]})
         assert len(results["replies"]) == 1
@@ -247,7 +227,7 @@ class TestCohereChatGenerator:
                 self.responses += chunk.content if chunk.content else ""
 
         callback = Callback()
-        chat_messages = [ChatMessage.from_user(content="What's the capital of France? answer in a word")]
+        chat_messages = [ChatMessage.from_user("What's the capital of France? answer in a word")]
         component = CohereChatGenerator(streaming_callback=callback)
         results = component.run(chat_messages, generation_kwargs={"connectors": [{"id": "web-search"}]})
 

{cohere_haystack-2.0.1 → cohere_haystack-2.0.2}/tests/test_cohere_generator.py

@@ -78,27 +78,6 @@ class TestCohereGenerator:
             },
         }
 
-    def test_to_dict_with_lambda_streaming_callback(self, monkeypatch):
-        monkeypatch.setenv("COHERE_API_KEY", "test-api-key")
-        component = CohereGenerator(
-            model="command-r",
-            max_tokens=10,
-            some_test_param="test-params",
-            streaming_callback=lambda x: x,
-            api_base_url="test-base-url",
-        )
-        data = component.to_dict()
-        assert data == {
-            "type": "haystack_integrations.components.generators.cohere.generator.CohereGenerator",
-            "init_parameters": {
-                "model": "command-r",
-                "streaming_callback": "tests.test_cohere_generator.<lambda>",
-                "api_base_url": "test-base-url",
-                "api_key": {"type": "env_var", "env_vars": ["COHERE_API_KEY", "CO_API_KEY"], "strict": True},
-                "generation_kwargs": {},
-            },
-        }
-
     def test_from_dict(self, monkeypatch):
         monkeypatch.setenv("COHERE_API_KEY", "fake-api-key")
         monkeypatch.setenv("CO_API_KEY", "fake-api-key")