Skip to content

The Unified and Autonomous Development Platform

feat: Improve AI chat to answer code questions by checking all accessible projects (OD-2777)

Robin Shen3bcef7fc85ec
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index 6d299bad29..f2a05eec31 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -9,6 +9,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.SynchronousQueue;
@@ -407,6 +408,7 @@ import io.onedev.server.web.editable.EditSupportRegistry;
import io.onedev.server.web.exceptionhandler.PageExpiredExceptionHandler;
import io.onedev.server.web.page.layout.AdministrationSettingContribution;
import io.onedev.server.web.page.project.blob.render.BlobRenderer;
+import io.onedev.server.ai.ChatToolsContribution;
import io.onedev.server.web.page.project.setting.ProjectSettingContribution;
import io.onedev.server.web.upload.DefaultUploadService;
import io.onedev.server.web.upload.UploadService;
@@ -637,6 +639,7 @@ public class CoreModule extends AbstractPluginModule {
contribute(LineCoverageContribution.class, (build, blobPath, reportName) -> new HashMap<>());
contribute(AdministrationSettingContribution.class, () -> new ArrayList<>());
contribute(ProjectSettingContribution.class, () -> new ArrayList<>());
+ contribute(ChatToolsContribution.class, page -> List.of());
contribute(GitPreReceiveChecker.class, (project, submitter, refName, oldObjectId, newObjectId) -> null);
bind(PackFilter.class);
diff --git a/server-core/src/main/java/io/onedev/server/ai/ChatToolsContribution.java b/server-core/src/main/java/io/onedev/server/ai/ChatToolsContribution.java
new file mode 100644
index 0000000000..f1a0838838
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/ai/ChatToolsContribution.java
@@ -0,0 +1,16 @@
+package io.onedev.server.ai;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.apache.wicket.Page;
+
+/**
+ * Contributes {@link ChatTool}s for a given Wicket page. Implementations inspect the page
+ * (type, state, permissions) and return an empty list when they have nothing to offer.
+ */
+public interface ChatToolsContribution extends Serializable {
+
+ List<ChatTool> getChatTools(Page page);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
index 1855be3d0d..34b3fc41c1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
@@ -12,6 +12,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Locale;
+import java.util.Set;
import java.util.concurrent.CompletableFuture;
import javax.inject.Inject;
@@ -61,6 +62,7 @@ import com.google.common.collect.Sets;
import io.onedev.commons.bootstrap.Bootstrap;
import io.onedev.server.OneDev;
+import io.onedev.server.ai.ChatToolsContribution;
import io.onedev.server.ai.ChatTool;
import io.onedev.server.ai.ChatToolAware;
import io.onedev.server.ai.ToolExecutionResult;
@@ -123,6 +125,9 @@ public abstract class BasePage extends WebPage {
@Inject
private JettyService jettyService;
+
+ @Inject
+ private Set<ChatToolsContribution> chatToolsContributions;
public BasePage(PageParameters params) {
super(params);
@@ -439,6 +444,9 @@ public abstract class BasePage extends WebPage {
tools.addAll(((ChatToolAware) object).getChatTools());
});
+ for (var contribution : chatToolsContributions)
+ tools.addAll(contribution.getChatTools(this));
+
return tools;
}
diff --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.java
index 5909b72e5c..158fbf28dd 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
@@ -1801,25 +1801,6 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
}
})
- /*
- wrapForChat(new AddCodeComment(false) {
-
- @Override
- protected Long getProjectId() {
- return projectId;
- }
-
- @Override
- protected Long getPullRequestId() {
- return null;
- }
-
- @Override
- protected ObjectId getCommitId(boolean oldRevision) {
- return commitId;
- }
- })
- */
);
} else {
return List.of();
diff --git a/server-ee b/server-ee
index d544cbcf27..6952ec8316 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit d544cbcf274876e97b957e58a7439e1b5756478c
+Subproject commit 6952ec83163c87437d1080163ea8b9c43728968d