Skip to content

The Unified and Autonomous Development Platform

chore: Add get patch tool to diff view

Robin Shen70676effe6b3
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.java
index 296e009136..05005dcd9e 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
@@ -22,6 +22,8 @@ import io.onedev.server.web.websocket.ChatToolExecution;
public abstract class GetFileContent implements ChatTool {
+ private static final int MAX_FILE_LENGTH = 500000;
+
@Override
public ToolSpecification getSpecification() {
return ToolSpecification.builder()
@@ -49,10 +51,15 @@ public abstract class GetFileContent implements ChatTool {
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
+ if (blob.getText() != null) {
+ var content = blob.getText().getContent();
+ if (content.length() > MAX_FILE_LENGTH)
+ return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "File is too large")), false));
+ else
+ return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", true, "fileContent", content)), false));
+ } else {
return completedFuture(new ChatToolExecution.Result(convertToJson(Map.of("successful", false, "failReason", "Not a text file")), false));
+ }
}
protected abstract Project getProject();
diff --git a/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.java b/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.java
index b05f7be71e..e51b3df24b 100644
--- a/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.java
+++ b/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.java
@@ -5,6 +5,7 @@ import static io.onedev.server.git.command.LogCommand.Field.PARENTS;
import static io.onedev.server.git.command.LogCommand.Field.SUBJECT;
import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.ObjectStreamException;
@@ -26,7 +27,6 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.ReadWriteLock;
-import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -59,6 +59,7 @@ import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.revwalk.RevWalkUtils;
import org.eclipse.jgit.revwalk.filter.RevFilter;
import org.eclipse.jgit.treewalk.TreeWalk;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -77,8 +78,6 @@ import io.onedev.commons.utils.command.Commandline;
import io.onedev.commons.utils.command.LineConsumer;
import io.onedev.server.cluster.ClusterService;
import io.onedev.server.cluster.ClusterTask;
-import io.onedev.server.service.ProjectService;
-import io.onedev.server.service.SettingService;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.project.DefaultBranchChanged;
import io.onedev.server.event.project.RefUpdated;
@@ -108,6 +107,8 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.support.code.BranchProtection;
import io.onedev.server.persistence.SessionService;
import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.service.ProjectService;
+import io.onedev.server.service.SettingService;
@Singleton
public class DefaultGitService implements GitService, Serializable {
@@ -1313,6 +1314,17 @@ public class DefaultGitService implements GitService, Serializable {
return diffEntries;
});
}
+
+ @Override
+ public String getPatch(Project project, AnyObjectId oldRevId, AnyObjectId newRevId) {
+ Long projectId = project.getId();
+ return runOnProjectServer(projectId, () -> {
+ var repository = getRepository(projectId);
+ var baos = new ByteArrayOutputStream();
+ GitUtils.diff(repository, oldRevId, newRevId, baos);
+ return baos.toString(StandardCharsets.UTF_8);
+ });
+ }
@Override
public Map<ObjectId, AheadBehind> getAheadBehinds(Project project, ObjectId baseId,
diff --git a/server-core/src/main/java/io/onedev/server/git/service/GitService.java b/server-core/src/main/java/io/onedev/server/git/service/GitService.java
index f66d607e6a..1a83ab92b0 100644
--- a/server-core/src/main/java/io/onedev/server/git/service/GitService.java
+++ b/server-core/src/main/java/io/onedev/server/git/service/GitService.java
@@ -137,6 +137,8 @@ public interface GitService {
List<DiffEntryFacade> diff(Project project, AnyObjectId oldRevId, AnyObjectId newRevId);
+ String getPatch(Project project, AnyObjectId oldRevId, AnyObjectId newRevId);
+
Map<ObjectId, AheadBehind> getAheadBehinds(Project project, ObjectId baseId,
Collection<ObjectId> compareIds);
diff --git a/server-core/src/main/java/io/onedev/server/model/ChatMessage.java b/server-core/src/main/java/io/onedev/server/model/ChatMessage.java
index 44696c11e8..2209f5a6a1 100644
--- a/server-core/src/main/java/io/onedev/server/model/ChatMessage.java
+++ b/server-core/src/main/java/io/onedev/server/model/ChatMessage.java
@@ -19,7 +19,7 @@ public class ChatMessage extends AbstractEntity {
private static final long serialVersionUID = 1L;
- private static final int MAX_CONTENT_LEN = 100000;
+ public static final int MAX_CONTENT_LEN = 100000;
@ManyToOne(fetch=FetchType.LAZY)
@JoinColumn(nullable=false)
diff --git a/server-core/src/main/java/io/onedev/server/web/component/ai/chat/ChatPanel.java b/server-core/src/main/java/io/onedev/server/web/component/ai/chat/ChatPanel.java
index b610a62e5f..4a57cee673 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/ai/chat/ChatPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/ai/chat/ChatPanel.java
@@ -3,6 +3,7 @@ package io.onedev.server.web.component.ai.chat;
import static io.onedev.server.security.SecurityUtils.getUser;
import static io.onedev.server.web.translation.Translation._T;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -350,8 +351,11 @@ public class ChatPanel extends Panel {
}
@Override
- public void setObject(String object) {
- WebSession.get().setChatInput(object);
+ public void setObject(String object) {
+ if (object != null && object.length() > ChatMessage.MAX_CONTENT_LEN)
+ getSession().error(MessageFormat.format(_T("Message is too long. Max {0} characters"), ChatMessage.MAX_CONTENT_LEN));
+ else
+ WebSession.get().setChatInput(object);
}
}).add(new OnTypingDoneBehavior() {
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.java
index f12c7ab753..80d0e21a84 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
@@ -1,6 +1,8 @@
package io.onedev.server.web.component.diff.revision;
+import static io.onedev.server.ai.ChatToolUtils.convertToJson;
import static io.onedev.server.web.translation.Translation._T;
+import static java.util.concurrent.CompletableFuture.completedFuture;
import static java.util.stream.Collectors.toList;
import java.nio.charset.StandardCharsets;
@@ -17,7 +19,9 @@ import java.util.Optional;
import java.util.Set;
import java.util.TreeMap;
import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import javax.inject.Inject;
import javax.servlet.http.Cookie;
import org.apache.commons.codec.binary.Hex;
@@ -29,6 +33,7 @@ import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;
import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;
import org.apache.wicket.extensions.markup.html.repeater.tree.nested.BranchItem;
@@ -63,11 +68,13 @@ import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
import org.jspecify.annotations.Nullable;
+import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
+import dev.langchain4j.agent.tool.ToolSpecification;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.commons.utils.ExceptionUtils;
@@ -76,13 +83,12 @@ import io.onedev.commons.utils.PlanarRange;
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.QueryCodeSnippets;
import io.onedev.server.ai.tools.QueryFilePaths;
import io.onedev.server.ai.tools.QuerySymbolDefinitions;
import io.onedev.server.attachment.ProjectAttachmentSupport;
@@ -142,6 +148,7 @@ import io.onedev.server.web.util.DiffPlanarRange;
import io.onedev.server.web.util.SuggestionUtils;
import io.onedev.server.web.util.TextUtils;
import io.onedev.server.web.util.WicketUtils;
+import io.onedev.server.web.websocket.ChatToolExecution.Result;
/**
* Make sure to add only one revision diff panel on a page
@@ -159,6 +166,17 @@ public abstract class RevisionDiffPanel extends Panel implements ChatToolAware {
private static final String COOKIE_NAVIGATION_WIDTH = "revisionDiff.navigation.width";
+ private static final int MAX_PATCH_SIZE = 1024 * 1024;
+
+ @Inject
+ private PendingSuggestionApplyService pendingSuggestionApplyService;
+
+ @Inject
+ private CodeIndexService codeIndexService;
+
+ @Inject
+ private GitService gitService;
+
private final String oldRev;
private final String newRev;
@@ -177,7 +195,7 @@ public abstract class RevisionDiffPanel extends Panel implements ChatToolAware {
protected List<DiffEntryFacade> load() {
AnyObjectId oldRevId = getProject().getObjectId(oldRev, true);
AnyObjectId newRevId = getProject().getObjectId(newRev, true);
- return getGitService().diff(getProject(), oldRevId, newRevId);
+ return gitService.diff(getProject(), oldRevId, newRevId);
}
};
@@ -308,8 +326,7 @@ public abstract class RevisionDiffPanel extends Panel implements ChatToolAware {
@Override
protected List<PendingSuggestionApply> load() {
- return OneDev.getInstance(PendingSuggestionApplyService.class)
- .query(SecurityUtils.getAuthUser(), getPullRequest());
+ return pendingSuggestionApplyService.query(SecurityUtils.getAuthUser(), getPullRequest());
}
};
@@ -410,20 +427,19 @@ public abstract class RevisionDiffPanel extends Panel implements ChatToolAware {
protected void onConfigure() {
super.onConfigure();
- CodeIndexService indexService = OneDev.getInstance(CodeIndexService.class);
ObjectId oldCommit = getOldCommitId();
ObjectId newCommit = getNewCommitId();
boolean oldCommitIndexed = oldCommit.equals(ObjectId.zeroId())
- || indexService.isIndexed(getProject().getId(), oldCommit);
+ || codeIndexService.isIndexed(getProject().getId(), oldCommit);
boolean newCommitIndexed = newCommit.equals(ObjectId.zeroId())
- || indexService.isIndexed(getProject().getId(), newCommit);
+ || codeIndexService.isIndexed(getProject().getId(), newCommit);
if (oldCommitIndexed && newCommitIndexed) {
setVisible(false);
} else {
if (!oldCommitIndexed)
- indexService.indexAsync(getProject().getId(), oldCommit);
+ codeIndexService.indexAsync(getProject().getId(), oldCommit);
if (!newCommitIndexed)
- indexService.indexAsync(getProject().getId(), newCommit);
+ codeIndexService.indexAsync(getProject().getId(), newCommit);
setVisible(true);
}
}
@@ -487,8 +503,7 @@ public abstract class RevisionDiffPanel extends Panel implements ChatToolAware {
PullRequest request = getPullRequest();
ObjectId commitId = request.getLatestUpdate().getHeadCommit().copy();
try {
- ObjectId newCommitId = OneDev.getInstance(PendingSuggestionApplyService.class)
- .apply(SecurityUtils.getAuthUser(), request, commitMessage);
+ ObjectId newCommitId = pendingSuggestionApplyService.apply(SecurityUtils.getAuthUser(), request, commitMessage);
PullRequestChangesPage.State state = new PullRequestChangesPage.State();
state.oldCommitHash = commitId.name();
@@ -540,8 +555,7 @@ public abstract class RevisionDiffPanel extends Panel implements ChatToolAware {
@Override
public void onClick(AjaxRequestTarget target) {
- OneDev.getInstance(PendingSuggestionApplyService.class)
- .discard(SecurityUtils.getAuthUser(), getPullRequest());
+ pendingSuggestionApplyService.discard(SecurityUtils.getAuthUser(), getPullRequest());
target.add(commentContainer);
target.add(RevisionDiffPanel.this.get("operations"));
dropdown.close();
@@ -1382,11 +1396,7 @@ public abstract class RevisionDiffPanel extends Panel implements ChatToolAware {
return null;
}
}
-
- private GitService getGitService() {
- return OneDev.getInstance(GitService.class);
- }
-
+
private WebMarkupContainer newNavigationContainer() {
WebMarkupContainer navigationContainer = new WebMarkupContainer("navigation") {
@@ -1917,7 +1927,7 @@ public abstract class RevisionDiffPanel extends Panel implements ChatToolAware {
pendingApply.setRequest(getPullRequest());
pendingApply.setUser(SecurityUtils.getAuthUser());
pendingApply.setSuggestion(new ArrayList<String>(suggestion));
- OneDev.getInstance(PendingSuggestionApplyService.class).create(pendingApply);
+ pendingSuggestionApplyService.create(pendingApply);
onBatchChange(target);
}
@@ -1930,7 +1940,7 @@ public abstract class RevisionDiffPanel extends Panel implements ChatToolAware {
&& pendingApply.getUser().equals(SecurityUtils.getAuthUser())
&& pendingApply.getComment().equals(annotationSupport.getOpenComment())) {
it.remove();
- OneDev.getInstance(PendingSuggestionApplyService.class).delete(pendingApply);
+ pendingSuggestionApplyService.delete(pendingApply);
break;
}
}
@@ -2478,6 +2488,27 @@ public abstract class RevisionDiffPanel extends Panel implements ChatToolAware {
protected ObjectId getCommitId(boolean oldRevision) {
return RevisionDiffPanel.this.getCommitId(oldRevision);
}
+ },
+ new ChatTool() {
+
+ @Override
+ public ToolSpecification getSpecification() {
+ return ToolSpecification.builder()
+ .name("getDiff")
+ .description("Get diff of old revision and new revision in json format")
+ .build();
+ }
+
+ @Override
+ public CompletableFuture<Result> execute(IPartialPageRequestHandler handler, JsonNode arguments) {
+ var oldCommitId = getOldCommitId().copy();
+ var newCommitId = getNewCommitId().copy();
+ var patch = gitService.getPatch(getProject(), oldCommitId, newCommitId);
+ if (patch.length() > MAX_PATCH_SIZE)
+ return completedFuture(new Result(convertToJson(Map.of("successful", false, "failReason", "Patch is too large")), false));
+ else
+ return completedFuture(new Result(convertToJson(Map.of("successful", true, "patch", patch)), false));
+ }
}
);
}