Add cohere suffix dirs

deepset-ai · Jan 19, 2024 · 0c23ff6 · 0c23ff6
1 parent e935a1c
commit 0c23ff6
Show file tree

Hide file tree

Showing 17 changed files with 327 additions and 23 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/haystack-core-integrations.iml b/.idea/haystack-core-integrations.iml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/...grations/components/embedders/__init__.py → ...s/components/embedders/cohere/__init__.py b/...grations/components/embedders/__init__.py → ...s/components/embedders/cohere/__init__.py
diff --git a/...components/embedders/document_embedder.py → ...nts/embedders/cohere/document_embedder.py b/...components/embedders/document_embedder.py → ...nts/embedders/cohere/document_embedder.py
@@ -5,9 +5,10 @@
 import os
 from typing import Any, Dict, List, Optional
 
-from cohere import COHERE_API_URL, AsyncClient, Client
 from haystack import Document, component, default_to_dict
-from haystack_integrations.components.embedders.utils import get_async_response, get_response
+from haystack_integrations.components.embedders.cohere.utils import get_async_response, get_response
+
+from cohere import COHERE_API_URL, AsyncClient, Client
 
 
 @component

diff --git a/...ons/components/embedders/text_embedder.py → ...ponents/embedders/cohere/text_embedder.py b/...ons/components/embedders/text_embedder.py → ...ponents/embedders/cohere/text_embedder.py
@@ -5,9 +5,10 @@
 import os
 from typing import Any, Dict, List, Optional
 
-from cohere import COHERE_API_URL, AsyncClient, Client
 from haystack import component, default_to_dict
-from haystack_integrations.components.embedders.utils import get_async_response, get_response
+from haystack_integrations.components.embedders.cohere.utils import get_async_response, get_response
+
+from cohere import COHERE_API_URL, AsyncClient, Client
 
 
 @component

diff --git a/...ntegrations/components/embedders/utils.py → ...ions/components/embedders/cohere/utils.py b/...ntegrations/components/embedders/utils.py → ...ions/components/embedders/cohere/utils.py
@@ -3,9 +3,10 @@
 # SPDX-License-Identifier: Apache-2.0
 from typing import Any, Dict, List, Tuple
 
-from cohere import AsyncClient, Client, CohereError
 from tqdm import tqdm
 
+from cohere import AsyncClient, Client, CohereError
+
 
 async def get_async_response(cohere_async_client: AsyncClient, texts: List[str], model_name, input_type, truncate):
     all_embeddings: List[List[float]] = []

diff --git a/...rations/components/generators/__init__.py → .../components/generators/cohere/__init__.py b/...rations/components/generators/__init__.py → .../components/generators/cohere/__init__.py
diff --git a/...ns/components/generators/chat/__init__.py → ...onents/generators/cohere/chat/__init__.py b/...ns/components/generators/chat/__init__.py → ...onents/generators/cohere/chat/__init__.py
diff --git a/...ponents/generators/chat/chat_generator.py → .../generators/cohere/chat/chat_generator.py b/...ponents/generators/chat/chat_generator.py → .../generators/cohere/chat/chat_generator.py
diff --git a/...ations/components/generators/generator.py → ...components/generators/cohere/generator.py b/...ations/components/generators/generator.py → ...components/generators/cohere/generator.py
@@ -6,9 +6,10 @@
 import sys
 from typing import Any, Callable, Dict, List, Optional, cast
 
+from haystack import DeserializationError, component, default_from_dict, default_to_dict
+
 from cohere import COHERE_API_URL, Client
 from cohere.responses import Generations
-from haystack import DeserializationError, component, default_from_dict, default_to_dict
 
 logger = logging.getLogger(__name__)
 

diff --git a/integrations/cohere/tests/test_cohere_chat_generator.py b/integrations/cohere/tests/test_cohere_chat_generator.py
@@ -5,7 +5,7 @@
 import pytest
 from haystack.components.generators.utils import default_streaming_callback
 from haystack.dataclasses import ChatMessage, ChatRole, StreamingChunk
