The Unified and Autonomous Development Platform
chore: Improved AI tool call procedure
Robin Shene362d9fa8ccb
diff --git a/server-core/src/main/java/io/onedev/server/ai/DefaultChatService.java b/server-core/src/main/java/io/onedev/server/ai/DefaultChatService.javaindex 80d57d00be..b7e73d2700 100644--- a/server-core/src/main/java/io/onedev/server/ai/DefaultChatService.java+++ b/server-core/src/main/java/io/onedev/server/ai/DefaultChatService.java@@ -275,7 +275,9 @@ public class DefaultChatService extends BaseEntityService<Chat> implements ChatSvar connection = connectionRegistry.getConnection(application, sessionId, pageKey);if (connection == null || !connection.isOpen())throw new ExplicitException("Conversation context lost");- for (var toolRequest: toolRequests) {+ for (var toolRequest: toolRequests) {+ if (responseFuture.isDone())+ return;String toolName = toolRequest.name();try {var toolExecution = new AiToolExecution(toolName, ToolUtils.getToolArguments(toolRequest));@@ -283,12 +285,14 @@ public class DefaultChatService extends BaseEntityService<Chat> implements ChatSvar toolExecutionFuture = toolExecution.getFuture();if (toolExecutionFuture == null)throw new ExplicitException("Tool not found: " + toolName);- while (!responseFuture.isDone()) {+ while (true) {try {var toolExecutionResult = toolExecutionFuture.get(1, TimeUnit.SECONDS);toolExecutionResult.addToMessages(langchain4jMessages, toolRequest);break;} catch (TimeoutException e) {+ if (responseFuture.isDone())+ return;} catch (CancellationException e) {// may get cancelled in DefaultManagedFutureServicethrow new ExplicitException("Timed out calling tool: " + toolName);@@ -299,6 +303,9 @@ public class DefaultChatService extends BaseEntityService<Chat> implements ChatS}}+ if (responseFuture.isDone())+ return;+var handler = newResponseHandler(SecurityUtils.getSubject());var langchain4jChatRequest = ChatRequest.builder().messages(new ArrayList<>(langchain4jMessages))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 c6574f715e..2305746064 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@@ -25,8 +25,7 @@ public class ToolExecutionResult {toolRequest.id(), toolRequest.name(), "Result returned as system message");messages.add(toolResultMessage);} else {- var toolResultMessage = ToolExecutionResultMessage.from(- toolRequest.id(), toolRequest.name(), content);+ var toolResultMessage = ToolExecutionResultMessage.from(toolRequest.id(), toolRequest.name(), content);messages.add(toolResultMessage);}}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.javaindex f0b47fd619..7eb8584f33 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@@ -594,6 +594,8 @@ public class DefaultUserService extends BaseEntityService<User> implements UserS.collect(Collectors.toList());ToolUtils.filterDuplications(toolSpecifications);while (true) {+ if (Thread.interrupted())+ throw new InterruptedException();var chatRequest = ChatRequest.builder().messages(messages).toolSpecifications(toolSpecifications)@@ -613,6 +615,8 @@ public class DefaultUserService extends BaseEntityService<User> implements UserSmessages.add(aiMessage);sessionService.run(() -> {for (var toolRequest : aiMessage.toolExecutionRequests()) {+ if (Thread.interrupted())+ throw new RuntimeException(new InterruptedException());var toolName = toolRequest.name();try {var tool = tools.stream()@@ -626,7 +630,7 @@ public class DefaultUserService extends BaseEntityService<User> implements UserS}});}- } catch (Exception e) {+ } catch (Throwable e) {sessionService.run(() -> {var user = Preconditions.checkNotNull(SecurityUtils.getUser(subject));var explicitException = ExceptionUtils.find(e, ExplicitException.class);