state() {
return state;
}
diff --git a/core/src/main/java/com/google/adk/tools/SetModelResponseTool.java b/core/src/main/java/com/google/adk/tools/SetModelResponseTool.java
new file mode 100644
index 000000000..e23d6414a
--- /dev/null
+++ b/core/src/main/java/com/google/adk/tools/SetModelResponseTool.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2026 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.adk.tools;
+
+import com.google.genai.types.FunctionDeclaration;
+import com.google.genai.types.Schema;
+import io.reactivex.rxjava3.core.Single;
+import java.util.Map;
+import java.util.Optional;
+import javax.annotation.Nonnull;
+
+/**
+ * Internal tool used for output schema workaround.
+ *
+ * This tool allows the model to set its final response when output_schema is configured
+ * alongside other tools. The model should use this tool to provide its final structured response
+ * instead of outputting text directly.
+ */
+public class SetModelResponseTool extends BaseTool {
+ public static final String NAME = "set_model_response";
+
+ private final Schema outputSchema;
+
+ public SetModelResponseTool(@Nonnull Schema outputSchema) {
+ super(
+ NAME,
+ "Set your final response using the required output schema. "
+ + "After using any other tools needed to complete the task, always call"
+ + " set_model_response with your final answer in the specified schema format.");
+ this.outputSchema = outputSchema;
+ }
+
+ @Override
+ public Optional declaration() {
+ return Optional.of(
+ FunctionDeclaration.builder()
+ .name(name())
+ .description(description())
+ .parameters(outputSchema)
+ .build());
+ }
+
+ @Override
+ public Single> runAsync(Map args, ToolContext toolContext) {
+ // This tool is a marker for the final response, it doesn't do anything but return its arguments
+ // which will be captured as the final result.
+ return Single.just(args);
+ }
+}
diff --git a/core/src/main/java/com/google/adk/utils/ModelNameUtils.java b/core/src/main/java/com/google/adk/utils/ModelNameUtils.java
index c46f6e3a8..cf0f2221e 100644
--- a/core/src/main/java/com/google/adk/utils/ModelNameUtils.java
+++ b/core/src/main/java/com/google/adk/utils/ModelNameUtils.java
@@ -21,6 +21,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+/** Utility class for model names. */
public final class ModelNameUtils {
private static final String GEMINI_PREFIX = "gemini-";
private static final Pattern GEMINI_2_PATTERN = Pattern.compile("^gemini-2\\..*");
@@ -35,11 +36,15 @@ public static boolean isGeminiModel(String modelString) {
}
public static boolean isGemini2Model(String modelString) {
+ return matchesModelPattern(modelString, GEMINI_2_PATTERN);
+ }
+
+ private static boolean matchesModelPattern(String modelString, Pattern pattern) {
if (modelString == null) {
return false;
}
String modelName = extractModelName(modelString);
- return GEMINI_2_PATTERN.matcher(modelName).matches();
+ return pattern.matcher(modelName).matches();
}
/**
@@ -65,6 +70,17 @@ public static boolean isInstanceOfGemini(Object o) {
return false;
}
+ /**
+ * Returns true if the model supports using output schema together with tools.
+ *
+ * @param modelString The model name or path.
+ * @return true if output schema with tools is supported, false otherwise.
+ */
+ public static boolean canUseOutputSchemaWithTools(String modelString) {
+ // Current limitation for Vertex AI 2.x models.
+ return !isGemini2Model(modelString);
+ }
+
/**
* Extract the actual model name from either simple or path-based format.
*
diff --git a/core/src/test/java/com/google/adk/VersionTest.java b/core/src/test/java/com/google/adk/VersionTest.java
index ff7939165..4b6f55c9b 100644
--- a/core/src/test/java/com/google/adk/VersionTest.java
+++ b/core/src/test/java/com/google/adk/VersionTest.java
@@ -18,6 +18,7 @@
import static com.google.common.truth.Truth.assertThat;
+import java.util.regex.Pattern;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -25,6 +26,11 @@
@RunWith(JUnit4.class)
public class VersionTest {
+ // from semver.org
+ private static final Pattern SEM_VER =
+ Pattern.compile(
+ "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$");
+
@Test
public void versionShouldMatchProjectVersion() {
assertThat(Version.JAVA_ADK_VERSION).isNotNull();
@@ -32,6 +38,11 @@ public void versionShouldMatchProjectVersion() {
assertThat(Version.JAVA_ADK_VERSION).isNotEqualTo("unknown");
assertThat(Version.JAVA_ADK_VERSION).isNotEqualTo("${project.version}");
- assertThat(Version.JAVA_ADK_VERSION).matches("\\d+\\.\\d+\\.\\d+(-SNAPSHOT)?");
+ assertThat(Version.JAVA_ADK_VERSION).matches("\\d+\\.\\d+\\.\\d+(-SNAPSHOT|-rc\\.\\d+)?");
+ }
+
+ @Test
+ public void versionShouldFollowSemanticVersioning() {
+ assertThat(Version.JAVA_ADK_VERSION).matches(SEM_VER);
}
}
diff --git a/core/src/test/java/com/google/adk/agents/AgentWithMemoryTest.java b/core/src/test/java/com/google/adk/agents/AgentWithMemoryTest.java
index d5edfc876..361c5eb6b 100644
--- a/core/src/test/java/com/google/adk/agents/AgentWithMemoryTest.java
+++ b/core/src/test/java/com/google/adk/agents/AgentWithMemoryTest.java
@@ -41,7 +41,7 @@ public final class AgentWithMemoryTest {
@Test
public void agentRemembersUserNameWithMemoryTool() throws Exception {
String userId = "test-user";
- String agentName = "test-agent";
+ String agentName = "test_agent";
Part functionCall =
Part.builder()
@@ -101,7 +101,7 @@ public void agentRemembersUserNameWithMemoryTool() throws Exception {
Session updatedSession =
runner
.sessionService()
- .getSession("test-agent", userId, sessionId, Optional.empty())
+ .getSession("test_agent", userId, sessionId, Optional.empty())
.blockingGet();
// Save the updated session to memory so we can bring it up on the next request.
diff --git a/core/src/test/java/com/google/adk/flows/llmflows/OutputSchemaTest.java b/core/src/test/java/com/google/adk/flows/llmflows/OutputSchemaTest.java
new file mode 100644
index 000000000..ffd56de6c
--- /dev/null
+++ b/core/src/test/java/com/google/adk/flows/llmflows/OutputSchemaTest.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright 2026 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.adk.flows.llmflows;
+
+import static com.google.adk.testing.TestUtils.createInvocationContext;
+import static com.google.adk.testing.TestUtils.createTestLlm;
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.adk.agents.InvocationContext;
+import com.google.adk.agents.LlmAgent;
+import com.google.adk.events.Event;
+import com.google.adk.flows.llmflows.RequestProcessor.RequestProcessingResult;
+import com.google.adk.models.LlmRequest;
+import com.google.adk.models.LlmResponse;
+import com.google.adk.testing.TestLlm;
+import com.google.adk.tools.BaseTool;
+import com.google.adk.tools.SetModelResponseTool;
+import com.google.adk.tools.ToolContext;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.genai.types.Content;
+import com.google.genai.types.FunctionResponse;
+import com.google.genai.types.Part;
+import com.google.genai.types.Schema;
+import io.reactivex.rxjava3.core.Single;
+import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public final class OutputSchemaTest {
+
+ private static final Schema TEST_OUTPUT_SCHEMA =
+ Schema.builder()
+ .type("OBJECT")
+ .properties(ImmutableMap.of("field1", Schema.builder().type("STRING").build()))
+ .required(ImmutableList.of("field1"))
+ .build();
+
+ private OutputSchema outputSchemaProcessor;
+ private TestLlm testLlm;
+ private LlmRequest initialRequest;
+
+ @Before
+ public void setUp() {
+ outputSchemaProcessor = new OutputSchema();
+ testLlm = createTestLlm(LlmResponse.builder().build());
+ initialRequest = LlmRequest.builder().model("gemini-2.0-pro").build();
+ }
+
+ public static class TestTool extends BaseTool {
+ public TestTool() {
+ super("test_tool", "test description");
+ }
+
+ @Override
+ public Single> runAsync(Map args, ToolContext toolContext) {
+ return Single.just(ImmutableMap.of());
+ }
+ }
+
+ @Test
+ public void processRequest_noOutputSchema_doesNothing() {
+ LlmAgent agent =
+ LlmAgent.builder()
+ .name("agent")
+ .model(testLlm)
+ .tools(ImmutableList.of(new TestTool()))
+ .build();
+ InvocationContext context = createInvocationContext(agent);
+
+ RequestProcessingResult result =
+ outputSchemaProcessor.processRequest(context, initialRequest).blockingGet();
+
+ assertThat(result.updatedRequest()).isEqualTo(initialRequest);
+ assertThat(result.events()).isEmpty();
+ }
+
+ @Test
+ public void processRequest_noTools_doesNothing() {
+ LlmAgent agent =
+ LlmAgent.builder().name("agent").model(testLlm).outputSchema(TEST_OUTPUT_SCHEMA).build();
+ InvocationContext context = createInvocationContext(agent);
+
+ RequestProcessingResult result =
+ outputSchemaProcessor.processRequest(context, initialRequest).blockingGet();
+
+ assertThat(result.updatedRequest()).isEqualTo(initialRequest);
+ assertThat(result.events()).isEmpty();
+ }
+
+ @Test
+ public void processRequest_withOutputSchemaAndTools_addsSetModelResponseTool() {
+ LlmAgent agent =
+ LlmAgent.builder()
+ .name("agent")
+ .model(testLlm)
+ .outputSchema(TEST_OUTPUT_SCHEMA)
+ .tools(ImmutableList.of(new TestTool()))
+ .build();
+ InvocationContext context = createInvocationContext(agent);
+ LlmRequest requestWithTools =
+ LlmRequest.builder()
+ .model("gemini-2.5-pro")
+ .tools(ImmutableMap.of("test_tool", new TestTool()))
+ .build();
+
+ RequestProcessingResult result =
+ outputSchemaProcessor.processRequest(context, requestWithTools).blockingGet();
+
+ LlmRequest updatedRequest = result.updatedRequest();
+ assertThat(updatedRequest.tools()).hasSize(2);
+ assertThat(
+ updatedRequest.tools().values().stream()
+ .anyMatch(t -> t instanceof SetModelResponseTool))
+ .isTrue();
+ assertThat(updatedRequest.tools().values().stream().anyMatch(t -> t.name().equals("test_tool")))
+ .isTrue();
+ assertThat(updatedRequest.getSystemInstructions()).isNotEmpty();
+ assertThat(updatedRequest.getSystemInstructions().get(0))
+ .contains("you must provide your final response using the set_model_response tool");
+ assertThat(result.events()).isEmpty();
+ }
+
+ @Test
+ public void getStructuredModelResponse_withSetModelResponse_returnsJson() {
+ FunctionResponse fr =
+ FunctionResponse.builder()
+ .name(SetModelResponseTool.NAME)
+ .response(ImmutableMap.of("field1", "value1"))
+ .build();
+ Event event =
+ Event.builder()
+ .content(
+ Content.builder()
+ .parts(Part.builder().functionResponse(fr).build())
+ .role("model")
+ .build())
+ .build();
+
+ assertThat(OutputSchema.getStructuredModelResponse(event)).hasValue("{\"field1\":\"value1\"}");
+ }
+
+ @Test
+ public void getStructuredModelResponse_withoutSetModelResponse_returnsEmpty() {
+ FunctionResponse fr =
+ FunctionResponse.builder()
+ .name("other_tool")
+ .response(ImmutableMap.of("field1", "value1"))
+ .build();
+ Event event =
+ Event.builder()
+ .content(
+ Content.builder()
+ .parts(Part.builder().functionResponse(fr).build())
+ .role("model")
+ .build())
+ .build();
+
+ assertThat(OutputSchema.getStructuredModelResponse(event)).isEmpty();
+ }
+
+ @Test
+ public void createFinalModelResponseEvent_createsModelResponseEvent() {
+ LlmAgent agent = LlmAgent.builder().name("agent").model(testLlm).build();
+ InvocationContext context = createInvocationContext(agent);
+ String jsonResponse = "{\"field1\":\"value1\"}";
+
+ Event event = OutputSchema.createFinalModelResponseEvent(context, jsonResponse);
+
+ assertThat(event.invocationId()).isEqualTo(context.invocationId());
+ assertThat(event.author()).isEqualTo("agent");
+ assertThat(event.content().get().role()).hasValue("model");
+ assertThat(event.content().get().parts().get()).containsExactly(Part.fromText(jsonResponse));
+ }
+}
diff --git a/core/src/test/java/com/google/adk/models/GeminiTest.java b/core/src/test/java/com/google/adk/models/GeminiTest.java
index 07dd675e5..c230f5f68 100644
--- a/core/src/test/java/com/google/adk/models/GeminiTest.java
+++ b/core/src/test/java/com/google/adk/models/GeminiTest.java
@@ -22,6 +22,7 @@
import com.google.genai.types.Content;
import com.google.genai.types.FinishReason;
import com.google.genai.types.GenerateContentResponse;
+import com.google.genai.types.GenerateContentResponseUsageMetadata;
import com.google.genai.types.Part;
import io.reactivex.rxjava3.core.Flowable;
import io.reactivex.rxjava3.functions.Predicate;
@@ -123,6 +124,76 @@ public void processRawResponses_textThenEmpty_emitsPartialTextThenFullTextAndEmp
isEmptyResponse());
}
+ @Test
+ public void processRawResponses_withTextChunks_partialResponsesIncludeUsageMetadata() {
+ GenerateContentResponseUsageMetadata metadata1 = createUsageMetadata(5, 10, 15);
+ GenerateContentResponseUsageMetadata metadata2 = createUsageMetadata(5, 20, 25);
+ Flowable rawResponses =
+ Flowable.just(
+ toResponseWithText("Hello", metadata1), toResponseWithText(" world", metadata2));
+
+ Flowable llmResponses = Gemini.processRawResponses(rawResponses);
+
+ assertLlmResponses(
+ llmResponses,
+ isPartialTextResponseWithUsageMetadata("Hello", metadata1),
+ isPartialTextResponseWithUsageMetadata(" world", metadata2));
+ }
+
+ @Test
+ public void processRawResponses_textAndStopReason_finalResponseIncludesUsageMetadata() {
+ GenerateContentResponseUsageMetadata metadata = createUsageMetadata(10, 20, 30);
+ Flowable rawResponses =
+ Flowable.just(
+ toResponseWithText("Hello"),
+ toResponseWithText(" world", FinishReason.Known.STOP, metadata));
+
+ Flowable llmResponses = Gemini.processRawResponses(rawResponses);
+
+ assertLlmResponses(
+ llmResponses,
+ isPartialTextResponse("Hello"),
+ isPartialTextResponseWithUsageMetadata(" world", metadata),
+ isFinalTextResponseWithUsageMetadata("Hello world", metadata));
+ }
+
+ @Test
+ public void processRawResponses_thoughtChunksAndStop_includeUsageMetadata() {
+ GenerateContentResponseUsageMetadata metadata1 = createUsageMetadata(5, 10, 15);
+ GenerateContentResponseUsageMetadata metadata2 = createUsageMetadata(5, 20, 25);
+ Flowable rawResponses =
+ Flowable.just(
+ toResponseWithThoughtText("Thinking", metadata1),
+ toResponseWithThoughtText(" deeply", FinishReason.Known.STOP, metadata2));
+
+ Flowable llmResponses = Gemini.processRawResponses(rawResponses);
+
+ assertLlmResponses(
+ llmResponses,
+ isPartialThoughtResponseWithUsageMetadata("Thinking", metadata1),
+ isPartialThoughtResponseWithUsageMetadata(" deeply", metadata2),
+ isFinalThoughtResponseWithUsageMetadata("Thinking deeply", metadata2));
+ }
+
+ @Test
+ public void processRawResponses_thoughtAndTextWithStop_onlyFinalTextIncludesUsageMetadata() {
+ GenerateContentResponseUsageMetadata metadata1 = createUsageMetadata(5, 5, 10);
+ GenerateContentResponseUsageMetadata metadata2 = createUsageMetadata(10, 20, 30);
+ Flowable rawResponses =
+ Flowable.just(
+ toResponseWithThoughtText("Thinking", metadata1),
+ toResponseWithText("Answer", FinishReason.Known.STOP, metadata2));
+
+ Flowable llmResponses = Gemini.processRawResponses(rawResponses);
+
+ assertLlmResponses(
+ llmResponses,
+ isPartialThoughtResponseWithUsageMetadata("Thinking", metadata1),
+ isPartialTextResponseWithUsageMetadata("Answer", metadata2),
+ isFinalThoughtResponseWithNoUsageMetadata("Thinking"),
+ isFinalTextResponseWithUsageMetadata("Answer", metadata2));
+ }
+
// Helper methods for assertions
private void assertLlmResponses(
@@ -170,6 +241,67 @@ private static Predicate isEmptyResponse() {
};
}
+ private static Predicate isPartialTextResponseWithUsageMetadata(
+ String expectedText, GenerateContentResponseUsageMetadata expectedMetadata) {
+ return response -> {
+ assertThat(response.partial()).hasValue(true);
+ assertThat(GeminiUtil.getPart0FromLlmResponse(response).flatMap(Part::text).orElse(""))
+ .isEqualTo(expectedText);
+ assertThat(response.usageMetadata()).hasValue(expectedMetadata);
+ return true;
+ };
+ }
+
+ private static Predicate isPartialThoughtResponseWithUsageMetadata(
+ String expectedText, GenerateContentResponseUsageMetadata expectedMetadata) {
+ return response -> {
+ assertThat(response.partial()).hasValue(true);
+ assertThat(GeminiUtil.getPart0FromLlmResponse(response).flatMap(Part::text).orElse(""))
+ .isEqualTo(expectedText);
+ assertThat(GeminiUtil.getPart0FromLlmResponse(response).flatMap(Part::thought).orElse(false))
+ .isTrue();
+ assertThat(response.usageMetadata()).hasValue(expectedMetadata);
+ return true;
+ };
+ }
+
+ private static Predicate isFinalTextResponseWithUsageMetadata(
+ String expectedText, GenerateContentResponseUsageMetadata expectedMetadata) {
+ return response -> {
+ assertThat(response.partial()).isEmpty();
+ assertThat(GeminiUtil.getPart0FromLlmResponse(response).flatMap(Part::text).orElse(""))
+ .isEqualTo(expectedText);
+ assertThat(response.usageMetadata()).hasValue(expectedMetadata);
+ return true;
+ };
+ }
+
+ private static Predicate isFinalThoughtResponseWithUsageMetadata(
+ String expectedText, GenerateContentResponseUsageMetadata expectedMetadata) {
+ return response -> {
+ assertThat(response.partial()).isEmpty();
+ assertThat(GeminiUtil.getPart0FromLlmResponse(response).flatMap(Part::text).orElse(""))
+ .isEqualTo(expectedText);
+ assertThat(GeminiUtil.getPart0FromLlmResponse(response).flatMap(Part::thought).orElse(false))
+ .isTrue();
+ assertThat(response.usageMetadata()).hasValue(expectedMetadata);
+ return true;
+ };
+ }
+
+ private static Predicate isFinalThoughtResponseWithNoUsageMetadata(
+ String expectedText) {
+ return response -> {
+ assertThat(response.partial()).isEmpty();
+ assertThat(GeminiUtil.getPart0FromLlmResponse(response).flatMap(Part::text).orElse(""))
+ .isEqualTo(expectedText);
+ assertThat(GeminiUtil.getPart0FromLlmResponse(response).flatMap(Part::thought).orElse(false))
+ .isTrue();
+ assertThat(response.usageMetadata()).isEmpty();
+ return true;
+ };
+ }
+
// Helper methods to create responses for testing
private GenerateContentResponse toResponseWithText(String text) {
@@ -191,4 +323,63 @@ private GenerateContentResponse toResponse(Part part) {
private GenerateContentResponse toResponse(Candidate candidate) {
return GenerateContentResponse.builder().candidates(candidate).build();
}
+
+ private GenerateContentResponse toResponseWithText(
+ String text, GenerateContentResponseUsageMetadata usageMetadata) {
+ return GenerateContentResponse.builder()
+ .candidates(
+ Candidate.builder()
+ .content(Content.builder().parts(Part.fromText(text)).build())
+ .build())
+ .usageMetadata(usageMetadata)
+ .build();
+ }
+
+ private GenerateContentResponse toResponseWithText(
+ String text,
+ FinishReason.Known finishReason,
+ GenerateContentResponseUsageMetadata usageMetadata) {
+ return GenerateContentResponse.builder()
+ .candidates(
+ Candidate.builder()
+ .content(Content.builder().parts(Part.fromText(text)).build())
+ .finishReason(new FinishReason(finishReason))
+ .build())
+ .usageMetadata(usageMetadata)
+ .build();
+ }
+
+ private GenerateContentResponse toResponseWithThoughtText(
+ String text, GenerateContentResponseUsageMetadata usageMetadata) {
+ Part thoughtPart = Part.fromText(text).toBuilder().thought(true).build();
+ return GenerateContentResponse.builder()
+ .candidates(
+ Candidate.builder().content(Content.builder().parts(thoughtPart).build()).build())
+ .usageMetadata(usageMetadata)
+ .build();
+ }
+
+ private GenerateContentResponse toResponseWithThoughtText(
+ String text,
+ FinishReason.Known finishReason,
+ GenerateContentResponseUsageMetadata usageMetadata) {
+ Part thoughtPart = Part.fromText(text).toBuilder().thought(true).build();
+ return GenerateContentResponse.builder()
+ .candidates(
+ Candidate.builder()
+ .content(Content.builder().parts(thoughtPart).build())
+ .finishReason(new FinishReason(finishReason))
+ .build())
+ .usageMetadata(usageMetadata)
+ .build();
+ }
+
+ private static GenerateContentResponseUsageMetadata createUsageMetadata(
+ int promptTokens, int candidateTokens, int totalTokens) {
+ return GenerateContentResponseUsageMetadata.builder()
+ .promptTokenCount(promptTokens)
+ .candidatesTokenCount(candidateTokens)
+ .totalTokenCount(totalTokens)
+ .build();
+ }
}
diff --git a/core/src/test/java/com/google/adk/telemetry/ContextPropagationTest.java b/core/src/test/java/com/google/adk/telemetry/ContextPropagationTest.java
index 1ee018848..b13904934 100644
--- a/core/src/test/java/com/google/adk/telemetry/ContextPropagationTest.java
+++ b/core/src/test/java/com/google/adk/telemetry/ContextPropagationTest.java
@@ -32,7 +32,6 @@
import com.google.adk.runner.Runner;
import com.google.adk.sessions.InMemorySessionService;
import com.google.adk.sessions.Session;
-import com.google.adk.sessions.SessionKey;
import com.google.adk.testing.TestLlm;
import com.google.adk.testing.TestUtils;
import com.google.adk.tools.BaseTool;
@@ -653,13 +652,13 @@ public void runnerRunAsync_propagatesContext() throws InterruptedException {
@Test
public void runnerRunLive_propagatesContext() throws InterruptedException {
BaseAgent agent = new TestAgent();
- Runner runner = Runner.builder().agent(agent).appName("test-app").build();
+ Runner runner =
+ Runner.builder().agent(agent).appName("test_app").sessionService(sessionService).build();
Span parentSpan = tracer.spanBuilder("parent").startSpan();
try (Scope s = parentSpan.makeCurrent()) {
Session session =
- runner
- .sessionService()
- .createSession("test-app", "test-user", (Map) null, "test-session")
+ sessionService
+ .createSession("test_app", "test-user", (Map) null, "test-session")
.blockingGet();
Content newMessage = Content.fromParts(Part.fromText("hi"));
RunConfig runConfig = RunConfig.builder().build();
@@ -800,12 +799,10 @@ public void testNestedAgentTraceHierarchy() throws InterruptedException {
}
private void runAgent(BaseAgent agent) throws InterruptedException {
- Runner runner = Runner.builder().agent(agent).appName("test-app").build();
+ Runner runner =
+ Runner.builder().agent(agent).appName("test_app").sessionService(sessionService).build();
Session session =
- runner
- .sessionService()
- .createSession(new SessionKey("test-app", "test-user", "test-session"))
- .blockingGet();
+ sessionService.createSession("test_app", "test-user", null, "test-session").blockingGet();
Content newMessage = Content.fromParts(Part.fromText("hi"));
RunConfig runConfig = RunConfig.builder().build();
runner
@@ -871,7 +868,9 @@ private SpanData findSpanByName(String name) {
private InvocationContext buildInvocationContext() {
Session session =
- sessionService.createSession("test-app", "test-user", null, "test-session").blockingGet();
+ sessionService
+ .createSession("test_app", "test-user", (Map) null, "test-session")
+ .blockingGet();
return InvocationContext.builder()
.sessionService(sessionService)
.session(session)
diff --git a/core/src/test/java/com/google/adk/testing/TestUtils.java b/core/src/test/java/com/google/adk/testing/TestUtils.java
index 70ae14bf1..daed8d2e4 100644
--- a/core/src/test/java/com/google/adk/testing/TestUtils.java
+++ b/core/src/test/java/com/google/adk/testing/TestUtils.java
@@ -61,7 +61,7 @@ public static InvocationContext createInvocationContext(BaseAgent agent, RunConf
.artifactService(new InMemoryArtifactService())
.invocationId("invocationId")
.agent(agent)
- .session(sessionService.createSession("test-app", "test-user").blockingGet())
+ .session(sessionService.createSession("test_app", "test-user").blockingGet())
.userContent(Content.fromParts(Part.fromText("user content")))
.runConfig(runConfig)
.build();
diff --git a/core/src/test/java/com/google/adk/tools/AgentToolTest.java b/core/src/test/java/com/google/adk/tools/AgentToolTest.java
index 3a5390027..0f168c5df 100644
--- a/core/src/test/java/com/google/adk/tools/AgentToolTest.java
+++ b/core/src/test/java/com/google/adk/tools/AgentToolTest.java
@@ -143,7 +143,7 @@ public void declaration_withInputSchema_returnsDeclarationWithSchema() {
AgentTool agentTool =
AgentTool.create(
createTestAgentBuilder(createTestLlm(LlmResponse.builder().build()))
- .name("agent name")
+ .name("agent_name")
.description("agent description")
.inputSchema(inputSchema)
.build());
@@ -153,7 +153,7 @@ public void declaration_withInputSchema_returnsDeclarationWithSchema() {
assertThat(declaration)
.isEqualTo(
FunctionDeclaration.builder()
- .name("agent name")
+ .name("agent_name")
.description("agent description")
.parameters(inputSchema)
.build());
@@ -164,7 +164,7 @@ public void declaration_withoutInputSchema_returnsDeclarationWithRequestParamete
AgentTool agentTool =
AgentTool.create(
createTestAgentBuilder(createTestLlm(LlmResponse.builder().build()))
- .name("agent name")
+ .name("agent_name")
.description("agent description")
.build());
@@ -173,7 +173,7 @@ public void declaration_withoutInputSchema_returnsDeclarationWithRequestParamete
assertThat(declaration)
.isEqualTo(
FunctionDeclaration.builder()
- .name("agent name")
+ .name("agent_name")
.description("agent description")
.parameters(
Schema.builder()
@@ -200,7 +200,7 @@ public void call_withInputSchema_invalidInput_throwsException() throws Exception
.build();
LlmAgent testAgent =
createTestAgentBuilder(createTestLlm(LlmResponse.builder().build()))
- .name("agent name")
+ .name("agent_name")
.description("agent description")
.inputSchema(inputSchema)
.build();
@@ -256,7 +256,7 @@ public void call_withOutputSchema_invalidOutput_throwsException() throws Excepti
"{\"is_valid\": \"invalid type\", "
+ "\"message\": \"success\"}")))
.build()))
- .name("agent name")
+ .name("agent_name")
.description("agent description")
.outputSchema(outputSchema)
.build();
@@ -301,7 +301,7 @@ public void call_withInputAndOutputSchema_successful() throws Exception {
Part.fromText(
"{\"is_valid\": true, " + "\"message\": \"success\"}")))
.build()))
- .name("agent name")
+ .name("agent_name")
.description("agent description")
.inputSchema(inputSchema)
.outputSchema(outputSchema)
@@ -332,7 +332,7 @@ public void call_withoutSchema_returnsConcatenatedTextFromLastEvent() throws Exc
Part.fromText("First text part. "),
Part.fromText("Second text part.")))
.build())))
- .name("agent name")
+ .name("agent_name")
.description("agent description")
.build();
AgentTool agentTool = AgentTool.create(testAgent);
@@ -358,7 +358,7 @@ public void call_withThoughts_returnsOnlyNonThoughtText() throws Exception {
.build())
.build());
LlmAgent testAgent =
- createTestAgentBuilder(testLlm).name("agent name").description("agent description").build();
+ createTestAgentBuilder(testLlm).name("agent_name").description("agent description").build();
AgentTool agentTool = AgentTool.create(testAgent);
ToolContext toolContext = createToolContext(testAgent);
@@ -373,7 +373,7 @@ public void call_emptyModelResponse_returnsEmptyMap() throws Exception {
LlmAgent testAgent =
createTestAgentBuilder(
createTestLlm(LlmResponse.builder().content(Content.builder().build()).build()))
- .name("agent name")
+ .name("agent_name")
.description("agent description")
.build();
AgentTool agentTool = AgentTool.create(testAgent);
@@ -394,7 +394,7 @@ public void call_withInputSchema_argsAreSentToAgent() throws Exception {
.build());
LlmAgent testAgent =
createTestAgentBuilder(testLlm)
- .name("agent name")
+ .name("agent_name")
.description("agent description")
.inputSchema(
Schema.builder()
@@ -422,7 +422,7 @@ public void call_withoutInputSchema_requestIsSentToAgent() throws Exception {
.content(Content.fromParts(Part.fromText("test response")))
.build());
LlmAgent testAgent =
- createTestAgentBuilder(testLlm).name("agent name").description("agent description").build();
+ createTestAgentBuilder(testLlm).name("agent_name").description("agent description").build();
AgentTool agentTool = AgentTool.create(testAgent);
ToolContext toolContext = createToolContext(testAgent);
@@ -447,7 +447,7 @@ public void call_withStateDeltaInResponse_propagatesStateDelta() throws Exceptio
.build());
LlmAgent testAgent =
createTestAgentBuilder(testLlm)
- .name("agent name")
+ .name("agent_name")
.description("agent description")
.afterAgentCallback(afterAgentCallback)
.build();
@@ -477,7 +477,7 @@ public void call_withSkipSummarizationAndStateDelta_propagatesStateAndSetsSkipSu
.build());
LlmAgent testAgent =
createTestAgentBuilder(testLlm)
- .name("agent name")
+ .name("agent_name")
.description("agent description")
.afterAgentCallback(afterAgentCallback)
.build();
diff --git a/dev/pom.xml b/dev/pom.xml
index 6cabcba7c..5468a1187 100644
--- a/dev/pom.xml
+++ b/dev/pom.xml
@@ -18,7 +18,7 @@
com.google.adk
google-adk-parent
- 0.9.1-SNAPSHOT
+ 1.0.1-rc.1-SNAPSHOT
google-adk-dev
diff --git a/maven_plugin/examples/custom_tools/pom.xml b/maven_plugin/examples/custom_tools/pom.xml
index f2118f9cc..aa273d732 100644
--- a/maven_plugin/examples/custom_tools/pom.xml
+++ b/maven_plugin/examples/custom_tools/pom.xml
@@ -4,7 +4,7 @@
com.example
custom-tools-example
- 0.9.1-SNAPSHOT
+ 1.0.1-rc.1-SNAPSHOT
jar
ADK Custom Tools Example
diff --git a/maven_plugin/examples/simple-agent/pom.xml b/maven_plugin/examples/simple-agent/pom.xml
index 5c0f4462d..34aeb8c1c 100644
--- a/maven_plugin/examples/simple-agent/pom.xml
+++ b/maven_plugin/examples/simple-agent/pom.xml
@@ -4,7 +4,7 @@
com.example
simple-adk-agent
- 0.9.1-SNAPSHOT
+ 1.0.1-rc.1-SNAPSHOT
jar
Simple ADK Agent Example
diff --git a/maven_plugin/pom.xml b/maven_plugin/pom.xml
index c48331f72..d0feb41e3 100644
--- a/maven_plugin/pom.xml
+++ b/maven_plugin/pom.xml
@@ -5,7 +5,7 @@
com.google.adk
google-adk-parent
- 0.9.1-SNAPSHOT
+ 1.0.1-rc.1-SNAPSHOT
../pom.xml
diff --git a/pom.xml b/pom.xml
index 0be05a629..cbeca1b72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
com.google.adk
google-adk-parent
- 0.9.1-SNAPSHOT
+ 1.0.1-rc.1-SNAPSHOT
pom
Google Agent Development Kit Maven Parent POM
diff --git a/tutorials/city-time-weather/pom.xml b/tutorials/city-time-weather/pom.xml
index 76b7331f3..aeb110cf6 100644
--- a/tutorials/city-time-weather/pom.xml
+++ b/tutorials/city-time-weather/pom.xml
@@ -20,7 +20,7 @@
com.google.adk
google-adk-parent
- 0.9.1-SNAPSHOT
+ 1.0.1-rc.1-SNAPSHOT
../../pom.xml
diff --git a/tutorials/live-audio-single-agent/pom.xml b/tutorials/live-audio-single-agent/pom.xml
index a330cf4bd..99243893b 100644
--- a/tutorials/live-audio-single-agent/pom.xml
+++ b/tutorials/live-audio-single-agent/pom.xml
@@ -20,7 +20,7 @@
com.google.adk
google-adk-parent
- 0.9.1-SNAPSHOT
+ 1.0.1-rc.1-SNAPSHOT
../../pom.xml