Skip to content

Updated MongoDBAtlasVectorStore to use org.bson.Document #1026

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

Merged
merged 1 commit into from
Jul 24, 2024
Merged

Updated MongoDBAtlasVectorStore to use org.bson.Document #1026

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
23 changes: 10 additions & 13 deletions ...atlas-store/src/main/java/org/springframework/ai/vectorstore/MongoDBAtlasVectorStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
import java.util.Map;
import java.util.Optional;

import com.mongodb.BasicDBObject;

import com.mongodb.MongoCommandException;
import org.springframework.ai.document.Document;
import org.springframework.ai.embedding.EmbeddingModel;
Expand Down Expand Up @@ -140,16 +138,15 @@ private org.bson.Document createSearchIndexDefinition() {
}

/**
* Maps a BasicDBObject to a Spring AI Document
* @param basicDBObject the basicDBObject to map to a spring ai document
* @return the spring ai document
* Maps a Bson Document to a Spring AI Document
* @param mongoDocument the mongoDocument to map to a Spring AI Document
* @return the Spring AI Document
*/
@SuppressWarnings("unchecked")
private Document mapBasicDbObject(BasicDBObject basicDBObject) {
String id = basicDBObject.getString(ID_FIELD_NAME);
String content = basicDBObject.getString(CONTENT_FIELD_NAME);
Map<String, Object> metadata = (Map<String, Object>) basicDBObject.get(METADATA_FIELD_NAME);
List<Double> embedding = (List<Double>) basicDBObject.get(this.config.pathName);
private Document mapMongoDocument(org.bson.Document mongoDocument) {
String id = mongoDocument.getString(ID_FIELD_NAME);
String content = mongoDocument.getString(CONTENT_FIELD_NAME);
Map<String, Object> metadata = mongoDocument.get(METADATA_FIELD_NAME, org.bson.Document.class);
List<Double> embedding = mongoDocument.getList(this.config.pathName, Double.class);

Document document = new Document(id, content, metadata);
document.setEmbedding(embedding);
Expand Down Expand Up @@ -198,10 +195,10 @@ public List<Document> similaritySearch(SearchRequest request) {
.build(),
Aggregation.match(new Criteria(SCORE_FIELD_NAME).gte(request.getSimilarityThreshold())));

return this.mongoTemplate.aggregate(aggregation, this.config.collectionName, BasicDBObject.class)
return this.mongoTemplate.aggregate(aggregation, this.config.collectionName, org.bson.Document.class)
.getMappedResults()
.stream()
.map(this::mapBasicDbObject)
.map(this::mapMongoDocument)
.toList();
}

Expand Down