diff --git a/base/src/main/java/com/tinyengine/it/common/enums/Enums.java b/base/src/main/java/com/tinyengine/it/common/enums/Enums.java index 2489eb00..e9b7f2ad 100644 --- a/base/src/main/java/com/tinyengine/it/common/enums/Enums.java +++ b/base/src/main/java/com/tinyengine/it/common/enums/Enums.java @@ -793,7 +793,12 @@ public enum FoundationModel { * Moonshot v1 8k e foundation model. */ // kimi - MOONSHOT_V1_8K("moonshot-v1-8k"); + MOONSHOT_V1_8K("moonshot-v1-8k"), + /** + * Moonshot v3 e foundation model. + */ + // deepseek + DEEPSEEK_V3("deepseek-chat"); private final String value; FoundationModel(String value) { diff --git a/base/src/main/java/com/tinyengine/it/config/AiChatConfig.java b/base/src/main/java/com/tinyengine/it/config/AiChatConfig.java index e69c16b5..aac487be 100644 --- a/base/src/main/java/com/tinyengine/it/config/AiChatConfig.java +++ b/base/src/main/java/com/tinyengine/it/config/AiChatConfig.java @@ -25,6 +25,7 @@ public class AiChatConfig { private static final String OPENAI_API_URL = "https://api.openai.com"; private static final String LOCAL_GPT_API_URL = "https://dashscope.aliyuncs.com/compatible-mode"; + private static final String DEEPSEEK_V3_URL = "https://api.deepseek.com"; /** @@ -44,14 +45,22 @@ public static Map getAiChatConfig(String model, String String localGptApiKey = Enums.FoundationModel.LOCAL_GPT.getValue().equals(model) ? token : null; localGptHeaders.put("Authorization", "Bearer " + localGptApiKey); + Map deepSeekHeaders = new HashMap<>(); + String deepSeekApiKey = Enums.FoundationModel.DEEPSEEK_V3.getValue().equals(model) ? token : null; + deepSeekHeaders.put("Authorization", "Bearer " + deepSeekApiKey); + Map ernieBotHeaders = new HashMap<>(); + config.put(Enums.FoundationModel.GPT_35_TURBO.getValue(), new AiChatConfigData( OPENAI_API_URL + "/v1/chat/completions", createCommonRequestOption(), openaiHeaders, "openai")); config.put(Enums.FoundationModel.LOCAL_GPT.getValue(), new AiChatConfigData( LOCAL_GPT_API_URL + "/v1/chat/completions", createCommonRequestOption(), localGptHeaders, "!openai")); + config.put(Enums.FoundationModel.DEEPSEEK_V3.getValue(), new AiChatConfigData( + DEEPSEEK_V3_URL + "/chat/completions", createCommonRequestOption(), deepSeekHeaders, "DeepSeek")); + String ernieBotAccessToken = Enums.FoundationModel.ERNIBOT_TURBO.getValue().equals(model) ? token : null; config.put(Enums.FoundationModel.ERNIBOT_TURBO.getValue(), new AiChatConfigData( diff --git a/base/src/main/java/com/tinyengine/it/model/dto/AiParam.java b/base/src/main/java/com/tinyengine/it/model/dto/AiParam.java index 01168485..85242481 100644 --- a/base/src/main/java/com/tinyengine/it/model/dto/AiParam.java +++ b/base/src/main/java/com/tinyengine/it/model/dto/AiParam.java @@ -26,10 +26,12 @@ public class AiParam { private Map foundationModel; private List messages; + private String model; public AiParam(Map foundationModel, List messages) { this.foundationModel = foundationModel; this.messages = messages; + this.model = foundationModel.get("model"); } public AiParam() { diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java index d80963e9..681ce799 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java @@ -445,10 +445,7 @@ public Result getDepth(String parentId) { // getFolder 获取父类信息 Page parentInfo = pageMapper.queryPageById(parent); int depth = parentInfo.getDepth(); - if (depth < 5) { - return Result.success(depth); - } - return Result.failed("Exceeded depth"); + return Result.success(depth); } /** diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImpl.java index 2e62fa27..d55fa0b0 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImpl.java @@ -467,7 +467,9 @@ public List getSchemaComponentsTree(MetaDto metaDto) { Map data = Utils.convert(pageInfo); boolean isToLine = false; Map page = formatDataFields(data, resKeys, isToLine); - page.put("isHome", String.valueOf(page.get("id")).equals(app.getHomePage().toString())); + if (null != app.getHomePage()) { + page.put("isHome", String.valueOf(page.get("id")).equals(app.getHomePage().toString())); + } Map schema; Schema schemaUtil = new Schema(); if (!pageInfo.getIsPage()) {