diff --git a/core/src/main/java/com/google/adk/events/Event.java b/core/src/main/java/com/google/adk/events/Event.java index 6288964be..df93859b3 100644 --- a/core/src/main/java/com/google/adk/events/Event.java +++ b/core/src/main/java/com/google/adk/events/Event.java @@ -37,7 +37,9 @@ import com.google.genai.types.FunctionResponse; import com.google.genai.types.GenerateContentResponseUsageMetadata; import com.google.genai.types.GroundingMetadata; +import com.google.genai.types.LiveServerGoAway; import com.google.genai.types.Transcription; +import com.google.genai.types.VoiceActivity; import java.time.InstantSource; import java.util.List; import java.util.Objects; @@ -70,6 +72,8 @@ public class Event extends JsonBaseModel { private @Nullable String modelVersion; private @Nullable Transcription inputTranscription; private @Nullable Transcription outputTranscription; + private @Nullable LiveServerGoAway goAway; + private @Nullable VoiceActivity voiceActivity; private @Nullable Object output; private @Nullable NodeInfo nodeInfo; private @Nullable CacheMetadata cacheMetadata; @@ -329,6 +333,26 @@ public void setOutputTranscription(@Nullable Transcription outputTranscription) this.outputTranscription = outputTranscription; } + /** A Live server warning that the connection will close; does not complete the model turn. */ + @JsonProperty("goAway") + public Optional goAway() { + return Optional.ofNullable(goAway); + } + + public void setGoAway(@Nullable LiveServerGoAway goAway) { + this.goAway = goAway; + } + + /** A Live server notification that the user has started or stopped speaking. */ + @JsonProperty("voiceActivity") + public Optional voiceActivity() { + return Optional.ofNullable(voiceActivity); + } + + public void setVoiceActivity(@Nullable VoiceActivity voiceActivity) { + this.voiceActivity = voiceActivity; + } + /** * For a workflow node, returns the value handed to successors, distinct from {@link #content()}, * or empty when the event carries no node output. Holds any value Jackson can serialize, such as @@ -436,6 +460,8 @@ public final boolean finalResponse() { } return functionCalls().isEmpty() && functionResponses().isEmpty() + && goAway().isEmpty() + && voiceActivity().isEmpty() && !partial().orElse(false) && !hasTrailingCodeExecutionResult(); } @@ -503,6 +529,8 @@ public static class Builder { private @Nullable String modelVersion; private @Nullable Transcription inputTranscription; private @Nullable Transcription outputTranscription; + private @Nullable LiveServerGoAway goAway; + private @Nullable VoiceActivity voiceActivity; private @Nullable Object output; private @Nullable NodeInfo nodeInfo; private @Nullable CacheMetadata cacheMetadata; @@ -691,6 +719,20 @@ public Builder outputTranscription(@Nullable Transcription value) { return this; } + @CanIgnoreReturnValue + @JsonProperty("goAway") + public Builder goAway(@Nullable LiveServerGoAway value) { + this.goAway = value; + return this; + } + + @CanIgnoreReturnValue + @JsonProperty("voiceActivity") + public Builder voiceActivity(@Nullable VoiceActivity value) { + this.voiceActivity = value; + return this; + } + @Experimental @CanIgnoreReturnValue @JsonProperty("output") @@ -739,6 +781,8 @@ public Event build() { timestamp().orElseGet(() -> InstantSource.system().instant().toEpochMilli())); event.setInputTranscription(inputTranscription); event.setOutputTranscription(outputTranscription); + event.setGoAway(goAway); + event.setVoiceActivity(voiceActivity); event.setOutput(output); event.setNodeInfo(nodeInfo); event.setCacheMetadata(cacheMetadata); @@ -779,6 +823,8 @@ public Builder toBuilder() { .modelVersion(this.modelVersion) .inputTranscription(this.inputTranscription) .outputTranscription(this.outputTranscription) + .goAway(this.goAway) + .voiceActivity(this.voiceActivity) .output(this.output) .nodeInfo(this.nodeInfo) .cacheMetadata(this.cacheMetadata) @@ -815,6 +861,8 @@ public boolean equals(Object obj) { && Objects.equals(modelVersion, other.modelVersion) && Objects.equals(inputTranscription, other.inputTranscription) && Objects.equals(outputTranscription, other.outputTranscription) + && Objects.equals(goAway, other.goAway) + && Objects.equals(voiceActivity, other.voiceActivity) && Objects.equals(output, other.output) && Objects.equals(nodeInfo, other.nodeInfo) && Objects.equals(cacheMetadata, other.cacheMetadata); @@ -849,6 +897,8 @@ public int hashCode() { modelVersion, inputTranscription, outputTranscription, + goAway, + voiceActivity, output, nodeInfo, cacheMetadata, diff --git a/core/src/main/java/com/google/adk/flows/llmflows/BaseLlmFlow.java b/core/src/main/java/com/google/adk/flows/llmflows/BaseLlmFlow.java index 7df495834..e8959f949 100644 --- a/core/src/main/java/com/google/adk/flows/llmflows/BaseLlmFlow.java +++ b/core/src/main/java/com/google/adk/flows/llmflows/BaseLlmFlow.java @@ -776,6 +776,8 @@ private Flowable buildPostprocessingEvents( || updatedResponse.usageMetadata().isEmpty()) && updatedResponse.inputTranscription().isEmpty() && updatedResponse.outputTranscription().isEmpty() + && updatedResponse.goAway().isEmpty() + && updatedResponse.voiceActivity().isEmpty() && updatedResponse.groundingMetadata().isEmpty()) { return processorEvents; } @@ -931,6 +933,8 @@ private Event buildModelResponseEvent( .modelVersion(llmResponse.modelVersion().orElse(null)) .inputTranscription(llmResponse.inputTranscription().orElse(null)) .outputTranscription(llmResponse.outputTranscription().orElse(null)) + .goAway(llmResponse.goAway().orElse(null)) + .voiceActivity(llmResponse.voiceActivity().orElse(null)) .cacheMetadata(llmResponse.cacheMetadata().orElse(null)); Event event = eventBuilder.build(); diff --git a/core/src/main/java/com/google/adk/models/GeminiLlmConnection.java b/core/src/main/java/com/google/adk/models/GeminiLlmConnection.java index de044c1e7..7f19e2d03 100644 --- a/core/src/main/java/com/google/adk/models/GeminiLlmConnection.java +++ b/core/src/main/java/com/google/adk/models/GeminiLlmConnection.java @@ -180,6 +180,30 @@ static Observable convertToServerResponse( handled.set(true); }); + message + .goAway() + .ifPresent( + goAway -> { + emitter.onNext(LlmResponse.builder().goAway(goAway).build()); + handled.set(true); + }); + message + .voiceActivity() + .ifPresent( + voiceActivity -> { + emitter.onNext(LlmResponse.builder().voiceActivity(voiceActivity).build()); + handled.set(true); + }); + message + .voiceActivityDetectionSignal() + .ifPresent( + signal -> { + // This lower-level VAD signal has no ADK event representation. Recognize it + // without treating it as an error or as the end of the model turn. + logger.debug("Received voice activity detection signal: {}", signal); + handled.set(true); + }); + if (!handled.get()) { logger.warn("Received unknown or empty server message."); emitter.onNext(createUnknownMessageResponse()); diff --git a/core/src/main/java/com/google/adk/models/LlmResponse.java b/core/src/main/java/com/google/adk/models/LlmResponse.java index 424e9e570..deae5dfd1 100644 --- a/core/src/main/java/com/google/adk/models/LlmResponse.java +++ b/core/src/main/java/com/google/adk/models/LlmResponse.java @@ -31,7 +31,9 @@ import com.google.genai.types.GenerateContentResponsePromptFeedback; import com.google.genai.types.GenerateContentResponseUsageMetadata; import com.google.genai.types.GroundingMetadata; +import com.google.genai.types.LiveServerGoAway; import com.google.genai.types.Transcription; +import com.google.genai.types.VoiceActivity; import java.util.List; import java.util.Optional; import org.jspecify.annotations.Nullable; @@ -130,6 +132,14 @@ public abstract class LlmResponse extends JsonBaseModel { @JsonProperty("outputTranscription") public abstract Optional outputTranscription(); + /** A Live server warning that the connection will close; does not complete the model turn. */ + @JsonProperty("goAway") + public abstract Optional goAway(); + + /** A Live server notification that the user has started or stopped speaking. */ + @JsonProperty("voiceActivity") + public abstract Optional voiceActivity(); + /** Context cache state for this response; set only when context caching is enabled. */ @JsonProperty("cacheMetadata") public abstract Optional cacheMetadata(); @@ -189,6 +199,12 @@ public abstract Builder usageMetadata( @JsonProperty("outputTranscription") public abstract Builder outputTranscription(@Nullable Transcription outputTranscription); + @JsonProperty("goAway") + public abstract Builder goAway(@Nullable LiveServerGoAway goAway); + + @JsonProperty("voiceActivity") + public abstract Builder voiceActivity(@Nullable VoiceActivity voiceActivity); + @JsonProperty("cacheMetadata") public abstract Builder cacheMetadata(@Nullable CacheMetadata cacheMetadata); diff --git a/core/src/test/java/com/google/adk/events/EventTest.java b/core/src/test/java/com/google/adk/events/EventTest.java index 349118e6b..fb8adefe8 100644 --- a/core/src/test/java/com/google/adk/events/EventTest.java +++ b/core/src/test/java/com/google/adk/events/EventTest.java @@ -28,8 +28,11 @@ import com.google.genai.types.FinishReason; import com.google.genai.types.FunctionCall; import com.google.genai.types.GenerateContentResponseUsageMetadata; +import com.google.genai.types.LiveServerGoAway; import com.google.genai.types.Part; import com.google.genai.types.Transcription; +import com.google.genai.types.VoiceActivity; +import java.time.Duration; import java.time.Instant; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -111,6 +114,68 @@ public void event_builder_works() { assertThat(EVENT.modelVersion()).hasValue("model_version"); } + @Test + public void event_liveControlFields_roundTripAndCopy_preservePayloads() { + LiveServerGoAway goAway = LiveServerGoAway.builder().timeLeft(Duration.ofMillis(30500)).build(); + VoiceActivity voiceActivity = + VoiceActivity.builder() + .voiceActivityType("ACTIVITY_END") + .audioOffset(Duration.ofMillis(1250)) + .build(); + Event event = EVENT.toBuilder().goAway(goAway).voiceActivity(voiceActivity).build(); + + Event restored = Event.fromJson(event.toJson()); + assertThat(restored).isEqualTo(event); + assertThat(restored.goAway()).hasValue(goAway); + assertThat(restored.voiceActivity()).hasValue(voiceActivity); + Event copied = event.toBuilder().build(); + assertThat(copied).isEqualTo(event); + assertThat(copied.hashCode()).isEqualTo(event.hashCode()); + assertThat(copied.toBuilder().goAway(null).voiceActivity(null).build()).isEqualTo(EVENT); + } + + @Test + public void event_liveControlFields_defaultAndNull_areAbsent() { + for (String json : ImmutableList.of("{}", "{\"goAway\":null,\"voiceActivity\":null}")) { + Event event = Event.fromJson(json); + assertThat(event.goAway()).isEmpty(); + assertThat(event.voiceActivity()).isEmpty(); + assertThat(event.toJson()).doesNotContain("\"goAway\""); + assertThat(event.toJson()).doesNotContain("\"voiceActivity\""); + + event.setGoAway(LiveServerGoAway.builder().build()); + event.setVoiceActivity(VoiceActivity.builder().build()); + assertThat(event.goAway()).isPresent(); + assertThat(event.voiceActivity()).isPresent(); + event.setGoAway(null); + event.setVoiceActivity(null); + assertThat(event.goAway()).isEmpty(); + assertThat(event.voiceActivity()).isEmpty(); + } + } + + @Test + public void event_equals_distinguishesLiveControlFields() { + assertThat(EVENT.toBuilder().goAway(LiveServerGoAway.builder().build()).build()) + .isNotEqualTo(EVENT); + assertThat(EVENT.toBuilder().voiceActivity(VoiceActivity.builder().build()).build()) + .isNotEqualTo(EVENT); + } + + @Test + public void event_finalResponse_liveNotifications_areNotFinalAnswers() { + assertThat(Event.builder().goAway(LiveServerGoAway.builder().build()).build().finalResponse()) + .isFalse(); + for (String type : ImmutableList.of("ACTIVITY_START", "ACTIVITY_END")) { + assertThat( + Event.builder() + .voiceActivity(VoiceActivity.builder().voiceActivityType(type).build()) + .build() + .finalResponse()) + .isFalse(); + } + } + @Test public void event_builder_fills_default_actions() { Event event = diff --git a/core/src/test/java/com/google/adk/flows/llmflows/BaseLlmFlowTest.java b/core/src/test/java/com/google/adk/flows/llmflows/BaseLlmFlowTest.java index db17216b1..f0ed80b64 100644 --- a/core/src/test/java/com/google/adk/flows/llmflows/BaseLlmFlowTest.java +++ b/core/src/test/java/com/google/adk/flows/llmflows/BaseLlmFlowTest.java @@ -57,8 +57,10 @@ import com.google.genai.types.FunctionDeclaration; import com.google.genai.types.GenerateContentResponseUsageMetadata; import com.google.genai.types.GroundingMetadata; +import com.google.genai.types.LiveServerGoAway; import com.google.genai.types.Part; import com.google.genai.types.Transcription; +import com.google.genai.types.VoiceActivity; import io.opentelemetry.context.Context; import io.opentelemetry.context.ContextKey; import io.opentelemetry.context.Scope; @@ -1187,6 +1189,37 @@ public void postprocess_onlyInputTranscription_returnsEvent() { assertThat(event.outputTranscription()).isEmpty(); } + @Test + public void postprocess_onlyLiveControlFields_returnsEventsWithoutContent() { + for (LlmResponse response : + ImmutableList.of( + LlmResponse.builder().goAway(LiveServerGoAway.builder().build()).build(), + LlmResponse.builder() + .voiceActivity(VoiceActivity.builder().voiceActivityType("ACTIVITY_START").build()) + .build())) { + InvocationContext context = createInvocationContext(createTestAgent(createTestLlm(response))); + Event baseEvent = + Event.builder() + .invocationId(context.invocationId()) + .author(context.agent().name()) + .build(); + + List events = + createBaseLlmFlowWithoutProcessors() + .postprocess( + context, baseEvent, LlmRequest.builder().build(), response, Context.current()) + .toList() + .blockingGet(); + + Event event = getOnlyElement(events); + assertThat(event.goAway()).isEqualTo(response.goAway()); + assertThat(event.voiceActivity()).isEqualTo(response.voiceActivity()); + assertThat(event.content()).isEmpty(); + assertThat(event.errorCode()).isEmpty(); + assertThat(event.finalResponse()).isFalse(); + } + } + @Test public void postprocess_onlyOutputTranscription_returnsEvent() { Transcription outputTranscription = diff --git a/core/src/test/java/com/google/adk/models/GeminiLlmConnectionTest.java b/core/src/test/java/com/google/adk/models/GeminiLlmConnectionTest.java index aeae0e2e1..9e838d1ea 100644 --- a/core/src/test/java/com/google/adk/models/GeminiLlmConnectionTest.java +++ b/core/src/test/java/com/google/adk/models/GeminiLlmConnectionTest.java @@ -32,6 +32,7 @@ import com.google.genai.types.LiveSendRealtimeInputParameters; import com.google.genai.types.LiveSendToolResponseParameters; import com.google.genai.types.LiveServerContent; +import com.google.genai.types.LiveServerGoAway; import com.google.genai.types.LiveServerMessage; import com.google.genai.types.LiveServerSetupComplete; import com.google.genai.types.LiveServerToolCall; @@ -39,8 +40,11 @@ import com.google.genai.types.Part; import com.google.genai.types.Transcription; import com.google.genai.types.UsageMetadata; +import com.google.genai.types.VoiceActivity; +import com.google.genai.types.VoiceActivityDetectionSignal; import io.reactivex.rxjava3.observers.TestObserver; import io.reactivex.rxjava3.subscribers.TestSubscriber; +import java.time.Duration; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CompletableFuture; @@ -55,6 +59,160 @@ @RunWith(JUnit4.class) public final class GeminiLlmConnectionTest { + @Test + public void convertToServerResponse_goAway_isNotAnError() { + LiveServerMessage message = + LiveServerMessage.builder() + .goAway(LiveServerGoAway.builder().timeLeft(Duration.ofSeconds(30)).build()) + .build(); + + TestObserver observer = + GeminiLlmConnection.convertToServerResponse(message, new PendingText()).test(); + + observer.assertComplete().assertNoErrors().assertValueCount(1); + LlmResponse response = getOnlyElement(observer.values()); + assertThat(response.errorCode()).isEmpty(); + assertThat(response.errorMessage()).isEmpty(); + assertThat(response.goAway()).isEqualTo(message.goAway()); + assertThat(response.content()).isEmpty(); + assertThat(response.turnComplete().orElse(false)).isFalse(); + } + + @Test + public void convertToServerResponse_voiceActivity_isNotAnError() { + for (String type : ImmutableList.of("ACTIVITY_START", "ACTIVITY_END")) { + LiveServerMessage message = + LiveServerMessage.builder() + .voiceActivity(VoiceActivity.builder().voiceActivityType(type).build()) + .build(); + + TestObserver observer = + GeminiLlmConnection.convertToServerResponse(message, new PendingText()).test(); + + observer.assertComplete().assertNoErrors().assertValueCount(1); + LlmResponse response = getOnlyElement(observer.values()); + assertThat(response.errorCode()).isEmpty(); + assertThat(response.errorMessage()).isEmpty(); + assertThat(response.voiceActivity()).isEqualTo(message.voiceActivity()); + assertThat(response.content()).isEmpty(); + assertThat(response.turnComplete().orElse(false)).isFalse(); + } + } + + @Test + public void convertToServerResponse_voiceActivityDetectionSignal_isIgnored() { + LiveServerMessage message = + LiveServerMessage.builder() + .voiceActivityDetectionSignal( + VoiceActivityDetectionSignal.builder().vadSignalType("VAD_SIGNAL_TYPE_SOS").build()) + .build(); + + GeminiLlmConnection.convertToServerResponse(message, new PendingText()).test().assertResult(); + } + + @Test + public void convertToServerResponse_controlMessages_preserveEmptyPayloads() { + LiveServerGoAway goAway = LiveServerGoAway.builder().build(); + VoiceActivity voiceActivity = VoiceActivity.builder().build(); + LiveServerMessage message = + LiveServerMessage.builder().goAway(goAway).voiceActivity(voiceActivity).build(); + + TestObserver observer = + GeminiLlmConnection.convertToServerResponse(message, new PendingText()).test(); + + observer.assertComplete().assertNoErrors().assertValueCount(2); + assertThat(observer.values().get(0).goAway()).hasValue(goAway); + assertThat(observer.values().get(1).voiceActivity()).hasValue(voiceActivity); + for (LlmResponse response : observer.values()) { + assertThat(response.errorCode()).isEmpty(); + } + } + + @Test + public void convertToServerResponse_controlsAlongsideContentAndUsage_preservesAllFields() { + LiveServerGoAway goAway = LiveServerGoAway.builder().timeLeft(Duration.ofSeconds(30)).build(); + VoiceActivity voiceActivity = VoiceActivity.builder().voiceActivityType("ACTIVITY_END").build(); + LiveServerMessage message = + LiveServerMessage.builder() + .serverContent( + LiveServerContent.builder().modelTurn(modelContent(Part.fromText("Hello"))).build()) + .usageMetadata(UsageMetadata.builder().totalTokenCount(7).build()) + .goAway(goAway) + .voiceActivity(voiceActivity) + .voiceActivityDetectionSignal( + VoiceActivityDetectionSignal.builder().vadSignalType("VAD_SIGNAL_TYPE_EOS").build()) + .build(); + + TestObserver observer = + GeminiLlmConnection.convertToServerResponse(message, new PendingText()).test(); + + observer.assertComplete().assertNoErrors().assertValueCount(4); + assertThat(observer.values().get(0).content().get().text()).isEqualTo("Hello"); + assertThat(observer.values().get(1).usageMetadata().get().totalTokenCount()).hasValue(7); + assertThat(observer.values().get(2).goAway()).hasValue(goAway); + assertThat(observer.values().get(3).voiceActivity()).hasValue(voiceActivity); + for (LlmResponse response : observer.values()) { + assertThat(response.errorCode()).isEmpty(); + } + } + + @Test + public void convertToServerResponse_controlMessages_doNotFlushPendingText() { + PendingText pendingText = new PendingText(); + List responses = new ArrayList<>(); + for (LiveServerMessage message : + ImmutableList.of( + modelTurn(Part.fromText("Hel")), + LiveServerMessage.builder() + .goAway(LiveServerGoAway.builder().timeLeft(Duration.ofSeconds(30)).build()) + .voiceActivity(VoiceActivity.builder().voiceActivityType("ACTIVITY_START").build()) + .build(), + serverContent( + LiveServerContent.builder() + .modelTurn(modelContent(Part.fromText("lo"))) + .turnComplete(true)))) { + responses.addAll( + GeminiLlmConnection.convertToServerResponse(message, pendingText).toList().blockingGet()); + } + + assertThat(responses).hasSize(5); + assertThat(responses.get(0).partial()).hasValue(true); + assertThat(responses.get(1).goAway()).isPresent(); + assertThat(responses.get(2).voiceActivity()).isPresent(); + assertThat(responses.get(3).content().get().text()).isEqualTo("Hello"); + assertThat(responses.get(3).partial()).hasValue(false); + assertThat(responses.get(4).turnComplete()).hasValue(true); + } + + @Test + public void receive_goAway_doesNotCloseConnectionOrStopLaterResponses() { + CompletableFuture future = new CompletableFuture<>(); + GeminiLlmConnection connection = new GeminiLlmConnection(future); + TestSubscriber subscriber = connection.receive().test(); + FakeTransport transport = + new FakeTransport( + /* endStreamOnReceive= */ false, + ImmutableList.of( + LiveServerMessage.builder() + .goAway(LiveServerGoAway.builder().timeLeft(Duration.ofSeconds(30)).build()) + .build(), + serverContent( + LiveServerContent.builder() + .modelTurn(modelContent(Part.fromText("Still connected"))) + .turnComplete(true)))); + try { + future.complete(transport); + subscriber.awaitCount(3).assertNoErrors().assertNotComplete().assertValueCount(3); + + assertThat(subscriber.values().get(0).goAway()).isPresent(); + assertThat(subscriber.values().get(1).content().get().text()).isEqualTo("Still connected"); + assertThat(subscriber.values().get(2).turnComplete()).hasValue(true); + assertThat(transport.closeCount.get()).isEqualTo(0); + } finally { + connection.close(); + } + } + @Test public void sendContent_withoutPartial_completesTurn() { Content content = Content.fromParts(Part.fromText("complete input")); diff --git a/core/src/test/java/com/google/adk/models/LlmResponseTest.java b/core/src/test/java/com/google/adk/models/LlmResponseTest.java index c930f73b5..cc265736a 100644 --- a/core/src/test/java/com/google/adk/models/LlmResponseTest.java +++ b/core/src/test/java/com/google/adk/models/LlmResponseTest.java @@ -29,8 +29,11 @@ import com.google.genai.types.FunctionCall; import com.google.genai.types.GenerateContentResponse; import com.google.genai.types.GenerateContentResponseUsageMetadata; +import com.google.genai.types.LiveServerGoAway; import com.google.genai.types.Part; import com.google.genai.types.Transcription; +import com.google.genai.types.VoiceActivity; +import java.time.Duration; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -50,6 +53,46 @@ private Content createSampleContent(String text) { return Content.builder().parts(ImmutableList.of(Part.fromText(text))).build(); } + @Test + public void liveControlFields_roundTripAndCopy_preservePayloads() throws JsonProcessingException { + LiveServerGoAway goAway = LiveServerGoAway.builder().timeLeft(Duration.ofMillis(30500)).build(); + VoiceActivity voiceActivity = + VoiceActivity.builder() + .voiceActivityType("ACTIVITY_START") + .audioOffset(Duration.ofMillis(1250)) + .build(); + LlmResponse response = + LlmResponse.builder().goAway(goAway).voiceActivity(voiceActivity).build(); + + String json = response.toJson(); + JsonNode node = objectMapper.readTree(json); + assertThat(node.has("goAway")).isTrue(); + assertThat(node.get("goAway").has("timeLeft")).isTrue(); + assertThat(node.get("voiceActivity").get("voiceActivityType").asText()) + .isEqualTo("ACTIVITY_START"); + assertThat(node.has("errorCode")).isFalse(); + LlmResponse restored = LlmResponse.fromJsonString(json, LlmResponse.class); + assertThat(restored).isEqualTo(response); + assertThat(restored.goAway()).hasValue(goAway); + assertThat(restored.voiceActivity()).hasValue(voiceActivity); + assertThat(response.toBuilder().build()).isEqualTo(response); + assertThat(response.toBuilder().goAway(null).voiceActivity(null).build()) + .isEqualTo(LlmResponse.builder().build()); + } + + @Test + public void liveControlFields_missingOrNull_remainOptional() throws JsonProcessingException { + for (String json : ImmutableList.of("{}", "{\"goAway\":null,\"voiceActivity\":null}")) { + LlmResponse response = LlmResponse.fromJsonString(json, LlmResponse.class); + + assertThat(response.goAway()).isEmpty(); + assertThat(response.voiceActivity()).isEmpty(); + JsonNode node = objectMapper.readTree(response.toJson()); + assertThat(node.has("goAway")).isFalse(); + assertThat(node.has("voiceActivity")).isFalse(); + } + } + private Content createSampleFunctionCallContent(String functionName) { return Content.builder() .parts( diff --git a/core/src/test/java/com/google/adk/runner/RunnerTest.java b/core/src/test/java/com/google/adk/runner/RunnerTest.java index 5a704aa96..183129db4 100644 --- a/core/src/test/java/com/google/adk/runner/RunnerTest.java +++ b/core/src/test/java/com/google/adk/runner/RunnerTest.java @@ -100,10 +100,12 @@ import com.google.genai.types.FunctionDeclaration; import com.google.genai.types.FunctionResponse; import com.google.genai.types.GenerateContentResponseUsageMetadata; +import com.google.genai.types.LiveServerGoAway; import com.google.genai.types.Part; import com.google.genai.types.PartialArg; import com.google.genai.types.Schema; import com.google.genai.types.Transcription; +import com.google.genai.types.VoiceActivity; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.context.Context; @@ -118,6 +120,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers; import io.reactivex.rxjava3.subjects.PublishSubject; import io.reactivex.rxjava3.subscribers.TestSubscriber; +import java.time.Duration; import java.time.Instant; import java.time.InstantSource; import java.util.ArrayList; @@ -2440,6 +2443,56 @@ public void runLive_success() throws Exception { assertThat(simplifyEvents(testSubscriber.values())).containsExactly("test agent: from llm"); } + @Test + public void runLive_controlMessages_reachCallerAndDoNotEndTheTurn() { + LiveServerGoAway goAway = LiveServerGoAway.builder().timeLeft(Duration.ofSeconds(30)).build(); + VoiceActivity start = VoiceActivity.builder().voiceActivityType("ACTIVITY_START").build(); + VoiceActivity end = VoiceActivity.builder().voiceActivityType("ACTIVITY_END").build(); + Content content = createContent("The connection is still usable."); + TestLlm liveLlm = + createTestLlm( + LlmResponse.builder().voiceActivity(start).build(), + LlmResponse.builder().goAway(goAway).build(), + LlmResponse.builder().voiceActivity(end).build(), + LlmResponse.builder().content(content).turnComplete(true).build()); + Runner liveRunner = + Runner.builder() + .app( + App.builder() + .name("test") + .rootAgent(createTestAgentBuilder(liveLlm).executor(Runnable::run).build()) + .build()) + .build(); + Session liveSession = liveRunner.sessionService().createSession("test", "user").blockingGet(); + LiveRequestQueue queue = new LiveRequestQueue(); + try { + TestSubscriber subscriber = + liveRunner + .runLive( + liveSession, + queue, + RunConfig.builder().setStreamingMode(RunConfig.StreamingMode.BIDI).build()) + .test(); + subscriber.awaitDone(5, SECONDS).assertComplete().assertNoErrors().assertValueCount(4); + + List events = subscriber.values(); + assertThat(events.get(0).voiceActivity()).hasValue(start); + assertThat(events.get(1).goAway()).hasValue(goAway); + assertThat(events.get(2).voiceActivity()).hasValue(end); + for (Event event : events.subList(0, 3)) { + assertThat(event.content()).isEmpty(); + assertThat(event.errorCode()).isEmpty(); + assertThat(event.finalResponse()).isFalse(); + assertThat(event.turnComplete().orElse(false)).isFalse(); + } + assertThat(events.get(3).content()).hasValue(content); + assertThat(events.get(3).turnComplete()).hasValue(true); + assertThat(events.get(3).finalResponse()).isTrue(); + } finally { + queue.close(); + } + } + // Each runLive opens a new connection and sends it the session's stored history. @Test public void runLive_newConnection_sendsStoredTranscriptionsAsHistory() throws Exception {