Fixes regex warning when running E2E tests for external retrievers (neo4j#64)

* Fixed regex warning when running E2E tests for external retrievers

* Reverted test_weaviate_neo4j_text_input_remote_embedder

* Added missing regex fix

* Replaced HuggingFaceEmbeddings import

* Updated CHANGELOG

Author: alexthomas93

CHANGELOG.md

@@ -13,6 +13,9 @@
 
 -   Removed Pinecone and Weaviate retrievers from **init**.py to prevent ImportError when optional dependencies are not installed.
 -   Moved few-shot examples in `Text2CypherRetriever` to the constructor for better initialization and usage. Updated unit tests and example script accordingly.
+-   Fixed regex warnings in E2E tests for Weaviate and Pinecone retrievers.
+-   Corrected HuggingFaceEmbeddings import in E2E tests.
+
 
 ## 0.2.0a5
 

examples/pinecone/text_search.py

@@ -1,4 +1,4 @@
-from langchain_community.embeddings import HuggingFaceEmbeddings
+from langchain_huggingface.embeddings import HuggingFaceEmbeddings
 from neo4j import GraphDatabase
 from neo4j_genai.retrievers.external.pinecone import PineconeNeo4jRetriever
 from pinecone import Pinecone

examples/weaviate/text_search_local_embedder.py

@@ -1,4 +1,4 @@
-from langchain_community.embeddings import HuggingFaceEmbeddings
+from langchain_huggingface.embeddings import HuggingFaceEmbeddings
 from neo4j import GraphDatabase
 from neo4j_genai.retrievers.external.weaviate import WeaviateNeo4jRetriever
 from weaviate.connect.helpers import connect_to_local

poetry.lock

@@ -49,6 +49,7 @@ pinecone-client = "^4.1.0"
 langchain-community = "^0.2.0"
 requests = "^2.32.0"
 sphinx = { version = "^7.2.6", python = "^3.9" }
+langchain-huggingface = "^0.0.3"
 
 [tool.poetry.extras]
 external_clients = ["weaviate-client", "pinecone-client"]

pyproject.toml

@@ -18,9 +18,9 @@
 from unittest.mock import MagicMock
 
 import pytest
-from langchain_community.embeddings import HuggingFaceEmbeddings
-from neo4j_genai.retrievers.external.pinecone import PineconeNeo4jRetriever
+from langchain_huggingface.embeddings import HuggingFaceEmbeddings
 from neo4j_genai.embedder import Embedder
+from neo4j_genai.retrievers.external.pinecone import PineconeNeo4jRetriever
 from neo4j_genai.types import RetrieverResult, RetrieverResultItem
 from pinecone import Pinecone
 
@@ -77,7 +77,7 @@ def test_pinecone_neo4j_vector_input(driver: MagicMock, client: MagicMock) -> No
             assert isinstance(result, RetrieverResultItem)
         pattern = (
             r"<Record node=<Node element_id='.+' "
-            "labels=frozenset\({'Question'}\) properties={'question': 'In 1953 Watson \& "
+            r"labels=frozenset\({'Question'}\) properties={'question': 'In 1953 Watson \& "
             "Crick built a model of the molecular structure of this, the gene-carrying "
             "substance', 'id': 'question_c458c6f64d8d47429636bc5a94c97f51'}> "
             r"score=0.232427984>"
@@ -123,7 +123,7 @@ def test_pinecone_neo4j_text_input(
             assert isinstance(result, RetrieverResultItem)
         pattern = (
             r"<Record node=<Node element_id='.+' "
-            "labels=frozenset\({'Question'}\) properties={'question': 'In 1953 Watson \& "
+            r"labels=frozenset\({'Question'}\) properties={'question': 'In 1953 Watson \& "
             "Crick built a model of the molecular structure of this, the gene-carrying "
             "substance', 'id': 'question_c458c6f64d8d47429636bc5a94c97f51'}> "
             r"score=0.232427984>"

tests/e2e/pinecone_e2e/test_pinecone_e2e.py

@@ -17,7 +17,7 @@
 from typing import Any, Generator
 
 import pytest
-from langchain_community.embeddings import HuggingFaceEmbeddings
+from langchain_huggingface.embeddings import HuggingFaceEmbeddings
 from neo4j import Driver
 from neo4j_genai.embedder import Embedder
 from neo4j_genai.retrievers.external.weaviate import WeaviateNeo4jRetriever
@@ -67,7 +67,7 @@ def test_weaviate_neo4j_vector_input(driver: Driver, weaviate_client: Client) ->
     assert isinstance(results.items[0], RetrieverResultItem)
     pattern = (
         r"<Record node=<Node element_id='.+' "
-        "labels=frozenset\({'Question'}\) properties={'question': 'In 1953 Watson \& "
+        r"labels=frozenset\({'Question'}\) properties={'question': 'In 1953 Watson \& "
         "Crick built a model of the molecular structure of this, the gene-carrying "
         "substance', 'id': 'question_c458c6f64d8d47429636bc5a94c97f51'}> "
         r"score=0.6[0-9]+>"
@@ -98,7 +98,7 @@ def test_weaviate_neo4j_text_input_local_embedder(
     assert isinstance(results.items[0], RetrieverResultItem)
     pattern = (
         r"<Record node=<Node element_id='.+' "
-        "labels=frozenset\({'Question'}\) properties={'question': 'In 1953 Watson \& "
+        r"labels=frozenset\({'Question'}\) properties={'question': 'In 1953 Watson \& "
         "Crick built a model of the molecular structure of this, the gene-carrying "
         "substance', 'id': 'question_c458c6f64d8d47429636bc5a94c97f51'}> "
         r"score=0.6[0-9]+>"
@@ -126,7 +126,7 @@ def test_weaviate_neo4j_text_input_remote_embedder(
     assert isinstance(results.items[0], RetrieverResultItem)
     pattern = (
         r"<Record node=<Node element_id='.+' "
-        "labels=frozenset\({'Question'}\) properties={'question': 'In 1953 Watson \& "
+        r"labels=frozenset\({'Question'}\) properties={'question': 'In 1953 Watson \& "
         "Crick built a model of the molecular structure of this, the gene-carrying "
         "substance', 'id': 'question_c458c6f64d8d47429636bc5a94c97f51'}> "
         r"score=0.5[0-9]+>"