-from haystack_integrations.components.generators.chat import CohereChatGenerator
+from haystack_integrations.components.generators.cohere.chat import CohereChatGenerator
 
 pytestmark = pytest.mark.chat_generators
 
@@ -87,7 +87,7 @@ def test_to_dict_default(self):
         component = CohereChatGenerator(api_key="test-api-key")
         data = component.to_dict()
         assert data == {
-            "type": "haystack_integrations.components.generators.chat.chat_generator.CohereChatGenerator",
+            "type": "haystack_integrations.components.generators.cohere.chat.chat_generator.CohereChatGenerator",
             "init_parameters": {
                 "model": "command",
                 "streaming_callback": None,
@@ -107,7 +107,7 @@ def test_to_dict_with_parameters(self):
         )
         data = component.to_dict()
         assert data == {
-            "type": "haystack_integrations.components.generators.chat.chat_generator.CohereChatGenerator",
+            "type": "haystack_integrations.components.generators.cohere.chat.chat_generator.CohereChatGenerator",
             "init_parameters": {
                 "model": "command-nightly",
                 "streaming_callback": "haystack.components.generators.utils.default_streaming_callback",
@@ -127,7 +127,7 @@ def test_to_dict_with_lambda_streaming_callback(self):
         )
         data = component.to_dict()
         assert data == {
-            "type": "haystack_integrations.components.generators.chat.chat_generator.CohereChatGenerator",
+            "type": "haystack_integrations.components.generators.cohere.chat.chat_generator.CohereChatGenerator",
             "init_parameters": {
                 "model": "command",
                 "api_base_url": "test-base-url",
@@ -140,7 +140,7 @@ def test_to_dict_with_lambda_streaming_callback(self):
     def test_from_dict(self, monkeypatch):
         monkeypatch.setenv("COHERE_API_KEY", "fake-api-key")
         data = {
-            "type": "haystack_integrations.components.generators.chat.chat_generator.CohereChatGenerator",
+            "type": "haystack_integrations.components.generators.cohere.chat.chat_generator.CohereChatGenerator",
             "init_parameters": {
                 "model": "command",
                 "api_base_url": "test-base-url",
@@ -158,7 +158,7 @@ def test_from_dict(self, monkeypatch):
     def test_from_dict_fail_wo_env_var(self, monkeypatch):
         monkeypatch.delenv("COHERE_API_KEY", raising=False)
         data = {
-            "type": "haystack_integrations.components.generators.chat.chat_generator.CohereChatGenerator",
+            "type": "haystack_integrations.components.generators.cohere.chat.chat_generator.CohereChatGenerator",
             "init_parameters": {
                 "model": "command",
                 "api_base_url": "test-base-url",

diff --git a/integrations/cohere/tests/test_cohere_generators.py b/integrations/cohere/tests/test_cohere_generators.py
@@ -5,7 +5,7 @@
 
 import pytest
 from cohere import COHERE_API_URL
-from haystack_integrations.components.generators import CohereGenerator
+from haystack_integrations.components.generators.cohere import CohereGenerator
 
 pytestmark = pytest.mark.generators
 
@@ -47,7 +47,7 @@ def test_to_dict_default(self):
         component = CohereGenerator(api_key="test-api-key")
         data = component.to_dict()
         assert data == {
-            "type": "haystack_integrations.components.generators.generator.CohereGenerator",
+            "type": "haystack_integrations.components.generators.cohere.generator.CohereGenerator",
             "init_parameters": {
                 "model": "command",
                 "streaming_callback": None,
@@ -66,7 +66,7 @@ def test_to_dict_with_parameters(self):
         )
         data = component.to_dict()
         assert data == {
-            "type": "haystack_integrations.components.generators.generator.CohereGenerator",
+            "type": "haystack_integrations.components.generators.cohere.generator.CohereGenerator",
             "init_parameters": {
                 "model": "command-light",
                 "max_tokens": 10,
@@ -87,7 +87,7 @@ def test_to_dict_with_lambda_streaming_callback(self):
         )
         data = component.to_dict()
         assert data == {
-            "type": "haystack_integrations.components.generators.generator.CohereGenerator",
+            "type": "haystack_integrations.components.generators.cohere.generator.CohereGenerator",
             "init_parameters": {
                 "model": "command",
                 "streaming_callback": "tests.test_cohere_generators.<lambda>",
@@ -100,7 +100,7 @@ def test_to_dict_with_lambda_streaming_callback(self):
     def test_from_dict(self, monkeypatch):
         monkeypatch.setenv("COHERE_API_KEY", "test-key")
         data = {
-            "type": "haystack_integrations.components.generators.generator.CohereGenerator",
+            "type": "haystack_integrations.components.generators.cohere.generator.CohereGenerator",
             "init_parameters": {
                 "model": "command",
                 "max_tokens": 10,

diff --git a/integrations/cohere/tests/test_document_embedder.py b/integrations/cohere/tests/test_document_embedder.py
@@ -6,7 +6,7 @@
 import pytest
 from cohere import COHERE_API_URL
 from haystack import Document
-from haystack_integrations.components.embedders import CohereDocumentEmbedder
+from haystack_integrations.components.embedders.cohere import CohereDocumentEmbedder
 
 pytestmark = pytest.mark.embedders
 
@@ -59,7 +59,7 @@ def test_to_dict(self):
         embedder_component = CohereDocumentEmbedder(api_key="test-api-key")
         component_dict = embedder_component.to_dict()
         assert component_dict == {
-            "type": "haystack_integrations.components.embedders.document_embedder.CohereDocumentEmbedder",
+            "type": "haystack_integrations.components.embedders.cohere.document_embedder.CohereDocumentEmbedder",
             "init_parameters": {
                 "model": "embed-english-v2.0",
                 "input_type": "search_document",
@@ -92,7 +92,7 @@ def test_to_dict_with_custom_init_parameters(self):
         )
         component_dict = embedder_component.to_dict()
         assert component_dict == {
-            "type": "haystack_integrations.components.embedders.document_embedder.CohereDocumentEmbedder",
+            "type": "haystack_integrations.components.embedders.cohere.document_embedder.CohereDocumentEmbedder",
             "init_parameters": {
                 "model": "embed-multilingual-v2.0",
                 "input_type": "search_query",

diff --git a/integrations/cohere/tests/test_text_embedder.py b/integrations/cohere/tests/test_text_embedder.py
@@ -5,7 +5,7 @@
 
 import pytest
 from cohere import COHERE_API_URL
-from haystack_integrations.components.embedders import CohereTextEmbedder
+from haystack_integrations.components.embedders.cohere import CohereTextEmbedder
 
 pytestmark = pytest.mark.embedders
 
@@ -56,7 +56,7 @@ def test_to_dict(self):
         embedder_component = CohereTextEmbedder(api_key="test-api-key")
         component_dict = embedder_component.to_dict()
         assert component_dict == {
-            "type": "haystack_integrations.components.embedders.text_embedder.CohereTextEmbedder",
+            "type": "haystack_integrations.components.embedders.cohere.text_embedder.CohereTextEmbedder",
             "init_parameters": {
                 "model": "embed-english-v2.0",
                 "input_type": "search_query",
@@ -84,7 +84,7 @@ def test_to_dict_with_custom_init_parameters(self):
         )
         component_dict = embedder_component.to_dict()
         assert component_dict == {
-            "type": "haystack_integrations.components.embedders.text_embedder.CohereTextEmbedder",
+            "type": "haystack_integrations.components.embedders.cohere.text_embedder.CohereTextEmbedder",
             "init_parameters": {
                 "model": "embed-multilingual-v2.0",
                 "input_type": "classification",