Skip to content

GH-1529 Fix ChromaVectorStore delete Ids operation #1730

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

Closed
wants to merge 1 commit into from
Closed

GH-1529 Fix ChromaVectorStore delete Ids operation #1730

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
1 change: 0 additions & 1 deletion models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/BaseOllamaIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import java.time.Duration;

import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.ollama.OllamaContainer;

Expand Down
12 changes: 5 additions & 7 deletions ...-stores/spring-ai-chroma-store/src/main/java/org/springframework/ai/chroma/ChromaApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import com.fasterxml.jackson.databind.ObjectMapper;

import org.springframework.ai.chroma.ChromaApi.QueryRequest.Include;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
Expand Down Expand Up @@ -188,17 +187,16 @@ public void upsertEmbeddings(String collectionId, AddEmbeddingsRequest embedding
.toBodilessEntity();
}

public List<String> deleteEmbeddings(String collectionId, DeleteEmbeddingsRequest deleteRequest) {
public String deleteEmbeddings(String collectionId, DeleteEmbeddingsRequest deleteRequest) {

return this.restClient.post()
return String.valueOf(this.restClient.post()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why return a string instead of the http status code which is an int?

.uri("/api/v1/collections/{collection_id}/delete", collectionId)
.headers(this::httpHeaders)
.body(deleteRequest)
.retrieve()
.toEntity(new ParameterizedTypeReference<List<String>>() {

})
.getBody();
.toEntity(String.class)
.getStatusCode()
.value());
}

public Long countEmbeddings(String collectionId) {
Expand Down
5 changes: 2 additions & 3 deletions ...g-ai-chroma-store/src/main/java/org/springframework/ai/vectorstore/ChromaVectorStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,8 @@ public void doAdd(List<Document> documents) {
@Override
public Optional<Boolean> doDelete(List<String> idList) {
Assert.notNull(idList, "Document id list must not be null");
List<String> deletedIds = this.chromaApi.deleteEmbeddings(this.collectionId,
new DeleteEmbeddingsRequest(idList));
return Optional.of(deletedIds.size() == idList.size());
String status = this.chromaApi.deleteEmbeddings(this.collectionId, new DeleteEmbeddingsRequest(idList));
return Optional.of(status.equals("200"));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion vector-stores/spring-ai-chroma-store/src/test/java/org/springframework/ai/ChromaImage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/
public final class ChromaImage {

public static final DockerImageName DEFAULT_IMAGE = DockerImageName.parse("ghcr.io/chroma-core/chroma:0.5.11");
public static final DockerImageName DEFAULT_IMAGE = DockerImageName.parse("ghcr.io/chroma-core/chroma:0.5.16");

private ChromaImage() {

Expand Down
4 changes: 3 additions & 1 deletion ...ai-chroma-store/src/test/java/org/springframework/ai/vectorstore/ChromaVectorStoreIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;

import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -83,7 +84,8 @@ public void addAndSearch() {
assertThat(resultDoc.getMetadata()).containsKeys("meta2", "distance");

// Remove all documents from the store
vectorStore.delete(this.documents.stream().map(doc -> doc.getId()).toList());
assertThat(vectorStore.delete(this.documents.stream().map(doc -> doc.getId()).toList()))
.isEqualTo(Optional.of(Boolean.TRUE));

List<Document> results2 = vectorStore.similaritySearch(SearchRequest.query("Great").withTopK(1));
assertThat(results2).hasSize(0);
Expand Down