(improvement)(chat) Modify the configuration of the zhipu vector database to disable the default persistence of the vector database configuration. (#1577)

This commit is contained in:
lexluo09
2024-08-16 23:14:23 +08:00
committed by GitHub
parent 7150f19def
commit 898c7100ba
4 changed files with 11 additions and 11 deletions

View File

@@ -102,7 +102,7 @@ public class EmbeddingModelParameterConfig extends ParameterConfig {
AzureModelFactory.PROVIDER, AzureModelFactory.DEFAULT_BASE_URL, AzureModelFactory.PROVIDER, AzureModelFactory.DEFAULT_BASE_URL,
DashscopeModelFactory.PROVIDER, DashscopeModelFactory.DEFAULT_BASE_URL, DashscopeModelFactory.PROVIDER, DashscopeModelFactory.DEFAULT_BASE_URL,
QianfanModelFactory.PROVIDER, QianfanModelFactory.DEFAULT_BASE_URL, QianfanModelFactory.PROVIDER, QianfanModelFactory.DEFAULT_BASE_URL,
ZhipuModelFactory.PROVIDER, ZhipuModelFactory.DEFAULT_BASE_URL ZhipuModelFactory.PROVIDER, ZhipuModelFactory.DEFAULT_EMBEDDING_BASE_URL
) )
); );
} }
@@ -110,13 +110,11 @@ public class EmbeddingModelParameterConfig extends ParameterConfig {
private static List<Parameter.Dependency> getApiKeyDependency() { private static List<Parameter.Dependency> getApiKeyDependency() {
return getDependency(EMBEDDING_MODEL_PROVIDER.getName(), return getDependency(EMBEDDING_MODEL_PROVIDER.getName(),
Lists.newArrayList(OpenAiModelFactory.PROVIDER, Lists.newArrayList(OpenAiModelFactory.PROVIDER,
OllamaModelFactory.PROVIDER,
AzureModelFactory.PROVIDER, AzureModelFactory.PROVIDER,
DashscopeModelFactory.PROVIDER, DashscopeModelFactory.PROVIDER,
QianfanModelFactory.PROVIDER, QianfanModelFactory.PROVIDER,
ZhipuModelFactory.PROVIDER), ZhipuModelFactory.PROVIDER),
ImmutableMap.of(OpenAiModelFactory.PROVIDER, DEMO, ImmutableMap.of(OpenAiModelFactory.PROVIDER, DEMO,
OllamaModelFactory.PROVIDER, DEMO,
AzureModelFactory.PROVIDER, DEMO, AzureModelFactory.PROVIDER, DEMO,
DashscopeModelFactory.PROVIDER, DEMO, DashscopeModelFactory.PROVIDER, DEMO,
QianfanModelFactory.PROVIDER, DEMO, QianfanModelFactory.PROVIDER, DEMO,
@@ -140,9 +138,9 @@ public class EmbeddingModelParameterConfig extends ParameterConfig {
OpenAiModelFactory.PROVIDER, "text-embedding-ada-002", OpenAiModelFactory.PROVIDER, "text-embedding-ada-002",
OllamaModelFactory.PROVIDER, "all-minilm", OllamaModelFactory.PROVIDER, "all-minilm",
AzureModelFactory.PROVIDER, "text-embedding-ada-002", AzureModelFactory.PROVIDER, "text-embedding-ada-002",
DashscopeModelFactory.PROVIDER, "text-embedding-ada-002", DashscopeModelFactory.PROVIDER, "text-embedding-v2",
QianfanModelFactory.PROVIDER, "text-embedding-ada-002", QianfanModelFactory.PROVIDER, "Embedding-V1",
ZhipuModelFactory.PROVIDER, "text-embedding-ada-002" ZhipuModelFactory.PROVIDER, "embedding-2"
) )
); );
} }

View File

@@ -17,7 +17,7 @@ import java.util.List;
public class EmbeddingStoreParameterConfig extends ParameterConfig { public class EmbeddingStoreParameterConfig extends ParameterConfig {
public static final Parameter EMBEDDING_STORE_PROVIDER = public static final Parameter EMBEDDING_STORE_PROVIDER =
new Parameter("s2.embedding.store.provider", EmbeddingStoreType.IN_MEMORY.name(), new Parameter("s2.embedding.store.provider", EmbeddingStoreType.IN_MEMORY.name(),
"向量库类型", "", "list", "向量库类型", "目前支持三种类型IN_MEMORY、MILVUS、CHROMA", "list",
"向量库配置", getCandidateValues()); "向量库配置", getCandidateValues());
public static final Parameter EMBEDDING_STORE_BASE_URL = public static final Parameter EMBEDDING_STORE_BASE_URL =
@@ -31,8 +31,9 @@ public class EmbeddingStoreParameterConfig extends ParameterConfig {
"向量库配置", null, getApiKeyDependency()); "向量库配置", null, getApiKeyDependency());
public static final Parameter EMBEDDING_STORE_PERSIST_PATH = public static final Parameter EMBEDDING_STORE_PERSIST_PATH =
new Parameter("s2.embedding.store.persist.path", "/tmp", new Parameter("s2.embedding.store.persist.path", "",
"持久化路径", "", "string", "持久化路径", "默认不持久化,如需持久化请填写持久化路径。"
+ "注意:如果变更了向量模型需删除该路径下已保存的文件或修改持久化路径", "string",
"向量库配置", null, getPathDependency()); "向量库配置", null, getPathDependency());
public static final Parameter EMBEDDING_STORE_TIMEOUT = public static final Parameter EMBEDDING_STORE_TIMEOUT =
@@ -96,7 +97,7 @@ public class EmbeddingStoreParameterConfig extends ParameterConfig {
private static List<Parameter.Dependency> getPathDependency() { private static List<Parameter.Dependency> getPathDependency() {
return getDependency(EMBEDDING_STORE_PROVIDER.getName(), return getDependency(EMBEDDING_STORE_PROVIDER.getName(),
Lists.newArrayList(EmbeddingStoreType.IN_MEMORY.name()), Lists.newArrayList(EmbeddingStoreType.IN_MEMORY.name()),
ImmutableMap.of(EmbeddingStoreType.IN_MEMORY.name(), "/tmp")); ImmutableMap.of(EmbeddingStoreType.IN_MEMORY.name(), ""));
} }
private static List<Parameter.Dependency> getDimensionDependency() { private static List<Parameter.Dependency> getDimensionDependency() {

View File

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
public class ZhipuModelFactory implements ModelFactory, InitializingBean { public class ZhipuModelFactory implements ModelFactory, InitializingBean {
public static final String PROVIDER = "ZHIPU"; public static final String PROVIDER = "ZHIPU";
public static final String DEFAULT_BASE_URL = "https://open.bigmodel.cn/api/paas/v4"; public static final String DEFAULT_BASE_URL = "https://open.bigmodel.cn/api/paas/v4";
public static final String DEFAULT_EMBEDDING_BASE_URL = "https://open.bigmodel.cn/";
@Override @Override
public ChatLanguageModel createChatModel(ChatModelConfig modelConfig) { public ChatLanguageModel createChatModel(ChatModelConfig modelConfig) {

View File

@@ -74,7 +74,7 @@ public class MapperConfig extends ParameterConfig {
"number", "Mapper相关配置"); "number", "Mapper相关配置");
public static final Parameter EMBEDDING_MAPPER_THRESHOLD = public static final Parameter EMBEDDING_MAPPER_THRESHOLD =
new Parameter("s2.mapper.embedding.threshold", "0.99", new Parameter("s2.mapper.embedding.threshold", "0.98",
"向量召回相似度阈值", "向量召回相似度阈值",
"相似度小于该阈值的则舍弃", "相似度小于该阈值的则舍弃",
"number", "Mapper相关配置"); "number", "Mapper相关配置");