[fix][chat]Model provider is case sensitive.#1739

This commit is contained in:
jerryjzhang
2024-10-09 17:48:42 +08:00
parent d1902e2704
commit cd57d2344e
4 changed files with 5 additions and 5 deletions

View File

@@ -25,7 +25,7 @@ public class ChatModelParameters {
"", "string", MODULE_NAME, null, getModelNameDependency()); "", "string", MODULE_NAME, null, getModelNameDependency());
public static final Parameter CHAT_MODEL_API_KEY = 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()); "password", MODULE_NAME, null, getApiKeyDependency());
public static final Parameter CHAT_MODEL_ENDPOINT = new Parameter("endpoint", "llama_2_70b", public static final Parameter CHAT_MODEL_ENDPOINT = new Parameter("endpoint", "llama_2_70b",

View File

@@ -123,7 +123,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentDOMapper, AgentDO> implem
} }
try { try {
chatQueryService.parseAndExecute(ChatParseReq.builder().chatId(-1) chatQueryService.parseAndExecute(ChatParseReq.builder().chatId(-1)
.agentId(agent.getId()).queryText(example).build()); .agentId(agent.getId()).queryText(example).user(User.getDefaultUser()).build());
} catch (Exception e) { } catch (Exception e) {
log.warn("agent:{} example execute failed:{}", agent.getName(), example); log.warn("agent:{} example execute failed:{}", agent.getName(), example);
} }

View File

@@ -14,7 +14,7 @@ import java.util.Map;
public class ModelProvider { public class ModelProvider {
public static final ChatModelConfig DEMO_CHAT_MODEL = 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(); .apiKey("demo").modelName("gpt-4o-mini").temperature(0.0).timeOut(60L).build();
private static final Map<String, ModelFactory> factories = new HashMap<>(); private static final Map<String, ModelFactory> factories = new HashMap<>();

View File

@@ -65,11 +65,11 @@ public class LLMConfigUtils {
ChatModelConfig chatModelConfig; ChatModelConfig chatModelConfig;
if (type.isOllam) { if (type.isOllam) {
chatModelConfig = ChatModelConfig.builder().provider("ollama").baseUrl(baseUrl) chatModelConfig = ChatModelConfig.builder().provider("OLLAMA").baseUrl(baseUrl)
.modelName(modelName).temperature(temperature).timeOut(60000L).build(); .modelName(modelName).temperature(temperature).timeOut(60000L).build();
} else { } else {
chatModelConfig = 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(); .modelName(modelName).temperature(temperature).timeOut(60000L).build();
} }