elasticsearch-haystack 0.1.0__tar.gz → 0.1.2__tar.gz

{elasticsearch_haystack-0.1.0 → elasticsearch_haystack-0.1.2}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: elasticsearch-haystack
-Version: 0.1.0
+Version: 0.1.2
 Summary: Haystack 2.x Document Store for ElasticSearch
-Project-URL: Documentation, https://github.com/deepset-ai/haystack-core-integrations/tree/main/document_stores/elasticsearch#readme
+Project-URL: Documentation, https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/elasticsearch#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/document_stores/elasticsearch
+Project-URL: Source, https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/elasticsearch
 Author-email: Silvano Cerza <silvanocerza@gmail.com>
 License-Expression: Apache-2.0
 License-File: LICENSE
@@ -21,7 +21,7 @@ Requires-Dist: elasticsearch<9,>=8
 Requires-Dist: haystack-ai
 Description-Content-Type: text/markdown
 
-[![test](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/document_stores_elasticsearch.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/document_stores_elasticsearch.yml)
+[![test](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/elasticsearch.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/elasticsearch.yml)
 
 [![PyPI - Version](https://img.shields.io/pypi/v/elasticsearch-haystack.svg)](https://pypi.org/project/elasticsearch-haystack)
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/elasticsearch-haystack.svg)](https://pypi.org/project/elasticsearch-haystack)

{elasticsearch_haystack-0.1.0 → elasticsearch_haystack-0.1.2}/README.md

@@ -1,4 +1,4 @@
-[![test](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/document_stores_elasticsearch.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/document_stores_elasticsearch.yml)
+[![test](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/elasticsearch.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/elasticsearch.yml)
 
 [![PyPI - Version](https://img.shields.io/pypi/v/elasticsearch-haystack.svg)](https://pypi.org/project/elasticsearch-haystack)
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/elasticsearch-haystack.svg)](https://pypi.org/project/elasticsearch-haystack)

{elasticsearch_haystack-0.1.0 → elasticsearch_haystack-0.1.2}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["hatchling"]
+requires = ["hatchling", "hatch-vcs"]
 build-backend = "hatchling.build"
 
 [project]
@@ -29,12 +29,17 @@ dependencies = [
 ]
 
 [project.urls]
-Documentation = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/document_stores/elasticsearch#readme"
+Documentation = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/elasticsearch#readme"
 Issues = "https://github.com/deepset-ai/haystack-core-integrations/issues"
-Source = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/document_stores/elasticsearch"
+Source = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/elasticsearch"
 
 [tool.hatch.version]
-path = "src/elasticsearch_haystack/__about__.py"
+source = "vcs"
+tag-pattern = 'integrations\/elasticsearch-v(?P<version>.*)'
+
+[tool.hatch.version.raw-options]
+root = "../.."
+git_describe_command = 'git describe --tags --match="integrations/elasticsearch-v[0-9]*"'
 
 [tool.hatch.envs.default]
 dependencies = [

{elasticsearch_haystack-0.1.0 → elasticsearch_haystack-0.1.2}/src/elasticsearch_haystack/document_store.py

@@ -263,7 +263,7 @@ class ElasticsearchDocumentStore:
                                 "query": query,
                                 "fuzziness": fuzziness,
                                 "type": "most_fields",
-                                "operator": "AND",
+                                "operator": "OR",
                             }
                         }
                     ]

{elasticsearch_haystack-0.1.0 → elasticsearch_haystack-0.1.2}/tests/test_document_store.py

@@ -10,7 +10,7 @@ import pytest
 from elasticsearch.exceptions import BadRequestError  # type: ignore[import-not-found]
 from haystack.dataclasses.document import Document
 from haystack.document_stores.errors import DocumentStoreError, DuplicateDocumentError
-from haystack.document_stores.protocols import DuplicatePolicy
+from haystack.document_stores.protocol import DuplicatePolicy
 from haystack.testing.document_store import DocumentStoreBaseTests
 
 from elasticsearch_haystack.document_store import ElasticsearchDocumentStore
@@ -182,6 +182,33 @@ class TestDocumentStore(DocumentStoreBaseTests):
         assert "functional" in res[1].content
         assert "functional" in res[2].content
 
+    def test_bm25_not_all_terms_must_match(self, document_store: ElasticsearchDocumentStore):
+        """
+        Test that not all terms must mandatorily match for BM25 retrieval to return a result.
+        """
+        documents = [
+            Document(id=1, content="There are over 7,000 languages spoken around the world today."),
+            Document(
+                id=2,
+                content=(
+                    "Elephants have been observed to behave in a way that indicates a high level of self-awareness"
+                    " such as recognizing themselves in mirrors."
+                ),
+            ),
+            Document(
+                id=3,
+                content=(
+                    "In certain parts of the world, like the Maldives, Puerto Rico, and San Diego, you can witness"
+                    " the phenomenon of bioluminescent waves."
+                ),
+            ),
+        ]
+        document_store.write_documents(documents)
+
+        res = document_store._bm25_retrieval("How much self awareness do elephants have?", top_k=3)
+        assert len(res) == 1
+        assert res[0].id == 2
+
     def test_embedding_retrieval(self, document_store: ElasticsearchDocumentStore):
         docs = [
             Document(content="Most similar document", embedding=[1.0, 1.0, 1.0, 1.0]),

elasticsearch_haystack-0.1.0/src/elasticsearch_haystack/__about__.py

@@ -1,4 +0,0 @@
-# SPDX-FileCopyrightText: 2023-present deepset GmbH <info@deepset.ai>
-#
-# SPDX-License-Identifier: Apache-2.0
-__version__ = "0.1.0"