From cd57d2344ea46e9cff336d01c79e24fc1d642dfa Mon Sep 17 00:00:00 2001 From: jerryjzhang Date: Wed, 9 Oct 2024 17:48:42 +0800 Subject: [PATCH] [fix][chat]Model provider is case sensitive.#1739 --- .../supersonic/chat/server/config/ChatModelParameters.java | 2 +- .../supersonic/chat/server/service/impl/AgentServiceImpl.java | 2 +- .../src/main/java/dev/langchain4j/provider/ModelProvider.java | 2 +- .../test/java/com/tencent/supersonic/util/LLMConfigUtils.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/config/ChatModelParameters.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/config/ChatModelParameters.java index bf643cf7a..f0cebe8f4 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/config/ChatModelParameters.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/config/ChatModelParameters.java @@ -25,7 +25,7 @@ public class ChatModelParameters { "", "string", MODULE_NAME, null, getModelNameDependency()); public static final Parameter CHAT_MODEL_API_KEY = - new Parameter("apiKey", ModelProvider.DEMO_CHAT_MODEL.getApiKey(), "ApiKey", "", + new Parameter("apiKey", "", "ApiKey", "", "password", MODULE_NAME, null, getApiKeyDependency()); public static final Parameter CHAT_MODEL_ENDPOINT = new Parameter("endpoint", "llama_2_70b", diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/AgentServiceImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/AgentServiceImpl.java index f7a327a17..8a896ecbd 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/AgentServiceImpl.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/AgentServiceImpl.java @@ -123,7 +123,7 @@ public class AgentServiceImpl extends ServiceImpl implem } try { chatQueryService.parseAndExecute(ChatParseReq.builder().chatId(-1) - .agentId(agent.getId()).queryText(example).build()); + .agentId(agent.getId()).queryText(example).user(User.getDefaultUser()).build()); } catch (Exception e) { log.warn("agent:{} example execute failed:{}", agent.getName(), example); } diff --git a/common/src/main/java/dev/langchain4j/provider/ModelProvider.java b/common/src/main/java/dev/langchain4j/provider/ModelProvider.java index e325eec95..76383d2f4 100644 --- a/common/src/main/java/dev/langchain4j/provider/ModelProvider.java +++ b/common/src/main/java/dev/langchain4j/provider/ModelProvider.java @@ -14,7 +14,7 @@ import java.util.Map; public class ModelProvider { public static final ChatModelConfig DEMO_CHAT_MODEL = - ChatModelConfig.builder().provider("open_ai").baseUrl("https://api.openai.com/v1") + ChatModelConfig.builder().provider("OPEN_AI").baseUrl("https://api.openai.com/v1") .apiKey("demo").modelName("gpt-4o-mini").temperature(0.0).timeOut(60L).build(); private static final Map factories = new HashMap<>(); diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/util/LLMConfigUtils.java b/launchers/standalone/src/test/java/com/tencent/supersonic/util/LLMConfigUtils.java index 63532d50b..2ec8632ee 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/util/LLMConfigUtils.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/util/LLMConfigUtils.java @@ -65,11 +65,11 @@ public class LLMConfigUtils { ChatModelConfig chatModelConfig; if (type.isOllam) { - chatModelConfig = ChatModelConfig.builder().provider("ollama").baseUrl(baseUrl) + chatModelConfig = ChatModelConfig.builder().provider("OLLAMA").baseUrl(baseUrl) .modelName(modelName).temperature(temperature).timeOut(60000L).build(); } else { chatModelConfig = - ChatModelConfig.builder().provider("open_ai").baseUrl(baseUrl).apiKey(apiKey) + ChatModelConfig.builder().provider("OPEN_AI").baseUrl(baseUrl).apiKey(apiKey) .modelName(modelName).temperature(temperature).timeOut(60000L).build(); }