The Unified and Autonomous Development Platform
chore: Improved chat tools
Robin Shend848dee6d3c0
diff --git a/server-core/src/main/java/io/onedev/server/ai/tools/GetFileContent.java b/server-core/src/main/java/io/onedev/server/ai/tools/GetFileContent.javaindex 23904bb01b..20dcc4fbc5 100644--- a/server-core/src/main/java/io/onedev/server/ai/tools/GetFileContent.java+++ b/server-core/src/main/java/io/onedev/server/ai/tools/GetFileContent.java@@ -33,11 +33,13 @@ public abstract class GetFileContent implements ChatTool {.addStringProperty("filePath").description("Text file path to get content").addBooleanProperty("oldRevision").description("Optionally specify whether to get file content in old revision in a diff context").required("filePath").build())- .build();+ .build();}@Overridepublic CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ if (arguments.get("filePath") == null)+ return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "Argument 'filePath' is required")), false));var filePath = arguments.get("filePath").asText();var oldRevision = arguments.get("oldRevision") != null ? arguments.get("oldRevision").asBoolean() : false;diff --git a/server-core/src/main/java/io/onedev/server/ai/tools/GetFilesAndSubfolders.java b/server-core/src/main/java/io/onedev/server/ai/tools/GetFilesAndSubfolders.javaindex 5b9354da67..cf3effb6b2 100644--- a/server-core/src/main/java/io/onedev/server/ai/tools/GetFilesAndSubfolders.java+++ b/server-core/src/main/java/io/onedev/server/ai/tools/GetFilesAndSubfolders.java@@ -1,7 +1,10 @@package io.onedev.server.ai.tools;+import static io.onedev.server.ai.ChatToolUtils.convertToJson;+import static io.onedev.server.ai.ChatToolUtils.getFilesAndFolders;import static java.util.concurrent.CompletableFuture.completedFuture;+import java.util.Map;import java.util.concurrent.CompletableFuture;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;@@ -12,7 +15,6 @@ import com.fasterxml.jackson.databind.JsonNode;import dev.langchain4j.agent.tool.ToolSpecification;import dev.langchain4j.model.chat.request.json.JsonObjectSchema;import io.onedev.server.ai.ChatTool;-import io.onedev.server.ai.ChatToolUtils;import io.onedev.server.model.Project;import io.onedev.server.web.websocket.ChatToolExecution;@@ -27,14 +29,18 @@ public abstract class GetFilesAndSubfolders implements ChatTool {.addStringProperty("folderPath").description("Folder path to list all files and subfolders").addBooleanProperty("oldRevision").description("Optionally specify whether to list files and subfolders in old revision in a diff context").required("folderPath").build())- .build();+ .build();}@Overridepublic CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ if (arguments.get("folderPath") == null)+ return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "Argument 'folderPath' is required")), false));var folderPath = arguments.get("folderPath").asText();- var oldRevision = arguments.get("oldRevision") != null ? arguments.get("oldRevision").asBoolean() : false;- return completedFuture(new ChatToolExecution.Result(ChatToolUtils.getFilesAndFolders(getProject(), getCommitId(oldRevision), folderPath), false));+ var oldRevision = arguments.get("oldRevision") != null ? arguments.get("oldRevision").asBoolean() : false;++ var resultData = Map.of("successful", true, "filesAndSubfolders", getFilesAndFolders(getProject(), getCommitId(oldRevision), folderPath));+ return completedFuture(new ChatToolExecution.Result(convertToJson(resultData), false));}protected abstract Project getProject();diff --git a/server-core/src/main/java/io/onedev/server/ai/tools/GetRootFilesAndFolders.java b/server-core/src/main/java/io/onedev/server/ai/tools/GetRootFilesAndFolders.javaindex aca3724f32..32e2ffdb3f 100644--- a/server-core/src/main/java/io/onedev/server/ai/tools/GetRootFilesAndFolders.java+++ b/server-core/src/main/java/io/onedev/server/ai/tools/GetRootFilesAndFolders.java@@ -25,7 +25,7 @@ public abstract class GetRootFilesAndFolders implements ChatTool {.description("List files and folders under repository root in json format").parameters(JsonObjectSchema.builder().addBooleanProperty("oldRevision").description("Optionally specify whether to list root files and folders in old revision in a diff context")- .required("oldRevision").build())+ .build()).build();}diff --git a/server-core/src/main/java/io/onedev/server/ai/tools/QueryCodeSnippets.java b/server-core/src/main/java/io/onedev/server/ai/tools/QueryCodeSnippets.javaindex 43e1a70a87..fa6f609887 100644--- a/server-core/src/main/java/io/onedev/server/ai/tools/QueryCodeSnippets.java+++ b/server-core/src/main/java/io/onedev/server/ai/tools/QueryCodeSnippets.java@@ -1,5 +1,6 @@package io.onedev.server.ai.tools;+import static io.onedev.server.ai.ChatToolUtils.convertToJson;import static java.util.concurrent.CompletableFuture.completedFuture;import java.util.ArrayList;@@ -17,7 +18,6 @@ import dev.langchain4j.model.chat.request.json.JsonObjectSchema;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.server.OneDev;import io.onedev.server.ai.ChatTool;-import io.onedev.server.ai.ChatToolUtils;import io.onedev.server.git.service.GitService;import io.onedev.server.model.Project;import io.onedev.server.search.code.CodeSearchService;@@ -50,16 +50,22 @@ public abstract class QueryCodeSnippets implements ChatTool {.addBooleanProperty("caseSensitive").description("Whether to match code snippets case-sensitively").addBooleanProperty("oldRevision").description("Optionally specify whether to query code snippets in old revision in a diff context").addIntegerProperty("currentPage").description("Current page for the query. First page is 1")- .required("regularExpression", "currentPage").build())- .build();+ .required("regularExpression", "caseSensitive", "currentPage")+ .build())+ .build();}@Override- public CompletableFuture<Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ public CompletableFuture<Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ if (arguments.get("regularExpression") == null)+ return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "Argument 'regularExpression' is required")), false));var regularExpression = arguments.get("regularExpression").asText();- regularExpression = "*";+ if (arguments.get("caseSensitive") == null)+ return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "Argument 'caseSensitive' is required")), false));var caseSensitive = arguments.get("caseSensitive").asBoolean();var oldRevision = arguments.get("oldRevision") != null ? arguments.get("oldRevision").asBoolean() : false;+ if (arguments.get("currentPage") == null)+ return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "Argument 'currentPage' is required")), false));var currentPage = arguments.get("currentPage").asInt();var project = getProject();@@ -92,13 +98,13 @@ public abstract class QueryCodeSnippets implements ChatTool {"successful", true,"codeSnippets", codeSnippets,"hasMorePages", textHits.size() > toIndex);- return completedFuture(new ChatToolExecution.Result(ChatToolUtils.convertToJson(resultData), false));+ return completedFuture(new ChatToolExecution.Result(convertToJson(resultData), false));} catch (RuntimeException e) {if (ExceptionUtils.find(e, TooGeneralQueryException.class) != null) {var resultData = Map.of("successful", false,"failReason", "Regular expression is too short or too general, try a more specific one");- return completedFuture(new ChatToolExecution.Result(ChatToolUtils.convertToJson(resultData), false));+ return completedFuture(new ChatToolExecution.Result(convertToJson(resultData), false));} else {throw e;}diff --git a/server-core/src/main/java/io/onedev/server/ai/tools/QueryFilePaths.java b/server-core/src/main/java/io/onedev/server/ai/tools/QueryFilePaths.javaindex 52e783a2cc..27df277b80 100644--- a/server-core/src/main/java/io/onedev/server/ai/tools/QueryFilePaths.java+++ b/server-core/src/main/java/io/onedev/server/ai/tools/QueryFilePaths.java@@ -40,15 +40,22 @@ public abstract class QueryFilePaths implements ChatTool {.addBooleanProperty("caseSensitive").description("Whether to match file names case-sensitively").addBooleanProperty("oldRevision").description("Optionally specify whether to query file paths in old revision in a diff context").addIntegerProperty("currentPage").description("Current page for the query. First page is 1")- .required("fileNamePattern", "currentPage").build())- .build();+ .required("fileNamePattern", "caseSensitive", "currentPage")+ .build())+ .build();}@Overridepublic CompletableFuture<Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ if (arguments.get("fileNamePattern") == null)+ return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "Argument 'fileNamePattern' is required")), false));var fileNamePattern = arguments.get("fileNamePattern").asText();+ if (arguments.get("caseSensitive") == null)+ return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "Argument 'caseSensitive' is required")), false));var caseSensitive = arguments.get("caseSensitive").asBoolean();var oldRevision = arguments.get("oldRevision") != null ? arguments.get("oldRevision").asBoolean() : false;+ if (arguments.get("currentPage") == null)+ return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "Argument 'currentPage' is required")), false));var currentPage = arguments.get("currentPage").asInt();try {diff --git a/server-core/src/main/java/io/onedev/server/ai/tools/QuerySymbolDefinitions.java b/server-core/src/main/java/io/onedev/server/ai/tools/QuerySymbolDefinitions.javaindex 030d506629..7686e68c6b 100644--- a/server-core/src/main/java/io/onedev/server/ai/tools/QuerySymbolDefinitions.java+++ b/server-core/src/main/java/io/onedev/server/ai/tools/QuerySymbolDefinitions.java@@ -1,5 +1,6 @@package io.onedev.server.ai.tools;+import static io.onedev.server.ai.ChatToolUtils.convertToJson;import static java.util.concurrent.CompletableFuture.completedFuture;import java.util.Map;@@ -14,7 +15,6 @@ import dev.langchain4j.agent.tool.ToolSpecification;import dev.langchain4j.model.chat.request.json.JsonObjectSchema;import io.onedev.server.OneDev;import io.onedev.server.ai.ChatTool;-import io.onedev.server.ai.ChatToolUtils;import io.onedev.server.exception.ExceptionUtils;import io.onedev.server.model.Project;import io.onedev.server.search.code.CodeSearchService;@@ -39,16 +39,23 @@ public abstract class QuerySymbolDefinitions implements ChatTool {.addStringProperty("fileNamePatterns").description("Optionally specify file name patterns to query definitions in. Pattern supports wildcards * and ?. Multiple patterns should be separated by comma").addBooleanProperty("oldRevision").description("Optionally specify whether to query definitions in old revision in a diff context").addIntegerProperty("currentPage").description("Current page for the query. First page is 1")- .required("symbolNamePattern", "caseSensitive", "currentPage").build())- .build();+ .required("symbolNamePattern", "caseSensitive", "currentPage")+ .build())+ .build();}@Overridepublic CompletableFuture<Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ if (arguments.get("symbolNamePattern") == null)+ return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "Argument 'symbolNamePattern' is required")), false));var symbolNamePattern = arguments.get("symbolNamePattern").asText();+ if (arguments.get("caseSensitive") == null)+ return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "Argument 'caseSensitive' is required")), false));var caseSensitive = arguments.get("caseSensitive").asBoolean();var fileNamePatterns = arguments.get("fileNamePatterns") != null ? arguments.get("fileNamePatterns").asText() : null;var oldRevision = arguments.get("oldRevision") != null ? arguments.get("oldRevision").asBoolean() : false;+ if (arguments.get("currentPage") == null)+ return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "Argument 'currentPage' is required")), false));var currentPage = arguments.get("currentPage").asInt();try {@@ -65,13 +72,13 @@ public abstract class QuerySymbolDefinitions implements ChatTool {"successful", true,"definitions", symbolHits.subList(fromIndex, toIndex),"hasMorePages", symbolHits.size() > toIndex);- return completedFuture(new ChatToolExecution.Result(ChatToolUtils.convertToJson(result), false));+ return completedFuture(new ChatToolExecution.Result(convertToJson(result), false));} catch (RuntimeException e) {if (ExceptionUtils.find(e, TooGeneralQueryException.class) != null) {var resultData = Map.of("successful", false,"failReason", "Symbol name pattern is too short or too general, try a more specific one");- return completedFuture(new ChatToolExecution.Result(ChatToolUtils.convertToJson(resultData), false));+ return completedFuture(new ChatToolExecution.Result(convertToJson(resultData), false));} else {throw e;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/ai/chat/chat.css b/server-core/src/main/java/io/onedev/server/web/component/ai/chat/chat.cssindex 9a875780be..5bfc14f26f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/ai/chat/chat.css+++ b/server-core/src/main/java/io/onedev/server/web/component/ai/chat/chat.css@@ -40,6 +40,7 @@}.chat>.body>.send textarea {max-height: 160px;+ padding-right: 36px;}.chat>.body>.send a {border-radius: 50px;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobEditPanel.javaindex 7199928508..3316880387 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobEditPanel.java@@ -1,11 +1,13 @@package io.onedev.server.web.page.project.blob.render.renderers.buildspec;+import static io.onedev.server.ai.ChatToolUtils.convertToJson;import static java.util.concurrent.CompletableFuture.completedFuture;import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.Collection;import java.util.List;+import java.util.Map;import java.util.concurrent.CompletableFuture;import java.util.stream.Collectors;@@ -199,23 +201,27 @@ public class BuildSpecBlobEditPanel extends BlobEditPanel implements PlainEditSu@Overridepublic CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {if (getCurrentTab() != Tab.SAVE) {+ if (arguments.get("buildSpec") == null)+ return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "Argument 'buildSpec' is required")), false));var buildSpecString = arguments.get("buildSpec").asText();BuildSpec buildSpec;try {buildSpec = BuildSpec.parse(buildSpecString.getBytes(StandardCharsets.UTF_8));} catch (Throwable t) {- return completedFuture(new ChatToolExecution.Result("Malformed CI/CD spec, please fix and save again", false));+ return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "Malformed CI/CD spec, please fix and save again")), false));}+var violations = validator.validate(buildSpec);- String result;+ Map<String, Object> resultData;if (!violations.isEmpty()) {- result = "Failed to validate CI/CD spec, please fix errors below and save again:\n\n" ++ var errorMessage = "Failed to validate CI/CD spec, please fix errors below and save again:\n\n" +Joiner.on("\n").join(violations.stream().map(it -> String.format("\t-> Location: %s, Error: %s", it.getPropertyPath(), it.getMessage())).collect(Collectors.toList()));+ resultData = Map.of( "successful", false, "failReason", errorMessage);} else {updateEditingContent(handler, buildSpecString.getBytes(StandardCharsets.UTF_8));- result = "CI/CD spec saved successfully";+ resultData = Map.of("successful", true);}- return completedFuture(new ChatToolExecution.Result(result, false));+ return completedFuture(new ChatToolExecution.Result(convertToJson(resultData), false));} else {throw new ExplicitException("CI/CD spec is not being edited currently");}