The Unified and Autonomous Development Platform
fix: Error when investigating build failures with OpenAI models (OD-2672)
Robin Shen00e9e4a97614
diff --git a/server-core/src/main/java/io/onedev/server/ai/ToolExecutionResult.java b/server-core/src/main/java/io/onedev/server/ai/ToolExecutionResult.javaindex 2305746064..b0b6b1f6c4 100644--- a/server-core/src/main/java/io/onedev/server/ai/ToolExecutionResult.java+++ b/server-core/src/main/java/io/onedev/server/ai/ToolExecutionResult.java@@ -3,6 +3,7 @@ package io.onedev.server.ai;import java.util.List;import dev.langchain4j.agent.tool.ToolExecutionRequest;+import dev.langchain4j.data.message.AiMessage;import dev.langchain4j.data.message.ChatMessage;import dev.langchain4j.data.message.SystemMessage;import dev.langchain4j.data.message.ToolExecutionResultMessage;@@ -20,13 +21,23 @@ public class ToolExecutionResult {public void addToMessages(List<ChatMessage> messages, ToolExecutionRequest toolRequest) {if (asSystemMessage) {- messages.add(new SystemMessage(content));- var toolResultMessage = ToolExecutionResultMessage.from(- toolRequest.id(), toolRequest.name(), "Result returned as system message");- messages.add(toolResultMessage);- } else {- var toolResultMessage = ToolExecutionResultMessage.from(toolRequest.id(), toolRequest.name(), content);- messages.add(toolResultMessage);+ var systemMessage = new SystemMessage(content);+ int lastAiMessageIndex = -1;+ for (int i = messages.size() - 1; i >= 0; i--) {+ if (messages.get(i) instanceof AiMessage) {+ lastAiMessageIndex = i;+ break;+ }+ }+ if (lastAiMessageIndex >= 0) {+ messages.add(lastAiMessageIndex, systemMessage);+ var toolResultMessage = ToolExecutionResultMessage.from(+ toolRequest.id(), toolRequest.name(), "Result added as system message");+ messages.add(toolResultMessage);+ return;+ }}+ var toolResultMessage = ToolExecutionResultMessage.from(toolRequest.id(), toolRequest.name(), content);+ messages.add(toolResultMessage);}}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/ai/tools/GetBuildSpecEditInstructions.java b/server-core/src/main/java/io/onedev/server/ai/tools/GetBuildSpecEditInstructions.javaindex 3165eaec9e..eecdfc66d7 100644--- a/server-core/src/main/java/io/onedev/server/ai/tools/GetBuildSpecEditInstructions.java+++ b/server-core/src/main/java/io/onedev/server/ai/tools/GetBuildSpecEditInstructions.java@@ -25,7 +25,7 @@ public class GetBuildSpecEditInstructions implements TaskTool {public ToolSpecification getSpecification() {return ToolSpecification.builder().name("getBuildSpecEditInstructions")- .description("Get instructions on how to edit CI/CD spec")+ .description("Get instructions on how to edit various parts of CI/CD spec, including jobs, services, step templates, properties, and imports").build();}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex 7dcd01e362..7fe5dc7e4f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -794,7 +794,7 @@ public abstract class BuildDetailPage extends ProjectPage@Overridepublic CompletableFuture<ToolExecutionResult> execute(IPartialPageRequestHandler handler, Subject subject, JsonNode arguments) {var instructions = """- Follow below steps to investigate build failure:+ Follow below steps when investigate build failure:- Call 'getCurrentBuild' tool to get detail of current build- Call 'getBuildLog' tool to get the build log- Call 'getBuildSpec' tool to get content of CI/CD spec used to run the build