Skip to content

Commit 59fdb7f

Browse files
committed
[NOID] Fixes #4233: Improve Weaviate error handling (#4239)
* Fixes #4233: Improve Weaviate error handling * fix tests
1 parent ae7315d commit 59fdb7f

File tree

2 files changed

+29
-1
lines changed

2 files changed

+29
-1
lines changed

full-it/src/test/java/apoc/full/it/vectordb/WeaviateTest.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@
1010
import static apoc.vectordb.VectorDbTestUtil.EntityType.*;
1111
import static apoc.vectordb.VectorDbUtil.ERROR_READONLY_MAPPING;
1212
import static apoc.vectordb.VectorEmbeddingConfig.ALL_RESULTS_KEY;
13+
import static apoc.vectordb.VectorEmbeddingConfig.FIELDS_KEY;
1314
import static apoc.vectordb.VectorEmbeddingConfig.MAPPING_KEY;
1415
import static apoc.vectordb.VectorMappingConfig.*;
1516
import static org.assertj.core.api.Assertions.assertThat;
1617
import static org.junit.Assert.assertEquals;
1718
import static org.junit.Assert.assertFalse;
1819
import static org.junit.Assert.assertNotNull;
1920
import static org.junit.Assert.assertNull;
21+
import static org.junit.Assert.assertTrue;
2022
import static org.junit.Assert.fail;
2123
import static org.neo4j.configuration.GraphDatabaseSettings.DEFAULT_DATABASE_NAME;
2224
import static org.neo4j.configuration.GraphDatabaseSettings.SYSTEM_DATABASE_NAME;
@@ -167,6 +169,24 @@ public void writeOperationWithReadOnlyUser() {
167169
assertThat(e.getMessage()).contains("HTTP response code: 403");
168170
}
169171
}
172+
173+
@Test
174+
public void queryWithWrongEmbeddingSize() {
175+
Map<String, Object> conf = map(ALL_RESULTS_KEY, true,
176+
FIELDS_KEY, FIELDS,
177+
HEADERS_KEY, READONLY_AUTHORIZATION);
178+
179+
180+
try {
181+
testCall(db, "CALL apoc.vectordb.weaviate.query($host, 'TestCollection', [0.2, 0.1, 0.9], null, 5, $conf)",
182+
map("host", HOST, "conf", conf),
183+
r -> fail());
184+
} catch (Exception e) {
185+
String message = e.getMessage();
186+
String expectedErrMsg = "distance between entrypoint and query node: vector lengths don't match: 4 vs 3";
187+
assertTrue(message.contains(expectedErrMsg));
188+
}
189+
}
170190

171191
@Test
172192
public void getVectorsWithoutVectorResult() {

full/src/main/java/apoc/vectordb/Weaviate.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
import java.util.Map;
1919
import java.util.stream.Collectors;
2020
import java.util.stream.Stream;
21+
import org.apache.commons.collections4.CollectionUtils;
22+
import org.apache.commons.lang3.StringUtils;
2123
import org.neo4j.graphdb.GraphDatabaseService;
2224
import org.neo4j.graphdb.Transaction;
2325
import org.neo4j.internal.kernel.api.procs.ProcedureCallContext;
@@ -248,7 +250,13 @@ private Stream<EmbeddingResult> queryCommon(
248250
VectorEmbeddingConfig conf =
249251
DB_HANDLER.getEmbedding().fromQuery(config, procedureCallContext, vector, filter, limit, collection);
250252
return getEmbeddingResultStream(conf, procedureCallContext, tx, v -> {
251-
Object getValue = ((Map<String, Map>) v).get("data").get("Get");
253+
Map<String, Map> mapResult = (Map<String, Map>) v;
254+
List<Map> errors = (List<Map>) mapResult.get("errors");
255+
if (CollectionUtils.isNotEmpty(errors)) {
256+
String message = "An error occurred during Weaviate API response: \n" + StringUtils.join(errors, "\n");
257+
throw new RuntimeException(message);
258+
}
259+
Object getValue = mapResult.get("data").get("Get");
252260
Object collectionValue = ((Map) getValue).get(collection);
253261
return ((List<Map>) collectionValue).stream().map(i -> {
254262
Map additional = (Map) i.remove("_additional");

0 commit comments

Comments
 (0)