Merge pull request #1904 from ejstuart/fix-exception-in-tool

Fix exception rethrow in tool executor

Author: geoand

core/deployment/src/test/java/io/quarkiverse/langchain4j/test/ToolExecutorTest.java

@@ -292,7 +292,7 @@ private ToolExecutor getToolExecutor(String methodName) {
                 toolExecutor = new QuarkusToolExecutor(
                         new QuarkusToolExecutor.Context(testTool, invokerClassName, methodCreateInfo.methodName(),
                                 methodCreateInfo.argumentMapperClassName(), methodCreateInfo.executionModel(),
-                                methodCreateInfo.returnBehavior()));
+                                methodCreateInfo.returnBehavior(), false));
                 break;
             }
         }

core/runtime/src/main/java/io/quarkiverse/langchain4j/runtime/ToolsRecorder.java

@@ -53,7 +53,7 @@ public static void populateToolMetadata(Collection<Object> objectsWithTools, Lis
                 QuarkusToolExecutor.Context executorContext = new QuarkusToolExecutor.Context(objectWithTool,
                         invokerClassName, methodCreateInfo.methodName(),
                         methodCreateInfo.argumentMapperClassName(), methodCreateInfo.executionModel(),
-                        methodCreateInfo.returnBehavior());
+                        methodCreateInfo.returnBehavior(), false);
                 toolExecutors.put(toolSpecification.name(), toolExecutorFactory.create(executorContext));
             }
         }

core/runtime/src/main/java/io/quarkiverse/langchain4j/runtime/devui/ChatJsonRPCService.java

@@ -117,7 +117,7 @@ public ChatJsonRPCService(@All List<ChatModel> models, // don't use ChatModel mo
                     QuarkusToolExecutor.Context executorContext = new QuarkusToolExecutor.Context(objectWithTool,
                             methodCreateInfo.invokerClassName(), methodCreateInfo.methodName(),
                             methodCreateInfo.argumentMapperClassName(), methodCreateInfo.executionModel(),
-                            methodCreateInfo.returnBehavior());
+                            methodCreateInfo.returnBehavior(), false);
                     toolExecutors.put(methodCreateInfo.toolSpecification().name(),
                             toolExecutorFactory.create(executorContext));
                     toolSpecifications.add(methodCreateInfo.toolSpecification());

core/runtime/src/main/java/io/quarkiverse/langchain4j/runtime/tool/QuarkusToolExecutor.java

@@ -13,6 +13,7 @@
 
 import dev.langchain4j.agent.tool.ReturnBehavior;
 import dev.langchain4j.agent.tool.ToolExecutionRequest;
+import dev.langchain4j.exception.ToolExecutionException;
 import dev.langchain4j.internal.Json;
 import dev.langchain4j.invocation.InvocationContext;
 import dev.langchain4j.service.tool.ToolExecutionResult;
@@ -29,7 +30,8 @@ public class QuarkusToolExecutor implements ToolExecutor {
     private final Context context;
 
     public record Context(Object tool, String toolInvokerName, String methodName, String argumentMapperClassName,
-            ToolMethodCreateInfo.ExecutionModel executionModel, ReturnBehavior returnBehavior) {
+            ToolMethodCreateInfo.ExecutionModel executionModel, ReturnBehavior returnBehavior,
+            boolean propagateToolExecutionExceptions) {
     }
 
     public interface Wrapper {
@@ -107,7 +109,7 @@ private ToolExecutionResult invoke(Object[] params, ToolInvoker invokerInstance)
             String result;
             if (invocationResult instanceof Uni<?>) { // TODO CS
                 if (io.vertx.core.Context.isOnEventLoopThread()) {
-                    throw new IllegalStateException(
+                    throw new ToolExecutionException(
                             "Cannot execute tools returning Uni on event loop thread due to a tool executor limitation");
                 }
                 result = handleResult(invokerInstance, ((Uni<?>) invocationResult).await().indefinitely());
@@ -116,12 +118,11 @@ private ToolExecutionResult invoke(Object[] params, ToolInvoker invokerInstance)
             }
             log.debugv("Tool execution result: {0}", result);
             return ToolExecutionResult.builder().result(invocationResult).resultText(result).build();
+        } catch (ToolExecutionException e) {
+            throw e;
         } catch (Exception e) {
-            if (e instanceof IllegalArgumentException) {
-                throw (IllegalArgumentException) e;
-            }
-            if (e instanceof IllegalStateException) {
-                throw (IllegalStateException) e;
+            if (context.propagateToolExecutionExceptions) {
+                throw new ToolExecutionException(e);
             }
             log.error("Error while executing tool '" + context.tool.getClass() + "'", e);
             return ToolExecutionResult.builder().isError(true).resultText(e.getMessage()).build();