Skip to content

The Unified and Autonomous Development Platform

feat: Improved PR review process for AI user (OD-2756)

Robin Shen369f435c993f
diff --git a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
index ca1b114be5..182eeecc6f 100644
--- a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
@@ -302,11 +302,10 @@ public class PullRequestNotificationManager {
MessageFormat.format("""
Review current pull request for major issues (ignore styling/format/documentation issues) \
introduced in the change. Check full content of relevant files to understand the change \
- if necessary. Check existing comments for conversation context. \
-
- Record your final decision by calling one of these tools, and call it \
- only once: `{0}` if you are satisfied with the change, or `{1}` if you think it needs more work. \
- If you are unsure, explain what is unclear via final response""",
+ if necessary. Check existing comments for conversation context. Record your final \
+ decision by calling one of these tools, and call it only once: `{0}` if you are satisfied \
+ with the change, or `{1}` if you think it needs more work. If you are unsure, explain \
+ what is unclear via final response""",
PullRequest.APPROVE_TOOL_NAME, PullRequest.REQUEST_FOR_CHANGES_TOOL_NAME),
request.getTools(true),
new PullRequestReviewTaskChecker(),
@@ -342,7 +341,7 @@ public class PullRequestNotificationManager {
replyAddress, senderName, threadingReferences);
}
} else if (isAiEntitled(user, request, mentionedUser)) {
- if (event instanceof PullRequestOpened || event instanceof PullRequestCommentCreated) {
+ if (event instanceof PullRequestOpened) {
var systemPrompt = """
You are mentioned in a pull request. The content mentioning you is presented as user \
prompt. Use existing comments as conversation context. Call relevant tools to get \
@@ -354,6 +353,35 @@ public class PullRequestNotificationManager {
new NoopTaskChecker(),
new AddPullRequestComment(request.getId()));
userService.execute(mentionedUser, task);
+ } else if (event instanceof PullRequestCommentCreated) {
+ var review = request.getReview(mentionedUser);
+ var pendingReview = review != null && review.getStatus() == PullRequestReview.Status.PENDING;
+ String systemPrompt;
+ if (pendingReview) {
+ systemPrompt = MessageFormat.format("""
+ You are mentioned in a pull request. The content mentioning you is presented as user \
+ prompt. Use existing comments as conversation context. Call relevant tools to get \
+ information about the pull request if necessary.
+
+ If you are requested to review the pull request, check full content of relevant \
+ files to understand the change if necessary. Record your final decision by calling \
+ one of these tools, and call it only once: `{0}` if you are satisfied with the \
+ change, or `{1}` if you think it needs more work. If you are unsure, explain what \
+ is unclear via final response""",
+ PullRequest.APPROVE_TOOL_NAME, PullRequest.REQUEST_FOR_CHANGES_TOOL_NAME);
+ } else {
+ systemPrompt = """
+ You are mentioned in a pull request. The content mentioning you is presented as user \
+ prompt. Use existing comments as conversation context. Call relevant tools to get \
+ information about the pull request if necessary""";
+ }
+ var task = new AiTask(
+ systemPrompt.formatted(mentionedUser.getName()),
+ event.getTextBody(),
+ request.getTools(pendingReview),
+ new PullRequestReviewTaskChecker(),
+ new AddPullRequestComment(request.getId()));
+ userService.execute(mentionedUser, task);
} else if (event instanceof PullRequestCodeCommentCreated || event instanceof PullRequestCodeCommentReplyCreated) {
String systemPrompt = """
You are mentioned in a pull request code comment. The content mentioning you is presented \
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.html
index d28158a97f..712b20f1b1 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.html
@@ -3,7 +3,7 @@
<li wicket:id="reviews" class="d-flex flex-nowrap align-items-center">
<a wicket:id="user" class="reviewer left mr-2 flex-shrink-0"></a>
<span class="flex-shrink-0 right d-flex align-items-center">
- <a wicket:id="refresh" class="refresh btn btn-xs btn-icon btn-light btn-hover-primary flex-shrink-0 mr-2" t:data-tippy-content="Request review"><wicket:svg href="refresh" class="icon"></wicket:svg></a>
+ <a wicket:id="refresh" class="refresh btn btn-xs btn-icon btn-light btn-hover-primary flex-shrink-0 mr-2" t:data-tippy-content="Request review again"><wicket:svg href="refresh" class="icon"></wicket:svg></a>
<a wicket:id="delete" class="delete btn btn-xs btn-icon btn-light btn-hover-danger flex-shrink-0 mr-2" t:data-tippy-content="Remove this reviewer"><wicket:svg href="trash" class="icon"></wicket:svg></a>
<span wicket:id="status" class="status flex-shrink-0"></span>
</span>
diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_de.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_de.java
index 9f6622b356..b61b503bb7 100644
--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_de.java
+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_de.java
@@ -5042,6 +5042,7 @@ public class Translation_de extends TranslationResourceBundle {
m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");
m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");
m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");
+ m.put("Request review again", "Überprüfung erneut anfordern");
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_es.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_es.java
index 24b2700b49..9306f20b79 100644
--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_es.java
+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_es.java
@@ -5042,6 +5042,7 @@ public class Translation_es extends TranslationResourceBundle {
m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");
m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");
m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");
+ m.put("Request review again", "Solicitar revisión nuevamente");
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_fr.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_fr.java
index 47ae7374c9..949fa5f78f 100644
--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_fr.java
+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_fr.java
@@ -5042,6 +5042,7 @@ public class Translation_fr extends TranslationResourceBundle {
m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");
m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");
m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");
+ m.put("Request review again", "Demander une révision à nouveau");
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_it.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_it.java
index 059d708ea2..7e4ada5012 100644
--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_it.java
+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_it.java
@@ -5042,6 +5042,7 @@ public class Translation_it extends TranslationResourceBundle {
m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");
m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");
m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");
+ m.put("Request review again", "Richiedi nuovamente la revisione");
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_ja.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_ja.java
index 52f5d19991..f3550c6dc9 100644
--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_ja.java
+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_ja.java
@@ -5042,6 +5042,7 @@ public class Translation_ja extends TranslationResourceBundle {
m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");
m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");
m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");
+ m.put("Request review again", "再度レビューをリクエスト");
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_ko.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_ko.java
index bd30acf647..bf109277da 100644
--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_ko.java
+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_ko.java
@@ -5042,6 +5042,7 @@ public class Translation_ko extends TranslationResourceBundle {
m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");
m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");
m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");
+ m.put("Request review again", "다시 검토 요청");
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_pt.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_pt.java
index 8328c595a1..a54d8d95ce 100644
--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_pt.java
+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_pt.java
@@ -5042,6 +5042,7 @@ public class Translation_pt extends TranslationResourceBundle {
m.put("{javax.validation.constraints.NotEmpty.message}", "{javax.validation.constraints.NotEmpty.message}");
m.put("{javax.validation.constraints.NotNull.message}", "{javax.validation.constraints.NotNull.message}");
m.put("{javax.validation.constraints.Size.message}", "{javax.validation.constraints.Size.message}");
+ m.put("Request review again", "Solicitar revisão novamente");
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.java
index d25e0c23ab..7a66789b7a 100644
--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.java
+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.java
@@ -5068,6 +5068,7 @@ public class Translation_zh extends TranslationResourceBundle {
m.put("{javax.validation.constraints.NotEmpty.message}", "不能为空");
m.put("{javax.validation.constraints.NotNull.message}", "不能为空");
m.put("{javax.validation.constraints.Size.message}", "至少需要指定一个值");
+ m.put("Request review again", "再次请求审核");
}
@Override