More refactorings - vector store builders, adding deprecations

Author: sobychacko

spring-ai-core/src/main/java/org/springframework/ai/vectorstore/observation/AbstractObservationVectorStore.java

@@ -22,6 +22,8 @@
 import io.micrometer.observation.ObservationRegistry;
 
 import org.springframework.ai.document.Document;
+import org.springframework.ai.embedding.EmbeddingModel;
+import org.springframework.ai.vectorstore.AbstractVectorStoreBuilder;
 import org.springframework.ai.vectorstore.SearchRequest;
 import org.springframework.ai.vectorstore.VectorStore;
 import org.springframework.lang.Nullable;
@@ -31,6 +33,7 @@
  * capabilities.
  *
  * @author Christian Tzolov
+ * @author Soby Chacko
  * @since 1.0.0
  */
 public abstract class AbstractObservationVectorStore implements VectorStore {
@@ -42,17 +45,42 @@ public abstract class AbstractObservationVectorStore implements VectorStore {
 	@Nullable
 	private final VectorStoreObservationConvention customObservationConvention;
 
+	@Nullable
+	protected final EmbeddingModel embeddingModel;
+
 	/**
 	 * Create a new {@link AbstractObservationVectorStore} instance.
 	 * @param observationRegistry the observation registry to use
 	 * @param customObservationConvention the custom observation convention to use
 	 */
+	@Deprecated(since = "1.0.0-M5", forRemoval = true)
 	public AbstractObservationVectorStore(ObservationRegistry observationRegistry,
 			@Nullable VectorStoreObservationConvention customObservationConvention) {
+		this(null, observationRegistry, customObservationConvention);
+	}
+
+	/**
+	 * Private constructor that both public constructors delegate to. This helps avoid
+	 * code duplication and centralizes object initialization.
+	 */
+	@Deprecated(since = "1.0.0-M5", forRemoval = true)
+	public AbstractObservationVectorStore(@Nullable EmbeddingModel embeddingModel,
+			ObservationRegistry observationRegistry,
+			@Nullable VectorStoreObservationConvention customObservationConvention) {
+		this.embeddingModel = embeddingModel;
 		this.observationRegistry = observationRegistry;
 		this.customObservationConvention = customObservationConvention;
 	}
 
+	/**
+	 * Creates a new AbstractObservationVectorStore instance with the specified builder
+	 * settings. Initializes observation-related components and the embedding model.
+	 * @param builder the builder containing configuration settings
+	 */
+	public AbstractObservationVectorStore(AbstractVectorStoreBuilder<?> builder) {
+		this(builder.embeddingModel(), builder.observationRegistry(), builder.customObservationConvention());
+	}
+
 	/**
 	 * Create a new {@link AbstractObservationVectorStore} instance.
 	 * @param documents the documents to add

spring-ai-core/src/main/java/org/springframework/ai/vectorstore/observation/NewAbstractObservationVectorStore.java

@@ -44,7 +44,6 @@
 import org.springframework.ai.vectorstore.VectorStore;
 import org.springframework.ai.vectorstore.filter.FilterExpressionConverter;
 import org.springframework.ai.vectorstore.observation.AbstractObservationVectorStore;
-import org.springframework.ai.vectorstore.observation.NewAbstractObservationVectorStore;
 import org.springframework.ai.vectorstore.observation.VectorStoreObservationContext;
 import org.springframework.ai.vectorstore.observation.VectorStoreObservationConvention;
 import org.springframework.beans.factory.InitializingBean;
@@ -66,7 +65,7 @@
  * @author Soby Chacko
  * @author Thomas Vitale
  */
-public class ChromaVectorStore extends NewAbstractObservationVectorStore implements InitializingBean {
+public class ChromaVectorStore extends AbstractObservationVectorStore implements InitializingBean {
 
 	public static final String DEFAULT_COLLECTION_NAME = "SpringAiCollection";
 
@@ -87,6 +86,33 @@ public class ChromaVectorStore extends NewAbstractObservationVectorStore impleme
 
 	private boolean initialized = false;
 
+	@Deprecated(since = "1.0.0-M5", forRemoval = true)
+	public ChromaVectorStore(EmbeddingModel embeddingModel, ChromaApi chromaApi, boolean initializeSchema) {
+		this(embeddingModel, chromaApi, DEFAULT_COLLECTION_NAME, initializeSchema);
+	}
+
+	@Deprecated(since = "1.0.0-M5", forRemoval = true)
+	public ChromaVectorStore(EmbeddingModel embeddingModel, ChromaApi chromaApi, String collectionName,
+			boolean initializeSchema) {
+		this(embeddingModel, chromaApi, collectionName, initializeSchema, ObservationRegistry.NOOP, null,
+				new TokenCountBatchingStrategy());
+	}
+
+	@Deprecated(since = "1.0.0-M5", forRemoval = true)
+	public ChromaVectorStore(EmbeddingModel embeddingModel, ChromaApi chromaApi, String collectionName,
+			boolean initializeSchema, ObservationRegistry observationRegistry,
+			VectorStoreObservationConvention customObservationConvention, BatchingStrategy batchingStrategy) {
+
+		super(embeddingModel, observationRegistry, customObservationConvention);
+
+		this.chromaApi = chromaApi;
+		this.collectionName = collectionName;
+		this.initializeSchema = initializeSchema;
+		this.filterExpressionConverter = new ChromaFilterExpressionConverter();
+		this.batchingStrategy = batchingStrategy;
+		this.objectMapper = JsonMapper.builder().addModules(JacksonUtils.instantiateAvailableModules()).build();
+	}
+
 	/**
 	 * @param builder {@link Builder} for chroma vector store
 	 */