From 98561d06f90f081d73801b7b73d7b66c75db7cfb Mon Sep 17 00:00:00 2001 From: Massimiliano Pippi Date: Mon, 22 Jan 2024 16:44:11 +0100 Subject: [PATCH] change import paths --- integrations/pinecone/pyproject.toml | 10 +++++++--- .../components/retrievers/pinecone/__init__.py | 3 +++ .../retrievers/pinecone}/dense_retriever.py | 3 +-- .../document_stores/pinecone/__init__.py | 6 ++++++ .../document_stores/pinecone}/document_store.py | 5 +++-- .../document_stores/pinecone}/errors.py | 0 .../document_stores/pinecone}/filters.py | 0 .../pinecone/src/pinecone_haystack/__init__.py | 7 ------- integrations/pinecone/tests/conftest.py | 3 +-- .../pinecone/tests/test_dense_retriever.py | 17 ++++++++--------- .../pinecone/tests/test_document_store.py | 4 ++-- integrations/pinecone/tests/test_filters.py | 1 + 12 files changed, 32 insertions(+), 27 deletions(-) create mode 100644 integrations/pinecone/src/haystack_integrations/components/retrievers/pinecone/__init__.py rename integrations/pinecone/src/{pinecone_haystack => haystack_integrations/components/retrievers/pinecone}/dense_retriever.py (96%) create mode 100644 integrations/pinecone/src/haystack_integrations/document_stores/pinecone/__init__.py rename integrations/pinecone/src/{pinecone_haystack => haystack_integrations/document_stores/pinecone}/document_store.py (99%) rename integrations/pinecone/src/{pinecone_haystack => haystack_integrations/document_stores/pinecone}/errors.py (100%) rename integrations/pinecone/src/{pinecone_haystack => haystack_integrations/document_stores/pinecone}/filters.py (100%) delete mode 100644 integrations/pinecone/src/pinecone_haystack/__init__.py diff --git a/integrations/pinecone/pyproject.toml b/integrations/pinecone/pyproject.toml index 5ada5669e..f11fa0f68 100644 --- a/integrations/pinecone/pyproject.toml +++ b/integrations/pinecone/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/pinecone" +[tool.hatch.build.targets.wheel] +packages = ["src/haystack_integrations"] + [tool.hatch.version] source = "vcs" tag-pattern = 'integrations\/pinecone-v(?P.*)' @@ -74,7 +77,7 @@ dependencies = [ "numpy", ] [tool.hatch.envs.lint.scripts] -typing = "mypy --install-types --non-interactive {args:src/pinecone_haystack tests}" +typing = "mypy --install-types --non-interactive --explicit-package-bases {args:src/ tests}" style = [ "ruff {args:.}", "black --check --diff {args:.}", @@ -146,7 +149,7 @@ unfixable = [ known-first-party = ["pinecone_haystack"] [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 @@ -157,7 +160,7 @@ source_pkgs = ["pinecone_haystack", "tests"] branch = true parallel = true omit = [ - "example" + "examples" ] [tool.coverage.paths] @@ -182,6 +185,7 @@ markers = [ module = [ "pinecone.*", "haystack.*", + "haystack_integrations.*", "pytest.*" ] ignore_missing_imports = true diff --git a/integrations/pinecone/src/haystack_integrations/components/retrievers/pinecone/__init__.py b/integrations/pinecone/src/haystack_integrations/components/retrievers/pinecone/__init__.py new file mode 100644 index 000000000..d73d799d4 --- /dev/null +++ b/integrations/pinecone/src/haystack_integrations/components/retrievers/pinecone/__init__.py @@ -0,0 +1,3 @@ +from .dense_retriever import PineconeDenseRetriever + +__all__ = ["PineconeDenseRetriever"] diff --git a/integrations/pinecone/src/pinecone_haystack/dense_retriever.py b/integrations/pinecone/src/haystack_integrations/components/retrievers/pinecone/dense_retriever.py similarity index 96% rename from integrations/pinecone/src/pinecone_haystack/dense_retriever.py rename to integrations/pinecone/src/haystack_integrations/components/retrievers/pinecone/dense_retriever.py index 3f60f252b..d9715a465 100644 --- a/integrations/pinecone/src/pinecone_haystack/dense_retriever.py +++ b/integrations/pinecone/src/haystack_integrations/components/retrievers/pinecone/dense_retriever.py @@ -5,8 +5,7 @@ from haystack import component, default_from_dict, default_to_dict from haystack.dataclasses import Document - -from pinecone_haystack.document_store import PineconeDocumentStore +from haystack_integrations.document_stores.pinecone import PineconeDocumentStore @component diff --git a/integrations/pinecone/src/haystack_integrations/document_stores/pinecone/__init__.py b/integrations/pinecone/src/haystack_integrations/document_stores/pinecone/__init__.py new file mode 100644 index 000000000..159a85fae --- /dev/null +++ b/integrations/pinecone/src/haystack_integrations/document_stores/pinecone/__init__.py @@ -0,0 +1,6 @@ +# SPDX-FileCopyrightText: 2023-present deepset GmbH +# +# SPDX-License-Identifier: Apache-2.0 +from .document_store import PineconeDocumentStore + +__all__ = ["PineconeDocumentStore"] diff --git a/integrations/pinecone/src/pinecone_haystack/document_store.py b/integrations/pinecone/src/haystack_integrations/document_stores/pinecone/document_store.py similarity index 99% rename from integrations/pinecone/src/pinecone_haystack/document_store.py rename to integrations/pinecone/src/haystack_integrations/document_stores/pinecone/document_store.py index 8fe579611..a755b7e47 100644 --- a/integrations/pinecone/src/pinecone_haystack/document_store.py +++ b/integrations/pinecone/src/haystack_integrations/document_stores/pinecone/document_store.py @@ -8,13 +8,14 @@ from typing import Any, Dict, List, Optional import pandas as pd -import pinecone from haystack import default_to_dict from haystack.dataclasses import Document from haystack.document_stores.types import DuplicatePolicy from haystack.utils.filters import convert -from pinecone_haystack.filters import _normalize_filters +import pinecone + +from .filters import _normalize_filters logger = logging.getLogger(__name__) diff --git a/integrations/pinecone/src/pinecone_haystack/errors.py b/integrations/pinecone/src/haystack_integrations/document_stores/pinecone/errors.py similarity index 100% rename from integrations/pinecone/src/pinecone_haystack/errors.py rename to integrations/pinecone/src/haystack_integrations/document_stores/pinecone/errors.py diff --git a/integrations/pinecone/src/pinecone_haystack/filters.py b/integrations/pinecone/src/haystack_integrations/document_stores/pinecone/filters.py similarity index 100% rename from integrations/pinecone/src/pinecone_haystack/filters.py rename to integrations/pinecone/src/haystack_integrations/document_stores/pinecone/filters.py diff --git a/integrations/pinecone/src/pinecone_haystack/__init__.py b/integrations/pinecone/src/pinecone_haystack/__init__.py deleted file mode 100644 index e3ec258d2..000000000 --- a/integrations/pinecone/src/pinecone_haystack/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-FileCopyrightText: 2023-present deepset GmbH -# -# SPDX-License-Identifier: Apache-2.0 -from pinecone_haystack.dense_retriever import PineconeDenseRetriever -from pinecone_haystack.document_store import PineconeDocumentStore - -__all__ = ["PineconeDocumentStore", "PineconeDenseRetriever"] diff --git a/integrations/pinecone/tests/conftest.py b/integrations/pinecone/tests/conftest.py index 3ae642ae7..f2947cffc 100644 --- a/integrations/pinecone/tests/conftest.py +++ b/integrations/pinecone/tests/conftest.py @@ -2,8 +2,7 @@ import pytest from haystack.document_stores.types import DuplicatePolicy - -from pinecone_haystack.document_store import PineconeDocumentStore +from haystack_integrations.document_stores.pinecone import PineconeDocumentStore # This is the approximate time it takes for the documents to be available SLEEP_TIME = 20 diff --git a/integrations/pinecone/tests/test_dense_retriever.py b/integrations/pinecone/tests/test_dense_retriever.py index ceb73b687..1e0961338 100644 --- a/integrations/pinecone/tests/test_dense_retriever.py +++ b/integrations/pinecone/tests/test_dense_retriever.py @@ -4,9 +4,8 @@ from unittest.mock import Mock, patch from haystack.dataclasses import Document - -from pinecone_haystack.dense_retriever import PineconeDenseRetriever -from pinecone_haystack.document_store import PineconeDocumentStore +from haystack_integrations.components.retrievers.pinecone import PineconeDenseRetriever +from haystack_integrations.document_stores.pinecone import PineconeDocumentStore def test_init_default(): @@ -17,7 +16,7 @@ def test_init_default(): assert retriever.top_k == 10 -@patch("pinecone_haystack.document_store.pinecone") +@patch("haystack_integrations.document_stores.pinecone.document_store.pinecone") def test_to_dict(mock_pinecone): mock_pinecone.Index.return_value.describe_index_stats.return_value = {"dimension": 512} document_store = PineconeDocumentStore( @@ -31,7 +30,7 @@ def test_to_dict(mock_pinecone): retriever = PineconeDenseRetriever(document_store=document_store) res = retriever.to_dict() assert res == { - "type": "pinecone_haystack.dense_retriever.PineconeDenseRetriever", + "type": "haystack_integrations.components.retrievers.pinecone.dense_retriever.PineconeDenseRetriever", "init_parameters": { "document_store": { "init_parameters": { @@ -41,7 +40,7 @@ def test_to_dict(mock_pinecone): "batch_size": 50, "dimension": 512, }, - "type": "pinecone_haystack.document_store.PineconeDocumentStore", + "type": "haystack_integrations.document_stores.pinecone.document_store.PineconeDocumentStore", }, "filters": {}, "top_k": 10, @@ -49,10 +48,10 @@ def test_to_dict(mock_pinecone): } -@patch("pinecone_haystack.document_store.pinecone") +@patch("haystack_integrations.document_stores.pinecone.document_store.pinecone") def test_from_dict(mock_pinecone, monkeypatch): data = { - "type": "pinecone_haystack.dense_retriever.PineconeDenseRetriever", + "type": "haystack_integrations.components.retrievers.pinecone.dense_retriever.PineconeDenseRetriever", "init_parameters": { "document_store": { "init_parameters": { @@ -62,7 +61,7 @@ def test_from_dict(mock_pinecone, monkeypatch): "batch_size": 50, "dimension": 512, }, - "type": "pinecone_haystack.document_store.PineconeDocumentStore", + "type": "haystack_integrations.document_stores.pinecone.document_store.PineconeDocumentStore", }, "filters": {}, "top_k": 10, diff --git a/integrations/pinecone/tests/test_document_store.py b/integrations/pinecone/tests/test_document_store.py index 5c9b32698..fc2462e6d 100644 --- a/integrations/pinecone/tests/test_document_store.py +++ b/integrations/pinecone/tests/test_document_store.py @@ -4,10 +4,10 @@ import pytest from haystack import Document from haystack.testing.document_store import CountDocumentsTest, DeleteDocumentsTest, WriteDocumentsTest - -from pinecone_haystack.document_store import PineconeDocumentStore +from haystack_integrations.document_stores.pinecone import PineconeDocumentStore +@pytest.mark.integration class TestDocumentStore(CountDocumentsTest, DeleteDocumentsTest, WriteDocumentsTest): def test_write_documents(self, document_store: PineconeDocumentStore): docs = [Document(id="1")] diff --git a/integrations/pinecone/tests/test_filters.py b/integrations/pinecone/tests/test_filters.py index 1e6aeb0cd..a38482a26 100644 --- a/integrations/pinecone/tests/test_filters.py +++ b/integrations/pinecone/tests/test_filters.py @@ -7,6 +7,7 @@ ) +@pytest.mark.integration class TestFilters(FilterDocumentsTest): def assert_documents_are_equal(self, received: List[Document], expected: List[Document]): for doc in received: