fix: workaround for the client config streaming settings are not respected (#983)

google-genai-bot · copybara-github · commit 3ba04d33dc8f · 2026-03-18T08:00:41.000-07:00
PiperOrigin-RevId: 885595843
diff --git a/a2a/src/main/java/com/google/adk/a2a/agent/RemoteA2AAgent.java b/a2a/src/main/java/com/google/adk/a2a/agent/RemoteA2AAgent.java
@@ -117,7 +117,7 @@ private RemoteA2AAgent(Builder builder) {
     if (this.description.isEmpty() && this.agentCard.description() != null) {
       this.description = this.agentCard.description();
     }
-    this.streaming = this.agentCard.capabilities().streaming();
+    this.streaming = builder.streaming && this.agentCard.capabilities().streaming();
   }
 
   public static Builder builder() {
@@ -133,6 +133,13 @@ public static class Builder {
     private List<? extends BaseAgent> subAgents;
     private List<Callbacks.BeforeAgentCallback> beforeAgentCallback;
     private List<Callbacks.AfterAgentCallback> afterAgentCallback;
+    private boolean streaming;
+
+    @CanIgnoreReturnValue
+    public Builder streaming(boolean streaming) {
+      this.streaming = streaming;
+      return this;
+    }
 
     @CanIgnoreReturnValue
     public Builder name(String name) {
@@ -181,6 +188,10 @@ public RemoteA2AAgent build() {
     }
   }
 
+  public boolean isStreaming() {
+    return streaming;
+  }
+
   private Message.Builder newA2AMessage(Message.Role role, List<io.a2a.spec.Part<?>> parts) {
     return new Message.Builder().messageId(UUID.randomUUID().toString()).role(role).parts(parts);
   }
diff --git a/a2a/src/test/java/com/google/adk/a2a/agent/RemoteA2AAgentTest.java b/a2a/src/test/java/com/google/adk/a2a/agent/RemoteA2AAgentTest.java
@@ -113,6 +113,20 @@ public void setUp() {
             .build();
   }
 
+  @Test
+  public void createAgent_streaming_false_returnsNonStreamingAgent() {
+    // With streaming false, the agent should not stream even if the AgentCard supports streaming.
+    RemoteA2AAgent agent = getAgentBuilder().streaming(false).build();
+    assertThat(agent.isStreaming()).isFalse();
+  }
+
+  @Test
+  public void createAgent_streaming_true_returnsStreamingAgent() {
+    // With streaming true, the agent should support streaming if the AgentCard supports streaming.
+    RemoteA2AAgent agent = getAgentBuilder().streaming(true).build();
+    assertThat(agent.isStreaming()).isTrue();
+  }
+
   @Test
   public void runAsync_aggregatesPartialEvents() {
     RemoteA2AAgent agent = createAgent();
@@ -763,7 +777,7 @@ private RemoteA2AAgent.Builder getAgentBuilder() {
   }
 
   private RemoteA2AAgent createAgent() {
-    return getAgentBuilder().build();
+    return getAgentBuilder().streaming(true).build();
   }
 
   @SuppressWarnings("unchecked") // cast for Mockito

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ private RemoteA2AAgent(Builder builder) {`
`117`	`117`	`if (this.description.isEmpty() && this.agentCard.description() != null) {`
`118`	`118`	`this.description = this.agentCard.description();`
`119`	`119`	`}`
`120`		`- this.streaming = this.agentCard.capabilities().streaming();`
	`120`	`+ this.streaming = builder.streaming && this.agentCard.capabilities().streaming();`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`public static Builder builder() {`
`@@ -133,6 +133,13 @@ public static class Builder {`
`133`	`133`	`private List<? extends BaseAgent> subAgents;`
`134`	`134`	`private List<Callbacks.BeforeAgentCallback> beforeAgentCallback;`
`135`	`135`	`private List<Callbacks.AfterAgentCallback> afterAgentCallback;`
	`136`	`+ private boolean streaming;`
	`137`	`+`
	`138`	`+ @CanIgnoreReturnValue`
	`139`	`+ public Builder streaming(boolean streaming) {`
	`140`	`+ this.streaming = streaming;`
	`141`	`+ return this;`
	`142`	`+ }`
`136`	`143`
`137`	`144`	`@CanIgnoreReturnValue`
`138`	`145`	`public Builder name(String name) {`
`@@ -181,6 +188,10 @@ public RemoteA2AAgent build() {`
`181`	`188`	`}`
`182`	`189`	`}`
`183`	`190`
	`191`	`+ public boolean isStreaming() {`
	`192`	`+ return streaming;`
	`193`	`+ }`
	`194`	`+`
`184`	`195`	`private Message.Builder newA2AMessage(Message.Role role, List<io.a2a.spec.Part<?>> parts) {`
`185`	`196`	`return new Message.Builder().messageId(UUID.randomUUID().toString()).role(role).parts(parts);`
`186`	`197`	`}`