Skip to content

refactor(vectorstore): introduce builder pattern for MilvusVectorStore #1885

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 2 commits into from
Closed

refactor(vectorstore): introduce builder pattern for MilvusVectorStore #1885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1397230
refactor(vectorstore): introduce builder pattern for MilvusVectorStore
sobychacko Dec 6, 2024
b22cbb8
Milvus vector store builder refactoring
sobychacko Dec 11, 2024
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
27 changes: 9 additions & 18 deletions ...ringframework/ai/autoconfigure/vectorstore/milvus/MilvusVectorStoreAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
import org.springframework.ai.embedding.BatchingStrategy;
import org.springframework.ai.embedding.EmbeddingModel;
import org.springframework.ai.embedding.TokenCountBatchingStrategy;
import org.springframework.ai.vectorstore.MilvusVectorStore;
import org.springframework.ai.vectorstore.MilvusVectorStore.MilvusVectorStoreConfig;
import org.springframework.ai.milvus.vectorstore.MilvusVectorStore;
import org.springframework.ai.milvus.vectorstore.MilvusVectorStore.MilvusVectorStoreConfig;
import org.springframework.ai.vectorstore.observation.VectorStoreObservationConvention;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.AutoConfiguration;
Expand Down Expand Up @@ -71,23 +71,14 @@ public MilvusVectorStore vectorStore(MilvusServiceClient milvusClient, Embedding
ObjectProvider<ObservationRegistry> observationRegistry,
ObjectProvider<VectorStoreObservationConvention> customObservationConvention) {

MilvusVectorStoreConfig config = MilvusVectorStoreConfig.builder()
.withCollectionName(properties.getCollectionName())
.withDatabaseName(properties.getDatabaseName())
.withIndexType(IndexType.valueOf(properties.getIndexType().name()))
.withMetricType(MetricType.valueOf(properties.getMetricType().name()))
.withIndexParameters(properties.getIndexParameters())
.withEmbeddingDimension(properties.getEmbeddingDimension())
.withIDFieldName(properties.getIdFieldName())
.withAutoId(properties.isAutoId())
.withContentFieldName(properties.getContentFieldName())
.withMetadataFieldName(properties.getMetadataFieldName())
.withEmbeddingFieldName(properties.getEmbeddingFieldName())
return MilvusVectorStore.builder()
.milvusClient(milvusClient)
.embeddingModel(embeddingModel)
Copy link
Member

Choose a reason for hiding this comment

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

Except isInitializeSchema, rest of the configuration properties don't seem to be set via builder.

Copy link
Member

Choose a reason for hiding this comment

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

We also need a test to validate this case in our AutoConfiguration IT for Milvus.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@ilayaperumalg Created this issue to track this: #1903. Maybe we can tackle this as a separate issue outside the scope of the builder refactoring?

.initializeSchema(properties.isInitializeSchema())
.batchingStrategy(batchingStrategy)
.observationRegistry(observationRegistry.getIfUnique(() -> ObservationRegistry.NOOP))
.customObservationConvention(customObservationConvention.getIfAvailable(() -> null))
.build();

return new MilvusVectorStore(milvusClient, embeddingModel, config, properties.isInitializeSchema(),
batchingStrategy, observationRegistry.getIfUnique(() -> ObservationRegistry.NOOP),
customObservationConvention.getIfAvailable(() -> null));
}

@Bean
Expand Down
2 changes: 1 addition & 1 deletion .../org/springframework/ai/autoconfigure/vectorstore/milvus/MilvusVectorStoreProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package org.springframework.ai.autoconfigure.vectorstore.milvus;

import org.springframework.ai.autoconfigure.vectorstore.CommonVectorStoreProperties;
import org.springframework.ai.vectorstore.MilvusVectorStore;
import org.springframework.ai.milvus.vectorstore.MilvusVectorStore;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.util.Assert;

Expand Down
2 changes: 1 addition & 1 deletion ...tore/MilvusFilterExpressionConverter.java → ...tore/MilvusFilterExpressionConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.ai.vectorstore;
package org.springframework.ai.milvus.vectorstore;

import org.springframework.ai.vectorstore.filter.Filter.Expression;
import org.springframework.ai.vectorstore.filter.Filter.ExpressionType;
Expand Down
Loading
Loading