Skip to content

Remove @Nullable from VectorStore similaritySearch #3613

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.

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

Merged
merged 1 commit into from
Jun 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import org.springframework.ai.vectorstore.filter.Filter;
import org.springframework.ai.vectorstore.observation.DefaultVectorStoreObservationConvention;
import org.springframework.ai.vectorstore.observation.VectorStoreObservationConvention;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;

/**
Expand Down Expand Up @@ -91,7 +90,6 @@ default void delete(String filterExpression) {
* topK, similarity threshold and metadata filter expressions.
* @return Returns documents th match the query request conditions.
*/
@Nullable
List<Document> similaritySearch(SearchRequest request);

/**
Expand All @@ -101,7 +99,6 @@ default void delete(String filterExpression) {
* @return Returns a list of documents that have embeddings similar to the query text
* embedding.
*/
@Nullable
default List<Document> similaritySearch(String query) {
return this.similaritySearch(SearchRequest.builder().query(query).build());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,9 @@ public void delete(Filter.Expression filterExpression) {
}

@Override
@Nullable
// Micrometer Observation#observe returns the value of the Supplier, which is never
// null
@SuppressWarnings("DataFlowIssue")
public List<Document> similaritySearch(SearchRequest request) {

VectorStoreObservationContext searchObservationContext = this
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -434,15 +434,13 @@ public List<Document> doSimilaritySearch(SearchRequest request) {
}

// Convert JsonNode to Document
List<Document> docs = documents.stream()
return documents.stream()
.map(doc -> Document.builder()
.id(doc.get("id").asText())
.text(doc.get("content").asText())
.metadata(docFields)
.build())
.collect(Collectors.toList());

return docs != null ? docs : List.of();
}
catch (Exception e) {
logger.error("Error during similarity search: {}", e.getMessage());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
import org.springframework.ai.vectorstore.observation.AbstractObservationVectorStore;
import org.springframework.ai.vectorstore.observation.VectorStoreObservationContext;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
Expand Down Expand Up @@ -148,7 +147,7 @@ public void afterPropertiesSet() throws Exception {
}

@Override
public void doAdd(@NonNull List<Document> documents) {
public void doAdd(List<Document> documents) {
Assert.notNull(documents, "Documents must not be null");
if (CollectionUtils.isEmpty(documents)) {
return;
Expand Down Expand Up @@ -202,8 +201,7 @@ protected void doDelete(Filter.Expression expression) {
}

@Override
@NonNull
public List<Document> doSimilaritySearch(@NonNull SearchRequest request) {
public List<Document> doSimilaritySearch(SearchRequest request) {

String query = request.getQuery();
Assert.notNull(query, "Query string must not be null");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@ public void doDelete(List<String> idList) {
}

@Override
@Nullable
public List<Document> doSimilaritySearch(SearchRequest request) {
if (request.hasFilterExpression()) {
throw new UnsupportedOperationException("GemFire currently does not support metadata filter expressions.");
Expand Down