Bump for 8.18.0 release

.github/workflows/tests.yml

@@ -17,9 +17,11 @@ jobs:
       fail-fast: false
       matrix:
         es_stack:
-          - 8.16.1
-          - 8.17.0
-          - 8.18.0-SNAPSHOT
+          - 8.17.5
+          - 8.18.0
+          - 8.19.0-SNAPSHOT
+          - 9.0.0
+          - 9.1.0-SNAPSHOT
     runs-on: ubuntu-latest
     services:
       elasticsearch:

Makefile

@@ -21,4 +21,4 @@ install-pre-commit:
 
 install-nbtest:
 	python3 -m venv $(VENV)
-	$(VENV)/bin/pip install -qqq elastic-nbtest sentence-transformers==2.7.0
+	$(VENV)/bin/pip install -qqq elastic-nbtest

bin/mocks/elasticsearch.py

@@ -31,7 +31,7 @@ def patched_es_init(self, *args, **kwargs):
             assert kwargs["cloud_id"] == "foo"
         if "api_key" in kwargs:
             assert kwargs["api_key"] == "bar"
-        return orig_es_init(self, "http://localhost:9200", timeout=60)
+        return orig_es_init(self, "http://localhost:9200", request_timeout=60)
 
     # patch Elasticsearch.__init__
     elasticsearch.Elasticsearch.__init__ = patched_es_init

notebooks/document-chunking/configuring-chunking-settings-for-inference-endpoints.ipynb

