cohere-haystack 9.1.0__tar.gz → 9.3.0__tar.gz

{cohere_haystack-9.1.0 → cohere_haystack-9.3.0}/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [integrations/cohere-v9.2.0] - 2026-06-05
+
+### 🚀 Features
+
+- Cohere - accept str as ChatGenerator input; deprecate generator (#3395)
+
+### 🧹 Chores
+
+- Cohere - set lower bound pin for Pydantic (#3284)
+
+
+## [integrations/cohere-v9.1.0] - 2026-04-13
+
+### 🚀 Features
+
+- *(cohere)* Add async support to CohereRanker (#3143)
+
+
 ## [integrations/cohere-v9.0.0] - 2026-04-07
 
 ### 🐛 Bug Fixes

{cohere_haystack-9.1.0 → cohere_haystack-9.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cohere-haystack
-Version: 9.1.0
+Version: 9.3.0
 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
@@ -19,7 +19,8 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.10
 Requires-Dist: cohere>=5.17.0
-Requires-Dist: haystack-ai>=2.23.0
+Requires-Dist: haystack-ai>=2.30.0
+Requires-Dist: pydantic>=2.12.0
 Description-Content-Type: text/markdown
 
 # cohere-haystack

{cohere_haystack-9.1.0 → cohere_haystack-9.3.0}/pyproject.toml

@@ -23,7 +23,7 @@ classifiers = [
   "Programming Language :: Python :: Implementation :: CPython",
   "Programming Language :: Python :: Implementation :: PyPy",
 ]
-dependencies = ["haystack-ai>=2.23.0", "cohere>=5.17.0"]
+dependencies = ["haystack-ai>=2.30.0", "cohere>=5.17.0", "pydantic>=2.12.0"]
 
 [project.urls]
 Documentation = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/cohere#readme"

{cohere_haystack-9.1.0 → cohere_haystack-9.3.0}/src/haystack_integrations/components/generators/cohere/chat/chat_generator.py

@@ -1,12 +1,12 @@
+import inspect
 import json
 from collections.abc import AsyncIterator, Iterator
 from typing import Any, ClassVar, Literal, get_args
 
 from haystack import component, default_from_dict, default_to_dict, logging
-from haystack.components.generators.utils import _convert_streaming_chunks_to_chat_message
+from haystack.components.generators.utils import _convert_streaming_chunks_to_chat_message, _normalize_messages
 from haystack.dataclasses import ChatMessage, ComponentInfo, ImageContent, TextContent, ToolCall
 from haystack.dataclasses.streaming_chunk import (
-    AsyncStreamingCallbackT,
     FinishReason,
     StreamingCallbackT,
     StreamingChunk,
@@ -351,7 +351,7 @@ def _parse_streaming_response(
 async def _parse_async_streaming_response(
     response: AsyncIterator[StreamedChatResponseV2],
     model: str,
-    streaming_callback: AsyncStreamingCallbackT,
+    streaming_callback: StreamingCallbackT,
     component_info: ComponentInfo,
 ) -> ChatMessage:
     """
@@ -375,7 +375,10 @@ async def _parse_async_streaming_response(
 
         original_chunks.append(chunk)
         chunks.append(streaming_chunk)
-        await streaming_callback(streaming_chunk)
+        # sync callbacks are allowed in async contexts with Haystack >= 3.0, so only await async ones
+        callback_result = streaming_callback(streaming_chunk)
+        if inspect.isawaitable(callback_result):
+            await callback_result
 
     return _convert_streaming_chunks_to_chat_message(chunks=chunks)
 
@@ -616,7 +619,7 @@ class CohereChatGenerator:
     @component.output_types(replies=list[ChatMessage])
     def run(
         self,
-        messages: list[ChatMessage],
+        messages: list[ChatMessage] | str,
         generation_kwargs: dict[str, Any] | None = None,
         tools: ToolsType | None = None,
         streaming_callback: StreamingCallbackT | None = None,
@@ -625,6 +628,7 @@ class CohereChatGenerator:
         Invoke the chat endpoint based on the provided messages and generation parameters.
 
         :param messages: list of `ChatMessage` instances representing the input messages.
+            If a string is provided, it is converted to a list containing a ChatMessage with user role.
         :param generation_kwargs: additional keyword arguments for chat generation. These parameters will
             potentially override the parameters passed in the __init__ method.
             For more details on the parameters supported by the Cohere API, refer to the
@@ -637,6 +641,7 @@ class CohereChatGenerator:
         :returns: A dictionary with the following keys:
             - `replies`: a list of `ChatMessage` instances representing the generated responses.
         """
+        messages = _normalize_messages(messages)
 
         # update generation kwargs by merging with the generation kwargs passed to the run method
         generation_kwargs = {**self.generation_kwargs, **(generation_kwargs or {})}
@@ -682,7 +687,7 @@ class CohereChatGenerator:
     @component.output_types(replies=list[ChatMessage])
     async def run_async(
         self,
-        messages: list[ChatMessage],
+        messages: list[ChatMessage] | str,
         generation_kwargs: dict[str, Any] | None = None,
         tools: ToolsType | None = None,
         streaming_callback: StreamingCallbackT | None = None,
@@ -691,6 +696,7 @@ class CohereChatGenerator:
         Asynchronously invoke the chat endpoint based on the provided messages and generation parameters.
 
         :param messages: list of `ChatMessage` instances representing the input messages.
+            If a string is provided, it is converted to a list containing a ChatMessage with user role.
         :param generation_kwargs: additional keyword arguments for chat generation. These parameters will
             potentially override the parameters passed in the __init__ method.
             For more details on the parameters supported by the Cohere API, refer to the
@@ -701,6 +707,7 @@ class CohereChatGenerator:
         :returns: A dictionary with the following keys:
             - `replies`: a list of `ChatMessage` instances representing the generated responses.
         """
+        messages = _normalize_messages(messages)
 
         # update generation kwargs by merging with the generation kwargs passed to the run method
         generation_kwargs = {**self.generation_kwargs, **(generation_kwargs or {})}

{cohere_haystack-9.1.0 → cohere_haystack-9.3.0}/src/haystack_integrations/components/generators/cohere/generator.py

@@ -1,6 +1,7 @@
 # SPDX-FileCopyrightText: 2023-present deepset GmbH <info@deepset.ai>
 #
 # SPDX-License-Identifier: Apache-2.0
+import warnings
 from collections.abc import Callable
 from typing import Any, ClassVar
 
@@ -70,6 +71,12 @@ class CohereGenerator(CohereChatGenerator):
             You can check them in model's documentation.
         """
 
+        warnings.warn(
+            "The `CohereGenerator` component is deprecated and will be removed in a future version. "
+            "Use `CohereChatGenerator` instead, which now also supports string inputs.",
+            FutureWarning,
+            stacklevel=2,
+        )
         # from_dict deserialization, where `generation_kwargs` is in **kwargs
         if "generation_kwargs" in kwargs:
             generation_kwargs = kwargs.pop("generation_kwargs")

cohere_haystack-9.3.0/tests/conftest.py

@@ -0,0 +1,18 @@
+from pathlib import Path
+
+import pytest
+
+
+@pytest.fixture()
+def test_files_path():
+    return Path(__file__).parent / "test_files"
+
+
+@pytest.fixture(autouse=True)
+def allow_deserialization_of_test_modules(monkeypatch):
+    """
+    haystack-ai >= 3.0 refuses to deserialize classes and callables from modules outside its
+    trusted-module allowlist. Tools and callbacks defined in the test modules live outside that
+    allowlist, so trust them explicitly; haystack-ai 2.x ignores this environment variable.
+    """
+    monkeypatch.setenv("HAYSTACK_DESERIALIZATION_ALLOWLIST", "tests,test_*")

{cohere_haystack-9.1.0 → cohere_haystack-9.3.0}/tests/test_chat_generator.py

@@ -1,11 +1,15 @@
 import os
-from unittest.mock import MagicMock
+from unittest.mock import AsyncMock, MagicMock
 
 import pytest
 from cohere.core import ApiError
 from haystack import Pipeline
 from haystack.components.generators.utils import print_streaming_chunk
-from haystack.components.tools import ToolInvoker
+
+try:
+    from haystack.components.tools import ToolInvoker
+except ImportError:  # ToolInvoker was removed in Haystack 3.0
+    ToolInvoker = None
 from haystack.dataclasses import ChatMessage, ChatRole, ImageContent, ToolCall
 from haystack.dataclasses.streaming_chunk import StreamingChunk
 from haystack.tools import Tool, Toolset
@@ -337,6 +341,11 @@ class TestCohereChatGenerator:
 
         pipeline_dict = pipeline.to_dict()
 
+        # the Tool serialization format is owned by haystack-ai and varies across its versions; the
+        # dumps/loads round-trip below covers the tools, so exclude them from the pinned-dict comparison
+        tools_entries = pipeline_dict["components"]["generator"]["init_parameters"].pop("tools")
+        assert len(tools_entries) == 1
+
         expected_dict = {
             "metadata": {},
             "max_runs_per_component": 100,
@@ -352,20 +361,6 @@ class TestCohereChatGenerator:
                         "generation_kwargs": {"temperature": 0.7},
                         "timeout": None,
                         "max_retries": None,
-                        "tools": [
-                            {
-                                "type": "haystack.tools.tool.Tool",
-                                "data": {
-                                    "name": "weather",
-                                    "description": "useful to determine the weather in a given location",
-                                    "parameters": {"city": {"type": "string"}},
-                                    "function": "tests.test_chat_generator.weather",
-                                    "outputs_to_string": tool.outputs_to_string,
-                                    "inputs_from_state": tool.inputs_from_state,
-                                    "outputs_to_state": tool.outputs_to_state,
-                                },
-                            }
-                        ],
                     },
                 }
             },
@@ -498,6 +493,59 @@ class TestCohereChatGenerator:
         assert multimodal_msg["content"][0]["type"] == "text"
         assert multimodal_msg["content"][1]["type"] == "image_url"
 
+    def test_run_with_string_input(self):
+        """Test that a string input is converted to a user ChatMessage before sending to the API."""
+        generator = CohereChatGenerator(api_key=Secret.from_token("test-api-key"))
+
+        mock_response = MagicMock()
+        mock_response.message.content = [MagicMock()]
+        mock_response.message.content[0].text = "Paris"
+        mock_response.message.content[0].type = "text"
+        mock_response.message.tool_calls = None
+        mock_response.finish_reason = "COMPLETE"
+        mock_response.usage = None
+
+        generator.client.chat = MagicMock(return_value=mock_response)
+
+        result = generator.run("What's the capital of France?")
+
+        generator.client.chat.assert_called_once()
+        call_args = generator.client.chat.call_args
+        sent_messages = call_args[1]["messages"]
+
+        assert len(sent_messages) == 1
+        assert sent_messages[0]["role"] == "user"
+        assert isinstance(result["replies"], list)
+        assert len(result["replies"]) == 1
+        assert isinstance(result["replies"][0], ChatMessage)
+
+    @pytest.mark.asyncio
+    async def test_run_async_with_string_input(self):
+        """Test that a string input is converted to a user ChatMessage before sending to the async API."""
+        generator = CohereChatGenerator(api_key=Secret.from_token("test-api-key"))
+
+        mock_response = MagicMock()
+        mock_response.message.content = [MagicMock()]
+        mock_response.message.content[0].text = "Paris"
+        mock_response.message.content[0].type = "text"
+        mock_response.message.tool_calls = None
+        mock_response.finish_reason = "COMPLETE"
+        mock_response.usage = None
+
+        generator.async_client.chat = AsyncMock(return_value=mock_response)
+
+        result = await generator.run_async("What's the capital of France?")
+
+        generator.async_client.chat.assert_called_once()
+        call_args = generator.async_client.chat.call_args
+        sent_messages = call_args[1]["messages"]
+
+        assert len(sent_messages) == 1
+        assert sent_messages[0]["role"] == "user"
+        assert isinstance(result["replies"], list)
+        assert len(result["replies"]) == 1
+        assert isinstance(result["replies"][0], ChatMessage)
+
 
 @pytest.mark.skipif(
     not os.environ.get("COHERE_API_KEY", None) and not os.environ.get("CO_API_KEY", None),
@@ -689,6 +737,7 @@ class TestCohereChatGeneratorInference:
         assert len(final_message.text) > 0
         assert "paris" in final_message.text.lower()
 
+    @pytest.mark.skipif(ToolInvoker is None, reason="ToolInvoker is not available in the installed haystack-ai version")
     def test_pipeline_with_cohere_chat_generator(self):
         """
         Test that the CohereChatGenerator component can be used in a pipeline

cohere_haystack-9.1.0/tests/conftest.py

@@ -1,8 +0,0 @@
-from pathlib import Path
-
-import pytest
-
-
-@pytest.fixture()
-def test_files_path():
-    return Path(__file__).parent / "test_files"