Skip to content

Commit a082ef2

Browse files
ssh-eshssh-esh
committed
fix warning: rank field deprecated
1 parent b956165 commit a082ef2

File tree

2 files changed

+84
-58
lines changed

2 files changed

+84
-58
lines changed

‎libs/elasticsearch/tests/integration_tests/_async/test_vectorstores.py‎

Lines changed: 42 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -823,38 +823,51 @@ def assert_query(
823823
# 2. check query result is okay
824824
es_output = await docsearch.client.search(
825825
index=index_name,
826-
query={
827-
"bool": {
828-
"filter": [],
829-
"must": [{"match": {"text": {"query": "foo"}}}],
826+
retriever={
827+
"rrf": {
828+
"retrievers": [
829+
{
830+
"standard": {
831+
"query": {
832+
"bool": {
833+
"filter": [],
834+
"must": [{"match": {"text": {"query": "foo"}}}],
835+
}
836+
}
837+
}
838+
},
839+
{
840+
"knn": {
841+
"field": "vector",
842+
"filter": [],
843+
"k": 3,
844+
"num_candidates": 50,
845+
"query_vector": [
846+
0.06,
847+
0.07,
848+
0.01,
849+
0.08,
850+
0.03,
851+
0.07,
852+
0.09,
853+
0.03,
854+
0.09,
855+
0.09,
856+
0.04,
857+
0.03,
858+
0.08,
859+
0.07,
860+
0.06,
861+
0.08,
862+
],
863+
}
864+
},
865+
],
866+
"rank_constant": 1,
867+
"rank_window_size": 5,
830868
}
831869
},
832-
knn={
833-
"field": "vector",
834-
"filter": [],
835-
"k": 3,
836-
"num_candidates": 50,
837-
"query_vector": [
838-
0.06,
839-
0.07,
840-
0.01,
841-
0.08,
842-
0.03,
843-
0.07,
844-
0.09,
845-
0.03,
846-
0.09,
847-
0.09,
848-
0.04,
849-
0.03,
850-
0.08,
851-
0.07,
852-
0.06,
853-
0.08,
854-
],
855-
},
856870
size=3,
857-
rank={"rrf": {"rank_constant": 1, "rank_window_size": 5}},
858871
)
859872

860873
assert [o.page_content for o in output] == [

‎libs/elasticsearch/tests/integration_tests/_sync/test_vectorstores.py‎

Lines changed: 42 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -807,38 +807,51 @@ def assert_query(
807807
# 2. check query result is okay
808808
es_output = docsearch.client.search(
809809
index=index_name,
810-
query={
811-
"bool": {
812-
"filter": [],
813-
"must": [{"match": {"text": {"query": "foo"}}}],
810+
retriever={
811+
"rrf": {
812+
"retrievers": [
813+
{
814+
"standard": {
815+
"query": {
816+
"bool": {
817+
"filter": [],
818+
"must": [{"match": {"text": {"query": "foo"}}}],
819+
}
820+
}
821+
}
822+
},
823+
{
824+
"knn": {
825+
"field": "vector",
826+
"filter": [],
827+
"k": 3,
828+
"num_candidates": 50,
829+
"query_vector": [
830+
0.06,
831+
0.07,
832+
0.01,
833+
0.08,
834+
0.03,
835+
0.07,
836+
0.09,
837+
0.03,
838+
0.09,
839+
0.09,
840+
0.04,
841+
0.03,
842+
0.08,
843+
0.07,
844+
0.06,
845+
0.08,
846+
],
847+
}
848+
},
849+
],
850+
"rank_constant": 1,
851+
"rank_window_size": 5,
814852
}
815853
},
816-
knn={
817-
"field": "vector",
818-
"filter": [],
819-
"k": 3,
820-
"num_candidates": 50,
821-
"query_vector": [
822-
0.06,
823-
0.07,
824-
0.01,
825-
0.08,
826-
0.03,
827-
0.07,
828-
0.09,
829-
0.03,
830-
0.09,
831-
0.09,
832-
0.04,
833-
0.03,
834-
0.08,
835-
0.07,
836-
0.06,
837-
0.08,
838-
],
839-
},
840854
size=3,
841-
rank={"rrf": {"rank_constant": 1, "rank_window_size": 5}},
842855
)
843856

844857
assert [o.page_content for o in output] == [

0 commit comments

Comments
 (0)