cohere-haystack 9.2.0__tar.gz → 9.4.0__tar.gz

{cohere_haystack-9.2.0 → cohere_haystack-9.4.0}/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## [integrations/cohere-v9.3.0] - 2026-07-09
+
+### 🧪 Testing
+
+- Guard ToolInvoker imports so chat-generator tests run under Haystack 3.0 (#3535)
+- Fix cohere, amazon_bedrock, mirage, and ollama tests under Haystack 3.0 (#3566)
+
+### 🧹 Chores
+
+- Support sync streaming callbacks in async contexts for Haystack 2.x/3.x compatibility (#3534)
+
+
+## [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_haystack-9.2.0 → cohere_haystack-9.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cohere-haystack
-Version: 9.2.0
+Version: 9.4.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

{cohere_haystack-9.2.0 → cohere_haystack-9.4.0}/src/haystack_integrations/components/generators/cohere/chat/chat_generator.py

@@ -1,3 +1,4 @@
+import inspect
 import json
 from collections.abc import AsyncIterator, Iterator
 from typing import Any, ClassVar, Literal, get_args
@@ -6,7 +7,6 @@ from haystack import component, default_from_dict, default_to_dict, logging
 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,
@@ -275,6 +275,17 @@ def _convert_cohere_chunk_to_streaming_chunk(
             arguments = chunk.delta.message.tool_calls.function.arguments
             tool_calls = [ToolCallDelta(index=global_index, arguments=arguments)]
 
+    elif chunk.type == "citation-start":
+        # Each citation-start chunk carries one Citation object in delta.message.citations.
+        # Collect it here so _parse_streaming_response can aggregate them into the final message
+        # meta, matching the behavior of the non-streaming path which returns citations via
+        # chat_response.message.citations.
+        delta = getattr(chunk, "delta", None)
+        if delta and delta.message:
+            citation = getattr(delta.message, "citations", None)
+            if citation is not None:
+                meta["citations"] = [citation]
+
     elif chunk.type == "message-end":
         finish_reason_raw = getattr(chunk.delta, "finish_reason", None)
         finish_reason = FINISH_REASON_MAPPING.get(finish_reason_raw) if finish_reason_raw else None
@@ -345,13 +356,20 @@ def _parse_streaming_response(
         chunks.append(streaming_chunk)
         streaming_callback(streaming_chunk)
 
-    return _convert_streaming_chunks_to_chat_message(chunks=chunks)
+    message = _convert_streaming_chunks_to_chat_message(chunks=chunks)
+
+    # Aggregate citations collected from citation-start chunks into the message meta,
+    # mirroring the non-streaming path which sets meta["citations"] from chat_response.message.citations.
+    citations = [c for sc in chunks for c in (sc.meta.get("citations") or [])]
+    message.meta["citations"] = citations if citations else None
+
+    return message
 
 
 async def _parse_async_streaming_response(
     response: AsyncIterator[StreamedChatResponseV2],
     model: str,
-    streaming_callback: AsyncStreamingCallbackT,
+    streaming_callback: StreamingCallbackT,
     component_info: ComponentInfo,
 ) -> ChatMessage:
     """
@@ -375,9 +393,17 @@ 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)
+    message = _convert_streaming_chunks_to_chat_message(chunks=chunks)
+
+    citations = [c for sc in chunks for c in (sc.meta.get("citations") or [])]
+    message.meta["citations"] = citations if citations else None
+
+    return message
 
 
 @component

cohere_haystack-9.4.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.2.0 → cohere_haystack-9.4.0}/tests/test_chat_generator.py

@@ -5,7 +5,11 @@ 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,
-                                },
-                            }
-                        ],
                     },
                 }
             },
@@ -742,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.2.0 → cohere_haystack-9.4.0}/tests/test_chat_generator_chunks.py

@@ -358,6 +358,7 @@ class TestCohereChunkConversion:
                 "finish_reason": "tool_calls",
                 "index": 0,
                 "usage": {"prompt_tokens": 60.0, "completion_tokens": 41.0},
+                "citations": None,
             },
         )
 
@@ -406,3 +407,64 @@ class TestCohereChunkConversion:
         result = _convert_cohere_chunk_to_streaming_chunk(chunk=mock_chunk, model="command-r-08-2024")
 
         assert result.meta["usage"] == {"completion_tokens": 0.0, "prompt_tokens": 0.0}
+
+    def test_convert_citation_start_chunk(self):
+        citation = MagicMock()
+        citation.start = 0
+        citation.end = 10
+        citation.text = "Hello world"
+
+        delta_message = MagicMock()
+        delta_message.citations = citation
+
+        delta = MagicMock()
+        delta.message = delta_message
+
+        mock_chunk = MagicMock()
+        mock_chunk.type = "citation-start"
+        mock_chunk.delta = delta
+
+        result = _convert_cohere_chunk_to_streaming_chunk(chunk=mock_chunk, model="command-r-08-2024")
+
+        assert result.content == ""
+        assert result.start is False
+        assert result.tool_calls is None
+        assert result.finish_reason is None
+        assert result.meta["citations"] == [citation]
+
+    def test_parse_streaming_response_with_citations(self):
+        citation = MagicMock()
+        citation.start = 0
+        citation.end = 5
+        citation.text = "Hello"
+
+        delta_message = MagicMock()
+        delta_message.citations = citation
+
+        delta = MagicMock()
+        delta.message = delta_message
+
+        citation_chunk = MagicMock()
+        citation_chunk.type = "citation-start"
+        citation_chunk.delta = delta
+
+        msg_end_chunk = MsgEndStream(
+            type="message-end",
+            delta=MsgEndDelta(
+                finish_reason="COMPLETE",
+                usage=Usage(
+                    billed_units=BilledUnits(input_tokens=5.0, output_tokens=5.0),
+                    tokens=UsageTokens(input_tokens=50.0, output_tokens=20.0),
+                ),
+            ),
+        )
+
+        stream = iter([citation_chunk, msg_end_chunk])
+        chat_message = _parse_streaming_response(
+            stream,
+            model="command-r-08-2024",
+            streaming_callback=lambda _: None,
+            component_info=ComponentInfo(type="type"),
+        )
+
+        assert chat_message.meta["citations"] == [citation]

cohere_haystack-9.2.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"