cohere-haystack 9.4.1__tar.gz → 9.5.0__tar.gz

{cohere_haystack-9.4.1 → cohere_haystack-9.5.0}/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## [unreleased]
+
+
 ## [integrations/cohere-v9.4.0] - 2026-07-22
 
 ### 🐛 Bug Fixes

{cohere_haystack-9.4.1 → cohere_haystack-9.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cohere-haystack
-Version: 9.4.1
+Version: 9.5.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.4.1 → cohere_haystack-9.5.0}/pyproject.toml

@@ -131,6 +131,7 @@ ignore = [
   "PLR0912",
   "PLR0913",
   "PLR0915",
+  "PLR0917",
   # Misc
   "B008",
   "S101",

{cohere_haystack-9.4.1 → cohere_haystack-9.5.0}/src/haystack_integrations/components/rankers/cohere/ranker.py

@@ -54,7 +54,13 @@ class CohereRanker:
         :param meta_data_separator: Separator used to concatenate the meta fields
             to the Document content.
         :param max_tokens_per_doc: The maximum number of tokens to embed for each document defaults to 4096.
+
+        :raises ValueError: If `top_k` is not > 0.
         """
+        if top_k <= 0:
+            msg = f"top_k must be > 0, but got {top_k}"
+            raise ValueError(msg)
+
         self.model_name = model
         self.api_key = api_key
         self.api_base_url = api_base_url
@@ -116,10 +122,10 @@ class CohereRanker:
         :return: A tuple of (list of strings to be given as input to Cohere model, resolved top_k).
         :raises ValueError: If `top_k` is not > 0.
         """
-        top_k = top_k or self.top_k
-        if top_k <= 0:
+        if top_k is not None and top_k <= 0:
             msg = f"top_k must be > 0, but got {top_k}"
             raise ValueError(msg)
+        top_k = self.top_k if top_k is None else top_k
 
         concatenated_input_list = []
         for doc in documents:

{cohere_haystack-9.4.1 → cohere_haystack-9.5.0}/tests/test_ranker.py

@@ -248,36 +248,39 @@ class TestCohereRanker:
         assert texts == []
         assert top_k == 10
 
-    def test_run_negative_topk_in_init(self, monkeypatch):
+    def test_init_negative_topk(self, monkeypatch):
         monkeypatch.setenv("CO_API_KEY", "test-api-key")
-        ranker = CohereRanker(top_k=-2)
-        query = "test"
-        documents = [Document(content="doc1"), Document(content="doc2"), Document(content="doc3")]
-        with pytest.raises(ValueError, match=r"top_k must be > 0, but got *"):
-            ranker.run(query, documents)
+        with pytest.raises(ValueError, match=r"top_k must be > 0, but got -2"):
+            CohereRanker(top_k=-2)
 
-    def test_run_zero_topk_in_init(self, monkeypatch):
+    def test_init_zero_topk(self, monkeypatch):
         monkeypatch.setenv("CO_API_KEY", "test-api-key")
-        ranker = CohereRanker(top_k=0)
-        query = "test"
-        documents = [Document(content="doc1"), Document(content="doc2"), Document(content="doc3")]
-        with pytest.raises(ValueError, match=r"top_k must be > 0, but got *"):
-            ranker.run(query, documents)
+        with pytest.raises(ValueError, match=r"top_k must be > 0, but got 0"):
+            CohereRanker(top_k=0)
 
     def test_run_negative_topk_in_run(self, monkeypatch):
         monkeypatch.setenv("CO_API_KEY", "test-api-key")
         ranker = CohereRanker()
         query = "test"
         documents = [Document(content="doc1"), Document(content="doc2"), Document(content="doc3")]
-        with pytest.raises(ValueError, match=r"top_k must be > 0, but got *"):
+        with pytest.raises(ValueError, match=r"top_k must be > 0, but got -3"):
             ranker.run(query, documents, -3)
 
-    def test_run_zero_topk_in_run_and_init(self, monkeypatch):
+    def test_run_zero_topk_in_run(self, monkeypatch):
+        monkeypatch.setenv("CO_API_KEY", "test-api-key")
+        ranker = CohereRanker()
+        query = "test"
+        documents = [Document(content="doc1"), Document(content="doc2"), Document(content="doc3")]
+        with pytest.raises(ValueError, match=r"top_k must be > 0, but got 0"):
+            ranker.run(query, documents, 0)
+
+    def test_run_zero_topk_does_not_fall_back_to_instance_topk(self, monkeypatch):
+        # a runtime top_k=0 must raise, not silently fall back to the instance top_k
         monkeypatch.setenv("CO_API_KEY", "test-api-key")
-        ranker = CohereRanker(top_k=0)
+        ranker = CohereRanker(top_k=5)
         query = "test"
         documents = [Document(content="doc1"), Document(content="doc2"), Document(content="doc3")]
-        with pytest.raises(ValueError, match=r"top_k must be > 0, but got *"):
+        with pytest.raises(ValueError, match=r"top_k must be > 0, but got 0"):
             ranker.run(query, documents, 0)
 
     def test_run_documents_provided(self, monkeypatch, mock_ranker_response):  # noqa: ARG002
@@ -360,11 +363,21 @@ class TestCohereRanker:
     @pytest.mark.asyncio
     async def test_run_async_negative_topk(self, monkeypatch):
         monkeypatch.setenv("CO_API_KEY", "test-api-key")
-        ranker = CohereRanker(top_k=-2)
+        ranker = CohereRanker()
+        query = "test"
+        documents = [Document(content="doc1"), Document(content="doc2"), Document(content="doc3")]
+        with pytest.raises(ValueError, match=r"top_k must be > 0, but got -3"):
+            await ranker.run_async(query, documents, -3)
+
+    @pytest.mark.asyncio
+    async def test_run_async_zero_topk_does_not_fall_back_to_instance_topk(self, monkeypatch):
+        # a runtime top_k=0 must raise, not silently fall back to the instance top_k
+        monkeypatch.setenv("CO_API_KEY", "test-api-key")
+        ranker = CohereRanker(top_k=5)
         query = "test"
         documents = [Document(content="doc1"), Document(content="doc2"), Document(content="doc3")]
-        with pytest.raises(ValueError, match=r"top_k must be > 0, but got *"):
-            await ranker.run_async(query, documents)
+        with pytest.raises(ValueError, match=r"top_k must be > 0, but got 0"):
+            await ranker.run_async(query, documents, 0)
 
     @pytest.mark.skipif(
         not os.environ.get("COHERE_API_KEY", None) and not os.environ.get("CO_API_KEY", None),