Skip to content

Commit 29f17b4

Browse files
sobychackosobychacko
committed
Fixing formatting changes
1 parent 80b5428 commit 29f17b4

File tree

4 files changed

+55
-85
lines changed

4 files changed

+55
-85
lines changed

‎vector-stores/spring-ai-neo4j-store/src/main/java/org/springframework/ai/vectorstore/neo4j/Neo4jVectorStore.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -247,13 +247,11 @@ protected void doDelete(Filter.Expression filterExpression) {
247247

248248
// Create Cypher query with transaction batching
249249
String cypher = """
250-
MATCH (node:%s) WHERE %s
251-
CALL { WITH node DETACH DELETE node } IN TRANSACTIONS OF $transactionSize ROWS
252-
""".formatted(this.label, whereClause);
250+
MATCH (node:%s) WHERE %s
251+
CALL { WITH node DETACH DELETE node } IN TRANSACTIONS OF $transactionSize ROWS
252+
""".formatted(this.label, whereClause);
253253

254-
var summary = session.run(cypher,
255-
Map.of("transactionSize", DEFAULT_TRANSACTION_SIZE))
256-
.consume();
254+
var summary = session.run(cypher, Map.of("transactionSize", DEFAULT_TRANSACTION_SIZE)).consume();
257255

258256
logger.debug("Deleted {} nodes matching filter expression", summary.counters().nodesDeleted());
259257
}

‎vector-stores/spring-ai-neo4j-store/src/test/java/org/springframework/ai/vectorstore/neo4j/Neo4jVectorStoreIT.java‎

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -319,10 +319,10 @@ void deleteByFilter() {
319319
vectorStore.add(List.of(bgDocument, nlDocument, bgDocument2));
320320

321321
SearchRequest searchRequest = SearchRequest.builder()
322-
.query("The World")
323-
.topK(5)
324-
.similarityThresholdAll()
325-
.build();
322+
.query("The World")
323+
.topK(5)
324+
.similarityThresholdAll()
325+
.build();
326326

327327
List<Document> results = vectorStore.similaritySearch(searchRequest);
328328
assertThat(results).hasSize(3);
@@ -352,11 +352,7 @@ void deleteWithStringFilterExpression() {
352352

353353
vectorStore.add(List.of(bgDocument, nlDocument, bgDocument2));
354354

355-
var searchRequest = SearchRequest.builder()
356-
.query("The World")
357-
.topK(5)
358-
.similarityThresholdAll()
359-
.build();
355+
var searchRequest = SearchRequest.builder().query("The World").topK(5).similarityThresholdAll().build();
360356

361357
List<Document> results = vectorStore.similaritySearch(searchRequest);
362358
assertThat(results).hasSize(3);
@@ -383,28 +379,21 @@ void deleteWithComplexFilterExpression() {
383379
// Complex filter expression: (type == 'A' AND priority > 1)
384380
Filter.Expression priorityFilter = new Filter.Expression(Filter.ExpressionType.GT,
385381
new Filter.Key("priority"), new Filter.Value(1));
386-
Filter.Expression typeFilter = new Filter.Expression(Filter.ExpressionType.EQ,
387-
new Filter.Key("type"), new Filter.Value("A"));
388-
Filter.Expression complexFilter = new Filter.Expression(Filter.ExpressionType.AND,
389-
typeFilter, priorityFilter);
382+
Filter.Expression typeFilter = new Filter.Expression(Filter.ExpressionType.EQ, new Filter.Key("type"),
383+
new Filter.Value("A"));
384+
Filter.Expression complexFilter = new Filter.Expression(Filter.ExpressionType.AND, typeFilter,
385+
priorityFilter);
390386

391387
vectorStore.delete(complexFilter);
392388

393-
var results = vectorStore.similaritySearch(SearchRequest.builder()
394-
.query("Content")
395-
.topK(5)
396-
.similarityThresholdAll()
397-
.build());
389+
var results = vectorStore
390+
.similaritySearch(SearchRequest.builder().query("Content").topK(5).similarityThresholdAll().build());
398391

399392
assertThat(results).hasSize(2);
400-
assertThat(results.stream()
401-
.map(doc -> doc.getMetadata().get("type"))
402-
.collect(Collectors.toList()))
403-
.containsExactlyInAnyOrder("A", "B");
404-
assertThat(results.stream()
405-
.map(doc -> doc.getMetadata().get("priority"))
406-
.collect(Collectors.toList()))
407-
.containsExactlyInAnyOrder(1L, 1L);
393+
assertThat(results.stream().map(doc -> doc.getMetadata().get("type")).collect(Collectors.toList()))
394+
.containsExactlyInAnyOrder("A", "B");
395+
assertThat(results.stream().map(doc -> doc.getMetadata().get("priority")).collect(Collectors.toList()))
396+
.containsExactlyInAnyOrder(1L, 1L);
408397
});
409398
}
410399

‎vector-stores/spring-ai-opensearch-store/src/main/java/org/springframework/ai/vectorstore/opensearch/OpenSearchVectorStore.java‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -242,20 +242,16 @@ protected void doDelete(Filter.Expression filterExpression) {
242242
String filterStr = this.filterExpressionConverter.convertExpression(filterExpression);
243243

244244
// Create delete by query request
245-
DeleteByQueryRequest request = new DeleteByQueryRequest.Builder()
246-
.index(this.index)
247-
.query(q -> q
248-
.queryString(qs -> qs
249-
.query(filterStr)
250-
))
251-
.build();
252-
253-
DeleteByQueryResponse response = this.openSearchClient.deleteByQuery(request);
254-
logger.debug("Deleted {} documents matching filter expression", response.deleted());
255-
256-
if (!response.failures().isEmpty()) {
257-
throw new IllegalStateException("Failed to delete some documents: " + response.failures());
258-
}
245+
DeleteByQueryRequest request = new DeleteByQueryRequest.Builder().index(this.index)
246+
.query(q -> q.queryString(qs -> qs.query(filterStr)))
247+
.build();
248+
249+
DeleteByQueryResponse response = this.openSearchClient.deleteByQuery(request);
250+
logger.debug("Deleted {} documents matching filter expression", response.deleted());
251+
252+
if (!response.failures().isEmpty()) {
253+
throw new IllegalStateException("Failed to delete some documents: " + response.failures());
254+
}
259255
}
260256
catch (Exception e) {
261257
logger.error("Failed to delete documents by filter: {}", e.getMessage(), e);

‎vector-stores/spring-ai-opensearch-store/src/test/java/org/springframework/ai/vectorstore/opensearch/OpenSearchVectorStoreIT.java‎

Lines changed: 26 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -432,23 +432,20 @@ void deleteByFilter() {
432432
vectorStore.add(List.of(bgDocument, nlDocument, bgDocument2));
433433

434434
Awaitility.await()
435-
.until(() -> vectorStore.similaritySearch(SearchRequest.builder().query("The World").topK(5).build()),
436-
hasSize(3));
435+
.until(() -> vectorStore.similaritySearch(SearchRequest.builder().query("The World").topK(5).build()),
436+
hasSize(3));
437437

438438
Filter.Expression filterExpression = new Filter.Expression(Filter.ExpressionType.EQ,
439439
new Filter.Key("country"), new Filter.Value("BG"));
440440

441441
vectorStore.delete(filterExpression);
442442

443443
Awaitility.await()
444-
.until(() -> vectorStore.similaritySearch(SearchRequest.builder().query("The World").topK(5).build()),
445-
hasSize(1));
444+
.until(() -> vectorStore.similaritySearch(SearchRequest.builder().query("The World").topK(5).build()),
445+
hasSize(1));
446446

447-
List<Document> results = vectorStore.similaritySearch(SearchRequest.builder()
448-
.query("The World")
449-
.topK(5)
450-
.similarityThresholdAll()
451-
.build());
447+
List<Document> results = vectorStore
448+
.similaritySearch(SearchRequest.builder().query("The World").topK(5).similarityThresholdAll().build());
452449

453450
assertThat(results).hasSize(1);
454451
assertThat(results.get(0).getMetadata()).containsEntry("country", "NL");
@@ -470,20 +467,17 @@ void deleteWithStringFilterExpression() {
470467
vectorStore.add(List.of(bgDocument, nlDocument, bgDocument2));
471468

472469
Awaitility.await()
473-
.until(() -> vectorStore.similaritySearch(SearchRequest.builder().query("The World").topK(5).build()),
474-
hasSize(3));
470+
.until(() -> vectorStore.similaritySearch(SearchRequest.builder().query("The World").topK(5).build()),
471+
hasSize(3));
475472

476473
vectorStore.delete("country == 'BG'");
477474

478475
Awaitility.await()
479-
.until(() -> vectorStore.similaritySearch(SearchRequest.builder().query("The World").topK(5).build()),
480-
hasSize(1));
476+
.until(() -> vectorStore.similaritySearch(SearchRequest.builder().query("The World").topK(5).build()),
477+
hasSize(1));
481478

482-
List<Document> results = vectorStore.similaritySearch(SearchRequest.builder()
483-
.query("The World")
484-
.topK(5)
485-
.similarityThresholdAll()
486-
.build());
479+
List<Document> results = vectorStore
480+
.similaritySearch(SearchRequest.builder().query("The World").topK(5).similarityThresholdAll().build());
487481

488482
assertThat(results).hasSize(1);
489483
assertThat(results.get(0).getMetadata()).containsEntry("country", "NL");
@@ -502,38 +496,31 @@ void deleteWithComplexFilterExpression() {
502496
vectorStore.add(List.of(doc1, doc2, doc3));
503497

504498
Awaitility.await()
505-
.until(() -> vectorStore.similaritySearch(SearchRequest.builder().query("Content").topK(5).build()),
506-
hasSize(3));
499+
.until(() -> vectorStore.similaritySearch(SearchRequest.builder().query("Content").topK(5).build()),
500+
hasSize(3));
507501

508502
// Complex filter expression: (type == 'A' AND priority > 1)
509503
Filter.Expression priorityFilter = new Filter.Expression(Filter.ExpressionType.GT,
510504
new Filter.Key("priority"), new Filter.Value(1));
511-
Filter.Expression typeFilter = new Filter.Expression(Filter.ExpressionType.EQ,
512-
new Filter.Key("type"), new Filter.Value("A"));
513-
Filter.Expression complexFilter = new Filter.Expression(Filter.ExpressionType.AND,
514-
typeFilter, priorityFilter);
505+
Filter.Expression typeFilter = new Filter.Expression(Filter.ExpressionType.EQ, new Filter.Key("type"),
506+
new Filter.Value("A"));
507+
Filter.Expression complexFilter = new Filter.Expression(Filter.ExpressionType.AND, typeFilter,
508+
priorityFilter);
515509

516510
vectorStore.delete(complexFilter);
517511

518512
Awaitility.await()
519-
.until(() -> vectorStore.similaritySearch(SearchRequest.builder().query("Content").topK(5).build()),
520-
hasSize(2));
513+
.until(() -> vectorStore.similaritySearch(SearchRequest.builder().query("Content").topK(5).build()),
514+
hasSize(2));
521515

522-
var results = vectorStore.similaritySearch(SearchRequest.builder()
523-
.query("Content")
524-
.topK(5)
525-
.similarityThresholdAll()
526-
.build());
516+
var results = vectorStore
517+
.similaritySearch(SearchRequest.builder().query("Content").topK(5).similarityThresholdAll().build());
527518

528519
assertThat(results).hasSize(2);
529-
assertThat(results.stream()
530-
.map(doc -> doc.getMetadata().get("type"))
531-
.collect(Collectors.toList()))
532-
.containsExactlyInAnyOrder("A", "B");
533-
assertThat(results.stream()
534-
.map(doc -> doc.getMetadata().get("priority"))
535-
.collect(Collectors.toList()))
536-
.containsExactlyInAnyOrder(1, 1);
520+
assertThat(results.stream().map(doc -> doc.getMetadata().get("type")).collect(Collectors.toList()))
521+
.containsExactlyInAnyOrder("A", "B");
522+
assertThat(results.stream().map(doc -> doc.getMetadata().get("priority")).collect(Collectors.toList()))
523+
.containsExactlyInAnyOrder(1, 1);
537524
});
538525
}
539526

0 commit comments

Comments
 (0)