From b250393393989dfb96fe00a388ffe13118b66b0c Mon Sep 17 00:00:00 2001 From: Rodney Norris Date: Mon, 28 Apr 2025 09:07:32 -0500 Subject: [PATCH] Bump for 8.18.0 release (#454) Co-authored-by: Quentin Pradet --- .github/workflows/tests.yml | 8 +++++--- Makefile | 2 +- bin/mocks/elasticsearch.py | 2 +- ...guring-chunking-settings-for-inference-endpoints.ipynb | 2 +- notebooks/document-chunking/with-index-pipelines.ipynb | 2 +- .../document-chunking/with-langchain-splitters.ipynb | 2 +- .../ingestion-and-chunking/json-chunking-ingest.ipynb | 2 +- .../ingestion-and-chunking/pdf-chunking-ingest.ipynb | 2 +- .../ingestion-and-chunking/website-chunking-ingest.ipynb | 2 +- .../hugging-face/loading-model-from-hugging-face.ipynb | 2 +- ..._nbtest.setup.langchain-vector-store-using-elser.ipynb | 2 +- notebooks/langchain/langchain-using-own-model.ipynb | 2 +- .../langchain/langchain-vector-store-using-elser.ipynb | 2 +- .../_nbtest.setup.upgrading-index-to-use-elser.ipynb | 2 +- .../model-upgrades/upgrading-index-to-use-elser.ipynb | 2 +- notebooks/search/00-quick-start.ipynb | 2 +- notebooks/search/01-keyword-querying-filtering.ipynb | 2 +- notebooks/search/02-hybrid-search.ipynb | 2 +- notebooks/search/03-ELSER.ipynb | 2 +- notebooks/search/04-multilingual.ipynb | 2 +- notebooks/search/05-query-rules.ipynb | 2 +- notebooks/search/06-synonyms-api.ipynb | 2 +- notebooks/search/09-semantic-text.ipynb | 2 +- notebooks/search/_nbtest.setup.ipynb | 2 +- 24 files changed, 28 insertions(+), 26 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ef27acb5a..b16f998f3 100644 --- a/.github/workflows/tests.yml +++ b/.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: diff --git a/Makefile b/Makefile index bc2d448c3..cfcba5f69 100644 --- a/Makefile +++ b/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 diff --git a/bin/mocks/elasticsearch.py b/bin/mocks/elasticsearch.py index 3a2a9fd7d..f248a79b7 100644 --- a/bin/mocks/elasticsearch.py +++ b/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 diff --git a/notebooks/document-chunking/configuring-chunking-settings-for-inference-endpoints.ipynb b/notebooks/document-chunking/configuring-chunking-settings-for-inference-endpoints.ipynb index 5bade95b0..8c21cc25a 100644 --- a/notebooks/document-chunking/configuring-chunking-settings-for-inference-endpoints.ipynb +++ b/notebooks/document-chunking/configuring-chunking-settings-for-inference-endpoints.ipynb @@ -62,7 +62,7 @@ "metadata": {}, "outputs": [], "source": [ - "!pip install elasticsearch" + "!pip install \"elasticsearch<9\"" ] }, { diff --git a/notebooks/document-chunking/with-index-pipelines.ipynb b/notebooks/document-chunking/with-index-pipelines.ipynb index 55e321035..10390f9e2 100644 --- a/notebooks/document-chunking/with-index-pipelines.ipynb +++ b/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\"" ] }, { diff --git a/notebooks/document-chunking/with-langchain-splitters.ipynb b/notebooks/document-chunking/with-langchain-splitters.ipynb index 86c379dd5..caa4e665f 100644 --- a/notebooks/document-chunking/with-langchain-splitters.ipynb +++ b/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" ] }, { diff --git a/notebooks/ingestion-and-chunking/json-chunking-ingest.ipynb b/notebooks/ingestion-and-chunking/json-chunking-ingest.ipynb index 0c4c66793..31cfb45e6 100644 --- a/notebooks/ingestion-and-chunking/json-chunking-ingest.ipynb +++ b/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" ] }, { diff --git a/notebooks/ingestion-and-chunking/pdf-chunking-ingest.ipynb b/notebooks/ingestion-and-chunking/pdf-chunking-ingest.ipynb index 66c2dfb7d..9e92b0bdf 100644 --- a/notebooks/ingestion-and-chunking/pdf-chunking-ingest.ipynb +++ b/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" ] }, { diff --git a/notebooks/ingestion-and-chunking/website-chunking-ingest.ipynb b/notebooks/ingestion-and-chunking/website-chunking-ingest.ipynb index 6ed716add..b0091b894 100644 --- a/notebooks/ingestion-and-chunking/website-chunking-ingest.ipynb +++ b/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" ] }, { diff --git a/notebooks/integrations/hugging-face/loading-model-from-hugging-face.ipynb b/notebooks/integrations/hugging-face/loading-model-from-hugging-face.ipynb index cf3fa4c6f..206280fa6 100644 --- a/notebooks/integrations/hugging-face/loading-model-from-hugging-face.ipynb +++ b/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" ] }, { diff --git a/notebooks/langchain/_nbtest.setup.langchain-vector-store-using-elser.ipynb b/notebooks/langchain/_nbtest.setup.langchain-vector-store-using-elser.ipynb index f7b7e01e7..6a8afd62e 100644 --- a/notebooks/langchain/_nbtest.setup.langchain-vector-store-using-elser.ipynb +++ b/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\"" ] }, { diff --git a/notebooks/langchain/langchain-using-own-model.ipynb b/notebooks/langchain/langchain-using-own-model.ipynb index e16f76d9d..a3c1040bb 100644 --- a/notebooks/langchain/langchain-using-own-model.ipynb +++ b/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", diff --git a/notebooks/langchain/langchain-vector-store-using-elser.ipynb b/notebooks/langchain/langchain-vector-store-using-elser.ipynb index aa263d397..b6e8ff764 100644 --- a/notebooks/langchain/langchain-vector-store-using-elser.ipynb +++ b/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", diff --git a/notebooks/model-upgrades/_nbtest.setup.upgrading-index-to-use-elser.ipynb b/notebooks/model-upgrades/_nbtest.setup.upgrading-index-to-use-elser.ipynb index b54ea2829..04bcd4c79 100644 --- a/notebooks/model-upgrades/_nbtest.setup.upgrading-index-to-use-elser.ipynb +++ b/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" ] }, { diff --git a/notebooks/model-upgrades/upgrading-index-to-use-elser.ipynb b/notebooks/model-upgrades/upgrading-index-to-use-elser.ipynb index 3b0bdd004..e701ab225 100644 --- a/notebooks/model-upgrades/upgrading-index-to-use-elser.ipynb +++ b/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" ] }, { diff --git a/notebooks/search/00-quick-start.ipynb b/notebooks/search/00-quick-start.ipynb index 45e50a2a0..ab38c832b 100644 --- a/notebooks/search/00-quick-start.ipynb +++ b/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" ] }, { diff --git a/notebooks/search/01-keyword-querying-filtering.ipynb b/notebooks/search/01-keyword-querying-filtering.ipynb index fa05b7d00..f55a7af7c 100644 --- a/notebooks/search/01-keyword-querying-filtering.ipynb +++ b/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" ] }, { diff --git a/notebooks/search/02-hybrid-search.ipynb b/notebooks/search/02-hybrid-search.ipynb index 750fa1baa..4d7e7a871 100644 --- a/notebooks/search/02-hybrid-search.ipynb +++ b/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" ] }, { diff --git a/notebooks/search/03-ELSER.ipynb b/notebooks/search/03-ELSER.ipynb index 303dfb3c8..760f3b8c2 100644 --- a/notebooks/search/03-ELSER.ipynb +++ b/notebooks/search/03-ELSER.ipynb @@ -48,7 +48,7 @@ }, "outputs": [], "source": [ - "!pip install -qU elasticsearch" + "!pip install -qU \"elasticsearch<9\"" ] }, { diff --git a/notebooks/search/04-multilingual.ipynb b/notebooks/search/04-multilingual.ipynb index 0842b0341..0f29ff9d2 100644 --- a/notebooks/search/04-multilingual.ipynb +++ b/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" ] }, { diff --git a/notebooks/search/05-query-rules.ipynb b/notebooks/search/05-query-rules.ipynb index b60112727..7ee7834b8 100644 --- a/notebooks/search/05-query-rules.ipynb +++ b/notebooks/search/05-query-rules.ipynb @@ -53,7 +53,7 @@ }, "outputs": [], "source": [ - "!pip install -qU elasticsearch" + "!pip install -qU \"elasticsearch<9\"" ] }, { diff --git a/notebooks/search/06-synonyms-api.ipynb b/notebooks/search/06-synonyms-api.ipynb index 7a07a6b4f..7bb33965b 100644 --- a/notebooks/search/06-synonyms-api.ipynb +++ b/notebooks/search/06-synonyms-api.ipynb @@ -52,7 +52,7 @@ }, "outputs": [], "source": [ - "!pip install -qU elasticsearch" + "!pip install -qU \"elasticsearch<9\"" ] }, { diff --git a/notebooks/search/09-semantic-text.ipynb b/notebooks/search/09-semantic-text.ipynb index 8e935282e..8a360a5c2 100644 --- a/notebooks/search/09-semantic-text.ipynb +++ b/notebooks/search/09-semantic-text.ipynb @@ -84,7 +84,7 @@ }, "outputs": [], "source": [ - "!pip install elasticsearch" + "!pip install \"elasticsearch<9\"" ] }, { diff --git a/notebooks/search/_nbtest.setup.ipynb b/notebooks/search/_nbtest.setup.ipynb index 517535976..d1f54c10c 100644 --- a/notebooks/search/_nbtest.setup.ipynb +++ b/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" ] }, {