From 80bf57b333c3789a46e5ff987c480fe5d5f6f95a Mon Sep 17 00:00:00 2001 From: Vladimir Blagojevic Date: Fri, 19 Jan 2024 14:18:46 +0100 Subject: [PATCH 1/9] Reorganize cohere integration project layout, adjust pyproject.toml --- .idea/workspace.xml | 83 +++++++++++++++++++ integrations/__init__.py | 0 integrations/cohere/pyproject.toml | 19 +++-- .../components/embedders/__init__.py | 7 ++ .../embedders/document_embedder.py | 0 .../components}/embedders/text_embedder.py | 0 .../components}/embedders/utils.py | 0 .../components/generators}/__init__.py | 3 + .../components/generators/chat}/__init__.py | 3 + .../generators}/chat/chat_generator.py | 0 .../components/generators}/generator.py | 0 .../tests/test_cohere_chat_generator.py | 2 +- .../cohere/tests/test_cohere_generators.py | 2 +- .../cohere/tests/test_document_embedder.py | 2 +- .../cohere/tests/test_text_embedder.py | 2 +- 15 files changed, 110 insertions(+), 13 deletions(-) create mode 100644 .idea/workspace.xml create mode 100644 integrations/__init__.py create mode 100644 integrations/cohere/src/haystack_integrations/components/embedders/__init__.py rename integrations/cohere/src/{cohere_haystack => haystack_integrations/components}/embedders/document_embedder.py (100%) rename integrations/cohere/src/{cohere_haystack => haystack_integrations/components}/embedders/text_embedder.py (100%) rename integrations/cohere/src/{cohere_haystack => haystack_integrations/components}/embedders/utils.py (100%) rename integrations/cohere/src/{cohere_haystack => haystack_integrations/components/generators}/__init__.py (61%) rename integrations/cohere/src/{cohere_haystack/embedders => haystack_integrations/components/generators/chat}/__init__.py (57%) rename integrations/cohere/src/{cohere_haystack => haystack_integrations/components/generators}/chat/chat_generator.py (100%) rename integrations/cohere/src/{cohere_haystack => haystack_integrations/components/generators}/generator.py (100%) diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 000000000..6b39e9d5b --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1705668709226 + + + + \ No newline at end of file diff --git a/integrations/__init__.py b/integrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/integrations/cohere/pyproject.toml b/integrations/cohere/pyproject.toml index ae96f114d..42349d9fb 100644 --- a/integrations/cohere/pyproject.toml +++ b/integrations/cohere/pyproject.toml @@ -34,6 +34,9 @@ Documentation = "https://github.com/deepset-ai/haystack-core-integrations/tree/m Issues = "https://github.com/deepset-ai/haystack-core-integrations/issues" Source = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/cohere" +[tool.hatch.build.targets.wheel] +packages = ["src/haystack_integrations"] + [tool.hatch.version] source = "vcs" tag-pattern = 'integrations\/cohere-v(?P.*)' @@ -70,7 +73,7 @@ dependencies = [ "ruff>=0.0.243", ] [tool.hatch.envs.lint.scripts] -typing = "mypy --install-types --non-interactive {args:src/cohere_haystack tests}" +typing = "mypy --install-types --non-interactive --explicit-package-bases {args:src/ tests}" style = [ "ruff {args:.}", "black --check --diff {args:.}", @@ -133,26 +136,23 @@ unfixable = [ ] [tool.ruff.isort] -known-first-party = ["cohere_haystack"] +known-first-party = ["src"] [tool.ruff.flake8-tidy-imports] -ban-relative-imports = "all" +ban-relative-imports = "parents" [tool.ruff.per-file-ignores] # Tests can use magic values, assertions, and relative imports "tests/**/*" = ["PLR2004", "S101", "TID252"] [tool.coverage.run] -source_pkgs = ["cohere_haystack", "tests"] +source_pkgs = ["src", "tests"] branch = true parallel = true -omit = [ - "src/cohere_haystack/__about__.py", -] [tool.coverage.paths] -cohere_haystack = ["src/cohere_haystack", "*/cohere-haystack/src/cohere_haystack"] -tests = ["tests", "*/cohere-haystack/tests"] +cohere_haystack = ["src/haystack_integrations", "*/cohere/src/haystack_integrations"] +tests = ["tests", "*/cohere/tests"] [tool.coverage.report] exclude_lines = [ @@ -165,6 +165,7 @@ exclude_lines = [ module = [ "cohere.*", "haystack.*", + "haystack_integrations.*", "pytest.*", "numpy.*", ] diff --git a/integrations/cohere/src/haystack_integrations/components/embedders/__init__.py b/integrations/cohere/src/haystack_integrations/components/embedders/__init__.py new file mode 100644 index 000000000..c4546eb30 --- /dev/null +++ b/integrations/cohere/src/haystack_integrations/components/embedders/__init__.py @@ -0,0 +1,7 @@ +# SPDX-FileCopyrightText: 2023-present deepset GmbH +# +# SPDX-License-Identifier: Apache-2.0 +from .document_embedder import CohereDocumentEmbedder +from .text_embedder import CohereTextEmbedder + +__all__ = ["CohereDocumentEmbedder", "CohereTextEmbedder"] \ No newline at end of file diff --git a/integrations/cohere/src/cohere_haystack/embedders/document_embedder.py b/integrations/cohere/src/haystack_integrations/components/embedders/document_embedder.py similarity index 100% rename from integrations/cohere/src/cohere_haystack/embedders/document_embedder.py rename to integrations/cohere/src/haystack_integrations/components/embedders/document_embedder.py diff --git a/integrations/cohere/src/cohere_haystack/embedders/text_embedder.py b/integrations/cohere/src/haystack_integrations/components/embedders/text_embedder.py similarity index 100% rename from integrations/cohere/src/cohere_haystack/embedders/text_embedder.py rename to integrations/cohere/src/haystack_integrations/components/embedders/text_embedder.py diff --git a/integrations/cohere/src/cohere_haystack/embedders/utils.py b/integrations/cohere/src/haystack_integrations/components/embedders/utils.py similarity index 100% rename from integrations/cohere/src/cohere_haystack/embedders/utils.py rename to integrations/cohere/src/haystack_integrations/components/embedders/utils.py diff --git a/integrations/cohere/src/cohere_haystack/__init__.py b/integrations/cohere/src/haystack_integrations/components/generators/__init__.py similarity index 61% rename from integrations/cohere/src/cohere_haystack/__init__.py rename to integrations/cohere/src/haystack_integrations/components/generators/__init__.py index e873bc332..0a6808be5 100644 --- a/integrations/cohere/src/cohere_haystack/__init__.py +++ b/integrations/cohere/src/haystack_integrations/components/generators/__init__.py @@ -1,3 +1,6 @@ # SPDX-FileCopyrightText: 2023-present deepset GmbH # # SPDX-License-Identifier: Apache-2.0 +from .generator import CohereGenerator + +__all__ = ["CohereGenerator"] \ No newline at end of file diff --git a/integrations/cohere/src/cohere_haystack/embedders/__init__.py b/integrations/cohere/src/haystack_integrations/components/generators/chat/__init__.py similarity index 57% rename from integrations/cohere/src/cohere_haystack/embedders/__init__.py rename to integrations/cohere/src/haystack_integrations/components/generators/chat/__init__.py index e873bc332..b56dd2e15 100644 --- a/integrations/cohere/src/cohere_haystack/embedders/__init__.py +++ b/integrations/cohere/src/haystack_integrations/components/generators/chat/__init__.py @@ -1,3 +1,6 @@ # SPDX-FileCopyrightText: 2023-present deepset GmbH # # SPDX-License-Identifier: Apache-2.0 +from .chat_generator import CohereChatGenerator + +__all__ = ["CohereChatGenerator"] \ No newline at end of file diff --git a/integrations/cohere/src/cohere_haystack/chat/chat_generator.py b/integrations/cohere/src/haystack_integrations/components/generators/chat/chat_generator.py similarity index 100% rename from integrations/cohere/src/cohere_haystack/chat/chat_generator.py rename to integrations/cohere/src/haystack_integrations/components/generators/chat/chat_generator.py diff --git a/integrations/cohere/src/cohere_haystack/generator.py b/integrations/cohere/src/haystack_integrations/components/generators/generator.py similarity index 100% rename from integrations/cohere/src/cohere_haystack/generator.py rename to integrations/cohere/src/haystack_integrations/components/generators/generator.py diff --git a/integrations/cohere/tests/test_cohere_chat_generator.py b/integrations/cohere/tests/test_cohere_chat_generator.py index e93db51fd..962513798 100644 --- a/integrations/cohere/tests/test_cohere_chat_generator.py +++ b/integrations/cohere/tests/test_cohere_chat_generator.py @@ -6,7 +6,7 @@ from haystack.components.generators.utils import default_streaming_callback from haystack.dataclasses import ChatMessage, ChatRole, StreamingChunk -from cohere_haystack.chat.chat_generator import CohereChatGenerator +from haystack_integrations.components.generators.chat import CohereChatGenerator pytestmark = pytest.mark.chat_generators diff --git a/integrations/cohere/tests/test_cohere_generators.py b/integrations/cohere/tests/test_cohere_generators.py index f22b38843..6bd3acb0c 100644 --- a/integrations/cohere/tests/test_cohere_generators.py +++ b/integrations/cohere/tests/test_cohere_generators.py @@ -6,7 +6,7 @@ import pytest from cohere import COHERE_API_URL -from cohere_haystack.generator import CohereGenerator +from haystack_integrations.components.generators import CohereGenerator pytestmark = pytest.mark.generators diff --git a/integrations/cohere/tests/test_document_embedder.py b/integrations/cohere/tests/test_document_embedder.py index c9770737e..8abe9d9c0 100644 --- a/integrations/cohere/tests/test_document_embedder.py +++ b/integrations/cohere/tests/test_document_embedder.py @@ -7,7 +7,7 @@ from cohere import COHERE_API_URL from haystack import Document -from cohere_haystack.embedders.document_embedder import CohereDocumentEmbedder +from haystack_integrations.components.embedders import CohereDocumentEmbedder pytestmark = pytest.mark.embedders diff --git a/integrations/cohere/tests/test_text_embedder.py b/integrations/cohere/tests/test_text_embedder.py index 7e91b4812..adfdc73b9 100644 --- a/integrations/cohere/tests/test_text_embedder.py +++ b/integrations/cohere/tests/test_text_embedder.py @@ -6,7 +6,7 @@ import pytest from cohere import COHERE_API_URL -from cohere_haystack.embedders.text_embedder import CohereTextEmbedder +from haystack_integrations.components.embedders import CohereTextEmbedder pytestmark = pytest.mark.embedders From 958ed988f5026d8cb4a4d73dbd158a77c8bd30fa Mon Sep 17 00:00:00 2001 From: Vladimir Blagojevic Date: Fri, 19 Jan 2024 14:23:02 +0100 Subject: [PATCH 2/9] Update tests --- .idea/workspace.xml | 8 -------- .../cohere/tests/test_cohere_chat_generator.py | 10 +++++----- integrations/cohere/tests/test_cohere_generators.py | 8 ++++---- integrations/cohere/tests/test_document_embedder.py | 4 ++-- integrations/cohere/tests/test_text_embedder.py | 4 ++-- 5 files changed, 13 insertions(+), 21 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 6b39e9d5b..385a81c2d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,14 +5,6 @@ - - - - - - - - diff --git a/integrations/cohere/tests/test_cohere_chat_generator.py b/integrations/cohere/tests/test_cohere_chat_generator.py index 962513798..3677f92e4 100644 --- a/integrations/cohere/tests/test_cohere_chat_generator.py +++ b/integrations/cohere/tests/test_cohere_chat_generator.py @@ -88,7 +88,7 @@ def test_to_dict_default(self): component = CohereChatGenerator(api_key="test-api-key") data = component.to_dict() assert data == { - "type": "cohere_haystack.chat.chat_generator.CohereChatGenerator", + "type": "haystack_integrations.components.generators.chat.chat_generator.CohereChatGenerator", "init_parameters": { "model": "command", "streaming_callback": None, @@ -108,7 +108,7 @@ def test_to_dict_with_parameters(self): ) data = component.to_dict() assert data == { - "type": "cohere_haystack.chat.chat_generator.CohereChatGenerator", + "type": "haystack_integrations.components.generators.chat.chat_generator.CohereChatGenerator", "init_parameters": { "model": "command-nightly", "streaming_callback": "haystack.components.generators.utils.default_streaming_callback", @@ -128,7 +128,7 @@ def test_to_dict_with_lambda_streaming_callback(self): ) data = component.to_dict() assert data == { - "type": "cohere_haystack.chat.chat_generator.CohereChatGenerator", + "type": "haystack_integrations.components.generators.chat.chat_generator.CohereChatGenerator", "init_parameters": { "model": "command", "api_base_url": "test-base-url", @@ -141,7 +141,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": "cohere_haystack.chat.chat_generator.CohereChatGenerator", + "type": "haystack_integrations.components.generators.chat.chat_generator.CohereChatGenerator", "init_parameters": { "model": "command", "api_base_url": "test-base-url", @@ -159,7 +159,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": "cohere_haystack.chat.chat_generator.CohereChatGenerator", + "type": "haystack_integrations.components.generators.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 index 6bd3acb0c..029af4533 100644 --- a/integrations/cohere/tests/test_cohere_generators.py +++ b/integrations/cohere/tests/test_cohere_generators.py @@ -48,7 +48,7 @@ def test_to_dict_default(self): component = CohereGenerator(api_key="test-api-key") data = component.to_dict() assert data == { - "type": "cohere_haystack.generator.CohereGenerator", + "type": "haystack_integrations.components.generators.generator.CohereGenerator", "init_parameters": { "model": "command", "streaming_callback": None, @@ -67,7 +67,7 @@ def test_to_dict_with_parameters(self): ) data = component.to_dict() assert data == { - "type": "cohere_haystack.generator.CohereGenerator", + "type": "haystack_integrations.components.generators.generator.CohereGenerator", "init_parameters": { "model": "command-light", "max_tokens": 10, @@ -88,7 +88,7 @@ def test_to_dict_with_lambda_streaming_callback(self): ) data = component.to_dict() assert data == { - "type": "cohere_haystack.generator.CohereGenerator", + "type": "haystack_integrations.components.generators.generator.CohereGenerator", "init_parameters": { "model": "command", "streaming_callback": "tests.test_cohere_generators.", @@ -101,7 +101,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": "cohere_haystack.generator.CohereGenerator", + "type": "haystack_integrations.components.generators.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 index 8abe9d9c0..571e8d419 100644 --- a/integrations/cohere/tests/test_document_embedder.py +++ b/integrations/cohere/tests/test_document_embedder.py @@ -60,7 +60,7 @@ def test_to_dict(self): embedder_component = CohereDocumentEmbedder(api_key="test-api-key") component_dict = embedder_component.to_dict() assert component_dict == { - "type": "cohere_haystack.embedders.document_embedder.CohereDocumentEmbedder", + "type": "haystack_integrations.components.embedders.document_embedder.CohereDocumentEmbedder", "init_parameters": { "model": "embed-english-v2.0", "input_type": "search_document", @@ -93,7 +93,7 @@ def test_to_dict_with_custom_init_parameters(self): ) component_dict = embedder_component.to_dict() assert component_dict == { - "type": "cohere_haystack.embedders.document_embedder.CohereDocumentEmbedder", + "type": "haystack_integrations.components.embedders.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 index adfdc73b9..55ee985d3 100644 --- a/integrations/cohere/tests/test_text_embedder.py +++ b/integrations/cohere/tests/test_text_embedder.py @@ -57,7 +57,7 @@ def test_to_dict(self): embedder_component = CohereTextEmbedder(api_key="test-api-key") component_dict = embedder_component.to_dict() assert component_dict == { - "type": "cohere_haystack.embedders.text_embedder.CohereTextEmbedder", + "type": "haystack_integrations.components.embedders.text_embedder.CohereTextEmbedder", "init_parameters": { "model": "embed-english-v2.0", "input_type": "search_query", @@ -85,7 +85,7 @@ def test_to_dict_with_custom_init_parameters(self): ) component_dict = embedder_component.to_dict() assert component_dict == { - "type": "cohere_haystack.embedders.text_embedder.CohereTextEmbedder", + "type": "haystack_integrations.components.embedders.text_embedder.CohereTextEmbedder", "init_parameters": { "model": "embed-multilingual-v2.0", "input_type": "classification", From 42b4b0eb72ca3aeeed3153a99b2642d5ba818a25 Mon Sep 17 00:00:00 2001 From: Vladimir Blagojevic Date: Fri, 19 Jan 2024 14:32:01 +0100 Subject: [PATCH 3/9] Fix for tests --- .../components/embedders/document_embedder.py | 2 +- .../haystack_integrations/components/embedders/text_embedder.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/integrations/cohere/src/haystack_integrations/components/embedders/document_embedder.py b/integrations/cohere/src/haystack_integrations/components/embedders/document_embedder.py index 151c4f794..e8b952c09 100644 --- a/integrations/cohere/src/haystack_integrations/components/embedders/document_embedder.py +++ b/integrations/cohere/src/haystack_integrations/components/embedders/document_embedder.py @@ -8,7 +8,7 @@ from cohere import COHERE_API_URL, AsyncClient, Client from haystack import Document, component, default_to_dict -from cohere_haystack.embedders.utils import get_async_response, get_response +from haystack_integrations.components.embedders.utils import get_async_response, get_response @component diff --git a/integrations/cohere/src/haystack_integrations/components/embedders/text_embedder.py b/integrations/cohere/src/haystack_integrations/components/embedders/text_embedder.py index bfef97dc3..90dd07918 100644 --- a/integrations/cohere/src/haystack_integrations/components/embedders/text_embedder.py +++ b/integrations/cohere/src/haystack_integrations/components/embedders/text_embedder.py @@ -8,7 +8,7 @@ from cohere import COHERE_API_URL, AsyncClient, Client from haystack import component, default_to_dict -from cohere_haystack.embedders.utils import get_async_response, get_response +from haystack_integrations.components.embedders.utils import get_async_response, get_response @component From 5af03b24f8578777676f5c76682aae2e6b1e04bd Mon Sep 17 00:00:00 2001 From: Vladimir Blagojevic Date: Fri, 19 Jan 2024 14:46:44 +0100 Subject: [PATCH 4/9] Remove workspace file --- .idea/workspace.xml | 75 --------------------------------------------- 1 file changed, 75 deletions(-) delete mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 385a81c2d..000000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1705668709226 - - - - \ No newline at end of file From 084c64e7e5c40c18191b4e941978bc98126dcefe Mon Sep 17 00:00:00 2001 From: Vladimir Blagojevic Date: Fri, 19 Jan 2024 14:48:39 +0100 Subject: [PATCH 5/9] Remove file --- integrations/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 integrations/__init__.py diff --git a/integrations/__init__.py b/integrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 From 41bdfb8ef5af739344be1e2307b49bd0eabe1766 Mon Sep 17 00:00:00 2001 From: Vladimir Blagojevic Date: Fri, 19 Jan 2024 15:04:43 +0100 Subject: [PATCH 6/9] Fix lint issues --- .../haystack_integrations/components/embedders/__init__.py | 2 +- .../components/embedders/document_embedder.py | 4 +--- .../components/embedders/text_embedder.py | 4 +--- .../haystack_integrations/components/generators/__init__.py | 2 +- .../components/generators/chat/__init__.py | 2 +- .../components/generators/chat/chat_generator.py | 3 +-- .../haystack_integrations/components/generators/generator.py | 3 +-- 7 files changed, 7 insertions(+), 13 deletions(-) diff --git a/integrations/cohere/src/haystack_integrations/components/embedders/__init__.py b/integrations/cohere/src/haystack_integrations/components/embedders/__init__.py index c4546eb30..73a863a73 100644 --- a/integrations/cohere/src/haystack_integrations/components/embedders/__init__.py +++ b/integrations/cohere/src/haystack_integrations/components/embedders/__init__.py @@ -4,4 +4,4 @@ from .document_embedder import CohereDocumentEmbedder from .text_embedder import CohereTextEmbedder -__all__ = ["CohereDocumentEmbedder", "CohereTextEmbedder"] \ No newline at end of file +__all__ = ["CohereDocumentEmbedder", "CohereTextEmbedder"] diff --git a/integrations/cohere/src/haystack_integrations/components/embedders/document_embedder.py b/integrations/cohere/src/haystack_integrations/components/embedders/document_embedder.py index e8b952c09..2d8895948 100644 --- a/integrations/cohere/src/haystack_integrations/components/embedders/document_embedder.py +++ b/integrations/cohere/src/haystack_integrations/components/embedders/document_embedder.py @@ -3,12 +3,10 @@ # SPDX-License-Identifier: Apache-2.0 import asyncio 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 typing import Any, Dict, List, Optional @component diff --git a/integrations/cohere/src/haystack_integrations/components/embedders/text_embedder.py b/integrations/cohere/src/haystack_integrations/components/embedders/text_embedder.py index 90dd07918..0805844bd 100644 --- a/integrations/cohere/src/haystack_integrations/components/embedders/text_embedder.py +++ b/integrations/cohere/src/haystack_integrations/components/embedders/text_embedder.py @@ -3,12 +3,10 @@ # SPDX-License-Identifier: Apache-2.0 import asyncio 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 typing import Any, Dict, List, Optional @component diff --git a/integrations/cohere/src/haystack_integrations/components/generators/__init__.py b/integrations/cohere/src/haystack_integrations/components/generators/__init__.py index 0a6808be5..c36f982df 100644 --- a/integrations/cohere/src/haystack_integrations/components/generators/__init__.py +++ b/integrations/cohere/src/haystack_integrations/components/generators/__init__.py @@ -3,4 +3,4 @@ # SPDX-License-Identifier: Apache-2.0 from .generator import CohereGenerator -__all__ = ["CohereGenerator"] \ No newline at end of file +__all__ = ["CohereGenerator"] diff --git a/integrations/cohere/src/haystack_integrations/components/generators/chat/__init__.py b/integrations/cohere/src/haystack_integrations/components/generators/chat/__init__.py index b56dd2e15..dc14c9c1c 100644 --- a/integrations/cohere/src/haystack_integrations/components/generators/chat/__init__.py +++ b/integrations/cohere/src/haystack_integrations/components/generators/chat/__init__.py @@ -3,4 +3,4 @@ # SPDX-License-Identifier: Apache-2.0 from .chat_generator import CohereChatGenerator -__all__ = ["CohereChatGenerator"] \ No newline at end of file +__all__ = ["CohereChatGenerator"] diff --git a/integrations/cohere/src/haystack_integrations/components/generators/chat/chat_generator.py b/integrations/cohere/src/haystack_integrations/components/generators/chat/chat_generator.py index 0ff29ce14..7b7410c70 100644 --- a/integrations/cohere/src/haystack_integrations/components/generators/chat/chat_generator.py +++ b/integrations/cohere/src/haystack_integrations/components/generators/chat/chat_generator.py @@ -1,11 +1,10 @@ import logging import os -from typing import Any, Callable, Dict, List, Optional - from haystack import component, default_from_dict, default_to_dict from haystack.components.generators.utils import deserialize_callback_handler, serialize_callback_handler from haystack.dataclasses import ChatMessage, ChatRole, StreamingChunk from haystack.lazy_imports import LazyImport +from typing import Any, Callable, Dict, List, Optional with LazyImport(message="Run 'pip install cohere'") as cohere_import: import cohere diff --git a/integrations/cohere/src/haystack_integrations/components/generators/generator.py b/integrations/cohere/src/haystack_integrations/components/generators/generator.py index 9917f17ea..bc952cb83 100644 --- a/integrations/cohere/src/haystack_integrations/components/generators/generator.py +++ b/integrations/cohere/src/haystack_integrations/components/generators/generator.py @@ -4,11 +4,10 @@ import logging import os import sys -from typing import Any, Callable, Dict, List, Optional, cast - from cohere import COHERE_API_URL, Client from cohere.responses import Generations from haystack import DeserializationError, component, default_from_dict, default_to_dict +from typing import Any, Callable, Dict, List, Optional, cast logger = logging.getLogger(__name__) From e935a1c4a301d693e67d4e67de8bcaccd47be879 Mon Sep 17 00:00:00 2001 From: Vladimir Blagojevic Date: Fri, 19 Jan 2024 15:06:23 +0100 Subject: [PATCH 7/9] More linting fixes --- .../components/embedders/document_embedder.py | 3 ++- .../components/embedders/text_embedder.py | 3 ++- .../components/generators/chat/chat_generator.py | 3 ++- .../haystack_integrations/components/generators/generator.py | 3 ++- integrations/cohere/tests/test_cohere_chat_generator.py | 1 - integrations/cohere/tests/test_cohere_generators.py | 1 - integrations/cohere/tests/test_document_embedder.py | 1 - integrations/cohere/tests/test_text_embedder.py | 1 - 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/integrations/cohere/src/haystack_integrations/components/embedders/document_embedder.py b/integrations/cohere/src/haystack_integrations/components/embedders/document_embedder.py index 2d8895948..77d88a395 100644 --- a/integrations/cohere/src/haystack_integrations/components/embedders/document_embedder.py +++ b/integrations/cohere/src/haystack_integrations/components/embedders/document_embedder.py @@ -3,10 +3,11 @@ # SPDX-License-Identifier: Apache-2.0 import asyncio 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 typing import Any, Dict, List, Optional @component diff --git a/integrations/cohere/src/haystack_integrations/components/embedders/text_embedder.py b/integrations/cohere/src/haystack_integrations/components/embedders/text_embedder.py index 0805844bd..be4c867fa 100644 --- a/integrations/cohere/src/haystack_integrations/components/embedders/text_embedder.py +++ b/integrations/cohere/src/haystack_integrations/components/embedders/text_embedder.py @@ -3,10 +3,11 @@ # SPDX-License-Identifier: Apache-2.0 import asyncio 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 typing import Any, Dict, List, Optional @component diff --git a/integrations/cohere/src/haystack_integrations/components/generators/chat/chat_generator.py b/integrations/cohere/src/haystack_integrations/components/generators/chat/chat_generator.py index 7b7410c70..0ff29ce14 100644 --- a/integrations/cohere/src/haystack_integrations/components/generators/chat/chat_generator.py +++ b/integrations/cohere/src/haystack_integrations/components/generators/chat/chat_generator.py @@ -1,10 +1,11 @@ import logging import os +from typing import Any, Callable, Dict, List, Optional + from haystack import component, default_from_dict, default_to_dict from haystack.components.generators.utils import deserialize_callback_handler, serialize_callback_handler from haystack.dataclasses import ChatMessage, ChatRole, StreamingChunk from haystack.lazy_imports import LazyImport -from typing import Any, Callable, Dict, List, Optional with LazyImport(message="Run 'pip install cohere'") as cohere_import: import cohere diff --git a/integrations/cohere/src/haystack_integrations/components/generators/generator.py b/integrations/cohere/src/haystack_integrations/components/generators/generator.py index bc952cb83..9917f17ea 100644 --- a/integrations/cohere/src/haystack_integrations/components/generators/generator.py +++ b/integrations/cohere/src/haystack_integrations/components/generators/generator.py @@ -4,10 +4,11 @@ import logging import os import sys +from typing import Any, Callable, Dict, List, Optional, cast + from cohere import COHERE_API_URL, Client from cohere.responses import Generations from haystack import DeserializationError, component, default_from_dict, default_to_dict -from typing import Any, Callable, Dict, List, Optional, cast logger = logging.getLogger(__name__) diff --git a/integrations/cohere/tests/test_cohere_chat_generator.py b/integrations/cohere/tests/test_cohere_chat_generator.py index 3677f92e4..b3502d51e 100644 --- a/integrations/cohere/tests/test_cohere_chat_generator.py +++ b/integrations/cohere/tests/test_cohere_chat_generator.py @@ -5,7 +5,6 @@ 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 pytestmark = pytest.mark.chat_generators diff --git a/integrations/cohere/tests/test_cohere_generators.py b/integrations/cohere/tests/test_cohere_generators.py index 029af4533..bc98731d0 100644 --- a/integrations/cohere/tests/test_cohere_generators.py +++ b/integrations/cohere/tests/test_cohere_generators.py @@ -5,7 +5,6 @@ import pytest from cohere import COHERE_API_URL - from haystack_integrations.components.generators import CohereGenerator pytestmark = pytest.mark.generators diff --git a/integrations/cohere/tests/test_document_embedder.py b/integrations/cohere/tests/test_document_embedder.py index 571e8d419..5cc8eb745 100644 --- a/integrations/cohere/tests/test_document_embedder.py +++ b/integrations/cohere/tests/test_document_embedder.py @@ -6,7 +6,6 @@ import pytest from cohere import COHERE_API_URL from haystack import Document - from haystack_integrations.components.embedders import CohereDocumentEmbedder pytestmark = pytest.mark.embedders diff --git a/integrations/cohere/tests/test_text_embedder.py b/integrations/cohere/tests/test_text_embedder.py index 55ee985d3..825b62942 100644 --- a/integrations/cohere/tests/test_text_embedder.py +++ b/integrations/cohere/tests/test_text_embedder.py @@ -5,7 +5,6 @@ import pytest from cohere import COHERE_API_URL - from haystack_integrations.components.embedders import CohereTextEmbedder pytestmark = pytest.mark.embedders From 0c23ff6f45ec88a99631fd075cf98f872edc2fa0 Mon Sep 17 00:00:00 2001 From: Vladimir Blagojevic Date: Fri, 19 Jan 2024 16:34:20 +0100 Subject: [PATCH 8/9] Add cohere suffix dirs --- .idea/.gitignore | 3 + .idea/haystack-core-integrations.iml | 10 + .idea/inspectionProfiles/Project_Default.xml | 275 ++++++++++++++++++ .../inspectionProfiles/profiles_settings.xml | 6 + .idea/vcs.xml | 6 + .../embedders/{ => cohere}/__init__.py | 0 .../{ => cohere}/document_embedder.py | 5 +- .../embedders/{ => cohere}/text_embedder.py | 5 +- .../embedders/{ => cohere}/utils.py | 3 +- .../generators/{ => cohere}/__init__.py | 0 .../generators/{ => cohere}/chat/__init__.py | 0 .../{ => cohere}/chat/chat_generator.py | 0 .../generators/{ => cohere}/generator.py | 3 +- .../tests/test_cohere_chat_generator.py | 12 +- .../cohere/tests/test_cohere_generators.py | 10 +- .../cohere/tests/test_document_embedder.py | 6 +- .../cohere/tests/test_text_embedder.py | 6 +- 17 files changed, 327 insertions(+), 23 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/haystack-core-integrations.iml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/inspectionProfiles/profiles_settings.xml create mode 100644 .idea/vcs.xml rename integrations/cohere/src/haystack_integrations/components/embedders/{ => cohere}/__init__.py (100%) rename integrations/cohere/src/haystack_integrations/components/embedders/{ => cohere}/document_embedder.py (98%) rename integrations/cohere/src/haystack_integrations/components/embedders/{ => cohere}/text_embedder.py (98%) rename integrations/cohere/src/haystack_integrations/components/embedders/{ => cohere}/utils.py (99%) rename integrations/cohere/src/haystack_integrations/components/generators/{ => cohere}/__init__.py (100%) rename integrations/cohere/src/haystack_integrations/components/generators/{ => cohere}/chat/__init__.py (100%) rename integrations/cohere/src/haystack_integrations/components/generators/{ => cohere}/chat/chat_generator.py (100%) rename integrations/cohere/src/haystack_integrations/components/generators/{ => cohere}/generator.py (99%) diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 000000000..26d33521a --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/haystack-core-integrations.iml b/.idea/haystack-core-integrations.iml new file mode 100644 index 000000000..aad402c4e --- /dev/null +++ b/.idea/haystack-core-integrations.iml @@ -0,0 +1,10 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 000000000..f8c314c08 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,275 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 000000000..105ce2da2 --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..35eb1ddfb --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/integrations/cohere/src/haystack_integrations/components/embedders/__init__.py b/integrations/cohere/src/haystack_integrations/components/embedders/cohere/__init__.py similarity index 100% rename from integrations/cohere/src/haystack_integrations/components/embedders/__init__.py rename to integrations/cohere/src/haystack_integrations/components/embedders/cohere/__init__.py diff --git a/integrations/cohere/src/haystack_integrations/components/embedders/document_embedder.py b/integrations/cohere/src/haystack_integrations/components/embedders/cohere/document_embedder.py similarity index 98% rename from integrations/cohere/src/haystack_integrations/components/embedders/document_embedder.py rename to integrations/cohere/src/haystack_integrations/components/embedders/cohere/document_embedder.py index 77d88a395..69308ad19 100644 --- a/integrations/cohere/src/haystack_integrations/components/embedders/document_embedder.py +++ b/integrations/cohere/src/haystack_integrations/components/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/integrations/cohere/src/haystack_integrations/components/embedders/text_embedder.py b/integrations/cohere/src/haystack_integrations/components/embedders/cohere/text_embedder.py similarity index 98% rename from integrations/cohere/src/haystack_integrations/components/embedders/text_embedder.py rename to integrations/cohere/src/haystack_integrations/components/embedders/cohere/text_embedder.py index be4c867fa..2fa922004 100644 --- a/integrations/cohere/src/haystack_integrations/components/embedders/text_embedder.py +++ b/integrations/cohere/src/haystack_integrations/components/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/integrations/cohere/src/haystack_integrations/components/embedders/utils.py b/integrations/cohere/src/haystack_integrations/components/embedders/cohere/utils.py similarity index 99% rename from integrations/cohere/src/haystack_integrations/components/embedders/utils.py rename to integrations/cohere/src/haystack_integrations/components/embedders/cohere/utils.py index 1c1049852..7b9c90730 100644 --- a/integrations/cohere/src/haystack_integrations/components/embedders/utils.py +++ b/integrations/cohere/src/haystack_integrations/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/integrations/cohere/src/haystack_integrations/components/generators/__init__.py b/integrations/cohere/src/haystack_integrations/components/generators/cohere/__init__.py similarity index 100% rename from integrations/cohere/src/haystack_integrations/components/generators/__init__.py rename to integrations/cohere/src/haystack_integrations/components/generators/cohere/__init__.py diff --git a/integrations/cohere/src/haystack_integrations/components/generators/chat/__init__.py b/integrations/cohere/src/haystack_integrations/components/generators/cohere/chat/__init__.py similarity index 100% rename from integrations/cohere/src/haystack_integrations/components/generators/chat/__init__.py rename to integrations/cohere/src/haystack_integrations/components/generators/cohere/chat/__init__.py diff --git a/integrations/cohere/src/haystack_integrations/components/generators/chat/chat_generator.py b/integrations/cohere/src/haystack_integrations/components/generators/cohere/chat/chat_generator.py similarity index 100% rename from integrations/cohere/src/haystack_integrations/components/generators/chat/chat_generator.py rename to integrations/cohere/src/haystack_integrations/components/generators/cohere/chat/chat_generator.py diff --git a/integrations/cohere/src/haystack_integrations/components/generators/generator.py b/integrations/cohere/src/haystack_integrations/components/generators/cohere/generator.py similarity index 99% rename from integrations/cohere/src/haystack_integrations/components/generators/generator.py rename to integrations/cohere/src/haystack_integrations/components/generators/cohere/generator.py index 9917f17ea..7bca3ed9f 100644 --- a/integrations/cohere/src/haystack_integrations/components/generators/generator.py +++ b/integrations/cohere/src/haystack_integrations/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 index b3502d51e..cc360f5c9 100644 --- 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 index bc98731d0..e2ce10405 100644 --- 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.", @@ -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 index 5cc8eb745..efe8eb36a 100644 --- 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 index 825b62942..657d8df83 100644 --- 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", From b9dfa379ef49418ebc32d1168ae4fbc5bea5b728 Mon Sep 17 00:00:00 2001 From: Vladimir Blagojevic Date: Fri, 19 Jan 2024 18:26:35 +0100 Subject: [PATCH 9/9] Remove idea folder --- .idea/.gitignore | 3 - .idea/haystack-core-integrations.iml | 10 - .idea/inspectionProfiles/Project_Default.xml | 275 ------------------ .../inspectionProfiles/profiles_settings.xml | 6 - .idea/vcs.xml | 6 - 5 files changed, 300 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/haystack-core-integrations.iml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d33521a..000000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/haystack-core-integrations.iml b/.idea/haystack-core-integrations.iml deleted file mode 100644 index aad402c4e..000000000 --- a/.idea/haystack-core-integrations.iml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index f8c314c08..000000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,275 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 105ce2da2..000000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddfb..000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file