topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-10 19:51:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[improvement][chat] Milvus supports setting the user and password parameters (#1845)

Browse Source
This commit is contained in:
lexluo09
2024-10-24 22:59:35 +08:00
committed by GitHub
parent bd68a7212a
commit 3a905d7fb1
4 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
common/src/main/java/com/tencent/supersonic/common/config/EmbeddingStoreParameterConfig.java
View File

@@ -50,12 +50,16 @@ public class EmbeddingStoreParameterConfig extends ParameterConfig {
public static final Parameter EMBEDDING_STORE_USER = new Parameter("s2.embedding.store.user", public static final Parameter EMBEDDING_STORE_USER = new Parameter("s2.embedding.store.user",
"", "用户名", "", "string", MODULE_NAME, null, getUserDependency()); "", "用户名", "", "string", MODULE_NAME, null, getUserDependency());
public static final Parameter EMBEDDING_STORE_PASSWORD =
new Parameter("s2.embedding.store.password", "", "密码", "", "password", MODULE_NAME,
null, getPasswordDependency());
@Override @Override
public List<Parameter> getSysParameters() { public List<Parameter> getSysParameters() {
return Lists.newArrayList(EMBEDDING_STORE_PROVIDER, EMBEDDING_STORE_BASE_URL, return Lists.newArrayList(EMBEDDING_STORE_PROVIDER, EMBEDDING_STORE_BASE_URL,
EMBEDDING_STORE_POST, EMBEDDING_STORE_USER, EMBEDDING_STORE_API_KEY, EMBEDDING_STORE_POST, EMBEDDING_STORE_USER, EMBEDDING_STORE_PASSWORD,
EMBEDDING_STORE_DATABASE_NAME, EMBEDDING_STORE_PERSIST_PATH, EMBEDDING_STORE_API_KEY, EMBEDDING_STORE_DATABASE_NAME,
EMBEDDING_STORE_TIMEOUT, EMBEDDING_STORE_DIMENSION); EMBEDDING_STORE_PERSIST_PATH, EMBEDDING_STORE_TIMEOUT, EMBEDDING_STORE_DIMENSION);
} }
public EmbeddingStoreConfig convert() { public EmbeddingStoreConfig convert() {
@@ -74,9 +78,10 @@ public class EmbeddingStoreParameterConfig extends ParameterConfig {
port = Integer.valueOf(getParameterValue(EMBEDDING_STORE_POST)); port = Integer.valueOf(getParameterValue(EMBEDDING_STORE_POST));
} }
String user = getParameterValue(EMBEDDING_STORE_USER); String user = getParameterValue(EMBEDDING_STORE_USER);
String password = getParameterValue(EMBEDDING_STORE_PASSWORD);
return EmbeddingStoreConfig.builder().provider(provider).baseUrl(baseUrl).apiKey(apiKey) return EmbeddingStoreConfig.builder().provider(provider).baseUrl(baseUrl).apiKey(apiKey)
.persistPath(persistPath).databaseName(databaseName).timeOut(Long.valueOf(timeOut)) .persistPath(persistPath).databaseName(databaseName).timeOut(Long.valueOf(timeOut))
.dimension(dimension).post(port).user(user).build(); .dimension(dimension).post(port).user(user).password(password).build();
} }
private static ArrayList<String> getCandidateValues() { private static ArrayList<String> getCandidateValues() {
@@ -132,7 +137,15 @@ public class EmbeddingStoreParameterConfig extends ParameterConfig {
private static List<Parameter.Dependency> getUserDependency() { private static List<Parameter.Dependency> getUserDependency() {
return getDependency(EMBEDDING_STORE_PROVIDER.getName(), return getDependency(EMBEDDING_STORE_PROVIDER.getName(),
Lists.newArrayList(EmbeddingStoreType.PGVECTOR.name()), Lists.newArrayList(EmbeddingStoreType.MILVUS.name(),
ImmutableMap.of(EmbeddingStoreType.PGVECTOR.name(), "pgvector")); EmbeddingStoreType.PGVECTOR.name()),
ImmutableMap.of(EmbeddingStoreType.MILVUS.name(), "milvus",
EmbeddingStoreType.PGVECTOR.name(), "pgvector"));
}
private static List<Parameter.Dependency> getPasswordDependency() {
return getDependency(EMBEDDING_STORE_PROVIDER.getName(),
Lists.newArrayList(EmbeddingStoreType.MILVUS.name()),
ImmutableMap.of(EmbeddingStoreType.MILVUS.name(), "milvus"));
} }
} }

1
common/src/main/java/com/tencent/supersonic/common/pojo/EmbeddingStoreConfig.java
View File

@@ -24,4 +24,5 @@ public class EmbeddingStoreConfig implements Serializable {
private String databaseName; private String databaseName;
private Integer post; private Integer post;
private String user; private String user;
private String password;
} }

2
common/src/main/java/dev/langchain4j/milvus/spring/EmbeddingStoreProperties.java
View File

@@ -18,7 +18,7 @@ class EmbeddingStoreProperties {
private IndexType indexType; private IndexType indexType;
private MetricType metricType; private MetricType metricType;
private String token; private String token;
private String username; private String user;
private String password; private String password;
private ConsistencyLevelEnum consistencyLevel; private ConsistencyLevelEnum consistencyLevel;
private Boolean retrieveEmbeddingsOnSearch; private Boolean retrieveEmbeddingsOnSearch;

2
common/src/main/java/dev/langchain4j/milvus/spring/MilvusEmbeddingStoreFactory.java
View File

@@ -33,7 +33,7 @@ public class MilvusEmbeddingStoreFactory extends BaseEmbeddingStoreFactory {
.port(storeProperties.getPort()).collectionName(collectionName) .port(storeProperties.getPort()).collectionName(collectionName)
.dimension(storeProperties.getDimension()).indexType(storeProperties.getIndexType()) .dimension(storeProperties.getDimension()).indexType(storeProperties.getIndexType())
.metricType(storeProperties.getMetricType()).uri(storeProperties.getUri()) .metricType(storeProperties.getMetricType()).uri(storeProperties.getUri())
.token(storeProperties.getToken()).username(storeProperties.getUsername()) .token(storeProperties.getToken()).username(storeProperties.getUser())
.password(storeProperties.getPassword()) .password(storeProperties.getPassword())
.consistencyLevel(storeProperties.getConsistencyLevel()) .consistencyLevel(storeProperties.getConsistencyLevel())
.retrieveEmbeddingsOnSearch(storeProperties.getRetrieveEmbeddingsOnSearch()) .retrieveEmbeddingsOnSearch(storeProperties.getRetrieveEmbeddingsOnSearch())