@@ -62,7 +62,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "!pip install elasticsearch"
+    "!pip install \"elasticsearch<9\""
    ]
   },
   {

notebooks/document-chunking/with-index-pipelines.ipynb

@@ -61,7 +61,7 @@
    },
    "outputs": [],
    "source": [
-    "!python3 -m pip install -qU elasticsearch eland"
+    "!python3 -m pip install -qU \"elasticsearch<9\" \"eland[pytorch]<9\""
    ]
   },
   {

notebooks/document-chunking/with-langchain-splitters.ipynb

@@ -38,7 +38,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "!python3 -m pip install -qU langchain langchain-community langchain-elasticsearch elasticsearch eland jq"
+    "!python3 -m pip install -qU langchain langchain-community langchain-elasticsearch \"elasticsearch<9\" \"eland<9\" jq"
    ]
   },
   {

notebooks/ingestion-and-chunking/json-chunking-ingest.ipynb

@@ -29,7 +29,7 @@
    },
    "outputs": [],
    "source": [
-    "!pip install -qU langchain_community langchain elasticsearch tiktoken langchain-elasticsearch jq"
+    "!pip install -qU langchain_community langchain \"elasticsearch<9\" tiktoken langchain-elasticsearch jq"
    ]
   },
   {

notebooks/ingestion-and-chunking/pdf-chunking-ingest.ipynb

@@ -29,7 +29,7 @@
    },
    "outputs": [],
    "source": [
-    "!pip install -qU  pypdf langchain_community langchain elasticsearch tiktoken langchain-elasticsearch"
+    "!pip install -qU  pypdf langchain_community langchain \"elasticsearch<9\" tiktoken langchain-elasticsearch"
    ]
   },
   {

notebooks/ingestion-and-chunking/website-chunking-ingest.ipynb

@@ -29,7 +29,7 @@
    },
    "outputs": [],
    "source": [
-    "!pip install -qU langchain_community langchain elasticsearch tiktoken langchain-elasticsearch unstructured"
+    "!pip install -qU langchain_community langchain \"elasticsearch<9\" tiktoken langchain-elasticsearch unstructured"
    ]
   },
   {

notebooks/integrations/hugging-face/loading-model-from-hugging-face.ipynb

@@ -47,7 +47,7 @@
    },
    "outputs": [],
    "source": [
-    "!python3 -m pip install sentence-transformers==2.7.0 eland elasticsearch transformers"
+    "!python3 -m pip install sentence-transformers==2.7.0 \"eland<9\" \"elasticsearch<9\" transformers"
    ]
   },
   {

notebooks/langchain/_nbtest.setup.langchain-vector-store-using-elser.ipynb

@@ -7,7 +7,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "!pip install -qU elasticsearch"
+    "!pip install -qU \"elasticsearch<9\""
    ]
   },
   {

notebooks/langchain/langchain-using-own-model.ipynb

@@ -30,7 +30,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "!python3 -m pip install -qU langchain langchain-elasticsearch tiktoken  sentence-transformers==2.7.0 eland transformers\n",
+    "!python3 -m pip install -qU langchain langchain-elasticsearch tiktoken sentence-transformers==2.7.0 \"eland<9\" transformers\n",
     "\n",
     "from getpass import getpass\n",
     "from langchain_elasticsearch import ElasticsearchStore\n",

notebooks/langchain/langchain-vector-store-using-elser.ipynb

@@ -33,7 +33,7 @@
    "outputs": [],
    "source": [
     "# install packages\n",
-    "!python3 -m pip install -qU langchain langchain-elasticsearch openai tiktoken\n",
+    "!python3 -m pip install -qU langchain langchain-elasticsearch \"elasticsearch<9\" openai tiktoken\n",
     "\n",
     "# import modules\n",
     "from getpass import getpass\n",

notebooks/model-upgrades/_nbtest.setup.upgrading-index-to-use-elser.ipynb

@@ -7,7 +7,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "!pip install -qU elasticsearch sentence-transformers==2.7.0"
+    "!pip install -qU \"elasticsearch<9\" sentence-transformers==2.7.0"
    ]
   },
   {

notebooks/model-upgrades/upgrading-index-to-use-elser.ipynb

@@ -39,7 +39,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "!pip install elasticsearch -qU"
+    "!pip install \"elasticsearch<9\" -qU"
    ]
   },
   {

notebooks/search/00-quick-start.ipynb

@@ -53,7 +53,7 @@
    },
    "outputs": [],
    "source": [
-    "!pip install -qU elasticsearch sentence-transformers==2.7.0"
+    "!pip install -qU \"elasticsearch<9\" sentence-transformers==2.7.0"
    ]
   },
   {

notebooks/search/01-keyword-querying-filtering.ipynb

@@ -26,7 +26,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "!pip install -qU elasticsearch pandas"
+    "!pip install -qU \"elasticsearch<9\" pandas"
    ]
   },
   {

notebooks/search/02-hybrid-search.ipynb

@@ -44,7 +44,7 @@
    },
    "outputs": [],
    "source": [
-    "!pip install -qU elasticsearch sentence-transformers==2.7.0"
+    "!pip install -qU \"elasticsearch<9\" sentence-transformers==2.7.0"
    ]
   },
   {

notebooks/search/03-ELSER.ipynb

@@ -48,7 +48,7 @@
    },
    "outputs": [],
    "source": [
-    "!pip install -qU elasticsearch"
+    "!pip install -qU \"elasticsearch<9\""
    ]
   },
   {

notebooks/search/04-multilingual.ipynb

@@ -82,7 +82,7 @@
    },
    "outputs": [],
    "source": [
-    "!pip install -qU elasticsearch sentence-transformers==2.7.0"
+    "!pip install -qU \"elasticsearch<9\" sentence-transformers==2.7.0"
    ]
   },
   {

notebooks/search/05-query-rules.ipynb

@@ -53,7 +53,7 @@
    },
    "outputs": [],
    "source": [
-    "!pip install -qU elasticsearch"
+    "!pip install -qU \"elasticsearch<9\""
    ]
   },
   {

notebooks/search/06-synonyms-api.ipynb

@@ -52,7 +52,7 @@
    },
    "outputs": [],
    "source": [
-    "!pip install -qU elasticsearch"
+    "!pip install -qU \"elasticsearch<9\""
    ]
   },
   {

notebooks/search/09-semantic-text.ipynb

@@ -84,7 +84,7 @@
    },
    "outputs": [],
    "source": [
-    "!pip install elasticsearch"
+    "!pip install \"elasticsearch<9\""
    ]
   },
   {

notebooks/search/_nbtest.setup.ipynb

@@ -7,7 +7,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "!pip install -qU elasticsearch sentence-transformers==2.7.0"
+    "!pip install -qU \"elasticsearch<9\" sentence-transformers==2.7.0"
    ]
   },
   {