fix: support non-map return values returned from Function Tools by automatically wrapping them into {"result": <value>}

Rationale: https://google.github.io/adk-docs/tools-custom/function-tools/#return-type
PiperOrigin-RevId: 840105092

Author: Mateusz Krawiec

core/src/main/java/com/google/adk/runner/Runner.java

@@ -514,10 +514,12 @@ public Flowable<Event> runLive(
                   .agent()
                   .runLive(invocationContext)
                   .doOnNext(event -> this.sessionService.appendEvent(session, event))
-                  .doOnError(
+                  .onErrorResumeNext(
                       throwable -> {
                         span.setStatus(StatusCode.ERROR, "Error in runLive Flowable execution");
                         span.recordException(throwable);
+                        span.end();
+                        return Flowable.error(throwable);
                       }));
     } catch (Throwable t) {
       span.setStatus(StatusCode.ERROR, "Error during runLive synchronous setup");

core/src/main/java/com/google/adk/tools/FunctionTool.java

@@ -238,8 +238,15 @@ private Maybe<Map<String, Object>> call(Map<String, Object> args, ToolContext to
               data -> OBJECT_MAPPER.convertValue(data, new TypeReference<Map<String, Object>>() {}))
           .toMaybe();
     } else {
-      return Maybe.just(
-          OBJECT_MAPPER.convertValue(result, new TypeReference<Map<String, Object>>() {}));
+      try {
+        return Maybe.just(
+            OBJECT_MAPPER.convertValue(result, new TypeReference<Map<String, Object>>() {}));
+      } catch (IllegalArgumentException e) {
+        // Conversion to map failed, in this case we follow
+        // https://google.github.io/adk-docs/tools-custom/function-tools/#return-type and return
+        // the { "result": $result }
+        return Maybe.just(ImmutableMap.of("result", result));
+      }
     }
   }
 

core/src/test/java/com/google/adk/tools/FunctionToolTest.java

@@ -328,6 +328,15 @@ public void call_withPojoParamWithFields() throws Exception {
     assertThat(result).containsExactly("field1", "abc", "field2", 123);
   }
 
+  @Test
+  public void call_withBooleanReturnValue_returnsMapWithResult() throws Exception {
+    FunctionTool tool = FunctionTool.create(Functions.class, "returnsBoolean");
+
+    Map<String, Object> result = tool.runAsync(ImmutableMap.of(), null).blockingGet();
+
+    assertThat(result).containsExactly("result", true);
+  }
+
   @Test
   public void call_withPojoParamWithGettersAndSetters() throws Exception {
     FunctionTool tool = FunctionTool.create(Functions.class, "pojoParamWithGettersAndSetters");
@@ -894,6 +903,10 @@ public static Single<Map<String, Object>> returnsSingleMap() {
       return Single.just(ImmutableMap.of("key", "value"));
     }
 
+    public static Boolean returnsBoolean() {
+      return true;
+    }
+
     public static PojoWithGettersAndSetters returnsPojo() {
       PojoWithGettersAndSetters pojo = new PojoWithGettersAndSetters();
       pojo.setField1("abc");

core/src/test/java/com/google/adk/tools/streaming/StreamingToolTest.java

@@ -48,6 +48,9 @@
 @RunWith(JUnit4.class)
 public final class StreamingToolTest {
 
+  private static final RunConfig BIDI_STREAMING_RUN_CONFIG =
+      RunConfig.builder().setStreamingMode(StreamingMode.BIDI).build();
+
   public static final class StreamingTools {
     public static Flowable<ImmutableMap<String, Object>> monitorStockPrice(
         @Schema(name = "stockSymbol") String stockSymbol) {
@@ -130,10 +133,7 @@ public void runLive_asyncFunctionCall_succeeds() throws Exception {
 
     Session session = runner.sessionService().createSession("test-app", "test-user").blockingGet();
     List<Event> resEvents =
-        runner
-            .runLive(session, liveRequestQueue, RunConfig.builder().build())
-            .toList()
-            .blockingGet();
+        runner.runLive(session, liveRequestQueue, BIDI_STREAMING_RUN_CONFIG).toList().blockingGet();
 
     assertThat(resEvents).isNotNull();
     assertThat(resEvents).isNotEmpty();
@@ -215,10 +215,7 @@ public void runLive_functionCall_returnsErrors() throws Exception {
 
     Session session = runner.sessionService().createSession("test-app", "test-user").blockingGet();
     List<Event> resEvents =
-        runner
-            .runLive(session, liveRequestQueue, RunConfig.builder().build())
-            .toList()
-            .blockingGet();
+        runner.runLive(session, liveRequestQueue, BIDI_STREAMING_RUN_CONFIG).toList().blockingGet();
 
     assertThat(resEvents).isNotNull();
     assertThat(resEvents).isNotEmpty();
@@ -301,13 +298,7 @@ public void runLive_videoStreamingTool_receivesVideoFramesAndSendsResultsToLlm()
 
     // Run the agent and collect events.
     List<Event> resEvents =
-        runner
-            .runLive(
-                session,
-                liveRequestQueue,
-                RunConfig.builder().setStreamingMode(StreamingMode.BIDI).build())
-            .toList()
-            .blockingGet();
+        runner.runLive(session, liveRequestQueue, BIDI_STREAMING_RUN_CONFIG).toList().blockingGet();
 
     // Wait for the tool to send its 3 results back to the LLM
     assertThat(testLlm.waitForStreamingToolResults("monitorVideoStream", 3, Duration.ofSeconds(20)))
@@ -409,10 +400,7 @@ public void runLive_stopStreamingTool() throws Exception {
 
     Session session = runner.sessionService().createSession("test-app", "test-user").blockingGet();
     List<Event> resEvents =
-        runner
-            .runLive(session, liveRequestQueue, RunConfig.builder().build())
-            .toList()
-            .blockingGet();
+        runner.runLive(session, liveRequestQueue, BIDI_STREAMING_RUN_CONFIG).toList().blockingGet();
 
     assertThat(resEvents).isNotNull();
     assertThat(resEvents.size()).isAtLeast(1);
@@ -502,13 +490,7 @@ public void runLive_streamingTool_responsesAreSentAsUserContentToLlm() throws Ex
     Session session = runner.sessionService().createSession("test-app", "test-user").blockingGet();
 
     List<Event> resEvents =
-        runner
-            .runLive(
-                session,
-                liveRequestQueue,
-                RunConfig.builder().setStreamingMode(StreamingMode.BIDI).build())
-            .toList()
-            .blockingGet();
+        runner.runLive(session, liveRequestQueue, BIDI_STREAMING_RUN_CONFIG).toList().blockingGet();
 
     assertThat(resEvents).isNotNull();
     assertThat(resEvents).isNotEmpty();