Merge branch 'main' into fix/2939-sparse-vector-storage

Author: davidsbatista

integrations/cohere/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [integrations/cohere-v8.1.0] - 2026-03-19
+
+### 🚀 Features
+
+- Add list of models supported by Cohere components (#2993)
+
+### 🧹 Chores
+
+- Enable ANN ruff ruleset for cohere integration (#2983)
+
+
 ## [integrations/cohere-v8.0.1] - 2026-03-17
 
 ### 🐛 Bug Fixes

integrations/cohere/src/haystack_integrations/components/embedders/cohere/document_embedder.py

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 from dataclasses import replace
-from typing import Any
+from typing import Any, ClassVar
 
 from haystack import Document, component, default_from_dict, default_to_dict
 from haystack.utils import Secret, deserialize_secrets_inplace
@@ -36,6 +36,16 @@ class CohereDocumentEmbedder:
     ```
     """
 
+    SUPPORTED_MODELS: ClassVar[list[str]] = [
+        "embed-v4.0",
+        "embed-english-v3.0",
+        "embed-english-light-v3.0",
+        "embed-multilingual-v3.0",
+        "embed-multilingual-light-v3.0",
+    ]
+    """A non-exhaustive list of embed models supported by this component.
+    See https://docs.cohere.com/docs/models#embed for the full list."""
+
     def __init__(
         self,
         api_key: Secret = Secret.from_env_var(["COHERE_API_KEY", "CO_API_KEY"]),

integrations/cohere/src/haystack_integrations/components/embedders/cohere/document_image_embedder.py

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 from dataclasses import replace
-from typing import Any
+from typing import Any, ClassVar
 
 from haystack import Document, component, default_from_dict, default_to_dict, logging
 from haystack.components.converters.image.image_utils import (
@@ -59,6 +59,16 @@ class CohereDocumentImageEmbedder:
     ```
     """
 
+    SUPPORTED_MODELS: ClassVar[list[str]] = [
+        "embed-v4.0",
+        "embed-english-v3.0",
+        "embed-english-light-v3.0",
+        "embed-multilingual-v3.0",
+        "embed-multilingual-light-v3.0",
+    ]
+    """A non-exhaustive list of embed models supported by this component.
+    See https://docs.cohere.com/docs/models#embed for the full list."""
+
     def __init__(
         self,
         *,

integrations/cohere/src/haystack_integrations/components/embedders/cohere/text_embedder.py

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2023-present deepset GmbH <info@deepset.ai>
 #
 # SPDX-License-Identifier: Apache-2.0
-from typing import Any
+from typing import Any, ClassVar
 
 from haystack import component, default_from_dict, default_to_dict
 from haystack.utils import Secret, deserialize_secrets_inplace
@@ -32,6 +32,16 @@ class CohereTextEmbedder:
     ```
     """
 
+    SUPPORTED_MODELS: ClassVar[list[str]] = [
+        "embed-v4.0",
+        "embed-english-v3.0",
+        "embed-english-light-v3.0",
+        "embed-multilingual-v3.0",
+        "embed-multilingual-light-v3.0",
+    ]
+    """A non-exhaustive list of embed models supported by this component.
+    See https://docs.cohere.com/docs/models#embed for the full list."""
+
     def __init__(
         self,
         api_key: Secret = Secret.from_env_var(["COHERE_API_KEY", "CO_API_KEY"]),

integrations/cohere/src/haystack_integrations/components/generators/cohere/chat/chat_generator.py

@@ -1,6 +1,6 @@
 import json
 from collections.abc import AsyncIterator, Iterator
-from typing import Any, Literal, get_args
+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
@@ -480,6 +480,24 @@ def weather(city: str) -> str:
     ```
     """
 
+    SUPPORTED_MODELS: ClassVar[list[str]] = [
+        "command-a-03-2025",
+        "command-r7b-12-2024",
+        "command-a-translate-08-2025",
+        "command-a-reasoning-08-2025",
+        "command-a-vision-07-2025",
+        "command-r-08-2024",
+        "command-r-plus-08-2024",
+        "command-r-03-2024",
+        "command-r-plus-04-2024",
+        "command-r-plus",
+        "command-r",
+        "command-light",
+        "command",
+    ]
+    """A non-exhaustive list of chat models supported by this component.
+    See https://docs.cohere.com/docs/models#command for the full list."""
+
     def __init__(
         self,
         api_key: Secret = Secret.from_env_var(["COHERE_API_KEY", "CO_API_KEY"]),

integrations/cohere/src/haystack_integrations/components/generators/cohere/generator.py

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 from collections.abc import Callable
-from typing import Any
+from typing import Any, ClassVar
 
 from haystack import component, logging
 from haystack.dataclasses import ChatMessage
@@ -30,6 +30,24 @@ class CohereGenerator(CohereChatGenerator):
     ```
     """
 
+    SUPPORTED_MODELS: ClassVar[list[str]] = [
+        "command-a-03-2025",
+        "command-r7b-12-2024",
+        "command-a-translate-08-2025",
+        "command-a-reasoning-08-2025",
+        "command-a-vision-07-2025",
+        "command-r-08-2024",
+        "command-r-plus-08-2024",
+        "command-r-03-2024",
+        "command-r-plus-04-2024",
+        "command-r-plus",
+        "command-r",
+        "command-light",
+        "command",
+    ]
+    """A non-exhaustive list of chat models supported by this component.
+    See https://docs.cohere.com/docs/models#command for the full list."""
+
     def __init__(
         self,
         api_key: Secret = Secret.from_env_var(["COHERE_API_KEY", "CO_API_KEY"]),

integrations/cohere/tests/test_chat_generator.py

@@ -148,6 +148,13 @@ def test_multiple_images_in_single_message(self):
 
 
 class TestCohereChatGenerator:
+    def test_supported_models(self) -> None:
+        """SUPPORTED_MODELS is a non-empty list of strings."""
+        models = CohereChatGenerator.SUPPORTED_MODELS
+        assert isinstance(models, list)
+        assert len(models) > 0
+        assert all(isinstance(m, str) for m in models)
+
     def test_init_default(self, monkeypatch):
         monkeypatch.setenv("COHERE_API_KEY", "test-api-key")
 

integrations/cohere/tests/test_document_embedder.py

@@ -15,6 +15,13 @@
 
 
 class TestCohereDocumentEmbedder:
+    def test_supported_models(self) -> None:
+        """SUPPORTED_MODELS is a non-empty list of strings."""
+        models = CohereDocumentEmbedder.SUPPORTED_MODELS
+        assert isinstance(models, list)
+        assert len(models) > 0
+        assert all(isinstance(m, str) for m in models)
+
     def test_init_default(self, monkeypatch):
         monkeypatch.setenv("COHERE_API_KEY", "test-api-key")
         embedder = CohereDocumentEmbedder()

integrations/cohere/tests/test_document_image_embedder.py

@@ -20,6 +20,13 @@
 
 
 class TestCohereDocumentImageEmbedder:
+    def test_supported_models(self) -> None:
+        """SUPPORTED_MODELS is a non-empty list of strings."""
+        models = CohereDocumentImageEmbedder.SUPPORTED_MODELS
+        assert isinstance(models, list)
+        assert len(models) > 0
+        assert all(isinstance(m, str) for m in models)
+
     def test_init_default(self, monkeypatch):
         monkeypatch.setenv("COHERE_API_KEY", "test-api-key")
         embedder = CohereDocumentImageEmbedder()

integrations/cohere/tests/test_generator.py

@@ -15,6 +15,13 @@
 
 
 class TestCohereGenerator:
+    def test_supported_models(self) -> None:
+        """SUPPORTED_MODELS is a non-empty list of strings."""
+        models = CohereGenerator.SUPPORTED_MODELS
+        assert isinstance(models, list)
+        assert len(models) > 0
+        assert all(isinstance(m, str) for m in models)
+
     def test_init_default(self, monkeypatch):
         monkeypatch.setenv("COHERE_API_KEY", "foo")
         component = CohereGenerator()