The Unified and Autonomous Development Platform
chore: Add more chat tools
Robin Shene2be99b85a67
diff --git a/pom.xml b/pom.xmlindex dde241b7c3..3e22d2f881 100644--- a/pom.xml+++ b/pom.xml@@ -676,8 +676,8 @@</repository></repositories><properties>- <commons.version>3.1.5</commons.version>- <agent.version>2.3.7</agent.version>+ <commons.version>3.1.6</commons.version>+ <agent.version>2.3.8</agent.version><slf4j.version>2.0.9</slf4j.version><logback.version>1.4.14</logback.version><antlr.version>4.7.2</antlr.version>diff --git a/server-core/src/main/java/io/onedev/server/ai/ChatToolUtils.java b/server-core/src/main/java/io/onedev/server/ai/ChatToolUtils.javanew file mode 100644index 0000000000..aa0c46f3ab--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ai/ChatToolUtils.java@@ -0,0 +1,60 @@+package io.onedev.server.ai;++import java.util.ArrayList;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import org.eclipse.jgit.lib.ObjectId;+import org.jspecify.annotations.Nullable;++import com.fasterxml.jackson.core.JsonProcessingException;+import com.fasterxml.jackson.databind.ObjectMapper;++import io.onedev.commons.utils.LinearRange;+import io.onedev.commons.utils.PlanarRange;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneDev;+import io.onedev.server.git.BlobIdent;+import io.onedev.server.git.BlobIdentFilter;+import io.onedev.server.git.service.GitService;+import io.onedev.server.model.Project;+import io.onedev.server.util.IgnoreLinearRangeMixin;+import io.onedev.server.util.IgnorePlanarRangeMixin;++public class ChatToolUtils {++ public static String convertToJson(Object data) {+ try {+ var mapper = OneDev.getInstance(ObjectMapper.class).copy();+ mapper.addMixIn(PlanarRange.class, IgnorePlanarRangeMixin.class);+ mapper.addMixIn(LinearRange.class, IgnoreLinearRangeMixin.class);+ return mapper.writeValueAsString(data);+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }+ }++ public static String getFilesAndFolders(Project project, ObjectId commitId, @Nullable String path) {+ var gitService = OneDev.getInstance(GitService.class);+ if (path != null) {+ var blobIdent = gitService.getBlobIdent(project, commitId, path);+ if (blobIdent == null)+ return convertToJson(Map.of("successful", false, "failReason", "Folder not found"));+ if (!blobIdent.isTree())+ return convertToJson(Map.of("successful", false, "failReason", "Not a folder"));+ path = StringUtils.strip(path.replace('\\', '/'), "/");+ }+ List<BlobIdent> children = gitService.getChildren(project, commitId,+ path, BlobIdentFilter.ALL, false);+ var filesAndFolders = new ArrayList<Map<String, Object>>();+ for (var child : children) {+ var fileAndFolder = new HashMap<String, Object>();+ fileAndFolder.put("name", child.getName());+ fileAndFolder.put("type", child.isTree() ? "folder" : "file");+ filesAndFolders.add(fileAndFolder);+ }+ return convertToJson(Map.of("successful", true, "filesAndFolders", filesAndFolders));+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/ai/HighlightedTextTool.java b/server-core/src/main/java/io/onedev/server/ai/HighlightedTextTool.javadeleted file mode 100644index 2acc63e632..0000000000--- a/server-core/src/main/java/io/onedev/server/ai/HighlightedTextTool.java+++ /dev/null@@ -1,74 +0,0 @@-package io.onedev.server.ai;--import static java.util.concurrent.CompletableFuture.completedFuture;--import java.util.List;-import java.util.Map;-import java.util.concurrent.CompletableFuture;--import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;--import com.fasterxml.jackson.core.JsonProcessingException;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.google.common.base.Joiner;--import dev.langchain4j.agent.tool.ToolSpecification;-import io.onedev.commons.utils.PlanarRange;-import io.onedev.server.OneDev;-import io.onedev.server.web.websocket.ChatToolExecution;--public class HighlightedTextTool implements ChatTool {-- private static final String HIGHLIGHT_BEGIN = "[HIGHLIGHT_BEGIN]";-- private static final String HIGHLIGHT_END = "[HIGHLIGHT_END]";-- private static final String OMITTED_LINES = "...OMITTED LINES...";-- private static final int START_CONTEXT_SIZE = 100;-- private static final int BEFORE_CONTEXT_SIZE = 50;-- private static final int AFTER_CONTEXT_SIZE = 50;-- private final String fileName;-- private final List<String> fileContent;-- private final PlanarRange highlightRange;-- public HighlightedTextTool(String fileName, List<String> fileContent, PlanarRange highlightRange) {- this.fileName = fileName;- this.fileContent = fileContent;- this.highlightRange = highlightRange;- }-- @Override- public ToolSpecification getSpecification() {- return ToolSpecification.builder()- .name("getHighlightedTextInformation")- .description("""- Get information of highlighted text in json format, including highlighted text itself,- name of the file containing highlighted text, and context of highlighted text- """)- .build();- }-- @Override- public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {- var map = Map.of(- "highlightedText", Joiner.on('\n').join(highlightRange.getContent(fileContent)),- "nameOfFileContainingHighlightedText", fileName,- "contextOfHighlightedText", Joiner.on('\n').join(highlightRange.getContext(fileContent, HIGHLIGHT_BEGIN, HIGHLIGHT_END, OMITTED_LINES, START_CONTEXT_SIZE, BEFORE_CONTEXT_SIZE, AFTER_CONTEXT_SIZE)),- "note", String.format("Highlighted text is between %s and %s in the context", HIGHLIGHT_BEGIN, HIGHLIGHT_END)- );-- try {- return completedFuture(new ChatToolExecution.Result(OneDev.getInstance(ObjectMapper.class).writeValueAsString(map), false));- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }- }--}\ No newline at end of filediff --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.javanew file mode 100644index 0000000000..296e009136--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ai/tools/GetFileContent.java@@ -0,0 +1,62 @@+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;+import java.util.concurrent.CompletableFuture;++import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import org.eclipse.jgit.lib.ObjectId;++import com.fasterxml.jackson.databind.JsonNode;++import dev.langchain4j.agent.tool.ToolSpecification;+import dev.langchain4j.model.chat.request.json.JsonObjectSchema;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneDev;+import io.onedev.server.ai.ChatTool;+import io.onedev.server.git.service.GitService;+import io.onedev.server.model.Project;+import io.onedev.server.web.websocket.ChatToolExecution;++public abstract class GetFileContent implements ChatTool {++ @Override+ public ToolSpecification getSpecification() {+ return ToolSpecification.builder()+ .name("getFileContent")+ .description("Get content of specified text file in json format")+ .parameters(JsonObjectSchema.builder()+ .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();+ }++ @Override+ public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ var filePath = arguments.get("filePath").asText();+ var oldRevision = arguments.get("oldRevision") != null ? arguments.get("oldRevision").asBoolean() : false;++ System.out.println("Get file content (file path: " + filePath + ")");++ filePath = StringUtils.strip(filePath.replace('\\', '/'), "/");+ var blobIdent = OneDev.getInstance(GitService.class).getBlobIdent(getProject(), getCommitId(oldRevision), filePath);+ if (blobIdent == null)+ return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "File not found")), false));+ if (!blobIdent.isFile())+ return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "Not a file")), false));++ var blob = getProject().getBlob(blobIdent, true);+ if (blob.getText() != null)+ return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", true, "fileContent", blob.getText().getContent())), false));+ else+ return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "Not a text file")), false));+ }++ protected abstract Project getProject();++ protected abstract ObjectId getCommitId(boolean oldRevision);++}\ No newline at end of filediff --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.javanew file mode 100644index 0000000000..5b9354da67--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ai/tools/GetFilesAndSubfolders.java@@ -0,0 +1,44 @@+package io.onedev.server.ai.tools;++import static java.util.concurrent.CompletableFuture.completedFuture;++import java.util.concurrent.CompletableFuture;++import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import org.eclipse.jgit.lib.ObjectId;++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;++public abstract class GetFilesAndSubfolders implements ChatTool {++ @Override+ public ToolSpecification getSpecification() {+ return ToolSpecification.builder()+ .name("getFilesAndSubfolders")+ .description("List all files and subfolders under specified folder in json format")+ .parameters(JsonObjectSchema.builder()+ .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();+ }++ @Override+ public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ 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));+ }++ protected abstract Project getProject();++ protected abstract ObjectId getCommitId(boolean oldRevision);++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/ai/tools/GetHighlightedText.java b/server-core/src/main/java/io/onedev/server/ai/tools/GetHighlightedText.javanew file mode 100644index 0000000000..3296788cd4--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ai/tools/GetHighlightedText.java@@ -0,0 +1,68 @@+package io.onedev.server.ai.tools;++import static io.onedev.server.ai.ChatToolUtils.convertToJson;+import static java.util.concurrent.CompletableFuture.completedFuture;++import java.util.HashMap;+import java.util.List;+import java.util.concurrent.CompletableFuture;++import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;++import com.fasterxml.jackson.databind.JsonNode;+import com.google.common.base.Joiner;++import dev.langchain4j.agent.tool.ToolSpecification;+import io.onedev.commons.utils.PlanarRange;+import io.onedev.server.ai.ChatTool;+import io.onedev.server.web.util.DiffPlanarRange;+import io.onedev.server.web.websocket.ChatToolExecution;++public class GetHighlightedText implements ChatTool {++ private static final String HIGHLIGHT_BEGIN = "[HIGHLIGHT_BEGIN]";++ private static final String HIGHLIGHT_END = "[HIGHLIGHT_END]";++ private static final String OMITTED_LINES = "...OMITTED LINES...";++ private final String filePath;++ private final List<String> fileContent;++ private final PlanarRange highlightRange;++ public GetHighlightedText(String filePath, List<String> fileContent, PlanarRange highlightRange) {+ this.filePath = filePath;+ this.fileContent = fileContent;+ this.highlightRange = highlightRange;+ }++ @Override+ public ToolSpecification getSpecification() {+ return ToolSpecification.builder()+ .name("getHighlightedTextInformation")+ .description("""+ Get information of highlighted text in json format, including highlighted text itself,+ path of the file containing highlighted text, and content of the file containing highlighted text+ """)+ .build();+ }++ @Override+ public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ var map = new HashMap<String, Object>();+ map.put("highlightedText", Joiner.on('\n').join(highlightRange.getContent(fileContent)));+ map.put("pathOfFileContainingHighlightedText", filePath);+ map.put("contentOfFileContainingHighlightedText", Joiner.on('\n').join(highlightRange.getContext(fileContent, HIGHLIGHT_BEGIN, HIGHLIGHT_END, OMITTED_LINES, 0, Integer.MAX_VALUE, Integer.MAX_VALUE)));+ if (highlightRange instanceof DiffPlanarRange diffPlanarRange)+ map.put("oldRevision", diffPlanarRange.isLeftSide());+ map.put("note", """+ 1. Highlighted text is between %s and %s in content of the file containing it+ 2. If property 'oldRevision' is available, it means that text is highlighted in a diff context, and this flag+ should be passed back to tools with this argument when calling them+ """.formatted(HIGHLIGHT_BEGIN, HIGHLIGHT_END));+ return completedFuture(new ChatToolExecution.Result(convertToJson(map), false));+ }++}\ No newline at end of filediff --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.javanew file mode 100644index 0000000000..aca3724f32--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ai/tools/GetRootFilesAndFolders.java@@ -0,0 +1,41 @@+package io.onedev.server.ai.tools;++import static java.util.concurrent.CompletableFuture.completedFuture;++import java.util.concurrent.CompletableFuture;++import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import org.eclipse.jgit.lib.ObjectId;++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;++public abstract class GetRootFilesAndFolders implements ChatTool {++ @Override+ public ToolSpecification getSpecification() {+ return ToolSpecification.builder()+ .name("getRootFilesAndFolders")+ .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();+ }++ @Override+ public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ return completedFuture(new ChatToolExecution.Result(ChatToolUtils.getFilesAndFolders(getProject(), getCommitId(false), null), false));+ }++ protected abstract Project getProject();++ protected abstract ObjectId getCommitId(boolean oldRevision);++}\ No newline at end of filediff --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.javanew file mode 100644index 0000000000..43e1a70a87--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ai/tools/QueryCodeSnippets.java@@ -0,0 +1,112 @@+package io.onedev.server.ai.tools;++import static java.util.concurrent.CompletableFuture.completedFuture;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;+import java.util.concurrent.CompletableFuture;++import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import org.eclipse.jgit.lib.ObjectId;++import com.fasterxml.jackson.databind.JsonNode;++import dev.langchain4j.agent.tool.ToolSpecification;+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;+import io.onedev.server.search.code.query.BlobQuery;+import io.onedev.server.search.code.query.TextQuery;+import io.onedev.server.search.code.query.TooGeneralQueryException;+import io.onedev.server.web.websocket.ChatToolExecution;+import io.onedev.server.web.websocket.ChatToolExecution.Result;++public abstract class QueryCodeSnippets implements ChatTool {++ private static final int PAGE_SIZE = 25;++ private static final int CONTEXT_LINES = 5;++ private static final String MATCHED_CODE_SNIPPET_BEGIN = "[MATCHED_CODE_SNIPPET_BEGIN]";++ private static final String MATCHED_CODE_SNIPPET_END = "[MATCHED_CODE_SNIPPET_END]";++ private static final String OMITTED_LINES = "...OMITTED LINES...";+++ @Override+ public ToolSpecification getSpecification() {+ return ToolSpecification.builder()+ .name("queryCodeSnippets")+ .description("Query code snippets matching specified perl-compatible regular expression and return result in json format")+ .parameters(JsonObjectSchema.builder()+ .addStringProperty("regularExpression").description("Perl-compatible regular expression to query code")+ .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();+ }++ @Override+ public CompletableFuture<Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ var regularExpression = arguments.get("regularExpression").asText();+ regularExpression = "*";+ var caseSensitive = arguments.get("caseSensitive").asBoolean();+ var oldRevision = arguments.get("oldRevision") != null ? arguments.get("oldRevision").asBoolean() : false;+ var currentPage = arguments.get("currentPage").asInt();++ var project = getProject();+ var commitId = getCommitId(oldRevision);+ try {+ BlobQuery query = new TextQuery.Builder(regularExpression)+ .caseSensitive(caseSensitive)+ .regex(true)+ .count(currentPage * PAGE_SIZE + 1)+ .build();+ var textHits = OneDev.getInstance(CodeSearchService.class).search(project, commitId, query);+ int fromIndex = (currentPage - 1) * PAGE_SIZE;+ int toIndex = Math.min(currentPage * PAGE_SIZE, textHits.size());++ List<Map<String, Object>> codeSnippets = new ArrayList<>();+ for (var i=fromIndex; i<toIndex; i++) {+ var textHit = textHits.get(i);+ var hitPos = textHit.getHitPos();+ var blobIdent = OneDev.getInstance(GitService.class).getBlobIdent(project, commitId, textHit.getFilePath());+ var lines = project.getBlob(blobIdent, true).getText().getLines();+ var codeSnippet = Map.of(+ "filePath", textHit.getFilePath(),+ "codeSnippet", hitPos.getContent(lines),+ "contextAroundCodeSnippet", hitPos.getContext(lines, MATCHED_CODE_SNIPPET_BEGIN, MATCHED_CODE_SNIPPET_END, OMITTED_LINES, 0, CONTEXT_LINES, CONTEXT_LINES),+ "note", String.format("Code snippet is between %s and %s in the context around it", MATCHED_CODE_SNIPPET_BEGIN, MATCHED_CODE_SNIPPET_END)+ );+ codeSnippets.add(codeSnippet);+ }+ var resultData = Map.of(+ "successful", true,+ "codeSnippets", codeSnippets,+ "hasMorePages", textHits.size() > toIndex);+ return completedFuture(new ChatToolExecution.Result(ChatToolUtils.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));+ } else {+ throw e;+ }+ }+ }++ protected abstract Project getProject();++ protected abstract ObjectId getCommitId(boolean oldRevision);++}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.javanew file mode 100644index 0000000000..52e783a2cc--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ai/tools/QueryFilePaths.java@@ -0,0 +1,88 @@+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;+import java.util.List;+import java.util.Map;+import java.util.concurrent.CompletableFuture;++import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import org.eclipse.jgit.lib.ObjectId;++import com.fasterxml.jackson.databind.JsonNode;++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.exception.ExceptionUtils;+import io.onedev.server.model.Project;+import io.onedev.server.search.code.CodeSearchService;+import io.onedev.server.search.code.query.BlobQuery;+import io.onedev.server.search.code.query.FileQuery;+import io.onedev.server.search.code.query.TooGeneralQueryException;+import io.onedev.server.web.websocket.ChatToolExecution;+import io.onedev.server.web.websocket.ChatToolExecution.Result;++public abstract class QueryFilePaths implements ChatTool {++ private static final int PAGE_SIZE = 25;++ @Override+ public ToolSpecification getSpecification() {+ return ToolSpecification.builder()+ .name("queryFilePaths")+ .description("Query file paths by specified file name pattern (supports wildcards * and ?) and return result in json format")+ .parameters(JsonObjectSchema.builder()+ .addStringProperty("fileNamePattern").description("File name pattern to query paths (supports wildcards * and ?)")+ .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();+ }++ @Override+ public CompletableFuture<Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ var fileNamePattern = arguments.get("fileNamePattern").asText();+ var caseSensitive = arguments.get("caseSensitive").asBoolean();+ var oldRevision = arguments.get("oldRevision") != null ? arguments.get("oldRevision").asBoolean() : false;+ var currentPage = arguments.get("currentPage").asInt();++ try {+ BlobQuery query = new FileQuery.Builder(fileNamePattern)+ .caseSensitive(caseSensitive)+ .count(currentPage * PAGE_SIZE + 1)+ .build();+ var fileHits = OneDev.getInstance(CodeSearchService.class).search(getProject(), getCommitId(oldRevision), query);+ int fromIndex = (currentPage - 1) * PAGE_SIZE;+ int toIndex = Math.min(currentPage * PAGE_SIZE, fileHits.size());++ List<String> filePaths = new ArrayList<>();+ for (var i=fromIndex; i<toIndex; i++) {+ filePaths.add(fileHits.get(i).getFilePath());+ }+ var resultData = Map.of(+ "successful", true,+ "filePaths", filePaths,+ "hasMorePages", fileHits.size() > toIndex);+ 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", "File name pattern is too short or too general, try a more specific one");+ return completedFuture(new ChatToolExecution.Result(convertToJson(resultData), false));+ } else {+ throw e;+ }+ }+ }++ protected abstract Project getProject();++ protected abstract ObjectId getCommitId(boolean oldRevision);++}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.javanew file mode 100644index 0000000000..030d506629--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ai/tools/QuerySymbolDefinitions.java@@ -0,0 +1,85 @@+package io.onedev.server.ai.tools;++import static java.util.concurrent.CompletableFuture.completedFuture;++import java.util.Map;+import java.util.concurrent.CompletableFuture;++import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import org.eclipse.jgit.lib.ObjectId;++import com.fasterxml.jackson.databind.JsonNode;++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;+import io.onedev.server.search.code.query.BlobQuery;+import io.onedev.server.search.code.query.SymbolQuery;+import io.onedev.server.search.code.query.TooGeneralQueryException;+import io.onedev.server.web.websocket.ChatToolExecution;+import io.onedev.server.web.websocket.ChatToolExecution.Result;++public abstract class QuerySymbolDefinitions implements ChatTool {++ private static final int PAGE_SIZE = 25;++ @Override+ public ToolSpecification getSpecification() {+ return ToolSpecification.builder()+ .name("querySymbolDefinitions")+ .description("Query definitions of specified symbol name pattern (supports wildcards * and ?) and return result in json format")+ .parameters(JsonObjectSchema.builder()+ .addStringProperty("symbolNamePattern").description("Symbol name pattern to query definitions (supports wildcards * and ?)")+ .addBooleanProperty("caseSensitive").description("Whether to match symbol names case-sensitively")+ .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();+ }++ @Override+ public CompletableFuture<Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {+ var symbolNamePattern = arguments.get("symbolNamePattern").asText();+ 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;+ var currentPage = arguments.get("currentPage").asInt();++ try {+ BlobQuery query = new SymbolQuery.Builder(symbolNamePattern)+ .caseSensitive(caseSensitive)+ .fileNames(fileNamePatterns)+ .local(false)+ .count(currentPage * PAGE_SIZE + 1)+ .build();+ var symbolHits = OneDev.getInstance(CodeSearchService.class).search(getProject(), getCommitId(oldRevision), query);+ int fromIndex = (currentPage - 1) * PAGE_SIZE;+ int toIndex = Math.min(currentPage * PAGE_SIZE, symbolHits.size());+ var result = Map.of(+ "successful", true,+ "definitions", symbolHits.subList(fromIndex, toIndex),+ "hasMorePages", symbolHits.size() > toIndex);+ return completedFuture(new ChatToolExecution.Result(ChatToolUtils.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));+ } else {+ throw e;+ }+ }+ }++ protected abstract Project getProject();++ protected abstract ObjectId getCommitId(boolean oldRevision);++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/search/code/hit/FileHit.java b/server-core/src/main/java/io/onedev/server/search/code/hit/FileHit.javaindex 53e0482a77..e733d5d18a 100644--- a/server-core/src/main/java/io/onedev/server/search/code/hit/FileHit.java+++ b/server-core/src/main/java/io/onedev/server/search/code/hit/FileHit.java@@ -17,19 +17,19 @@ public class FileHit extends QueryHit {private final LinearRange match;- public FileHit(String blobPath, @Nullable LinearRange match) {- super(blobPath, null);+ public FileHit(String filePath, @Nullable LinearRange match) {+ super(filePath, null);this.match = match;}@Overridepublic String toString() {- return getBlobPath();+ return getFilePath();}@Overridepublic Component render(String componentId) {- String fileName = getBlobPath();+ String fileName = getFilePath();if (fileName.contains("/"))fileName = StringUtils.substringAfterLast(fileName, "/");@@ -43,8 +43,8 @@ public class FileHit extends QueryHit {@Overridepublic String getNamespace() {- if (getBlobPath().contains("/"))- return StringUtils.substringBeforeLast(getBlobPath(), "/");+ if (getFilePath().contains("/"))+ return StringUtils.substringBeforeLast(getFilePath(), "/");elsereturn null;}diff --git a/server-core/src/main/java/io/onedev/server/search/code/hit/QueryHit.java b/server-core/src/main/java/io/onedev/server/search/code/hit/QueryHit.javaindex 98191feac5..3c8529d048 100644--- a/server-core/src/main/java/io/onedev/server/search/code/hit/QueryHit.java+++ b/server-core/src/main/java/io/onedev/server/search/code/hit/QueryHit.java@@ -12,17 +12,17 @@ public abstract class QueryHit implements Serializable {private static final long serialVersionUID = 1L;- private final String blobPath;+ private final String filePath;private final PlanarRange hitPos;- public QueryHit(String blobPath, @Nullable PlanarRange hitPos) {- this.blobPath = blobPath;+ public QueryHit(String filePath, @Nullable PlanarRange hitPos) {+ this.filePath = filePath;this.hitPos = hitPos;}- public String getBlobPath() {- return blobPath;+ public String getFilePath() {+ return filePath;}@Nullablediff --git a/server-core/src/main/java/io/onedev/server/search/code/hit/SymbolHit.java b/server-core/src/main/java/io/onedev/server/search/code/hit/SymbolHit.javaindex 822013e8c7..528636f23d 100644--- a/server-core/src/main/java/io/onedev/server/search/code/hit/SymbolHit.java+++ b/server-core/src/main/java/io/onedev/server/search/code/hit/SymbolHit.java@@ -16,8 +16,8 @@ public class SymbolHit extends QueryHit {private final LinearRange match;- public SymbolHit(String blobPath, Symbol symbol, @Nullable LinearRange match) {- super(blobPath, symbol.getPosition());+ public SymbolHit(String filePath, Symbol symbol, @Nullable LinearRange match) {+ super(filePath, symbol.getPosition());this.symbol = symbol;this.match = match;}diff --git a/server-core/src/main/java/io/onedev/server/search/code/hit/TextHit.java b/server-core/src/main/java/io/onedev/server/search/code/hit/TextHit.javaindex 5d03dfa1f3..62d3d65021 100644--- a/server-core/src/main/java/io/onedev/server/search/code/hit/TextHit.java+++ b/server-core/src/main/java/io/onedev/server/search/code/hit/TextHit.java@@ -16,8 +16,8 @@ public class TextHit extends QueryHit {private final String line;- public TextHit(String blobPath, PlanarRange hitPos, String line) {- super(blobPath, hitPos);+ public TextHit(String filePath, PlanarRange hitPos, String line) {+ super(filePath, hitPos);this.line = line;}@@ -42,7 +42,7 @@ public class TextHit extends QueryHit {@Overridepublic String getNamespace() {- String fileName = getBlobPath();+ String fileName = getFilePath();if (fileName.contains("/"))fileName = StringUtils.substringAfterLast(fileName, "/");return fileName;diff --git a/server-core/src/main/java/io/onedev/server/util/IgnoreLinearRangeMixin.java b/server-core/src/main/java/io/onedev/server/util/IgnoreLinearRangeMixin.javanew file mode 100644index 0000000000..d5ab16229c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/IgnoreLinearRangeMixin.java@@ -0,0 +1,7 @@+package io.onedev.server.util;++import com.fasterxml.jackson.annotation.JsonIgnoreType;++@JsonIgnoreType+public interface IgnoreLinearRangeMixin {+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/util/IgnorePlanarRangeMixin.java b/server-core/src/main/java/io/onedev/server/util/IgnorePlanarRangeMixin.javanew file mode 100644index 0000000000..fd9a3c1341--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/IgnorePlanarRangeMixin.java@@ -0,0 +1,7 @@+package io.onedev.server.util;++import com.fasterxml.jackson.annotation.JsonIgnoreType;++@JsonIgnoreType+public interface IgnorePlanarRangeMixin {+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/RevisionAndPathParam.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/RevisionAndPathParam.javaindex 4eab10e439..3a99951796 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/RevisionAndPathParam.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/RevisionAndPathParam.java@@ -37,7 +37,7 @@ public class RevisionAndPathParam extends ParamSegment {.build();try {for (QueryHit hit: codeSearchService.search(project, commitId, query)) {- String revisionAndPath = project.getDefaultBranch() + "/" + hit.getBlobPath();+ String revisionAndPath = project.getDefaultBranch() + "/" + hit.getFilePath();suggestions.put(revisionAndPath, revisionAndPath);}} catch (TooGeneralQueryException e) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.javaindex 00e25e9acc..6d55e55e3c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java@@ -45,7 +45,7 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.ai.ChatTool;import io.onedev.server.ai.ChatToolAware;-import io.onedev.server.ai.HighlightedTextTool;+import io.onedev.server.ai.tools.GetHighlightedText;import io.onedev.server.codequality.CodeProblem;import io.onedev.server.git.BlameBlock;import io.onedev.server.git.BlameCommit;@@ -1088,16 +1088,16 @@ public class BlobTextDiffPanel extends Panel implements ChatToolAware {if (getAnnotationSupport() != null) {var markRange = getAnnotationSupport().getMarkRange();if (markRange != null) {- String fileName;+ String filePath;List<String> fileLines;if (markRange.isLeftSide()) {- fileName = change.getOldBlobIdent().getName();+ filePath = change.getOldBlobIdent().path;fileLines = change.getOldText().getLines();} else {- fileName = change.getNewBlobIdent().getName();+ filePath = change.getNewBlobIdent().path;fileLines = change.getNewText().getLines();}- tools.add(new HighlightedTextTool(fileName, fileLines, markRange));+ tools.add(new GetHighlightedText(filePath, fileLines, markRange));}}return tools;diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex bbc9cc8f37..f12c7ab753 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -18,7 +18,6 @@ import java.util.Set;import java.util.TreeMap;import java.util.UUID;-import org.jspecify.annotations.Nullable;import javax.servlet.http.Cookie;import org.apache.commons.codec.binary.Hex;@@ -62,6 +61,7 @@ import org.eclipse.jgit.diff.DiffEntry.ChangeType;import org.eclipse.jgit.lib.AnyObjectId;import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.lib.ObjectId;+import org.jspecify.annotations.Nullable;import com.google.common.base.Joiner;import com.google.common.base.Splitter;@@ -77,11 +77,18 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.match.Matcher;import io.onedev.commons.utils.match.PathMatcher;import io.onedev.server.OneDev;+import io.onedev.server.ai.ChatTool;+import io.onedev.server.ai.ChatToolAware;+import io.onedev.server.ai.tools.GetFileContent;+import io.onedev.server.ai.tools.GetFilesAndSubfolders;+import io.onedev.server.ai.tools.QueryCodeSnippets;+import io.onedev.server.ai.tools.GetRootFilesAndFolders;+import io.onedev.server.ai.tools.QueryFilePaths;+import io.onedev.server.ai.tools.QuerySymbolDefinitions;import io.onedev.server.attachment.ProjectAttachmentSupport;import io.onedev.server.codequality.BlobTarget;import io.onedev.server.codequality.CodeProblem;import io.onedev.server.codequality.CoverageStatus;-import io.onedev.server.service.PendingSuggestionApplyService;import io.onedev.server.event.project.CommitIndexed;import io.onedev.server.git.BlobChange;import io.onedev.server.git.BlobEdits;@@ -101,6 +108,7 @@ import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.Mark;import io.onedev.server.search.code.CodeIndexService;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.service.PendingSuggestionApplyService;import io.onedev.server.util.Pair;import io.onedev.server.util.PathComparator;import io.onedev.server.util.diff.WhitespaceOption;@@ -141,7 +149,7 @@ import io.onedev.server.web.util.WicketUtils;* @author robin**/-public abstract class RevisionDiffPanel extends Panel {+public abstract class RevisionDiffPanel extends Panel implements ChatToolAware {private static final String COOKIE_VIEW_MODE = "onedev.server.diff.viewmode";@@ -2376,7 +2384,7 @@ public abstract class RevisionDiffPanel extends Panel {}}return newCoverages;- }+ }@Overridepublic DiffPlanarRange getCommentRange(CodeComment comment) {@@ -2396,4 +2404,82 @@ public abstract class RevisionDiffPanel extends Panel {return blobAnnotationSupport.orElse(null);}+ private ObjectId getCommitId(boolean oldRevision) {+ System.out.println("oldRevision: " + oldRevision);+ return oldRevision ? getOldCommitId().copy() : getNewCommitId().copy();+ }++ @Override+ public Collection<ChatTool> getChatTools() {+ return List.of(+ new GetRootFilesAndFolders() {+ @Override+ protected Project getProject() {+ return RevisionDiffPanel.this.getProject();+ }++ @Override+ protected ObjectId getCommitId(boolean oldRevision) {+ return RevisionDiffPanel.this.getCommitId(oldRevision);+ }+ },+ new GetFilesAndSubfolders() {+ @Override+ protected Project getProject() {+ return RevisionDiffPanel.this.getProject();+ }++ @Override+ protected ObjectId getCommitId(boolean oldRevision) {+ return RevisionDiffPanel.this.getCommitId(oldRevision);+ }+ },+ new GetFileContent() {+ @Override+ protected Project getProject() {+ return RevisionDiffPanel.this.getProject();+ }++ @Override+ protected ObjectId getCommitId(boolean oldRevision) {+ return RevisionDiffPanel.this.getCommitId(oldRevision);+ }+ },+ new QuerySymbolDefinitions() {+ @Override+ protected Project getProject() {+ return RevisionDiffPanel.this.getProject();+ }++ @Override+ protected ObjectId getCommitId(boolean oldRevision) {+ return RevisionDiffPanel.this.getCommitId(oldRevision);+ }+ },+ new QueryCodeSnippets() {++ @Override+ protected Project getProject() {+ return RevisionDiffPanel.this.getProject();+ }++ @Override+ protected ObjectId getCommitId(boolean oldRevision) {+ return RevisionDiffPanel.this.getCommitId(oldRevision);+ }+ },+ new QueryFilePaths() {+ @Override+ protected Project getProject() {+ return RevisionDiffPanel.this.getProject();+ }++ @Override+ protected ObjectId getCommitId(boolean oldRevision) {+ return RevisionDiffPanel.this.getCommitId(oldRevision);+ }+ }+ );+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.javaindex d5e14fb68b..82c38c39f2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java@@ -33,7 +33,6 @@ import org.eclipse.jgit.lib.ObjectId;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.fasterxml.jackson.annotation.JsonIgnoreType;import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;import com.google.common.base.Joiner;@@ -56,6 +55,8 @@ import io.onedev.server.search.code.query.BlobQuery;import io.onedev.server.search.code.query.SymbolQuery;import io.onedev.server.search.code.query.TextQuery;import io.onedev.server.service.SettingService;+import io.onedev.server.util.IgnoreLinearRangeMixin;+import io.onedev.server.util.IgnorePlanarRangeMixin;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.CtrlClickBehavior;import io.onedev.server.web.behavior.RunTaskBehavior;@@ -346,7 +347,7 @@ public abstract class SymbolTooltipPanel extends Panel {var occurrenceMap = Map.of("symbolName", symbolName,- "blobPath", symbolContext.getBlobPath(),+ "filePath", symbolContext.getBlobPath(),"symbolContext", Joiner.on('\n').join(symbolContext.getContextLines()),"note", String.format("Symbol is between %s and %s in the context", SYMBOL_BEGIN, SYMBOL_END));@@ -409,7 +410,7 @@ public abstract class SymbolTooltipPanel extends Panel {}public PageParameters getQueryHitParams(QueryHit hit) {- BlobIdent blobIdent = new BlobIdent(revision, hit.getBlobPath(), FileMode.REGULAR_FILE.getBits());+ BlobIdent blobIdent = new BlobIdent(revision, hit.getFilePath(), FileMode.REGULAR_FILE.getBits());ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);state.position = BlobRenderer.getSourcePosition(hit.getHitPos());return ProjectBlobPage.paramsOf(getProject(), state);@@ -441,12 +442,4 @@ public abstract class SymbolTooltipPanel extends Panel {protected abstract SymbolContext getSymbolContext(String symbolPosition, String symbolBeginMark, String symbolEndMark,String omittedLinesMark, int startContextSize, int beforeContextSize, int afterContextSize);-}--@JsonIgnoreType-interface IgnorePlanarRangeMixin {-}--@JsonIgnoreType-interface IgnoreLinearRangeMixin {}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex 598596502d..eba2af2d8f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -1,7 +1,6 @@package io.onedev.server.web.page.project.blob;import static io.onedev.server.web.translation.Translation._T;-import static java.util.concurrent.CompletableFuture.completedFuture;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;import java.io.Serializable;@@ -14,7 +13,6 @@ import java.util.HashSet;import java.util.List;import java.util.Map;import java.util.Set;-import java.util.concurrent.CompletableFuture;import java.util.concurrent.atomic.AtomicBoolean;import javax.inject.Inject;@@ -57,29 +55,29 @@ import org.jspecify.annotations.Nullable;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.fasterxml.jackson.core.JsonProcessingException;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;import com.google.common.base.Objects;import com.google.common.base.Preconditions;import com.google.common.base.Splitter;import com.google.common.collect.Sets;-import dev.langchain4j.agent.tool.ToolSpecification;-import dev.langchain4j.model.chat.request.json.JsonObjectSchema;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.PlanarRange;import io.onedev.server.ai.ChatTool;import io.onedev.server.ai.ChatToolAware;+import io.onedev.server.ai.tools.GetFileContent;+import io.onedev.server.ai.tools.GetFilesAndSubfolders;+import io.onedev.server.ai.tools.GetRootFilesAndFolders;+import io.onedev.server.ai.tools.QueryCodeSnippets;+import io.onedev.server.ai.tools.QueryFilePaths;+import io.onedev.server.ai.tools.QuerySymbolDefinitions;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.event.project.CommitIndexed;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobContent;import io.onedev.server.git.BlobEdits;import io.onedev.server.git.BlobIdent;-import io.onedev.server.git.BlobIdentFilter;import io.onedev.server.git.GitUtils;import io.onedev.server.git.LfsObject;import io.onedev.server.git.LfsPointer;@@ -139,7 +137,6 @@ import io.onedev.server.web.resource.RawBlobResource;import io.onedev.server.web.resource.RawBlobResourceReference;import io.onedev.server.web.upload.FileUpload;import io.onedev.server.web.util.EditParamsAware;-import io.onedev.server.web.websocket.ChatToolExecution;public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,EditParamsAware, JobAuthorizationContextAware, ChatToolAware {@@ -175,12 +172,9 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,private static final String BLOB_NAVIGATOR_ID = "blobNavigator";private static final String BLOB_CONTENT_ID = "blobContent";-+private static final Logger logger = LoggerFactory.getLogger(ProjectBlobPage.class);- @Inject- private ObjectMapper objectMapper;-@Injectprivate GitService gitService;@@ -711,7 +705,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,@Overrideprotected void onSelect(AjaxRequestTarget target, QueryHit hit) {- BlobIdent selected = new BlobIdent(state.blobIdent.revision, hit.getBlobPath(),+ BlobIdent selected = new BlobIdent(state.blobIdent.revision, hit.getFilePath(),FileMode.REGULAR_FILE.getBits());ProjectBlobPage.this.onSelect(target, selected, BlobRenderer.getSourcePosition(hit.getHitPos()));modal.close();@@ -1682,101 +1676,88 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,ProjectDashboardPage.paramsOf(project.getId()));}}-- private String convertToJson(Map<String, Object> map) {- try {- return objectMapper.writeValueAsString(map);- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }- }-- private String getFilesAndFolders(@Nullable String path) {- var commitId = getCommit().copy();- if (path != null) {- var blobIdent = gitService.getBlobIdent(getProject(), commitId, path);- if (blobIdent == null)- return convertToJson(Map.of("successful", false, "failReason", "Folder not found"));- if (!blobIdent.isTree())- return convertToJson(Map.of("successful", false, "failReason", "Not a folder"));- path = StringUtils.strip(path.replace('\\', '/'), "/");- }- List<BlobIdent> children = gitService.getChildren(getProject(), commitId,- path, BlobIdentFilter.ALL, false);- var filesAndFolders = new ArrayList<Map<String, Object>>();- for (var child : children) {- var fileAndFolder = new HashMap<String, Object>();- fileAndFolder.put("name", child.getName());- fileAndFolder.put("type", child.isTree() ? "folder" : "file");- filesAndFolders.add(fileAndFolder);- }- return convertToJson(Map.of("successful", true, "filesAndFolders", filesAndFolders));- }@Overridepublic Collection<ChatTool> getChatTools() {- return List.of(new ChatTool() {+ var commitId = getCommit().copy();+ return List.of(+ new GetRootFilesAndFolders() {++ @Override+ protected Project getProject() {+ return ProjectBlobPage.this.getProject();+ }++ @Override+ protected ObjectId getCommitId(boolean oldRevision) {+ return commitId;+ }- @Override- public ToolSpecification getSpecification() {- return ToolSpecification.builder()- .name("getRootFilesAndFolders")- .description("List files and folders under repository root in json format")- .build();- }+ },+ new GetFilesAndSubfolders() {++ @Override+ protected Project getProject() {+ return ProjectBlobPage.this.getProject();+ }++ @Override+ protected ObjectId getCommitId(boolean oldRevision) {+ return commitId;+ }- @Override- public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {- return completedFuture(new ChatToolExecution.Result(getFilesAndFolders(null), false));- }+ },+ new GetFileContent() {- }, new ChatTool() {+ @Override+ protected Project getProject() {+ return ProjectBlobPage.this.getProject();+ }++ @Override+ protected ObjectId getCommitId(boolean oldRevision) {+ return commitId;+ }- @Override- public ToolSpecification getSpecification() {- return ToolSpecification.builder()- .name("getFilesAndSubfolders")- .description("List all files and subfolders under specified folder in json format")- .parameters(JsonObjectSchema.builder()- .addStringProperty("folderPath").description(_T("Folder path to list all files and subfolders"))- .required("folderPath").build())- .build();- }+ },+ new QuerySymbolDefinitions() {- @Override- public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {- return completedFuture(new ChatToolExecution.Result(getFilesAndFolders(arguments.get("folderPath").asText()), false));- }+ @Override+ protected Project getProject() {+ return ProjectBlobPage.this.getProject();+ }++ @Override+ protected ObjectId getCommitId(boolean oldRevision) {+ return commitId;+ }- }, new ChatTool() {+ },+ new QueryCodeSnippets() {- @Override- public ToolSpecification getSpecification() {- return ToolSpecification.builder()- .name("getTextContent")- .description("Get text content of specified file in json format")- .parameters(JsonObjectSchema.builder()- .addStringProperty("filePath").description(_T("File path to get text content"))- .required("filePath").build())- .build();+ @Override+ protected Project getProject() {+ return ProjectBlobPage.this.getProject();+ }++ @Override+ protected ObjectId getCommitId(boolean oldRevision) {+ return commitId;}+ },+ new QueryFilePaths() {+@Override- public CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {- var filePath = arguments.get("filePath").asText();- filePath = StringUtils.strip(filePath.replace('\\', '/'), "/");- var blobIdent = gitService.getBlobIdent(getProject(), getCommit().copy(), filePath);- if (blobIdent == null)- return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "File not found")), false));- if (!blobIdent.isFile())- return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "Not a file")), false));-- var blob = getProject().getBlob(blobIdent, true);- if (blob.getText() != null)- return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", true, "textContent", blob.getText().getContent())), false));- else- return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "Not a text file")), false));+ protected Project getProject() {+ return ProjectBlobPage.this.getProject();}++ @Override+ protected ObjectId getCommitId(boolean oldRevision) {+ return commitId;+ }+});}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.javaindex 2f14ebb9e7..16f045dd6b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java@@ -75,7 +75,8 @@ import io.onedev.commons.utils.PlanarRange;import io.onedev.commons.utils.StringUtils;import io.onedev.server.ai.ChatTool;import io.onedev.server.ai.ChatToolAware;-import io.onedev.server.ai.HighlightedTextTool;+import io.onedev.server.ai.ChatToolUtils;+import io.onedev.server.ai.tools.GetHighlightedText;import io.onedev.server.attachment.ProjectAttachmentSupport;import io.onedev.server.codequality.BlobTarget;import io.onedev.server.codequality.CodeProblem;@@ -520,7 +521,9 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searrange = getRange(params, "param1", "param2", "param3", "param4");context.onPosition(target, BlobRenderer.getSourcePosition(range));var page = (LayoutPage) getPage();- page.getChatter().show(target, "Help me understand highlighted text. Display in " + getSession().getLocale().getDisplayLanguage());+ page.getChatter().show(target,+ "Help me understand highlighted text. Display explanation in %s"+ .formatted(getSession().getLocale().getDisplayLanguage()));target.appendJavaScript(String.format("onedev.server.sourceView.mark(%s, false);", convertToJson(range)));break;case "addComment":@@ -865,7 +868,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear@Overrideprotected void onSelect(AjaxRequestTarget target, QueryHit hit) {BlobIdent blobIdent = new BlobIdent(- getRevision(), hit.getBlobPath(), FileMode.REGULAR_FILE.getBits());+ getRevision(), hit.getFilePath(), FileMode.REGULAR_FILE.getBits());context.onSelect(target, blobIdent, BlobRenderer.getSourcePosition(hit.getHitPos()));}@@ -1451,15 +1454,15 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear"fileName", context.getBlobIdent().getName(),"fileContent", Joiner.on('\n').join(lines));- return completedFuture(new ChatToolExecution.Result(convertToJson(map), false));+ return completedFuture(new ChatToolExecution.Result(ChatToolUtils.convertToJson(map), false));}});var markRange = getMarkRange();if (markRange != null) {- tools.add(new HighlightedTextTool(- context.getBlobIdent().getName(),+ tools.add(new GetHighlightedText(+ context.getBlobIdent().path,context.getProject().getBlob(context.getBlobIdent(), true).getText().getLines(),markRange));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.javaindex b95196803b..6392bef290 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java@@ -249,7 +249,7 @@ public abstract class QuickSearchPanel extends Panel {link.add(new Label("scope", hit.getNamespace()).setVisible(hit.getNamespace()!=null));item.add(link);- BlobIdent blobIdent = new BlobIdent(revisionModel.getObject(), hit.getBlobPath(),+ BlobIdent blobIdent = new BlobIdent(revisionModel.getObject(), hit.getFilePath(),FileMode.REGULAR_FILE.getBits());ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);state.position = BlobRenderer.getSourcePosition(hit.getHitPos());diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.javaindex 4ee006982c..a27142bf01 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java@@ -79,10 +79,10 @@ public abstract class SearchResultPanel extends Panel {Map<String, MatchedBlob> hitsByBlob = new LinkedHashMap<>();for (QueryHit hit: hits) {- MatchedBlob blob = hitsByBlob.get(hit.getBlobPath());+ MatchedBlob blob = hitsByBlob.get(hit.getFilePath());if (blob == null) {- blob = new MatchedBlob(hit.getBlobPath(), new ArrayList<QueryHit>());- hitsByBlob.put(hit.getBlobPath(), blob);+ blob = new MatchedBlob(hit.getFilePath(), new ArrayList<QueryHit>());+ hitsByBlob.put(hit.getFilePath(), blob);}if (!(hit instanceof FileHit)) {blob.getHits().add(hit);@@ -153,7 +153,7 @@ public abstract class SearchResultPanel extends Panel {elsehit = new FileHit(activeBlob.getBlobPath(), null);- BlobIdent selected = new BlobIdent(context.getBlobIdent().revision, hit.getBlobPath(),+ BlobIdent selected = new BlobIdent(context.getBlobIdent().revision, hit.getFilePath(),FileMode.REGULAR_FILE.getBits());context.onSelect(target, selected, BlobRenderer.getSourcePosition(hit.getHitPos()));}@@ -161,7 +161,7 @@ public abstract class SearchResultPanel extends Panel {private String getActiveBlobPath(ActiveIndex activeIndex) {MatchedBlob activeBlob = blobs.get(activeIndex.blob);if (activeIndex.hit != -1)- return activeBlob.getHits().get(activeIndex.hit).getBlobPath();+ return activeBlob.getHits().get(activeIndex.hit).getFilePath();elsereturn activeBlob.getBlobPath();}@@ -542,7 +542,7 @@ public abstract class SearchResultPanel extends Panel {if (activeBlobIndex == blobItem.getIndex() && activeHitIndex == hitItem.getIndex())add(AttributeAppender.append("class", " active"));- BlobIdent blobIdent = new BlobIdent(context.getBlobIdent().revision, hit.getBlobPath(),+ BlobIdent blobIdent = new BlobIdent(context.getBlobIdent().revision, hit.getFilePath(),FileMode.REGULAR_FILE.getBits());ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);state.position = BlobRenderer.getSourcePosition(hit.getHitPos());diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex b4c2730c8b..8d78e5c323 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -1,5 +1,6 @@package io.onedev.server.web.page.project.issues.detail;+import static io.onedev.server.ai.ChatToolUtils.convertToJson;import static io.onedev.server.web.translation.Translation._T;import static java.util.concurrent.CompletableFuture.completedFuture;@@ -35,9 +36,7 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.flow.RedirectToUrlException;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;import com.google.common.collect.Lists;import dev.langchain4j.agent.tool.ToolSpecification;@@ -89,9 +88,6 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Inputprotected final IModel<Issue> issueModel;- @Inject- private ObjectMapper objectMapper;-@Injectprivate IssueService issueService;@@ -465,11 +461,7 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input@Overridepublic CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {- try {- return completedFuture(new ChatToolExecution.Result(objectMapper.writeValueAsString(IssueHelper.getDetail(getIssue().getProject(), getIssue())), false));- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }+ return completedFuture(new ChatToolExecution.Result(convertToJson(IssueHelper.getDetail(getIssue().getProject(), getIssue())), false));}});@@ -486,11 +478,7 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input@Overridepublic CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {- try {- return completedFuture(new ChatToolExecution.Result(objectMapper.writeValueAsString(IssueHelper.getComments(getIssue())), false));- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }+ return completedFuture(new ChatToolExecution.Result(convertToJson(IssueHelper.getComments(getIssue())), false));}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 6b2f9a6c2f..5557a58fa0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -1,5 +1,6 @@package io.onedev.server.web.page.project.pullrequests.detail;+import static io.onedev.server.ai.ChatToolUtils.convertToJson;import static io.onedev.server.entityreference.ReferenceUtils.transformReferences;import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT;import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT_IF_NECESSARY;@@ -68,9 +69,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.ObjectId;import org.jetbrains.annotations.Nullable;-import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;import com.google.common.collect.Sets;import dev.langchain4j.agent.tool.ToolSpecification;@@ -196,9 +195,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRprivate MergeStrategy mergeStrategy;- @Inject- private ObjectMapper objectMapper;-@Injectprivate PullRequestService pullRequestService;@@ -2421,11 +2417,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overridepublic CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {- try {- return completedFuture(new ChatToolExecution.Result(objectMapper.writeValueAsString(PullRequestHelper.getDetail(getPullRequest().getProject(), getPullRequest())), false));- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }+ return completedFuture(new ChatToolExecution.Result(convertToJson(PullRequestHelper.getDetail(getPullRequest().getProject(), getPullRequest())), false));}});@@ -2442,11 +2434,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overridepublic CompletableFuture<ChatToolExecution.Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {- try {- return completedFuture(new ChatToolExecution.Result(objectMapper.writeValueAsString(PullRequestHelper.getComments(getPullRequest())), false));- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }+ return completedFuture(new ChatToolExecution.Result(convertToJson(PullRequestHelper.getComments(getPullRequest())), false));}});