elasticsearch-haystack 3.1.0__tar.gz → 4.0.0__tar.gz

{elasticsearch_haystack-3.1.0 → elasticsearch_haystack-4.0.0}/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [integrations/elasticsearch-v3.1.0] - 2025-06-12
+
+### 🐛 Bug Fixes
+
+- Fix Elasticsearch types + add py.typed (#1923)
+
+### 🧹 Chores
+
+- Align core-integrations Hatch scripts (#1898)
+- Update md files for new hatch scripts (#1911)
+
+
 ## [integrations/elasticsearch-v3.0.1] - 2025-05-27
 
 

{elasticsearch_haystack-3.1.0 → elasticsearch_haystack-4.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: elasticsearch-haystack
-Version: 3.1.0
+Version: 4.0.0
 Summary: Haystack 2.x Document Store for ElasticSearch
 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
@@ -24,35 +24,19 @@ Requires-Dist: elasticsearch<9,>=8
 Requires-Dist: haystack-ai>=2.4.0
 Description-Content-Type: text/markdown
 
-[![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)
+# elasticsearch-haystack
 
 [![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 Document Store
+- [Integration page](https://haystack.deepset.ai/integrations/elasticsearch-document-store)
+- [Changelog](https://github.com/deepset-ai/haystack-core-integrations/blob/main/integrations/elasticsearch/CHANGELOG.md)
 
-Document Store for Haystack 2.x, supports ElasticSearch 8.
+---
 
-## Installation
+## Contributing
 
-```console
-pip install elasticsearch-haystack
-```
+Refer to the general [Contribution Guidelines](https://github.com/deepset-ai/haystack-core-integrations/blob/main/CONTRIBUTING.md).
 
-## Testing
-
-To run tests first start a Docker container running ElasticSearch. We provide a utility `docker-compose.yml` for that:
-
-```console
-docker-compose up
-```
-
-Then run tests:
-
-```console
-hatch run test:all
-```
-
-## License
-
-`elasticsearch-haystack` is distributed under the terms of the [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) license.
+To run integration tests locally, you need a Docker container running ElasticSearch.
+Use the provided `docker-compose.yml` file to start the container: `docker compose up -d`.

elasticsearch_haystack-4.0.0/README.md

@@ -0,0 +1,16 @@
+# elasticsearch-haystack
+
+[![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)
+
+- [Integration page](https://haystack.deepset.ai/integrations/elasticsearch-document-store)
+- [Changelog](https://github.com/deepset-ai/haystack-core-integrations/blob/main/integrations/elasticsearch/CHANGELOG.md)
+
+---
+
+## Contributing
+
+Refer to the general [Contribution Guidelines](https://github.com/deepset-ai/haystack-core-integrations/blob/main/CONTRIBUTING.md).
+
+To run integration tests locally, you need a Docker container running ElasticSearch.
+Use the provided `docker-compose.yml` file to start the container: `docker compose up -d`.

{elasticsearch_haystack-3.1.0 → elasticsearch_haystack-4.0.0}/pyproject.toml

@@ -82,11 +82,6 @@ disallow_incomplete_defs = true
 [tool.hatch.metadata]
 allow-direct-references = true
 
-[tool.black]
-target-version = ["py38"]
-line-length = 120
-skip-string-normalization = true
-
 [tool.ruff]
 target-version = "py38"
 line-length = 120

{elasticsearch_haystack-3.1.0 → elasticsearch_haystack-4.0.0}/src/haystack_integrations/document_stores/elasticsearch/document_store.py

@@ -1,8 +1,9 @@
 # SPDX-FileCopyrightText: 2023-present deepset GmbH <info@deepset.ai>
 #
 # SPDX-License-Identifier: Apache-2.0
+
 from collections.abc import Mapping
-from typing import Any, Dict, List, Literal, Optional, Union
+from typing import Any, Dict, List, Literal, Optional, Tuple, Union
 
 import numpy as np
 from elastic_transport import NodeConfig
@@ -10,6 +11,7 @@ from haystack import default_from_dict, default_to_dict, logging
 from haystack.dataclasses import Document
 from haystack.document_stores.errors import DocumentStoreError, DuplicateDocumentError
 from haystack.document_stores.types import DuplicatePolicy
+from haystack.utils import Secret, deserialize_secrets_inplace
 from haystack.version import __version__ as haystack_version
 
 from elasticsearch import AsyncElasticsearch, Elasticsearch, helpers
@@ -38,13 +40,16 @@ class ElasticsearchDocumentStore:
 
     Usage example (Elastic Cloud):
     ```python
-    from haystack.document_store.elasticsearch import ElasticsearchDocumentStore
-    document_store = ElasticsearchDocumentStore(cloud_id="YOUR_CLOUD_ID", api_key="YOUR_API_KEY")
+    from haystack_integrations.document_stores.elasticsearch import ElasticsearchDocumentStore
+    document_store = ElasticsearchDocumentStore(
+        api_key_id=Secret.from_env_var("ELASTIC_API_KEY_ID", strict=False),
+        api_key=Secret.from_env_var("ELASTIC_API_KEY", strict=False),
+    )
     ```
 
     Usage example (self-hosted Elasticsearch instance):
     ```python
-    from haystack.document_store.elasticsearch import ElasticsearchDocumentStore
+    from haystack_integrations.document_stores.elasticsearch import ElasticsearchDocumentStore
     document_store = ElasticsearchDocumentStore(hosts="http://localhost:9200")
     ```
     In the above example we connect with security disabled just to show the basic usage.
@@ -63,6 +68,8 @@ class ElasticsearchDocumentStore:
         hosts: Optional[Hosts] = None,
         custom_mapping: Optional[Dict[str, Any]] = None,
         index: str = "default",
+        api_key: Secret = Secret.from_env_var("ELASTIC_API_KEY", strict=False),  # noqa: B008
+        api_key_id: Secret = Secret.from_env_var("ELASTIC_API_KEY_ID", strict=False),  # noqa: B008
         embedding_similarity_function: Literal["cosine", "dot_product", "l2_norm", "max_inner_product"] = "cosine",
         **kwargs: Any,
     ):
@@ -80,9 +87,16 @@ class ElasticsearchDocumentStore:
         For the full list of supported kwargs, see the official Elasticsearch
         [reference](https://elasticsearch-py.readthedocs.io/en/stable/api.html#module-elasticsearch)
 
+        Authentication is provided via Secret objects, which by default are loaded from environment variables.
+        You can either provide both `api_key_id` and `api_key`, or just `api_key` containing a base64-encoded string
+        of `id:secret`. Secret instances can also be loaded from a token using the `Secret.from_token()` method.
+
         :param hosts: List of hosts running the Elasticsearch client.
         :param custom_mapping: Custom mapping for the index. If not provided, a default mapping will be used.
         :param index: Name of index in Elasticsearch.
+        :param api_key: A Secret object containing the API key for authenticating or base64-encoded with the
+                        concatenated secret and id for authenticating with Elasticsearch (separated by “:”).
+        :param api_key_id: A Secret object containing the API key ID for authenticating with Elasticsearch.
         :param embedding_similarity_function: The similarity function used to compare Documents embeddings.
             This parameter only takes effect if the index does not yet exist and is created.
             To choose the most appropriate function, look for information about your embedding model.
@@ -94,6 +108,8 @@ class ElasticsearchDocumentStore:
         self._client: Optional[Elasticsearch] = None
         self._async_client: Optional[AsyncElasticsearch] = None
         self._index = index
+        self._api_key = api_key
+        self._api_key_id = api_key_id
         self._embedding_similarity_function = embedding_similarity_function
         self._custom_mapping = custom_mapping
         self._kwargs = kwargs
@@ -111,14 +127,18 @@ class ElasticsearchDocumentStore:
             headers = self._kwargs.pop("headers", {})
             headers["user-agent"] = f"haystack-py-ds/{haystack_version}"
 
+            api_key = self._handle_auth()
+
             # Initialize both sync and async clients
             self._client = Elasticsearch(
                 self._hosts,
+                api_key=api_key,
                 headers=headers,
                 **self._kwargs,
             )
             self._async_client = AsyncElasticsearch(
                 self._hosts,
+                api_key=api_key,
                 headers=headers,
                 **self._kwargs,
             )
@@ -158,6 +178,49 @@ class ElasticsearchDocumentStore:
 
             self._initialized = True
 
+    def _handle_auth(self) -> Optional[Union[str, Tuple[str, str]]]:
+        """
+        Handles authentication for the Elasticsearch client.
+
+        There are three possible scenarios.
+
+        1) Authentication with both api_key and api_key_id, either as Secrets or as environment variables. In this case,
+           use both for authentication.
+
+        2) Authentication with only api_key, either as a Secret or as an environment variable. In this case, the api_key
+           must be a base64-encoded string that encodes both id and secret <id:secret>.
+
+        3) There's no authentication, neither api_key nor api_key_id are provided as a Secret nor defined as
+           environment variables. In this case, the client will connect without authentication.
+
+        :returns:
+            api_key: Optional[Union[str, Tuple[str, str]]]
+
+        """
+
+        api_key: Optional[Union[str, Tuple[str, str]]]  # make the type checker happy
+
+        api_key_resolved = self._api_key.resolve_value()
+        api_key_id_resolved = self._api_key_id.resolve_value()
+
+        # Scenario 1: both are found, use them
+        if api_key_id_resolved and api_key_resolved:
+            api_key = (api_key_id_resolved, api_key_resolved)
+            return api_key
+
+        # Scenario 2: only api_key is set, must be a base64-encoded string that encodes id and secret (separated by “:”)
+        elif api_key_resolved and not api_key_id_resolved:
+            return api_key_resolved
+
+        # Error: only api_key_id is found, raise an error
+        elif api_key_id_resolved and not api_key_resolved:
+            msg = "api_key_id is provided but api_key is missing."
+            raise ValueError(msg)
+
+        else:
+            # Scenario 3: neither found, no authentication
+            return None
+
     @property
     def client(self) -> Elasticsearch:
         """
@@ -191,6 +254,8 @@ class ElasticsearchDocumentStore:
             hosts=self._hosts,
             custom_mapping=self._custom_mapping,
             index=self._index,
+            api_key=self._api_key.to_dict(),
+            api_key_id=self._api_key_id.to_dict(),
             embedding_similarity_function=self._embedding_similarity_function,
             **self._kwargs,
         )
@@ -205,6 +270,7 @@ class ElasticsearchDocumentStore:
         :returns:
             Deserialized component.
         """
+        deserialize_secrets_inplace(data, keys=["api_key", "api_key_id"])
         return default_from_dict(cls, data)
 
     def count_documents(self) -> int:

{elasticsearch_haystack-3.1.0 → elasticsearch_haystack-4.0.0}/tests/test_bm25_retriever.py

@@ -1,6 +1,7 @@
 # SPDX-FileCopyrightText: 2023-present deepset GmbH <info@deepset.ai>
 #
 # SPDX-License-Identifier: Apache-2.0
+
 from unittest.mock import Mock, patch
 
 import pytest
@@ -38,6 +39,20 @@ def test_to_dict(_mock_elasticsearch_client):
             "document_store": {
                 "init_parameters": {
                     "hosts": "some fake host",
+                    "api_key": {
+                        "env_vars": [
+                            "ELASTIC_API_KEY",
+                        ],
+                        "strict": False,
+                        "type": "env_var",
+                    },
+                    "api_key_id": {
+                        "env_vars": [
+                            "ELASTIC_API_KEY_ID",
+                        ],
+                        "strict": False,
+                        "type": "env_var",
+                    },
                     "custom_mapping": None,
                     "index": "default",
                     "embedding_similarity_function": "cosine",

{elasticsearch_haystack-3.1.0 → elasticsearch_haystack-4.0.0}/tests/test_document_store.py

@@ -13,6 +13,8 @@ from haystack.dataclasses.sparse_embedding import SparseEmbedding
 from haystack.document_stores.errors import DocumentStoreError, DuplicateDocumentError
 from haystack.document_stores.types import DuplicatePolicy
 from haystack.testing.document_store import DocumentStoreBaseTests
+from haystack.utils import Secret
+from haystack.utils.auth import TokenSecret
 
 from haystack_integrations.document_stores.elasticsearch import ElasticsearchDocumentStore
 
@@ -46,6 +48,20 @@ def test_to_dict(_mock_elasticsearch_client):
     assert res == {
         "type": "haystack_integrations.document_stores.elasticsearch.document_store.ElasticsearchDocumentStore",
         "init_parameters": {
+            "api_key": {
+                "env_vars": [
+                    "ELASTIC_API_KEY",
+                ],
+                "strict": False,
+                "type": "env_var",
+            },
+            "api_key_id": {
+                "env_vars": [
+                    "ELASTIC_API_KEY_ID",
+                ],
+                "strict": False,
+                "type": "env_var",
+            },
             "hosts": "some hosts",
             "custom_mapping": None,
             "index": "default",
@@ -62,6 +78,8 @@ def test_from_dict(_mock_elasticsearch_client):
             "hosts": "some hosts",
             "custom_mapping": None,
             "index": "default",
+            "api_key": None,
+            "api_key_id": None,
             "embedding_similarity_function": "cosine",
         },
     }
@@ -69,9 +87,135 @@ def test_from_dict(_mock_elasticsearch_client):
     assert document_store._hosts == "some hosts"
     assert document_store._index == "default"
     assert document_store._custom_mapping is None
+    assert document_store._api_key is None
+    assert document_store._api_key_id is None
     assert document_store._embedding_similarity_function == "cosine"
 
 
+@patch("haystack_integrations.document_stores.elasticsearch.document_store.Elasticsearch")
+def test_to_dict_with_api_keys_env_vars(_mock_elasticsearch_client, monkeypatch):
+    monkeypatch.setenv("ELASTIC_API_KEY", "test-api-key")
+    monkeypatch.setenv("ELASTIC_API_KEY_ID", "test-api-key-id")
+    document_store = ElasticsearchDocumentStore(hosts="https://localhost:9200")
+    document_store.client()
+    res = document_store.to_dict()
+    assert res["init_parameters"]["api_key"] == {"type": "env_var", "env_vars": ["ELASTIC_API_KEY"], "strict": False}
+    assert res["init_parameters"]["api_key_id"] == {
+        "type": "env_var",
+        "env_vars": ["ELASTIC_API_KEY_ID"],
+        "strict": False,
+    }
+
+
+@patch("haystack_integrations.document_stores.elasticsearch.document_store.Elasticsearch")
+def test_to_dict_with_api_keys_as_secret(_mock_elasticsearch_client, monkeypatch):
+    monkeypatch.setenv("ELASTIC_API_KEY", "test-api-key")
+    monkeypatch.setenv("ELASTIC_API_KEY_ID", "test-api-key-id")
+    with pytest.raises(ValueError):
+        document_store = ElasticsearchDocumentStore(
+            hosts="https://localhost:9200",
+            api_key=TokenSecret(_token="test-api-key"),
+            api_key_id=TokenSecret(_token="test-api-key-id"),
+        )
+        document_store.client()
+        _ = document_store.to_dict()
+
+
+@patch("haystack_integrations.document_stores.elasticsearch.document_store.Elasticsearch")
+def test_from_dict_with_api_keys_env_vars(_mock_elasticsearch_client):
+    data = {
+        "type": "haystack_integrations.document_stores.elasticsearch.document_store.ElasticsearchDocumentStore",
+        "init_parameters": {
+            "hosts": "some hosts",
+            "custom_mapping": None,
+            "index": "default",
+            "api_key": {"type": "env_var", "env_vars": ["ELASTIC_API_KEY"], "strict": False},
+            "api_key_id": {"type": "env_var", "env_vars": ["ELASTIC_API_KEY_ID"], "strict": False},
+            "embedding_similarity_function": "cosine",
+        },
+    }
+
+    document_store = ElasticsearchDocumentStore.from_dict(data)
+    assert document_store._api_key == {"type": "env_var", "env_vars": ["ELASTIC_API_KEY"], "strict": False}
+    assert document_store._api_key_id == {"type": "env_var", "env_vars": ["ELASTIC_API_KEY_ID"], "strict": False}
+
+
+@patch("haystack_integrations.document_stores.elasticsearch.document_store.Elasticsearch")
+def test_api_key_validation_only_api_key(_mock_elasticsearch_client):
+    api_key = Secret.from_token("test_api_key")
+
+    document_store = ElasticsearchDocumentStore(hosts="https://localhost:9200", api_key=api_key)
+    document_store.client()
+    assert document_store._api_key == api_key
+    # not passing the api_key_id makes it default to reading from env var
+    assert document_store._api_key_id == Secret.from_env_var("ELASTIC_API_KEY_ID", strict=False)
+
+
+@patch("haystack_integrations.document_stores.elasticsearch.document_store.Elasticsearch")
+def test_api_key_validation_only_api_key_id_raises_error(_mock_elasticsearch_client):
+    api_key_id = Secret.from_token("test_api_key_id")
+    with pytest.raises(ValueError, match="api_key_id is provided but api_key is missing"):
+        es = ElasticsearchDocumentStore(hosts="https://localhost:9200", api_key_id=api_key_id)
+        es.client()
+
+
+@patch("haystack_integrations.document_stores.elasticsearch.document_store.Elasticsearch")
+@patch("haystack_integrations.document_stores.elasticsearch.document_store.AsyncElasticsearch")
+def test_client_initialization_with_api_key_tuple(_mock_async_es, _mock_es):
+    api_key = Secret.from_token("test_api_key")
+    api_key_id = Secret.from_token("test_api_key_id")
+
+    # Mock the client.info() call to avoid actual connection
+    mock_client = Mock()
+    mock_client.info.return_value = {"version": {"number": "8.0.0"}}
+    _mock_es.return_value = mock_client
+
+    document_store = ElasticsearchDocumentStore(hosts="https://localhost:9200", api_key=api_key, api_key_id=api_key_id)
+
+    # Access client to trigger initialization
+    _ = document_store.client
+
+    # Check that Elasticsearch was called with the correct api_key tuple
+    _mock_es.assert_called_once()
+    call_args = _mock_es.call_args
+    assert call_args[0][0] == "https://localhost:9200"  # hosts
+    assert call_args[1]["api_key"] == ("test_api_key_id", "test_api_key")
+
+    # Check that AsyncElasticsearch was called with the same api_key tuple
+    _mock_async_es.assert_called_once()
+    async_call_args = _mock_async_es.call_args
+    assert async_call_args[0][0] == "https://localhost:9200"  # hosts
+    assert async_call_args[1]["api_key"] == ("test_api_key_id", "test_api_key")
+
+
+@patch("haystack_integrations.document_stores.elasticsearch.document_store.Elasticsearch")
+@patch("haystack_integrations.document_stores.elasticsearch.document_store.AsyncElasticsearch")
+def test_client_initialization_with_api_key_string(_mock_async_es, _mock_es):
+    api_key = Secret.from_token("test_api_key")
+
+    # Mock the client.info() call to avoid actual connection
+    mock_client = Mock()
+    mock_client.info.return_value = {"version": {"number": "8.0.0"}}
+    _mock_es.return_value = mock_client
+
+    document_store = ElasticsearchDocumentStore(hosts="testhost", api_key=api_key)
+
+    # Access client to trigger initialization
+    _ = document_store.client
+
+    # Check that Elasticsearch was called with the correct api_key string
+    _mock_es.assert_called_once()
+    call_args = _mock_es.call_args
+    assert call_args[0][0] == "testhost"  # hosts
+    assert call_args[1]["api_key"] == "test_api_key"
+
+    # Check that AsyncElasticsearch was called with the same api_key string
+    _mock_async_es.assert_called_once()
+    async_call_args = _mock_async_es.call_args
+    assert async_call_args[0][0] == "testhost"  # hosts
+    assert async_call_args[1]["api_key"] == "test_api_key"
+
+
 @pytest.mark.integration
 class TestDocumentStore(DocumentStoreBaseTests):
     """

{elasticsearch_haystack-3.1.0 → elasticsearch_haystack-4.0.0}/tests/test_embedding_retriever.py

@@ -37,6 +37,20 @@ def test_to_dict(_mock_elasticsearch_client):
         "init_parameters": {
             "document_store": {
                 "init_parameters": {
+                    "api_key": {
+                        "env_vars": [
+                            "ELASTIC_API_KEY",
+                        ],
+                        "strict": False,
+                        "type": "env_var",
+                    },
+                    "api_key_id": {
+                        "env_vars": [
+                            "ELASTIC_API_KEY_ID",
+                        ],
+                        "strict": False,
+                        "type": "env_var",
+                    },
                     "hosts": "some fake host",
                     "custom_mapping": None,
                     "index": "default",

elasticsearch_haystack-3.1.0/README.md

@@ -1,32 +0,0 @@
-[![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 Document Store
-
-Document Store for Haystack 2.x, supports ElasticSearch 8.
-
-## Installation
-
-```console
-pip install elasticsearch-haystack
-```
-
-## Testing
-
-To run tests first start a Docker container running ElasticSearch. We provide a utility `docker-compose.yml` for that:
-
-```console
-docker-compose up
-```
-
-Then run tests:
-
-```console
-hatch run test:all
-```
-
-## License
-
-`elasticsearch-haystack` is distributed under the terms of the [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) license.