The Unified and Autonomous Development Platform
feat: Add tool to get current commit info in addition to commit patch in commit detail page (OD-2748)
Robin Shen6dc8def28c62
diff --git a/server-core/src/main/java/io/onedev/server/ai/tools/CommitDetailTool.java b/server-core/src/main/java/io/onedev/server/ai/tools/CommitDetailTool.javanew file mode 100644index 0000000000..767bf7aca4--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ai/tools/CommitDetailTool.java@@ -0,0 +1,68 @@+package io.onedev.server.ai.tools;++import static io.onedev.server.ai.ToolUtils.convertToJson;++import java.util.List;+import java.util.Map;++import org.apache.shiro.authz.UnauthorizedException;+import org.apache.shiro.subject.Subject;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.revwalk.RevCommit;++import com.fasterxml.jackson.databind.JsonNode;++import dev.langchain4j.agent.tool.ToolSpecification;+import io.onedev.server.OneDev;+import io.onedev.server.ai.TaskTool;+import io.onedev.server.ai.ToolExecutionResult;+import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.service.ProjectService;+import io.onedev.server.service.UrlService;++public abstract class CommitDetailTool implements TaskTool {++ @Override+ public ToolSpecification getSpecification() {+ return ToolSpecification.builder()+ .name("getCurrentCommit")+ .description("Get info of current commit in json format")+ .build();+ }++ @Override+ public ToolExecutionResult execute(Subject subject, JsonNode arguments) {+ var project = OneDev.getInstance(ProjectService.class).load(getProjectId());+ if (!SecurityUtils.canReadCode(subject, project))+ throw new UnauthorizedException();++ var commit = project.getRevCommit(getCommitId(), true);+ return new ToolExecutionResult(convertToJson(getDetail(project, commit)), false);+ }++ private Map<String, Object> getDetail(Project project, RevCommit commit) {+ var authorIdent = commit.getAuthorIdent();+ var committerIdent = commit.getCommitterIdent();+ return Map.of(+ "project", project.getPath(),+ "hash", commit.name(),+ "shortMessage", commit.getShortMessage(),+ "fullMessage", commit.getFullMessage(),+ "author", Map.of(+ "name", authorIdent.getName(),+ "emailAddress", authorIdent.getEmailAddress(),+ "date", authorIdent.getWhen()),+ "committer", Map.of(+ "name", committerIdent.getName(),+ "emailAddress", committerIdent.getEmailAddress(),+ "date", committerIdent.getWhen()),+ "parents", List.of(commit.getParents()).stream().map(RevCommit::name).toList(),+ "link", OneDev.getInstance(UrlService.class).urlFor(project, commit.copy(), true));+ }++ protected abstract Long getProjectId();++ protected abstract ObjectId getCommitId();++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex 3206b3ba79..935b6f81bb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -8,6 +8,7 @@ import io.onedev.commons.utils.PlanarRange;import io.onedev.server.OneDev;import io.onedev.server.ai.ChatTool;import io.onedev.server.ai.ChatToolAware;+import io.onedev.server.ai.tools.CommitDetailTool;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.job.Job;import io.onedev.server.codequality.CodeProblem;@@ -1083,7 +1084,22 @@ public class CommitDetailPage extends ProjectPage implements RevisionAnnotationSvar projectId = getProject().getId();var oldCommitId = getCompareWith().copy();var newCommitId = getCommit().copy();- return wrapForChat(getDiffTools(projectId, oldCommitId, newCommitId, null));+ var tools = new ArrayList<ChatTool>();+ tools.add(wrapForChat(new CommitDetailTool() {++ @Override+ protected Long getProjectId() {+ return projectId;+ }++ @Override+ protected ObjectId getCommitId() {+ return newCommitId;+ }++ }));+ tools.addAll(wrapForChat(getDiffTools(projectId, oldCommitId, newCommitId, null)));+ return tools;}}