Skip to content

The Unified and Autonomous Development Platform

feat: Add CreatePullRequestStep as a built-in CI/CD step (like CreateBranchStep) (OD-2714)

Robin Shena6ae899b4f21
diff --git a/server-core/src/main/java/io/onedev/server/ai/McpHelperResource.java b/server-core/src/main/java/io/onedev/server/ai/McpHelperResource.java
index 9714c6907e..75d7405df2 100644
--- a/server-core/src/main/java/io/onedev/server/ai/McpHelperResource.java
+++ b/server-core/src/main/java/io/onedev/server/ai/McpHelperResource.java
@@ -54,7 +54,6 @@ import io.onedev.server.data.migration.VersionedYamlDoc;
import io.onedev.server.entityreference.BuildReference;
import io.onedev.server.entityreference.IssueReference;
import io.onedev.server.entityreference.PullRequestReference;
-import io.onedev.server.exception.PullRequestReviewRejectedException;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.service.GitService;
import io.onedev.server.job.JobService;
@@ -1260,49 +1259,28 @@ public class McpHelperResource {
var target = new ProjectAndBranch(targetProject, targetBranch);
var source = new ProjectAndBranch(sourceProject, sourceBranch);
- if (target.equals(source))
- throw new NotAcceptableException("Target and source branches are the same");
-
- PullRequest request = pullRequestService.findOpen(target, source);
- if (request != null)
- throw new NotAcceptableException("Another pull request already opened for this change");
+ PullRequest request = new PullRequest();
+ request.setTarget(target);
+ request.setSource(source);
+ request.setSubmitter(SecurityUtils.getUser());
- request = pullRequestService.findEffective(target, source);
- if (request != null) {
- if (request.isOpen())
- throw new NotAcceptableException("Another pull request already opened for this change");
- else
- throw new NotAcceptableException("Change already merged");
- }
+ var mergeStrategyName = (String) data.remove("mergeStrategy");
+ if (mergeStrategyName != null)
+ request.setMergeStrategy(MergeStrategy.valueOf(mergeStrategyName));
- request = new PullRequest();
+ // Pre-populate baseCommitHash + initial update so title/description can
+ // be generated from commits below; openNew(...) will keep them as-is.
ObjectId baseCommitId = gitService.getMergeBase(
target.getProject(), target.getObjectId(),
source.getProject(), source.getObjectId());
-
if (baseCommitId == null)
throw new NotAcceptableException("No common base for source and target branches");
-
- request.setTarget(target);
- request.setSource(source);
- request.setSubmitter(SecurityUtils.getUser());
request.setBaseCommitHash(baseCommitId.name());
- var mergeStrategyName = (String) data.remove("mergeStrategy");
- if (mergeStrategyName != null)
- request.setMergeStrategy(MergeStrategy.valueOf(mergeStrategyName));
- else
- request.setMergeStrategy(request.getProject().findDefaultPullRequestMergeStrategy());
-
- if (request.getBaseCommitHash().equals(source.getObjectName()))
- throw new NotAcceptableException("Change already merged");
-
PullRequestUpdate update = new PullRequestUpdate();
-
- update.setDate(Date.from(request.getSubmitDate().toInstant().plusSeconds(1)));
update.setRequest(request);
update.setHeadCommitHash(source.getObjectName());
- update.setTargetHeadCommitHash(request.getTarget().getObjectName());
+ update.setTargetHeadCommitHash(target.getObjectName());
request.getUpdates().add(update);
var title = (String) data.remove("title");
@@ -1310,7 +1288,7 @@ public class McpHelperResource {
title = request.generateTitleFromCommits();
else
title = request.cleanTitle(title);
-
+
if (title == null)
title = request.generateTitleFromBranch();
@@ -1321,8 +1299,6 @@ public class McpHelperResource {
description = request.generateDescriptionFromCommits();
request.setDescription(description);
- pullRequestService.checkReviews(request, false);
-
@SuppressWarnings("unchecked")
var reviewerNames = (List<String>) data.remove("reviewers");
if (reviewerNames != null) {
@@ -1354,13 +1330,6 @@ public class McpHelperResource {
assignment.setUser(assignee);
request.getAssignments().add(assignment);
}
- } else {
- for (var assignee : target.getProject().findDefaultPullRequestAssignees()) {
- PullRequestAssignment assignment = new PullRequestAssignment();
- assignment.setRequest(request);
- assignment.setUser(assignee);
- request.getAssignments().add(assignment);
- }
}
pullRequestService.open(request);
@@ -1535,18 +1504,10 @@ public class McpHelperResource {
switch (operation) {
case "approve":
- try {
- pullRequestReviewService.review(user, pullRequest, true, comment);
- } catch (PullRequestReviewRejectedException e) {
- throw new NotAcceptableException(e.getMessage());
- }
+ pullRequestReviewService.review(user, pullRequest, true, comment);
return "Approved pull request " + pullRequestReference;
case "requestChanges":
- try {
- pullRequestReviewService.review(user, pullRequest, false, comment);
- } catch (PullRequestReviewRejectedException e) {
- throw new NotAcceptableException(e.getMessage());
- }
+ pullRequestReviewService.review(user, pullRequest, false, comment);
return "Requested changes on pull request " + pullRequestReference;
case "merge":
if (!SecurityUtils.canWriteCode(user.asSubject(), pullRequest.getProject()))
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java
index b81c73bb9d..5ddaf6a98b 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java
@@ -6,6 +6,7 @@ import static io.onedev.k8shelper.KubernetesHelper.PLACEHOLDER_SUFFIX;
import java.net.MalformedURLException;
import java.net.URL;
+import io.onedev.commons.utils.ExplicitException;
import io.onedev.k8shelper.KubernetesHelper;
import io.onedev.server.OneDev;
import io.onedev.server.model.Build;
@@ -122,7 +123,7 @@ public enum JobVariable {
if (build.getIssue() != null)
return OneDev.getInstance(IssueService.class).suggestBranch(build.getIssue());
else
- return null;
+ throw new ExplicitException("Suggested issue branch is only available for issue state triggers");
}
},
SERVER {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CreateBranchStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CreateBranchStep.java
index de77223069..0b156e5968 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CreateBranchStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CreateBranchStep.java
@@ -96,7 +96,7 @@ public class CreateBranchStep extends ServerSideStep {
return OneDev.getInstance(SessionService.class).call(() -> {
var build = OneDev.getInstance(BuildService.class).load(buildId);
Project project = build.getProject();
- String branchName = getBranchName();
+ String branchName = getBranchName();
if (!Repository.isValidRefName(GitUtils.branch2ref(branchName)))
throw new ExplicitException("Invalid branch name: " + branchName);
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CreatePullRequestStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CreatePullRequestStep.java
new file mode 100644
index 0000000000..5ec17415dd
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CreatePullRequestStep.java
@@ -0,0 +1,179 @@
+package io.onedev.server.buildspec.step;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.TaskLogger;
+import io.onedev.k8shelper.ServerStepResult;
+import io.onedev.server.OneDev;
+import io.onedev.server.annotation.BranchName;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.Interpolative;
+import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.buildspec.step.pullrequesttitleanddescriptionprovider.GeneratedPullRequestTitleAndDescription;
+import io.onedev.server.buildspec.step.pullrequesttitleanddescriptionprovider.PullRequestTitleAndDescriptionProvider;
+import io.onedev.server.git.service.GitService;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestUpdate;
+import io.onedev.server.model.support.pullrequest.MergeStrategy;
+import io.onedev.server.persistence.SessionService;
+import io.onedev.server.service.BuildService;
+import io.onedev.server.service.PullRequestService;
+import io.onedev.server.service.UserService;
+import io.onedev.server.util.ProjectAndBranch;
+import io.onedev.server.web.util.SuggestionUtils;
+
+@Editable(name="Create Pull Request", order=350)
+public class CreatePullRequestStep extends ServerSideStep {
+
+ private static final long serialVersionUID = 1L;
+
+ private String targetBranch;
+
+ private String sourceBranch;
+
+ private PullRequestTitleAndDescriptionProvider titleAndDescritpionProvider = new GeneratedPullRequestTitleAndDescription();
+
+ private MergeStrategy mergeStrategy;
+
+ private boolean workInProgress = true;
+
+ @Editable(order=1000, description="Specify name of the target branch")
+ @Interpolative(variableSuggester="suggestVariables")
+ @BranchName
+ @NotEmpty
+ public String getTargetBranch() {
+ return targetBranch;
+ }
+
+ public void setTargetBranch(String targetBranch) {
+ this.targetBranch = targetBranch;
+ }
+
+ @Editable(order=1050, description="Specify name of the source branch")
+ @Interpolative(variableSuggester="suggestVariables")
+ @BranchName
+ @NotEmpty
+ public String getSourceBranch() {
+ return sourceBranch;
+ }
+
+ public void setSourceBranch(String sourceBranch) {
+ this.sourceBranch = sourceBranch;
+ }
+
+ @Editable(order=1100, name="Title and Description")
+ @NotNull
+ public PullRequestTitleAndDescriptionProvider getTitleAndDescritpionProvider() {
+ return titleAndDescritpionProvider;
+ }
+
+ public void setTitleAndDescritpionProvider(PullRequestTitleAndDescriptionProvider titleProvider) {
+ this.titleAndDescritpionProvider = titleProvider;
+ }
+
+ @Editable(order=1200, description="Specify merge strategy of the pull request. Leave empty to use default merge strategy of the project")
+ public MergeStrategy getMergeStrategy() {
+ return mergeStrategy;
+ }
+
+ public void setMergeStrategy(MergeStrategy mergeStrategy) {
+ this.mergeStrategy = mergeStrategy;
+ }
+
+ @Editable(order=1250, description="Specify whether to create a work in progress pull request")
+ public boolean isWorkInProgress() {
+ return workInProgress;
+ }
+
+ public void setWorkInProgress(boolean workInProgress) {
+ this.workInProgress = workInProgress;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<InputSuggestion> suggestVariables(String matchWith) {
+ return BuildSpec.suggestVariables(matchWith, true, true, false);
+ }
+
+ @SuppressWarnings("unused")
+ private static List<InputSuggestion> suggestRevisions(String matchWith) {
+ Project project = Project.get();
+ if (project != null)
+ return SuggestionUtils.suggestRevisions(project, matchWith);
+ else
+ return new ArrayList<>();
+ }
+
+ @Override
+ public ServerStepResult run(Long buildId, File inputDir, TaskLogger logger) {
+ return OneDev.getInstance(SessionService.class).call(() -> {
+ if (StringUtils.isBlank(getTargetBranch()))
+ throw new ExplicitException("Target branch should not be empty");
+ if (StringUtils.isBlank(getSourceBranch()))
+ throw new ExplicitException("Source branch should not be empty");
+
+ var build = OneDev.getInstance(BuildService.class).load(buildId);
+
+ var projectId = build.getProject().getId();
+
+ ProjectAndBranch target = new ProjectAndBranch(projectId, getTargetBranch());
+ ProjectAndBranch source = new ProjectAndBranch(projectId, getSourceBranch());
+
+ if (target.equals(source)) {
+ logger.warning("Pull request will not be created as target branch is the same as source branch");
+ } else {
+ var pullRequestService = OneDev.getInstance(PullRequestService.class);
+ var pullRequest = pullRequestService.findOpen(target, source);
+ if (pullRequest != null) {
+ logger.warning("A pull request has already been opened for specified branches");
+ } else {
+ pullRequest = new PullRequest();
+ pullRequest.setTarget(target);
+ pullRequest.setSource(source);
+ pullRequest.setMergeStrategy(getMergeStrategy());
+ pullRequest.setSubmitter(OneDev.getInstance(UserService.class).getSystem());
+
+ var baseCommitId = OneDev.getInstance(GitService.class).getMergeBase(
+ target.getProject(), target.getObjectId(),
+ source.getProject(), source.getObjectId());
+
+ if (baseCommitId == null)
+ throw new ExplicitException("No common base for target and source branches");
+
+ if (baseCommitId.name().equals(source.getObjectName())) {
+ logger.warning("Pull request will not be created as target branch is already up to date with source branch");
+ } else {
+ pullRequest.setBaseCommitHash(baseCommitId.name());
+
+ var update = new PullRequestUpdate();
+ pullRequest.getUpdates().add(update);
+ pullRequest.setUpdates(pullRequest.getUpdates());
+ update.setRequest(pullRequest);
+ update.setHeadCommitHash(source.getObjectName());
+ update.setTargetHeadCommitHash(pullRequest.getTarget().getObjectName());
+
+ var titleAndDescription = titleAndDescritpionProvider.getTitleAndDescription(pullRequest);
+
+ pullRequest.setTitle(titleAndDescription.getLeft());
+ if (isWorkInProgress() && !pullRequest.isWorkInProgress())
+ pullRequest.setTitle("[WIP] " + pullRequest.getTitle());
+
+ pullRequest.setDescription(titleAndDescription.getRight());
+
+ pullRequestService.open(pullRequest);
+ }
+ }
+ }
+ return new ServerStepResult(true);
+ });
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/pullrequesttitleanddescriptionprovider/GeneratedPullRequestTitleAndDescription.java b/server-core/src/main/java/io/onedev/server/buildspec/step/pullrequesttitleanddescriptionprovider/GeneratedPullRequestTitleAndDescription.java
new file mode 100644
index 0000000000..311e992b80
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/pullrequesttitleanddescriptionprovider/GeneratedPullRequestTitleAndDescription.java
@@ -0,0 +1,36 @@
+package io.onedev.server.buildspec.step.pullrequesttitleanddescriptionprovider;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.service.PullRequestService;
+import io.onedev.server.service.SettingService;
+
+@Editable(order=100, name="Use generated title and description")
+public class GeneratedPullRequestTitleAndDescription implements PullRequestTitleAndDescriptionProvider {
+
+ @Override
+ public Pair<String, String> getTitleAndDescription(PullRequest pullRequest) {
+ var title = pullRequest.generateTitleFromCommits();
+ var description = pullRequest.generateDescriptionFromCommits();
+ if (title == null || description == null) {
+ var liteModel = OneDev.getInstance(SettingService.class).getAiSetting().getLiteModel();
+ if (liteModel != null) {
+ var titleAndDescription = OneDev.getInstance(PullRequestService.class)
+ .suggestTitleAndDescription(pullRequest, liteModel, title == null, description == null);
+ if (title == null)
+ title = titleAndDescription.getLeft();
+ if (description == null)
+ description = titleAndDescription.getRight();
+ }
+ }
+ if (title == null)
+ title = pullRequest.generateTitleFromBranch();
+
+ return ImmutablePair.of(title, description);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/pullrequesttitleanddescriptionprovider/PullRequestTitleAndDescriptionProvider.java b/server-core/src/main/java/io/onedev/server/buildspec/step/pullrequesttitleanddescriptionprovider/PullRequestTitleAndDescriptionProvider.java
new file mode 100644
index 0000000000..770562848f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/pullrequesttitleanddescriptionprovider/PullRequestTitleAndDescriptionProvider.java
@@ -0,0 +1,15 @@
+package io.onedev.server.buildspec.step.pullrequesttitleanddescriptionprovider;
+
+import java.io.Serializable;
+
+import org.apache.commons.lang3.tuple.Pair;
+
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.model.PullRequest;
+
+@Editable
+public interface PullRequestTitleAndDescriptionProvider extends Serializable {
+
+ Pair<String, String> getTitleAndDescription(PullRequest pullRequest);
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/pullrequesttitleanddescriptionprovider/SpecifiedPullRequestTitleAndDescription.java b/server-core/src/main/java/io/onedev/server/buildspec/step/pullrequesttitleanddescriptionprovider/SpecifiedPullRequestTitleAndDescription.java
new file mode 100644
index 0000000000..9c1e8af92d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/pullrequesttitleanddescriptionprovider/SpecifiedPullRequestTitleAndDescription.java
@@ -0,0 +1,56 @@
+package io.onedev.server.buildspec.step.pullrequesttitleanddescriptionprovider;
+
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.Interpolative;
+import io.onedev.server.annotation.Multiline;
+import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.model.PullRequest;
+
+@Editable(order=200, name="Use specified title and description")
+public class SpecifiedPullRequestTitleAndDescription implements PullRequestTitleAndDescriptionProvider {
+
+ private String title;
+
+ private String description;
+
+ @Editable(order=100)
+ @Interpolative(variableSuggester="suggestVariables")
+ @NotEmpty
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ @Editable(order=200)
+ @Interpolative(variableSuggester="suggestVariables")
+ @Multiline
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ @Override
+ public Pair<String, String> getTitleAndDescription(PullRequest pullRequest) {
+ return ImmutablePair.of(getTitle(), getDescription());
+ }
+
+ @SuppressWarnings("unused")
+ private static List<InputSuggestion> suggestVariables(String matchWith) {
+ return BuildSpec.suggestVariables(matchWith, true, true, false);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/exception/OperationRejectedException.java b/server-core/src/main/java/io/onedev/server/exception/OperationRejectedException.java
new file mode 100644
index 0000000000..186a1ae14b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/exception/OperationRejectedException.java
@@ -0,0 +1,11 @@
+package io.onedev.server.exception;
+
+import io.onedev.commons.utils.ExplicitException;
+
+public class OperationRejectedException extends ExplicitException {
+
+ public OperationRejectedException(String message) {
+ super(message);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/exception/PullRequestReviewRejectedException.java b/server-core/src/main/java/io/onedev/server/exception/PullRequestReviewRejectedException.java
deleted file mode 100644
index 74449fcb9d..0000000000
--- a/server-core/src/main/java/io/onedev/server/exception/PullRequestReviewRejectedException.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.onedev.server.exception;
-
-import io.onedev.commons.utils.ExplicitException;
-
-public class PullRequestReviewRejectedException extends ExplicitException {
-
- public PullRequestReviewRejectedException(String message) {
- super(message);
- }
-
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/OperationRejectedExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/OperationRejectedExceptionHandler.java
new file mode 100644
index 0000000000..3b86bdb07c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/exception/handler/OperationRejectedExceptionHandler.java
@@ -0,0 +1,17 @@
+package io.onedev.server.exception.handler;
+
+import javax.servlet.http.HttpServletResponse;
+
+import io.onedev.server.exception.HttpResponse;
+import io.onedev.server.exception.OperationRejectedException;
+
+public class OperationRejectedExceptionHandler extends AbstractExceptionHandler<OperationRejectedException> {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public HttpResponse getResponse(OperationRejectedException exception) {
+ return new HttpResponse(HttpServletResponse.SC_NOT_ACCEPTABLE, exception.getMessage());
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index f752f49163..7c868de157 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -88,7 +88,7 @@ import io.onedev.server.ai.ToolExecutionResult;
import io.onedev.server.attachment.AttachmentStorageSupport;
import io.onedev.server.entityreference.EntityReference;
import io.onedev.server.entityreference.PullRequestReference;
-import io.onedev.server.exception.PullRequestReviewRejectedException;
+import io.onedev.server.exception.OperationRejectedException;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.service.CommitMessageError;
import io.onedev.server.git.service.GitService;
@@ -1485,7 +1485,7 @@ public class PullRequest extends ProjectBelonging
public String generateTitleFromCommits() {
var commits = getLatestUpdate().getCommits();
if (commits.size() == 1) {
- return cleanTitle(commits.get(0).getShortMessage());
+ return getTitlePrefix(getSourceBranchSemantic()) + cleanTitle(commits.get(0).getShortMessage());
} else {
return null;
}
@@ -1575,7 +1575,7 @@ public class PullRequest extends ProjectBelonging
try {
getPullRequestReviewService().review(user, request, true, null);
return new ToolExecutionResult(convertToJson(Map.of("successful", true)), false);
- } catch (PullRequestReviewRejectedException e) {
+ } catch (OperationRejectedException e) {
var data = Map.of(
"successful", false,
"failReason", "You are not a reviewer and is not allowed to approve this pull request. Add your option as comment instead");
@@ -1605,10 +1605,10 @@ public class PullRequest extends ProjectBelonging
try {
getPullRequestReviewService().review(user, request, false, null);
return new ToolExecutionResult(convertToJson(Map.of("successful", true)), false);
- } catch (PullRequestReviewRejectedException e) {
+ } catch (OperationRejectedException e) {
var data = Map.of(
"successful", false,
- "failReason", "You are not a reviewer and is not allowed to request changes for this pull request. Add your option as comment instead");
+ "failReason", e.getMessage());
return new ToolExecutionResult(convertToJson(data), false);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java b/server-core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java
index cb9dc40971..5cb7306490 100644
--- a/server-core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java
+++ b/server-core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java
@@ -47,9 +47,9 @@ public class DefaultDao implements Dao, Serializable {
@Transactional
@Override
public void persist(AbstractEntity entity) {
- boolean isNew = entity.isNew();
+ boolean wasNew = entity.isNew();
getSession().saveOrUpdate(entity);
- listenerRegistry.post(new EntityPersisted(entity, isNew));
+ listenerRegistry.post(new EntityPersisted(entity, wasNew));
}
@Transactional
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
index f87611c3d2..bc118d1bd4 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
@@ -27,8 +27,6 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.shiro.authz.UnauthorizedException;
-import org.eclipse.jgit.lib.ObjectId;
-import org.joda.time.DateTime;
import io.onedev.server.attachment.AttachmentService;
import io.onedev.server.data.migration.VersionedXmlDoc;
@@ -37,7 +35,6 @@ import io.onedev.server.service.PullRequestChangeService;
import io.onedev.server.service.PullRequestService;
import io.onedev.server.service.UrlService;
import io.onedev.server.service.UserService;
-import io.onedev.server.git.service.GitService;
import io.onedev.server.model.Build;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestAssignment;
@@ -73,8 +70,6 @@ public class PullRequestResource {
private final PullRequestChangeService pullRequestChangeService;
private final UserService userService;
-
- private final GitService gitService;
private final AuditService auditService;
@@ -85,12 +80,11 @@ public class PullRequestResource {
@Inject
public PullRequestResource(PullRequestService pullRequestService,
PullRequestChangeService pullRequestChangeService,
- UserService userService, GitService gitService, AuditService auditService,
+ UserService userService, AuditService auditService,
AttachmentService attachmentService, UrlService urlService) {
this.pullRequestService = pullRequestService;
this.pullRequestChangeService = pullRequestChangeService;
this.userService = userService;
- this.gitService = gitService;
this.auditService = auditService;
this.attachmentService = attachmentService;
this.urlService = urlService;
@@ -233,66 +227,28 @@ public class PullRequestResource {
@POST
public Response createPullRequest(@NotNull PullRequestOpenData data) {
User user = SecurityUtils.getUser();
-
+
ProjectAndBranch target = new ProjectAndBranch(data.getTargetProjectId(), data.getTargetBranch());
ProjectAndBranch source = new ProjectAndBranch(data.getSourceProjectId(), data.getSourceBranch());
-
+
if (!SecurityUtils.canReadCode(target.getProject()) || !SecurityUtils.canReadCode(source.getProject()))
throw new UnauthorizedException();
-
- if (target.equals(source))
- throw new NotAcceptableException("Source and target are the same");
-
- PullRequest request = pullRequestService.findOpen(target, source);
- if (request != null)
- throw new NotAcceptableException("Another pull request already opened for this change");
-
- request = pullRequestService.findEffective(target, source);
- if (request != null) {
- if (request.isOpen())
- throw new NotAcceptableException("Another pull request already opened for this change");
- else
- throw new NotAcceptableException("Change already merged");
- }
-
- request = new PullRequest();
- ObjectId baseCommitId = gitService.getMergeBase(
- target.getProject(), target.getObjectId(),
- source.getProject(), source.getObjectId());
-
- if (baseCommitId == null)
- throw new NotAcceptableException("No common base for target and source");
- request.setTitle(data.getTitle());
+ PullRequest request = new PullRequest();
+ request.setSubmitter(user);
request.setTarget(target);
request.setSource(source);
- request.setSubmitter(user);
- request.setBaseCommitHash(baseCommitId.name());
+ request.setTitle(data.getTitle());
request.setDescription(data.getDescription());
-
if (data.getMergeStrategy() != null)
request.setMergeStrategy(data.getMergeStrategy());
- else
- request.setMergeStrategy(request.getProject().findDefaultPullRequestMergeStrategy());
-
- if (request.getBaseCommitHash().equals(source.getObjectName()))
- throw new NotAcceptableException("Change already merged");
- PullRequestUpdate update = new PullRequestUpdate();
- update.setDate(new DateTime(request.getSubmitDate()).plusSeconds(1).toDate());
- update.setRequest(request);
- update.setHeadCommitHash(source.getObjectName());
- update.setTargetHeadCommitHash(request.getTarget().getObjectName());
- request.getUpdates().add(update);
-
- pullRequestService.checkReviews(request, false);
-
if (data.getReviewerIds() != null) {
for (Long reviewerId: data.getReviewerIds()) {
User reviewer = userService.load(reviewerId);
- if (reviewer.equals(request.getSubmitter()))
+ if (reviewer.equals(request.getSubmitter()))
return Response.status(NOT_ACCEPTABLE).entity("Pull request submitter can not be reviewer").build();
-
+
if (request.getReview(reviewer) == null) {
PullRequestReview review = new PullRequestReview();
review.setRequest(request);
@@ -309,16 +265,10 @@ public class PullRequestResource {
assignment.setUser(userService.load(assigneeId));
request.getAssignments().add(assignment);
}
- } else {
- for (var assignee: target.getProject().findDefaultPullRequestAssignees()) {
- PullRequestAssignment assignment = new PullRequestAssignment();
- assignment.setRequest(request);
- assignment.setUser(assignee);
- request.getAssignments().add(assignment);
- }
}
-
+
pullRequestService.open(request);
+
return Response.ok(request.getId()).build();
}
diff --git a/server-core/src/main/java/io/onedev/server/service/PullRequestService.java b/server-core/src/main/java/io/onedev/server/service/PullRequestService.java
index 576bf00131..fda26812a5 100644
--- a/server-core/src/main/java/io/onedev/server/service/PullRequestService.java
+++ b/server-core/src/main/java/io/onedev/server/service/PullRequestService.java
@@ -5,12 +5,12 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
-import org.jspecify.annotations.Nullable;
-
import org.apache.commons.lang3.tuple.Pair;
import org.apache.shiro.subject.Subject;
import org.eclipse.jgit.lib.ObjectId;
+import org.jspecify.annotations.Nullable;
+import dev.langchain4j.model.chat.ChatModel;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
@@ -96,5 +96,8 @@ public interface PullRequestService extends EntityService<PullRequest> {
List<PullRequest> query(User submitter, Date fromDate, Date toDate);
Collection<Long> getTargetProjectIds();
-
+
+ Pair<String, String> suggestTitleAndDescription(PullRequest request, ChatModel chatModel,
+ boolean suggestTitle, boolean suggestDescription);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestReviewService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestReviewService.java
index 075ef2e816..1af4cd327c 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestReviewService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestReviewService.java
@@ -16,7 +16,7 @@ import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.project.pullrequest.PullRequestReviewRequested;
import io.onedev.server.event.project.pullrequest.PullRequestReviewerRemoved;
-import io.onedev.server.exception.PullRequestReviewRejectedException;
+import io.onedev.server.exception.OperationRejectedException;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.PullRequestReview;
@@ -77,7 +77,7 @@ public class DefaultPullRequestReviewService extends BaseEntityService<PullReque
public void review(User user, PullRequest request, boolean approved, String note) {
PullRequestReview review = request.getReview(user);
if (review == null || review.getStatus() == PullRequestReview.Status.EXCLUDED)
- throw new PullRequestReviewRejectedException("You are not reviewer of this pull request");
+ throw new OperationRejectedException("You are not reviewer of this pull request. Add your option as comment instead");
if (approved)
review.setStatus(PullRequestReview.Status.APPROVED);
else
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java
index 2e4747d1af..96d81822bb 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java
@@ -32,7 +32,6 @@ import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
-import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.criteria.CriteriaBuilder;
@@ -42,6 +41,7 @@ import javax.persistence.criteria.Order;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
+import javax.ws.rs.NotAcceptableException;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
@@ -54,13 +54,19 @@ import org.hibernate.criterion.Restrictions;
import org.hibernate.query.Query;
import org.hibernate.query.criteria.internal.path.SingularAttributePath;
import org.joda.time.DateTime;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
+import dev.langchain4j.data.message.SystemMessage;
+import dev.langchain4j.data.message.UserMessage;
+import dev.langchain4j.model.chat.ChatModel;
import io.onedev.commons.loader.ManagedSerializedForm;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.LockUtils;
@@ -68,15 +74,6 @@ import io.onedev.server.OneDev;
import io.onedev.server.cluster.ClusterRunnable;
import io.onedev.server.cluster.ClusterService;
import io.onedev.server.cluster.ClusterTask;
-import io.onedev.server.service.BuildService;
-import io.onedev.server.service.PendingSuggestionApplyService;
-import io.onedev.server.service.ProjectService;
-import io.onedev.server.service.PullRequestChangeService;
-import io.onedev.server.service.PullRequestLabelService;
-import io.onedev.server.service.PullRequestReviewService;
-import io.onedev.server.service.PullRequestService;
-import io.onedev.server.service.PullRequestUpdateService;
-import io.onedev.server.service.UserService;
import io.onedev.server.event.Listen;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.entity.EntityRemoved;
@@ -136,6 +133,15 @@ import io.onedev.server.search.entity.EntitySort.Direction;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ReadCode;
+import io.onedev.server.service.BuildService;
+import io.onedev.server.service.PendingSuggestionApplyService;
+import io.onedev.server.service.ProjectService;
+import io.onedev.server.service.PullRequestChangeService;
+import io.onedev.server.service.PullRequestLabelService;
+import io.onedev.server.service.PullRequestReviewService;
+import io.onedev.server.service.PullRequestService;
+import io.onedev.server.service.PullRequestUpdateService;
+import io.onedev.server.service.UserService;
import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.util.ProjectPullRequestStatusStat;
import io.onedev.server.util.ProjectScope;
@@ -196,6 +202,9 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>
@Inject
private PullRequestInfoService pullRequestInfoService;
+ @Inject
+ private ObjectMapper objectMapper;
+
private SequenceGenerator numberGenerator;
private synchronized SequenceGenerator getNumberGenerator() {
@@ -374,6 +383,61 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>
public void open(PullRequest request) {
Preconditions.checkArgument(request.isNew());
+ var target = Preconditions.checkNotNull(request.getTarget(),
+ "Pull request target must be set before calling open");
+ var source = Preconditions.checkNotNull(request.getSource(),
+ "Pull request source must be set before calling open");
+ Preconditions.checkNotNull(request.getSubmitter(),
+ "Pull request submitter must be set before calling open");
+
+ if (target.equals(source))
+ throw new NotAcceptableException("Source and target are the same");
+
+ PullRequest existing = findOpen(target, source);
+ if (existing != null)
+ throw new NotAcceptableException("Another pull request already opened for this change");
+
+ existing = findEffective(target, source);
+ if (existing != null) {
+ if (existing.isOpen())
+ throw new NotAcceptableException("Another pull request already opened for this change");
+ else
+ throw new NotAcceptableException("Another pull request already merged the change");
+ }
+
+ if (request.getBaseCommitHash() == null) {
+ ObjectId baseCommitId = gitService.getMergeBase(
+ target.getProject(), target.getObjectId(),
+ source.getProject(), source.getObjectId());
+ if (baseCommitId == null)
+ throw new NotAcceptableException("No common base for target and source");
+ request.setBaseCommitHash(baseCommitId.name());
+ }
+
+ if (request.getBaseCommitHash().equals(source.getObjectName()))
+ throw new NotAcceptableException("Target already up to date with source");
+
+ if (request.getUpdates().isEmpty()) {
+ PullRequestUpdate update = new PullRequestUpdate();
+ request.getUpdates().add(update);
+ request.setUpdates(request.getUpdates());
+ update.setRequest(request);
+ update.setHeadCommitHash(source.getObjectName());
+ update.setTargetHeadCommitHash(target.getObjectName());
+ }
+
+ if (request.getAssignments().isEmpty()) {
+ for (var assignee: target.getProject().findDefaultPullRequestAssignees()) {
+ PullRequestAssignment assignment = new PullRequestAssignment();
+ assignment.setRequest(request);
+ assignment.setUser(assignee);
+ request.getAssignments().add(assignment);
+ }
+ }
+
+ if (request.getMergeStrategy() == null)
+ request.setMergeStrategy(target.getProject().findDefaultPullRequestMergeStrategy());
+
request.setNumberScope(request.getTargetProject().getForkRoot());
request.setNumber(getNumberGenerator().getNextSequence(request.getNumberScope()));
request.setSubmitDate(new Date());
@@ -396,6 +460,7 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>
for (PullRequestUpdate update: request.getUpdates())
updateService.create(update);
+ checkReviews(request, false);
for (PullRequestReview review: request.getReviews())
dao.persist(review);
@@ -589,8 +654,7 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>
ofOpen(),
Restrictions.or(ofSource(projectAndBranch), ofTarget(projectAndBranch)));
for (PullRequest request: query(EntityCriteria.of(PullRequest.class).add(criterion))) {
- boolean sourceUpdated = request.getSource() != null
- && request.getSource().equals(projectAndBranch);
+ boolean sourceUpdated = request.getSource() != null && request.getSource().equals(projectAndBranch);
checkAsync(request, sourceUpdated, sourceUpdated);
}
}
@@ -1201,4 +1265,98 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>
return getSession().createQuery(criteriaQuery).getResultList();
}
+ @Override
+ public Pair<String, String> suggestTitleAndDescription(PullRequest pullRequest, ChatModel chatModel, boolean suggestTitle, boolean suggestDescription) {
+ if (!suggestTitle && !suggestDescription)
+ return ImmutablePair.of(null, null);
+
+ var sourceBranchSemantic = pullRequest.getSourceBranchSemantic();
+ String titleSuggestInstruction;
+ if (sourceBranchSemantic.isWorkInProgress()) {
+ if (sourceBranchSemantic.getWorkType() != null) {
+ titleSuggestInstruction = """
+ When suggesting pull request title, you should not add work in progress prefix
+ or conventional commit type prefix to the title even if commit messages
+ indicate that.
+ """;
+ } else {
+ titleSuggestInstruction = """
+ When suggesting pull request title, you should not add work in progress prefix
+ to the title even if commit messages indicate that.
+ """;
+ }
+ } else {
+ if (sourceBranchSemantic.getWorkType() != null) {
+ titleSuggestInstruction = """
+ When suggesting pull request title, you should not add conventional commit type prefix
+ to the title even if commit messages indicate that.
+ """;
+ } else {
+ titleSuggestInstruction = "";
+ }
+ }
+
+ var commitMessages = pullRequest.getLatestUpdate().getCommits().stream()
+ .map(it -> it.getFullMessage())
+ .collect(Collectors.toList());
+ String userPromptText;
+ try {
+ userPromptText = "A json array of commit messages:\n" + objectMapper.writeValueAsString(commitMessages);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ var userMessage = new UserMessage(userPromptText);
+
+ String title;
+ String description;
+ if (!suggestTitle) {
+ var systemMessage = new SystemMessage(String.format("""
+ You are a helpful assistant that can suggest pull request description by
+ summarizing multiple commit messages. Maximum %d characters allowed for
+ the description.
+
+ IMPORTANT: only return the description, no other text or comments.
+ """, PullRequest.MAX_DESCRIPTION_LEN));
+ description = chatModel.chat(systemMessage, userMessage).aiMessage().text();
+ title = null;
+ } else if (!suggestDescription) {
+ var systemMessage = new SystemMessage(String.format("""
+ You are a helpful assistant that can suggest pull request title by summarizing
+ multiple commit messages. %s Maximum %d characters allowed for the title.
+
+ IMPORTANT: only return the title, no other text or comments.
+ """, titleSuggestInstruction, PullRequest.MAX_TITLE_LEN));
+ title = (pullRequest.getTitlePrefix(sourceBranchSemantic) + chatModel.chat(systemMessage, userMessage).aiMessage().text()).trim();
+ description = null;
+ } else {
+ var systemMessage = new SystemMessage(String.format("""
+ You are a helpful assistant that can suggest pull request title and description
+ by summarizing multiple commit messages. %s Maximum %d characters allowed for the title,
+ and %d characters allowed for the description.
+
+ IMPORTANT: only return a VALID json object with "title" property set to the title and "description"
+ property set to the description, no other text or comments.
+ """, titleSuggestInstruction, PullRequest.MAX_TITLE_LEN, PullRequest.MAX_DESCRIPTION_LEN));
+ var responseText = chatModel.chat(systemMessage, userMessage).aiMessage().text();
+ if (responseText.startsWith("```json"))
+ responseText = responseText.substring("```json".length());
+ if (responseText.endsWith("```"))
+ responseText = responseText.substring(0, responseText.length() - "```".length());
+ try {
+ var response = objectMapper.readTree(responseText);
+ if (response.has("title"))
+ title = (pullRequest.getTitlePrefix(sourceBranchSemantic) + response.get("title").asText()).trim();
+ else
+ title = null;
+ if (response.has("description"))
+ description = response.get("description").asText();
+ else
+ description = null;
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return ImmutablePair.of(title, description);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.java
index 9095ffba4f..51abbef043 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.java
@@ -5,6 +5,8 @@ import static io.onedev.server.model.User.Type.SERVICE;
import static io.onedev.server.util.SiteSyncUtils.syncDirectory;
import java.io.File;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -37,6 +39,7 @@ import dev.langchain4j.data.message.ToolExecutionResultMessage;
import dev.langchain4j.data.message.UserMessage;
import dev.langchain4j.model.chat.request.ChatRequest;
import io.onedev.commons.bootstrap.Bootstrap;
+import io.onedev.commons.loader.ManagedSerializedForm;
import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.FileUtils;
@@ -79,7 +82,7 @@ import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.usage.Usage;
@Singleton
-public class DefaultUserService extends BaseEntityService<User> implements UserService {
+public class DefaultUserService extends BaseEntityService<User> implements UserService, Serializable {
private static final Logger logger = LoggerFactory.getLogger(DefaultUserService.class);
@@ -816,6 +819,10 @@ public class DefaultUserService extends BaseEntityService<User> implements UserS
batchWorkExecutionService.submit(SYNC_WORKER, new SyncWork(SYNC_PRIORITY, syncWithServer));
}
+ public Object writeReplace() throws ObjectStreamException {
+ return new ManagedSerializedForm(UserService.class);
+ }
+
private static class SyncWork extends Prioritized {
final String syncWithServer;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index fe88b1994b..9066f9c259 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
@@ -3,7 +3,6 @@ package io.onedev.server.web.page.project.pullrequests.create;
import static io.onedev.server.ai.ToolUtils.getDiffTools;
import static io.onedev.server.ai.ToolUtils.wrapForChat;
import static io.onedev.server.model.PullRequest.MAX_DESCRIPTION_LEN;
-import static io.onedev.server.model.PullRequest.MAX_TITLE_LEN;
import static io.onedev.server.search.commit.Revision.Type.COMMIT;
import static io.onedev.server.web.translation.Translation._T;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
@@ -61,10 +60,9 @@ import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
-import dev.langchain4j.data.message.SystemMessage;
-import dev.langchain4j.data.message.UserMessage;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.PlanarRange;
import io.onedev.server.ai.ChatTool;
@@ -703,89 +701,19 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatio
var suggestTitle = params.getParameterValue("suggestTitle").toBoolean();
var suggestDescription = params.getParameterValue("suggestDescription").toBoolean();
+ var chatModel = Preconditions.checkNotNull(settingService.getAiSetting().getLiteModel());
+
String title;
String description;
try {
- if (suggestTitle || suggestDescription) {
- var chatModel = settingService.getAiSetting().getLiteModel();
- var sourceBranchSemantic = getPullRequest().getSourceBranchSemantic();
- String titleSuggestInstruction;
- if (sourceBranchSemantic.isWorkInProgress()) {
- if (sourceBranchSemantic.getWorkType() != null) {
- titleSuggestInstruction = """
- When suggesting pull request title, you should not add work in progress prefix
- or conventional commit type prefix to the title even if commit messages
- indicate that.
- """;
- } else {
- titleSuggestInstruction = """
- When suggesting pull request title, you should not add work in progress prefix
- to the title even if commit messages indicate that.
- """;
- }
- } else {
- if (sourceBranchSemantic.getWorkType() != null) {
- titleSuggestInstruction = """
- When suggesting pull request title, you should not add conventional commit type prefix
- to the title even if commit messages indicate that.
- """;
- } else {
- titleSuggestInstruction = "";
- }
- }
-
- var userPrompt = getPullRequest().getLatestUpdate().getCommits().stream()
- .map(it -> it.getFullMessage())
- .collect(Collectors.toList());
- var userMessage = new UserMessage("A json array of commit messages:\n" + objectMapper.writeValueAsString(userPrompt));
- if (!suggestTitle) {
- var systemMessage = new SystemMessage(String.format("""
- You are a helpful assistant that can suggest pull request description by
- summarizing multiple commit messages. Maximum %d characters allowed for
- the description.
-
- IMPORTANT: only return the description, no other text or comments.
- """, MAX_DESCRIPTION_LEN));
- description = chatModel.chat(systemMessage, userMessage).aiMessage().text();
- title = "";
- } else if (!suggestDescription) {
- var systemMessage = new SystemMessage(String.format("""
- You are a helpful assistant that can suggest pull request title by summarizing
- multiple commit messages. %s Maximum %d characters allowed for the title.
-
- IMPORTANT: only return the title, no other text or comments.
- """, titleSuggestInstruction, MAX_TITLE_LEN));
- title = (getPullRequest().getTitlePrefix(sourceBranchSemantic) + chatModel.chat(systemMessage, userMessage).aiMessage().text()).trim();
- description = "";
- } else {
- var systemMessage = new SystemMessage(String.format("""
- You are a helpful assistant that can suggest pull request title and description
- by summarizing multiple commit messages. %s Maximum %d characters allowed for the title,
- and %d characters allowed for the description.
-
- IMPORTANT: only return a VALID json object with "title" property set to the title and "description"
- property set to the description, no other text or comments.
- """, titleSuggestInstruction, MAX_TITLE_LEN, MAX_DESCRIPTION_LEN));
- var responseText = chatModel.chat(systemMessage, userMessage).aiMessage().text();
- if (responseText.startsWith("```json"))
- responseText = responseText.substring("```json".length());
- if (responseText.endsWith("```"))
- responseText = responseText.substring(0, responseText.length() - "```".length());
- var response = objectMapper.readTree(responseText);
- if (response.has("title")) {
- title = (getPullRequest().getTitlePrefix(sourceBranchSemantic) + response.get("title").asText()).trim();
- } else {
- title = "";
- }
- if (response.has("description"))
- description = response.get("description").asText();
- else
- description = "";
- }
- } else {
+ var titleAndDescription = pullRequestService.suggestTitleAndDescription(
+ getPullRequest(), chatModel, suggestTitle, suggestDescription);
+ title = titleAndDescription.getLeft();
+ description = titleAndDescription.getRight();
+ if (title == null)
title = "";
- description = "";
- }
+ if (description == null)
+ description = "";
} catch (Exception e) {
title = "";
description = "";
diff --git a/server-ee b/server-ee
index cc31b3d077..daf8dce5bb 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit cc31b3d077f3e51c782f8ccee5febc1fdb624b50
+Subproject commit daf8dce5bb8fc729ab7314235fe0b3317819643a