diff --git a/core/src/main/java/com/google/adk/events/EventActions.java b/core/src/main/java/com/google/adk/events/EventActions.java index 24fa5e95a..93fdd756b 100644 --- a/core/src/main/java/com/google/adk/events/EventActions.java +++ b/core/src/main/java/com/google/adk/events/EventActions.java @@ -17,7 +17,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.google.adk.tools.ToolConfirmation; import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.genai.types.Part; import java.util.Objects; diff --git a/core/src/main/java/com/google/adk/tools/ToolConfirmation.java b/core/src/main/java/com/google/adk/events/ToolConfirmation.java similarity index 98% rename from core/src/main/java/com/google/adk/tools/ToolConfirmation.java rename to core/src/main/java/com/google/adk/events/ToolConfirmation.java index 4d74af2cd..66b107eea 100644 --- a/core/src/main/java/com/google/adk/tools/ToolConfirmation.java +++ b/core/src/main/java/com/google/adk/events/ToolConfirmation.java @@ -13,8 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.google.adk.tools; +package com.google.adk.events; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/core/src/main/java/com/google/adk/flows/llmflows/Functions.java b/core/src/main/java/com/google/adk/flows/llmflows/Functions.java index 53fe948b4..86721e985 100644 --- a/core/src/main/java/com/google/adk/flows/llmflows/Functions.java +++ b/core/src/main/java/com/google/adk/flows/llmflows/Functions.java @@ -29,9 +29,9 @@ import com.google.adk.agents.RunConfig.ToolExecutionMode; import com.google.adk.events.Event; import com.google.adk.events.EventActions; +import com.google.adk.events.ToolConfirmation; import com.google.adk.tools.BaseTool; import com.google.adk.tools.FunctionTool; -import com.google.adk.tools.ToolConfirmation; import com.google.adk.tools.ToolContext; import com.google.common.base.VerifyException; import com.google.common.collect.ImmutableList; diff --git a/core/src/main/java/com/google/adk/flows/llmflows/RequestConfirmationLlmRequestProcessor.java b/core/src/main/java/com/google/adk/flows/llmflows/RequestConfirmationLlmRequestProcessor.java index b06abeacb..b0846a091 100644 --- a/core/src/main/java/com/google/adk/flows/llmflows/RequestConfirmationLlmRequestProcessor.java +++ b/core/src/main/java/com/google/adk/flows/llmflows/RequestConfirmationLlmRequestProcessor.java @@ -28,9 +28,9 @@ import com.google.adk.agents.InvocationContext; import com.google.adk.agents.LlmAgent; import com.google.adk.events.Event; +import com.google.adk.events.ToolConfirmation; import com.google.adk.models.LlmRequest; import com.google.adk.tools.BaseTool; -import com.google.adk.tools.ToolConfirmation; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/core/src/main/java/com/google/adk/tools/ToolContext.java b/core/src/main/java/com/google/adk/tools/ToolContext.java index 50a27bd85..b421a8e58 100644 --- a/core/src/main/java/com/google/adk/tools/ToolContext.java +++ b/core/src/main/java/com/google/adk/tools/ToolContext.java @@ -19,6 +19,7 @@ import com.google.adk.agents.CallbackContext; import com.google.adk.agents.InvocationContext; import com.google.adk.events.EventActions; +import com.google.adk.events.ToolConfirmation; import com.google.adk.memory.SearchMemoryResponse; import com.google.errorprone.annotations.CanIgnoreReturnValue; import io.reactivex.rxjava3.core.Single; diff --git a/core/src/test/java/com/google/adk/events/EventActionsTest.java b/core/src/test/java/com/google/adk/events/EventActionsTest.java index faa389c6d..a9e3693d5 100644 --- a/core/src/test/java/com/google/adk/events/EventActionsTest.java +++ b/core/src/test/java/com/google/adk/events/EventActionsTest.java @@ -18,7 +18,6 @@ import static com.google.common.truth.Truth.assertThat; -import com.google.adk.tools.ToolConfirmation; import com.google.common.collect.ImmutableMap; import com.google.genai.types.Content; import com.google.genai.types.Part; diff --git a/core/src/test/java/com/google/adk/tools/ToolConfirmationTest.java b/core/src/test/java/com/google/adk/events/ToolConfirmationTest.java similarity index 98% rename from core/src/test/java/com/google/adk/tools/ToolConfirmationTest.java rename to core/src/test/java/com/google/adk/events/ToolConfirmationTest.java index 9410f3065..974f01006 100644 --- a/core/src/test/java/com/google/adk/tools/ToolConfirmationTest.java +++ b/core/src/test/java/com/google/adk/events/ToolConfirmationTest.java @@ -13,8 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.google.adk.tools; +package com.google.adk.events; import static com.google.common.truth.Truth.assertThat; diff --git a/core/src/test/java/com/google/adk/tools/FunctionToolTest.java b/core/src/test/java/com/google/adk/tools/FunctionToolTest.java index 2e84371ca..3e2826369 100644 --- a/core/src/test/java/com/google/adk/tools/FunctionToolTest.java +++ b/core/src/test/java/com/google/adk/tools/FunctionToolTest.java @@ -21,6 +21,7 @@ import com.google.adk.agents.InvocationContext; import com.google.adk.agents.RunConfig; +import com.google.adk.events.ToolConfirmation; import com.google.adk.sessions.Session; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -34,7 +35,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Optional; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -236,18 +236,10 @@ public void call_withAllSupportedParameterTypes() throws Exception { FunctionTool tool = FunctionTool.create(Functions.class, "returnAllSupportedParametersAsMap"); ToolContext toolContext = ToolContext.builder( - new InvocationContext( - /* sessionService= */ null, - /* artifactService= */ null, - /* memoryService= */ null, - /* liveRequestQueue= */ Optional.empty(), - /* branch= */ Optional.empty(), - /* invocationId= */ null, - /* agent= */ null, - /* session= */ Session.builder("123").build(), - /* userContent= */ Optional.empty(), - /* runConfig= */ RunConfig.builder().build(), - /* endInvocation= */ false)) + InvocationContext.builder() + .session(Session.builder("123").build()) + .runConfig(RunConfig.builder().build()) + .build()) .functionCallId("functionCallId") .build(); @@ -593,18 +585,7 @@ public void call_nonStaticWithAllSupportedParameterTypes() throws Exception { FunctionTool.create(functions, "nonStaticReturnAllSupportedParametersAsMap"); ToolContext toolContext = ToolContext.builder( - new InvocationContext( - /* sessionService= */ null, - /* artifactService= */ null, - /* memoryService= */ null, - /* liveRequestQueue= */ Optional.empty(), - /* branch= */ Optional.empty(), - /* invocationId= */ null, - /* agent= */ null, - /* session= */ Session.builder("123").build(), - /* userContent= */ Optional.empty(), - /* runConfig= */ null, - /* endInvocation= */ false)) + InvocationContext.builder().session(Session.builder("123").build()).build()) .functionCallId("functionCallId") .build(); @@ -655,18 +636,7 @@ public void runAsync_withRequireConfirmation() throws Exception { new FunctionTool(null, method, /* isLongRunning= */ false, /* requireConfirmation= */ true); ToolContext toolContext = ToolContext.builder( - new InvocationContext( - /* sessionService= */ null, - /* artifactService= */ null, - /* memoryService= */ null, - /* liveRequestQueue= */ Optional.empty(), - /* branch= */ Optional.empty(), - /* invocationId= */ null, - /* agent= */ null, - /* session= */ Session.builder("123").build(), - /* userContent= */ Optional.empty(), - /* runConfig= */ null, - /* endInvocation= */ false)) + InvocationContext.builder().session(Session.builder("123").build()).build()) .functionCallId("functionCallId") .build(); @@ -699,18 +669,7 @@ public void create_instanceMethodWithConfirmation_requestsConfirmation() throws FunctionTool tool = FunctionTool.create(functions, method, /* requireConfirmation= */ true); ToolContext toolContext = ToolContext.builder( - new InvocationContext( - /* sessionService= */ null, - /* artifactService= */ null, - /* memoryService= */ null, - /* liveRequestQueue= */ Optional.empty(), - /* branch= */ Optional.empty(), - /* invocationId= */ null, - /* agent= */ null, - /* session= */ Session.builder("123").build(), - /* userContent= */ Optional.empty(), - /* runConfig= */ null, - /* endInvocation= */ false)) + InvocationContext.builder().session(Session.builder("123").build()).build()) .functionCallId("functionCallId") .build(); @@ -727,18 +686,7 @@ public void create_staticMethodWithConfirmation_requestsConfirmation() throws Ex FunctionTool tool = FunctionTool.create(method, /* requireConfirmation= */ true); ToolContext toolContext = ToolContext.builder( - new InvocationContext( - /* sessionService= */ null, - /* artifactService= */ null, - /* memoryService= */ null, - /* liveRequestQueue= */ Optional.empty(), - /* branch= */ Optional.empty(), - /* invocationId= */ null, - /* agent= */ null, - /* session= */ Session.builder("123").build(), - /* userContent= */ Optional.empty(), - /* runConfig= */ null, - /* endInvocation= */ false)) + InvocationContext.builder().session(Session.builder("123").build()).build()) .functionCallId("functionCallId") .build(); @@ -756,18 +704,7 @@ public void create_classMethodNameWithConfirmation_requestsConfirmation() throws Functions.class, "voidReturnWithoutSchema", /* requireConfirmation= */ true); ToolContext toolContext = ToolContext.builder( - new InvocationContext( - /* sessionService= */ null, - /* artifactService= */ null, - /* memoryService= */ null, - /* liveRequestQueue= */ Optional.empty(), - /* branch= */ Optional.empty(), - /* invocationId= */ null, - /* agent= */ null, - /* session= */ Session.builder("123").build(), - /* userContent= */ Optional.empty(), - /* runConfig= */ null, - /* endInvocation= */ false)) + InvocationContext.builder().session(Session.builder("123").build()).build()) .functionCallId("functionCallId") .build(); @@ -786,18 +723,7 @@ public void create_instanceMethodNameWithConfirmation_requestsConfirmation() thr functions, "nonStaticVoidReturnWithoutSchema", /* requireConfirmation= */ true); ToolContext toolContext = ToolContext.builder( - new InvocationContext( - /* sessionService= */ null, - /* artifactService= */ null, - /* memoryService= */ null, - /* liveRequestQueue= */ Optional.empty(), - /* branch= */ Optional.empty(), - /* invocationId= */ null, - /* agent= */ null, - /* session= */ Session.builder("123").build(), - /* userContent= */ Optional.empty(), - /* runConfig= */ null, - /* endInvocation= */ false)) + InvocationContext.builder().session(Session.builder("123").build()).build()) .functionCallId("functionCallId") .build(); diff --git a/core/src/test/java/com/google/adk/tools/ToolContextTest.java b/core/src/test/java/com/google/adk/tools/ToolContextTest.java index d6dd3bcc1..f9aae7950 100644 --- a/core/src/test/java/com/google/adk/tools/ToolContextTest.java +++ b/core/src/test/java/com/google/adk/tools/ToolContextTest.java @@ -10,6 +10,7 @@ import com.google.adk.agents.LlmAgent; import com.google.adk.artifacts.BaseArtifactService; import com.google.adk.artifacts.ListArtifactsResponse; +import com.google.adk.events.ToolConfirmation; import com.google.adk.sessions.Session; import com.google.common.collect.ImmutableList; import io.reactivex.rxjava3.core.Single;