Chroma vector store builer refactoring

Author: sobychacko

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/chroma/ChromaVectorStoreAutoConfiguration.java

@@ -86,9 +86,13 @@ public ChromaVectorStore vectorStore(EmbeddingModel embeddingModel, ChromaApi ch
 			ChromaVectorStoreProperties storeProperties, ObjectProvider<ObservationRegistry> observationRegistry,
 			ObjectProvider<VectorStoreObservationConvention> customObservationConvention,
 			BatchingStrategy chromaBatchingStrategy) {
-		return new ChromaVectorStore(embeddingModel, chromaApi, storeProperties.getCollectionName(),
-				storeProperties.isInitializeSchema(), observationRegistry.getIfUnique(() -> ObservationRegistry.NOOP),
-				customObservationConvention.getIfAvailable(() -> null), chromaBatchingStrategy);
+		return ChromaVectorStore.builder(embeddingModel, chromaApi)
+			.collectionName(storeProperties.getCollectionName())
+			.initializeSchema(storeProperties.isInitializeSchema())
+			.observationRegistry(observationRegistry.getIfUnique(() -> ObservationRegistry.NOOP))
+			.customObservationConvention(customObservationConvention.getIfAvailable(() -> null))
+			.batchingStrategy(chromaBatchingStrategy)
+			.build();
 	}
 
 	static class PropertiesChromaConnectionDetails implements ChromaConnectionDetails {

vector-stores/spring-ai-chroma-store/src/main/java/org/springframework/ai/vectorstore/ChromaVectorStore.java

@@ -83,31 +83,6 @@ public class ChromaVectorStore extends AbstractObservationVectorStore implements
 
 	private boolean initialized = false;
 
-	public ChromaVectorStore(EmbeddingModel embeddingModel, ChromaApi chromaApi, boolean initializeSchema) {
-		this(embeddingModel, chromaApi, DEFAULT_COLLECTION_NAME, initializeSchema);
-	}
-
-	public ChromaVectorStore(EmbeddingModel embeddingModel, ChromaApi chromaApi, String collectionName,
-			boolean initializeSchema) {
-		this(embeddingModel, chromaApi, collectionName, initializeSchema, ObservationRegistry.NOOP, null,
-				new TokenCountBatchingStrategy());
-	}
-
-	public ChromaVectorStore(EmbeddingModel embeddingModel, ChromaApi chromaApi, String collectionName,
-			boolean initializeSchema, ObservationRegistry observationRegistry,
-			VectorStoreObservationConvention customObservationConvention, BatchingStrategy batchingStrategy) {
-
-		super(observationRegistry, customObservationConvention);
-
-		this.embeddingModel = embeddingModel;
-		this.chromaApi = chromaApi;
-		this.collectionName = collectionName;
-		this.initializeSchema = initializeSchema;
-		this.filterExpressionConverter = new ChromaFilterExpressionConverter();
-		this.batchingStrategy = batchingStrategy;
-		this.objectMapper = JsonMapper.builder().addModules(JacksonUtils.instantiateAvailableModules()).build();
-	}
-
 	private ChromaVectorStore(Builder builder) {
 		super(builder.observationRegistry, builder.customObservationConvention);
 		this.embeddingModel = builder.embeddingModel;
@@ -128,6 +103,10 @@ private ChromaVectorStore(Builder builder) {
 		}
 	}
 
+	public static Builder builder(EmbeddingModel embeddingModel, ChromaApi chromaApi) {
+		return new Builder(embeddingModel, chromaApi);
+	}
+
 	public void setFilterExpressionConverter(FilterExpressionConverter filterExpressionConverter) {
 		Assert.notNull(filterExpressionConverter, "FilterExpressionConverter should not be null.");
 		this.filterExpressionConverter = filterExpressionConverter;

vector-stores/spring-ai-chroma-store/src/test/java/org/springframework/ai/vectorstore/BasicAuthChromaWhereIT.java

@@ -110,7 +110,10 @@ public ChromaApi chromaApi(RestClient.Builder builder) {
 
 		@Bean
 		public VectorStore chromaVectorStore(EmbeddingModel embeddingModel, ChromaApi chromaApi) {
-			return new ChromaVectorStore(embeddingModel, chromaApi, "TestCollection", true);
+			return ChromaVectorStore.builder(embeddingModel, chromaApi)
+				.collectionName("TestCollection")
+				.initializeSchema(true)
+				.build();
 		}
 
 		@Bean

vector-stores/spring-ai-chroma-store/src/test/java/org/springframework/ai/vectorstore/ChromaVectorStoreIT.java

@@ -249,7 +249,10 @@ public ChromaApi chromaApi(RestClient.Builder builder) {
 
 		@Bean
 		public VectorStore chromaVectorStore(EmbeddingModel embeddingModel, ChromaApi chromaApi) {
-			return new ChromaVectorStore(embeddingModel, chromaApi, "TestCollection", true);
+			return ChromaVectorStore.builder(embeddingModel, chromaApi)
+				.collectionName("TestCollection")
+				.initializeSchema(true)
+				.build();
 		}
 
 		@Bean

vector-stores/spring-ai-chroma-store/src/test/java/org/springframework/ai/vectorstore/ChromaVectorStoreObservationIT.java

@@ -176,8 +176,12 @@ public ChromaApi chromaApi(RestClient.Builder builder) {
 		@Bean
 		public VectorStore chromaVectorStore(EmbeddingModel embeddingModel, ChromaApi chromaApi,
 				ObservationRegistry observationRegistry) {
-			return new ChromaVectorStore(embeddingModel, chromaApi, "TestCollection", true, observationRegistry, null,
-					new TokenCountBatchingStrategy());
+			return ChromaVectorStore.builder(embeddingModel, chromaApi)
+				.collectionName("TestCollection")
+				.initializeSchema(true)
+				.observationRegistry(observationRegistry)
+				.batchingStrategy(new TokenCountBatchingStrategy())
+				.build();
 		}
 
 		@Bean

vector-stores/spring-ai-chroma-store/src/test/java/org/springframework/ai/vectorstore/TokenSecuredChromaWhereIT.java

@@ -143,7 +143,10 @@ public ChromaApi chromaApi(RestClient.Builder builder) {
 
 		@Bean
 		public VectorStore chromaVectorStore(EmbeddingModel embeddingModel, ChromaApi chromaApi) {
-			return new ChromaVectorStore(embeddingModel, chromaApi, "TestCollection", true);
+			return ChromaVectorStore.builder(embeddingModel, chromaApi)
+				.collectionName("TestCollection")
+				.initializeSchema(true)
+				.build();
 		}
 
 		@Bean