dev_1.0.0^2
liu 11 months ago
parent 4b3f90f5ca
commit c0371f1106

@ -1,6 +1,7 @@
package som.supervision.knowsub.config; package som.supervision.knowsub.config;
import org.elasticsearch.client.RestClient; import org.elasticsearch.client.RestClient;
import org.springframework.ai.autoconfigure.vectorstore.elasticsearch.ElasticsearchVectorStoreProperties;
import org.springframework.ai.embedding.EmbeddingModel; import org.springframework.ai.embedding.EmbeddingModel;
import org.springframework.ai.vectorstore.ElasticsearchVectorStore; import org.springframework.ai.vectorstore.ElasticsearchVectorStore;
import org.springframework.ai.vectorstore.ElasticsearchVectorStoreOptions; import org.springframework.ai.vectorstore.ElasticsearchVectorStoreOptions;
@ -23,9 +24,9 @@ public class ElasticsearchVectorStoreConfig {
@Bean @Bean
@ConditionalOnProperty(prefix = "embedding", name = "url") @ConditionalOnProperty(prefix = "embedding", name = "url")
public ElasticsearchVectorStore vectorStore(EmbeddingModel embeddingModel, RestClient restClient) { public ElasticsearchVectorStore vectorStore(ElasticsearchVectorStoreProperties properties,EmbeddingModel embeddingModel, RestClient restClient) {
ElasticsearchVectorStoreOptions options = new ElasticsearchVectorStoreOptions(); ElasticsearchVectorStoreOptions options = new ElasticsearchVectorStoreOptions();
options.setIndexName("test_rag"); options.setIndexName(properties.getIndexName());
options.setDimensions(1024); options.setDimensions(1024);
return new ElasticsearchVectorStore(options, restClient, embeddingModel, true); return new ElasticsearchVectorStore(options, restClient, embeddingModel, true);
} }

@ -1,6 +1,7 @@
package com.supervision.knowsub.config; package com.supervision.knowsub.config;
import org.elasticsearch.client.RestClient; import org.elasticsearch.client.RestClient;
import org.springframework.ai.autoconfigure.vectorstore.elasticsearch.ElasticsearchVectorStoreProperties;
import org.springframework.ai.embedding.EmbeddingClient; import org.springframework.ai.embedding.EmbeddingClient;
import org.springframework.ai.embedding.EmbeddingModel; import org.springframework.ai.embedding.EmbeddingModel;
import org.springframework.ai.vectorstore.ElasticsearchVectorStore; import org.springframework.ai.vectorstore.ElasticsearchVectorStore;
@ -24,9 +25,9 @@ public class ElasticsearchVectorStoreConfig {
@Bean @Bean
@ConditionalOnProperty(prefix = "embedding", name = "url") @ConditionalOnProperty(prefix = "embedding", name = "url")
public ElasticsearchVectorStore vectorStore(EmbeddingModel embeddingModel, RestClient restClient) { public ElasticsearchVectorStore vectorStore(ElasticsearchVectorStoreProperties properties, EmbeddingModel embeddingModel, RestClient restClient) {
ElasticsearchVectorStoreOptions options = new ElasticsearchVectorStoreOptions(); ElasticsearchVectorStoreOptions options = new ElasticsearchVectorStoreOptions();
options.setIndexName("test_rag"); options.setIndexName(properties.getIndexName());
options.setDimensions(1024); options.setDimensions(1024);
return new ElasticsearchVectorStore(options, restClient, embeddingModel, true); return new ElasticsearchVectorStore(options, restClient, embeddingModel, true);
} }

Loading…
Cancel
Save