Update client version, update tests for new retriever format and update auth flow (#80)

* update client version and poetry lock file

* resolve authentication issues in integration tests

* update query body tests for new retriever format

* lint and cleanup

* lint: fix comment length

* linting

* linting: add type annotation for client_kwargs

* delete poetry.lock

* update elasticsearch client version range

* consolidate lock file dependacies in pyproject.toml

* add lock file to git ignore

* remove lock check command from _lint.yml

* add version flexibility for langchain pkgs

* remove langchain community and text splitters test dependancies

* use langchain core to import pkgs FakeMessagesListChatModel

* add DistanceStrategy import to __init__

* add DistanceStrategy to test_imports

* update spynhix docs to not use langchain_community

* update elasticsearch client in release script

* Release 0.4.0

Author: ssh-esh

.github/workflows/_lint.yml

@@ -48,11 +48,6 @@ jobs:
         run: |
           poetry check
 
-      - name: Check lock file
-        shell: bash
-        working-directory: ${{ inputs.working-directory }}
-        run: |
-          poetry lock --check
 
       - name: Install dependencies
         # Also installs dev/lint/test/typing dependencies, to ensure we have

.github/workflows/_release.yml

@@ -90,7 +90,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       elasticsearch:
-        image: elasticsearch:8.13.0
+        image: elasticsearch:8.16.0
         env:
           discovery.type: single-node
           xpack.license.self_generated.type: trial

libs/elasticsearch/.gitignore

@@ -1 +1,2 @@
 __pycache__
+poetry.lock

libs/elasticsearch/langchain_elasticsearch/__init__.py

@@ -12,6 +12,7 @@
     SparseVectorStrategy,
 )
 
+from langchain_elasticsearch._utilities import DistanceStrategy
 from langchain_elasticsearch.cache import (
     AsyncElasticsearchCache,
     AsyncElasticsearchEmbeddingsCache,
@@ -62,6 +63,7 @@
     "DenseVectorScriptScoreStrategy",
     "DenseVectorStrategy",
     "DistanceMetric",
+    "DistanceStrategy",
     "RetrievalStrategy",
     "SparseVectorStrategy",
     # deprecated retrieval strategies

libs/elasticsearch/langchain_elasticsearch/_async/vectorstores.py

@@ -283,7 +283,7 @@ class AsyncElasticsearchStore(VectorStore):
 
             from langchain_elasticsearch.vectorstores import ElasticsearchStore
             from langchain_openai import OpenAIEmbeddings
-            from langchain_community.vectorstores.utils import DistanceStrategy
+            from langchain_elasticsearch import DistanceStrategy
 
             store = ElasticsearchStore(
                 "langchain-demo",

libs/elasticsearch/langchain_elasticsearch/_sync/vectorstores.py

@@ -283,7 +283,7 @@ class ElasticsearchStore(VectorStore):
 
             from langchain_elasticsearch.vectorstores import ElasticsearchStore
             from langchain_openai import OpenAIEmbeddings
-            from langchain_community.vectorstores.utils import DistanceStrategy
+            from langchain_elasticsearch import DistanceStrategy
 
             store = ElasticsearchStore(
                 "langchain-demo",

libs/elasticsearch/poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langchain-elasticsearch"
-version = "0.3.2"
+version = "0.4.0"
 description = "An integration package connecting Elasticsearch and LangChain"
 authors = []
 readme = "README.md"
@@ -12,8 +12,8 @@ license = "MIT"
 
 [tool.poetry.dependencies]
 python = ">=3.9,<4.0"
-langchain-core = "^0.3.0"
-elasticsearch = {version = "^8.15.1", extras = ["vectorstore_mmr"]}
+langchain-core = ">=0.3.0"
+elasticsearch = {version = ">=8.16.0,<9.0.0", extras = ["vectorstore_mmr"]}
 
 [tool.poetry.group.test]
 optional = true
@@ -25,10 +25,7 @@ pytest-mock = "^3.10.0"
 syrupy = "^4.0.2"
 pytest-watcher = "^0.3.4"
 pytest-asyncio = "^0.21.1"
-langchain = {git = "https://github.com/langchain-ai/langchain.git", subdirectory = "libs/langchain" }
-langchain-community = {git = "https://github.com/langchain-ai/langchain.git", subdirectory = "libs/community" }
-langchain-text-splitters = {git = "https://github.com/langchain-ai/langchain.git", subdirectory = "libs/text-splitters" }
-langchain-core = {git = "https://github.com/langchain-ai/langchain.git", subdirectory = "libs/core" }
+langchain = ">=0.3.10,<1.0.0"
 
 [tool.poetry.group.codespell]
 optional = true
@@ -44,13 +41,11 @@ ruff = "^0.1.5"
 
 [tool.poetry.group.typing.dependencies]
 mypy = "^0.991"
-langchain-core = {git = "https://github.com/langchain-ai/langchain.git", subdirectory = "libs/core" }
 
 [tool.poetry.group.dev]
 optional = true
 
 [tool.poetry.group.dev.dependencies]
-langchain-core = {git = "https://github.com/langchain-ai/langchain.git", subdirectory = "libs/core" }
 
 [tool.poetry.group.test_integration]
 optional = true

libs/elasticsearch/pyproject.toml

@@ -6,8 +6,8 @@
 from elasticsearch import AsyncElasticsearch, Elasticsearch
 from elasticsearch._async.client import IndicesClient as AsyncIndicesClient
 from elasticsearch._sync.client import IndicesClient
-from langchain_community.chat_models.fake import FakeMessagesListChatModel
 from langchain_core.language_models import BaseChatModel
+from langchain_core.language_models.fake_chat_models import FakeMessagesListChatModel
 from langchain_core.messages import AIMessage
 
 from langchain_elasticsearch import (

libs/elasticsearch/tests/conftest.py

@@ -17,7 +17,11 @@ def read_env() -> Dict:
 
     if cloud_id:
         return {"es_cloud_id": cloud_id, "es_api_key": api_key}
-    return {"es_url": url}
+
+    result = {"es_url": url}
+    if api_key:
+        result["es_api_key"] = api_key
+    return result
 
 
 class AsyncRequestSavingTransport(AsyncTransport):
@@ -46,7 +50,12 @@ def create_es_client(
             **es_kwargs,
         )
 
-    return AsyncElasticsearch(hosts=[es_params["es_url"]], **es_kwargs)
+    client_kwargs: Dict[str, Any] = {"hosts": [es_params["es_url"]]}
+    if "es_api_key" in es_params:
+        client_kwargs["api_key"] = es_params["es_api_key"]
+    client_kwargs.update(es_kwargs)
+
+    return AsyncElasticsearch(**client_kwargs)
 
 
 def requests_saving_es_client() -> AsyncElasticsearch: