github/langchain
1
0
Fork 0
mirror of https://github.com/hwchase17/langchain.git synced 2025-06-23 07:09:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes issue #5072 - adds additional support to Weaviate (#5085)

Browse Source 
Implementation is similar to search_distance and where_filter

# adds 'additional' support to Weaviate queries

Co-authored-by: Dev 2049 <dev.dev2049@gmail.com>
This commit is contained in:
Jettro Coenradie 2023-05-23 03:57:10 +02:00 committed by GitHub
parent 87bba2e8d3
commit b950022894
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
langchain/vectorstores/weaviate.py
View File

@ -195,6 +195,8 @@ class Weaviate(VectorStore):
query_obj = self._client.query.get(self._index_name, self._query_attrs) query_obj = self._client.query.get(self._index_name, self._query_attrs)
if kwargs.get("where_filter"): if kwargs.get("where_filter"):
query_obj = query_obj.with_where(kwargs.get("where_filter")) query_obj = query_obj.with_where(kwargs.get("where_filter"))
if kwargs.get("additional"):
query_obj = query_obj.with_additional(kwargs.get("additional"))
result = query_obj.with_near_text(content).with_limit(k).do() result = query_obj.with_near_text(content).with_limit(k).do()
if "errors" in result: if "errors" in result:
raise ValueError(f"Error during query: {result['errors']}") raise ValueError(f"Error during query: {result['errors']}")
@ -212,6 +214,8 @@ class Weaviate(VectorStore):
query_obj = self._client.query.get(self._index_name, self._query_attrs) query_obj = self._client.query.get(self._index_name, self._query_attrs)
if kwargs.get("where_filter"): if kwargs.get("where_filter"):
query_obj = query_obj.with_where(kwargs.get("where_filter")) query_obj = query_obj.with_where(kwargs.get("where_filter"))
if kwargs.get("additional"):
query_obj = query_obj.with_additional(kwargs.get("additional"))
result = query_obj.with_near_vector(vector).with_limit(k).do() result = query_obj.with_near_vector(vector).with_limit(k).do()
if "errors" in result: if "errors" in result:
raise ValueError(f"Error during query: {result['errors']}") raise ValueError(f"Error during query: {result['errors']}")

22
tests/integration_tests/vectorstores/test_weaviate.py
View File

@ -81,6 +81,28 @@ class TestWeaviate:
) )
assert output == [Document(page_content="foo", metadata={"page": 0})] assert output == [Document(page_content="foo", metadata={"page": 0})]
@pytest.mark.vcr(ignore_localhost=True)
def test_similarity_search_with_metadata_and_additional(
self, weaviate_url: str, embedding_openai: OpenAIEmbeddings
) -> None:
"""Test end to end construction and search with metadata and additional."""
texts = ["foo", "bar", "baz"]
metadatas = [{"page": i} for i in range(len(texts))]
docsearch = Weaviate.from_texts(
texts, embedding_openai, metadatas=metadatas, weaviate_url=weaviate_url
)
output = docsearch.similarity_search(
"foo",
k=1,
additional=["certainty"],
)
assert output == [
Document(
page_content="foo",
metadata={"page": 0, "_additional": {"certainty": 1}},
)
]
@pytest.mark.vcr(ignore_localhost=True) @pytest.mark.vcr(ignore_localhost=True)
def test_similarity_search_with_uuids( def test_similarity_search_with_uuids(
self, weaviate_url: str, embedding_openai: OpenAIEmbeddings self, weaviate_url: str, embedding_openai: OpenAIEmbeddings