upstream-archive/qdrant
1
0
Fork 0
mirror of https://github.com/qdrant/qdrant.git synced 2026-07-23 11:11:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Return complete error for sparse vector validation (#5536)

Browse Source 
* Return complete error for sparse vector validation

* remove unecessary path

* update test to show new value
This commit is contained in:
Arnaud Gourlay
2024-11-28 12:27:12 +01:00
committed by timvisee
parent 362a721d08
commit 83cd887fcd
4 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/api/src/conversions/vectors.rs
View File

@@ -464,12 +464,11 @@ impl TryFrom<grpc::Vector> for VectorInternal {
// sparse vector
if let Some(indices) = vector.indices {
return Ok(VectorInternal::Sparse(
sparse::common::sparse_vector::SparseVector::new(indices.data, vector.data)
.map_err(|e| {
Status::invalid_argument(format!(
"Sparse indices does not match sparse vector conditions: {e}"
))
})?,
SparseVector::new(indices.data, vector.data).map_err(|e| {
Status::invalid_argument(format!(
"Sparse indices does not match sparse vector conditions: {e}"
))
})?,
));
}

14
lib/api/src/grpc/conversions.rs
View File

@@ -1709,8 +1709,10 @@ pub fn into_named_vector_struct(
Some(indices) => NamedVectorStruct::Sparse(NamedSparseVector {
name: vector_name
.ok_or_else(|| Status::invalid_argument("Sparse vector must have a name"))?,
vector: SparseVector::new(indices.data, vector).map_err(|_| {
Status::invalid_argument("Sparse indices does not match sparse vector conditions")
vector: SparseVector::new(indices.data, vector).map_err(|e| {
Status::invalid_argument(format!(
"Sparse indices does not match sparse vector conditions: {e}"
))
})?,
}),
None => {
@@ -1957,10 +1959,10 @@ impl TryFrom<SearchPointGroups> for rest::SearchGroupsRequestInternal {
if let Some(sparse_indices) = &search_points.sparse_indices {
validate_sparse_vector_impl(&sparse_indices.data, &search_points.vector).map_err(
|_| {
Status::invalid_argument(
"Sparse indices does not match sparse vector conditions",
)
|e| {
Status::invalid_argument(format!(
"Sparse indices does not match sparse vector conditions: {e}"
))
},
)?;
}

10
lib/collection/src/operations/conversions.rs
View File

@@ -932,8 +932,10 @@ impl TryFrom<api::grpc::qdrant::SearchPoints> for CoreSearchRequest {
} = value;
if let Some(sparse_indices) = &sparse_indices {
validate_sparse_vector_impl(&sparse_indices.data, &vector).map_err(|_| {
Status::invalid_argument("Sparse indices does not match sparse vector conditions")
validate_sparse_vector_impl(&sparse_indices.data, &vector).map_err(|e| {
Status::invalid_argument(format!(
"Sparse indices does not match sparse vector conditions: {e}"
))
})?;
}
@@ -1265,9 +1267,9 @@ impl TryFrom<api::grpc::qdrant::VectorExample> for RecommendExample {
match vector.indices {
Some(indices) => {
validate_sparse_vector_impl(&indices.data, &vector.data).map_err(
|_| {
|e| {
Status::invalid_argument(
"Sparse indices does not match sparse vector conditions",
format!("Sparse indices does not match sparse vector conditions: {e}"),
)
},
)?;

2
tests/basic_sparse_grpc_test.sh
View File

@@ -175,7 +175,7 @@ response=$(
"limit": 3
}' $QDRANT_HOST qdrant.Points/Search 2>&1
)
if [[ $response != *"Sparse indices does not match sparse vector conditions"* ]]; then
if [[ $response != *"Sparse indices does not match sparse vector conditions: values: Validation error: must be the same length as indices [{}]"* ]]; then
echo Unexpected response, expected validation error: $response
exit 1
fi