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 f75fdaa89..daf3d69c4 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 @@ -9,6 +9,7 @@ import com.tencent.supersonic.chat.server.agent.VisualConfig; import com.tencent.supersonic.chat.server.persistence.dataobject.AgentDO; import com.tencent.supersonic.chat.server.persistence.dataobject.ChatMemoryDO; import com.tencent.supersonic.chat.server.persistence.mapper.AgentDOMapper; +import com.tencent.supersonic.chat.server.pojo.ChatModel; import com.tencent.supersonic.chat.server.service.AgentService; import com.tencent.supersonic.chat.server.service.ChatModelService; import com.tencent.supersonic.chat.server.service.ChatQueryService; @@ -22,6 +23,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.List; +import java.util.Objects; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.stream.Collectors; @@ -127,6 +129,12 @@ public class AgentServiceImpl extends ServiceImpl implem agent.setChatAppConfig( JsonUtil.toMap(agentDO.getChatModelConfig(), String.class, ChatApp.class)); agent.setVisualConfig(JsonUtil.toObject(agentDO.getVisualConfig(), VisualConfig.class)); + agent.getChatAppConfig().values().forEach(c -> { + ChatModel chatModel = chatModelService.getChatModel(c.getChatModelId()); + if (Objects.nonNull(chatModel)) { + c.setChatModelConfig(chatModelService.getChatModel(c.getChatModelId()).getConfig()); + } + }); return agent; } diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatQueryServiceImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatQueryServiceImpl.java index 791a4b072..6b4be45d0 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatQueryServiceImpl.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatQueryServiceImpl.java @@ -172,12 +172,6 @@ public class ChatQueryServiceImpl implements ChatQueryService { ParseContext parseContext = new ParseContext(); BeanMapper.mapper(chatParseReq, parseContext); Agent agent = agentService.getAgent(chatParseReq.getAgentId()); - agent.getChatAppConfig().values().forEach(c -> { - ChatModel chatModel = chatModelService.getChatModel(c.getChatModelId()); - if (Objects.nonNull(chatModel)) { - c.setChatModelConfig(chatModelService.getChatModel(c.getChatModelId()).getConfig()); - } - }); parseContext.setAgent(agent); return parseContext; } diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DataSetSchemaBuilder.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DataSetSchemaBuilder.java index 94b71979a..808e18d98 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DataSetSchemaBuilder.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DataSetSchemaBuilder.java @@ -213,7 +213,7 @@ public class DataSetSchemaBuilder { } private static void setDefaultTimeFormat(SchemaElement dimToAdd, - DimensionTimeTypeParams dimensionTimeTypeParams, String timeFormat) { + DimensionTimeTypeParams dimensionTimeTypeParams, String timeFormat) { if (null != dimensionTimeTypeParams && TimeDimensionEnum.DAY.name() .equalsIgnoreCase(dimensionTimeTypeParams.getTimeGranularity())) { dimToAdd.getExtInfo().put(DimensionConstants.DIMENSION_TIME_FORMAT,