Skip to content

fix: Preserve rrf_ranking_alpha=0.0 in MatchingEngineIndexEndpoint hybrid queries #6993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −3
Open

fix: Preserve rrf_ranking_alpha=0.0 in MatchingEngineIndexEndpoint hybrid queries #6993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions google/cloud/aiplatform/matching_engine/matching_engine_index_endpoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1865,7 +1865,7 @@ def find_neighbors(
dimensions=query.sparse_embedding_dimensions,
),
)
if query.rrf_ranking_alpha:
if query.rrf_ranking_alpha is not None:
find_neighbors_query.rrf = (
gca_match_service_v1beta1.FindNeighborsRequest.Query.RRF(
alpha=query.rrf_ranking_alpha,
Expand Down Expand Up @@ -2200,7 +2200,7 @@ def match(
match_service_pb2.MatchRequest.RRF(
alpha=query.rrf_ranking_alpha,
)
if query_is_hybrid and query.rrf_ranking_alpha
if query_is_hybrid and query.rrf_ranking_alpha is not None
else None
),
)
Expand Down
28 changes: 27 additions & 1 deletion tests/unit/aiplatform/test_matching_engine_index_endpoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,11 @@
sparse_embedding_dimensions=[1, 2, 3],
sparse_embedding_values=[0.1, 0.2, 0.3],
),
HybridQuery(
sparse_embedding_dimensions=[1, 2, 3],
sparse_embedding_values=[0.1, 0.2, 0.3],
rrf_ranking_alpha=0.0, # Test edge case where alpha is 0
),
]
_TEST_NUM_NEIGHBOURS = 1
_TEST_FILTER = [
Expand Down Expand Up @@ -1539,7 +1544,7 @@ def test_private_service_access_hybrid_search_match_queries(
match_service_pb2.MatchRequest.RRF(
alpha=_TEST_HYBRID_QUERIES[i].rrf_ranking_alpha,
)
if _TEST_HYBRID_QUERIES[i].rrf_ranking_alpha
if _TEST_HYBRID_QUERIES[i].rrf_ranking_alpha is not None
else None
),
)
Expand Down Expand Up @@ -2093,6 +2098,27 @@ def test_index_public_endpoint_find_neighbors_queries(
approximate_neighbor_count=_TEST_APPROX_NUM_NEIGHBORS,
fraction_leaf_nodes_to_search_override=_TEST_FRACTION_LEAF_NODES_TO_SEARCH_OVERRIDE,
),
gca_match_service_v1beta1.FindNeighborsRequest.Query(
neighbor_count=_TEST_NUM_NEIGHBOURS,
datapoint=gca_index_v1beta1.IndexDatapoint(
restricts=[
gca_index_v1beta1.IndexDatapoint.Restriction(
namespace="class",
allow_list=["token_1"],
deny_list=["token_2"],
)
],
sparse_embedding=gca_index_v1beta1.IndexDatapoint.SparseEmbedding(
values=[0.1, 0.2, 0.3], dimensions=[1, 2, 3]
),
),
rrf=gca_match_service_v1beta1.FindNeighborsRequest.Query.RRF(
alpha=0.0,
),
per_crowding_attribute_neighbor_count=_TEST_PER_CROWDING_ATTRIBUTE_NUM_NEIGHBOURS,
approximate_neighbor_count=_TEST_APPROX_NUM_NEIGHBORS,
fraction_leaf_nodes_to_search_override=_TEST_FRACTION_LEAF_NODES_TO_SEARCH_OVERRIDE,
),
],
return_full_datapoint=_TEST_RETURN_FULL_DATAPOINT,
)
Expand Down
Loading