From 898c7100ba90b68ce4e5c76b01eb885924745c04 Mon Sep 17 00:00:00 2001 From: lexluo09 <39718951+lexluo09@users.noreply.github.com> Date: Fri, 16 Aug 2024 23:14:23 +0800 Subject: [PATCH] (improvement)(chat) Modify the configuration of the zhipu vector database to disable the default persistence of the vector database configuration. (#1577) --- .../common/config/EmbeddingModelParameterConfig.java | 10 ++++------ .../common/config/EmbeddingStoreParameterConfig.java | 9 +++++---- .../dev/langchain4j/provider/ZhipuModelFactory.java | 1 + .../supersonic/headless/chat/mapper/MapperConfig.java | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/common/src/main/java/com/tencent/supersonic/common/config/EmbeddingModelParameterConfig.java b/common/src/main/java/com/tencent/supersonic/common/config/EmbeddingModelParameterConfig.java index 6082ca6e8..03ebb7947 100644 --- a/common/src/main/java/com/tencent/supersonic/common/config/EmbeddingModelParameterConfig.java +++ b/common/src/main/java/com/tencent/supersonic/common/config/EmbeddingModelParameterConfig.java @@ -102,7 +102,7 @@ public class EmbeddingModelParameterConfig extends ParameterConfig { AzureModelFactory.PROVIDER, AzureModelFactory.DEFAULT_BASE_URL, DashscopeModelFactory.PROVIDER, DashscopeModelFactory.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 getApiKeyDependency() { return getDependency(EMBEDDING_MODEL_PROVIDER.getName(), Lists.newArrayList(OpenAiModelFactory.PROVIDER, - OllamaModelFactory.PROVIDER, AzureModelFactory.PROVIDER, DashscopeModelFactory.PROVIDER, QianfanModelFactory.PROVIDER, ZhipuModelFactory.PROVIDER), ImmutableMap.of(OpenAiModelFactory.PROVIDER, DEMO, - OllamaModelFactory.PROVIDER, DEMO, AzureModelFactory.PROVIDER, DEMO, DashscopeModelFactory.PROVIDER, DEMO, QianfanModelFactory.PROVIDER, DEMO, @@ -140,9 +138,9 @@ public class EmbeddingModelParameterConfig extends ParameterConfig { OpenAiModelFactory.PROVIDER, "text-embedding-ada-002", OllamaModelFactory.PROVIDER, "all-minilm", AzureModelFactory.PROVIDER, "text-embedding-ada-002", - DashscopeModelFactory.PROVIDER, "text-embedding-ada-002", - QianfanModelFactory.PROVIDER, "text-embedding-ada-002", - ZhipuModelFactory.PROVIDER, "text-embedding-ada-002" + DashscopeModelFactory.PROVIDER, "text-embedding-v2", + QianfanModelFactory.PROVIDER, "Embedding-V1", + ZhipuModelFactory.PROVIDER, "embedding-2" ) ); } diff --git a/common/src/main/java/com/tencent/supersonic/common/config/EmbeddingStoreParameterConfig.java b/common/src/main/java/com/tencent/supersonic/common/config/EmbeddingStoreParameterConfig.java index 94733e445..cd4937491 100644 --- a/common/src/main/java/com/tencent/supersonic/common/config/EmbeddingStoreParameterConfig.java +++ b/common/src/main/java/com/tencent/supersonic/common/config/EmbeddingStoreParameterConfig.java @@ -17,7 +17,7 @@ import java.util.List; public class EmbeddingStoreParameterConfig extends ParameterConfig { public static final Parameter EMBEDDING_STORE_PROVIDER = new Parameter("s2.embedding.store.provider", EmbeddingStoreType.IN_MEMORY.name(), - "向量库类型", "", "list", + "向量库类型", "目前支持三种类型：IN_MEMORY、MILVUS、CHROMA", "list", "向量库配置", getCandidateValues()); public static final Parameter EMBEDDING_STORE_BASE_URL = @@ -31,8 +31,9 @@ public class EmbeddingStoreParameterConfig extends ParameterConfig { "向量库配置", null, getApiKeyDependency()); public static final Parameter EMBEDDING_STORE_PERSIST_PATH = - new Parameter("s2.embedding.store.persist.path", "/tmp", - "持久化路径", "", "string", + new Parameter("s2.embedding.store.persist.path", "", + "持久化路径", "默认不持久化，如需持久化请填写持久化路径。" + + "注意：如果变更了向量模型需删除该路径下已保存的文件或修改持久化路径", "string", "向量库配置", null, getPathDependency()); public static final Parameter EMBEDDING_STORE_TIMEOUT = @@ -96,7 +97,7 @@ public class EmbeddingStoreParameterConfig extends ParameterConfig { private static List getPathDependency() { return getDependency(EMBEDDING_STORE_PROVIDER.getName(), Lists.newArrayList(EmbeddingStoreType.IN_MEMORY.name()), - ImmutableMap.of(EmbeddingStoreType.IN_MEMORY.name(), "/tmp")); + ImmutableMap.of(EmbeddingStoreType.IN_MEMORY.name(), "")); } private static List getDimensionDependency() { diff --git a/common/src/main/java/dev/langchain4j/provider/ZhipuModelFactory.java b/common/src/main/java/dev/langchain4j/provider/ZhipuModelFactory.java index 10fb5f0c7..68594eee1 100644 --- a/common/src/main/java/dev/langchain4j/provider/ZhipuModelFactory.java +++ b/common/src/main/java/dev/langchain4j/provider/ZhipuModelFactory.java @@ -13,6 +13,7 @@ import org.springframework.stereotype.Service; public class ZhipuModelFactory implements ModelFactory, InitializingBean { 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_EMBEDDING_BASE_URL = "https://open.bigmodel.cn/"; @Override public ChatLanguageModel createChatModel(ChatModelConfig modelConfig) { diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/MapperConfig.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/MapperConfig.java index f5a7af8af..62a0458bd 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/MapperConfig.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/MapperConfig.java @@ -74,7 +74,7 @@ public class MapperConfig extends ParameterConfig { "number", "Mapper相关配置"); 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相关配置");