Skip to content

Commit 404ac0d

Browse files
google-genai-botcopybara-github
google-genai-bot
authored and
copybara-github
committed
refactor: Moving ToolCofirmation from tools/ to events/
The move from tools/ to events/ removes a cyclical dependency. I also fixed some warnings related to deprecated use of InvocationContext constructors. PiperOrigin-RevId: 852772567
1 parent a99c75b commit 404ac0d

File tree

9 files changed

+17
-93
lines changed

9 files changed

+17
-93
lines changed

‎core/src/main/java/com/google/adk/events/EventActions.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import com.fasterxml.jackson.annotation.JsonProperty;
1919
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
20-
import com.google.adk.tools.ToolConfirmation;
2120
import com.google.errorprone.annotations.CanIgnoreReturnValue;
2221
import com.google.genai.types.Part;
2322
import java.util.Objects;

core/src/main/java/com/google/adk/tools/ToolConfirmation.java renamed to core/src/main/java/com/google/adk/events/ToolConfirmation.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
17-
package com.google.adk.tools;
16+
package com.google.adk.events;
1817

1918
import com.fasterxml.jackson.annotation.JsonCreator;
2019
import com.fasterxml.jackson.annotation.JsonProperty;

‎core/src/main/java/com/google/adk/flows/llmflows/Functions.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
import com.google.adk.agents.RunConfig.ToolExecutionMode;
3030
import com.google.adk.events.Event;
3131
import com.google.adk.events.EventActions;
32+
import com.google.adk.events.ToolConfirmation;
3233
import com.google.adk.tools.BaseTool;
3334
import com.google.adk.tools.FunctionTool;
34-
import com.google.adk.tools.ToolConfirmation;
3535
import com.google.adk.tools.ToolContext;
3636
import com.google.common.base.VerifyException;
3737
import com.google.common.collect.ImmutableList;

‎core/src/main/java/com/google/adk/flows/llmflows/RequestConfirmationLlmRequestProcessor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
import com.google.adk.agents.InvocationContext;
2929
import com.google.adk.agents.LlmAgent;
3030
import com.google.adk.events.Event;
31+
import com.google.adk.events.ToolConfirmation;
3132
import com.google.adk.models.LlmRequest;
3233
import com.google.adk.tools.BaseTool;
33-
import com.google.adk.tools.ToolConfirmation;
3434
import com.google.common.collect.ImmutableList;
3535
import com.google.common.collect.ImmutableMap;
3636
import com.google.common.collect.ImmutableSet;

‎core/src/main/java/com/google/adk/tools/ToolContext.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.google.adk.agents.CallbackContext;
2020
import com.google.adk.agents.InvocationContext;
2121
import com.google.adk.events.EventActions;
22+
import com.google.adk.events.ToolConfirmation;
2223
import com.google.adk.memory.SearchMemoryResponse;
2324
import com.google.errorprone.annotations.CanIgnoreReturnValue;
2425
import io.reactivex.rxjava3.core.Single;

‎core/src/test/java/com/google/adk/events/EventActionsTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import static com.google.common.truth.Truth.assertThat;
2020

21-
import com.google.adk.tools.ToolConfirmation;
2221
import com.google.common.collect.ImmutableMap;
2322
import com.google.genai.types.Content;
2423
import com.google.genai.types.Part;

core/src/test/java/com/google/adk/tools/ToolConfirmationTest.java renamed to core/src/test/java/com/google/adk/events/ToolConfirmationTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
17-
package com.google.adk.tools;
16+
package com.google.adk.events;
1817

1918
import static com.google.common.truth.Truth.assertThat;
2019

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

Lines changed: 11 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import com.google.adk.agents.InvocationContext;
2323
import com.google.adk.agents.RunConfig;
24+
import com.google.adk.events.ToolConfirmation;
2425
import com.google.adk.sessions.Session;
2526
import com.google.common.collect.ImmutableList;
2627
import com.google.common.collect.ImmutableMap;
@@ -34,7 +35,6 @@
3435
import java.util.HashMap;
3536
import java.util.List;
3637
import java.util.Map;
37-
import java.util.Optional;
3838
import org.junit.Test;
3939
import org.junit.runner.RunWith;
4040
import org.junit.runners.JUnit4;
@@ -236,18 +236,10 @@ public void call_withAllSupportedParameterTypes() throws Exception {
236236
FunctionTool tool = FunctionTool.create(Functions.class, "returnAllSupportedParametersAsMap");
237237
ToolContext toolContext =
238238
ToolContext.builder(
239-
new InvocationContext(
240-
/* sessionService= */ null,
241-
/* artifactService= */ null,
242-
/* memoryService= */ null,
243-
/* liveRequestQueue= */ Optional.empty(),
244-
/* branch= */ Optional.empty(),
245-
/* invocationId= */ null,
246-
/* agent= */ null,
247-
/* session= */ Session.builder("123").build(),
248-
/* userContent= */ Optional.empty(),
249-
/* runConfig= */ RunConfig.builder().build(),
250-
/* endInvocation= */ false))
239+
InvocationContext.builder()
240+
.session(Session.builder("123").build())
241+
.runConfig(RunConfig.builder().build())
242+
.build())
251243
.functionCallId("functionCallId")
252244
.build();
253245

@@ -593,18 +585,7 @@ public void call_nonStaticWithAllSupportedParameterTypes() throws Exception {
593585
FunctionTool.create(functions, "nonStaticReturnAllSupportedParametersAsMap");
594586
ToolContext toolContext =
595587
ToolContext.builder(
596-
new InvocationContext(
597-
/* sessionService= */ null,
598-
/* artifactService= */ null,
599-
/* memoryService= */ null,
600-
/* liveRequestQueue= */ Optional.empty(),
601-
/* branch= */ Optional.empty(),
602-
/* invocationId= */ null,
603-
/* agent= */ null,
604-
/* session= */ Session.builder("123").build(),
605-
/* userContent= */ Optional.empty(),
606-
/* runConfig= */ null,
607-
/* endInvocation= */ false))
588+
InvocationContext.builder().session(Session.builder("123").build()).build())
608589
.functionCallId("functionCallId")
609590
.build();
610591

@@ -655,18 +636,7 @@ public void runAsync_withRequireConfirmation() throws Exception {
655636
new FunctionTool(null, method, /* isLongRunning= */ false, /* requireConfirmation= */ true);
656637
ToolContext toolContext =
657638
ToolContext.builder(
658-
new InvocationContext(
659-
/* sessionService= */ null,
660-
/* artifactService= */ null,
661-
/* memoryService= */ null,
662-
/* liveRequestQueue= */ Optional.empty(),
663-
/* branch= */ Optional.empty(),
664-
/* invocationId= */ null,
665-
/* agent= */ null,
666-
/* session= */ Session.builder("123").build(),
667-
/* userContent= */ Optional.empty(),
668-
/* runConfig= */ null,
669-
/* endInvocation= */ false))
639+
InvocationContext.builder().session(Session.builder("123").build()).build())
670640
.functionCallId("functionCallId")
671641
.build();
672642

@@ -699,18 +669,7 @@ public void create_instanceMethodWithConfirmation_requestsConfirmation() throws
699669
FunctionTool tool = FunctionTool.create(functions, method, /* requireConfirmation= */ true);
700670
ToolContext toolContext =
701671
ToolContext.builder(
702-
new InvocationContext(
703-
/* sessionService= */ null,
704-
/* artifactService= */ null,
705-
/* memoryService= */ null,
706-
/* liveRequestQueue= */ Optional.empty(),
707-
/* branch= */ Optional.empty(),
708-
/* invocationId= */ null,
709-
/* agent= */ null,
710-
/* session= */ Session.builder("123").build(),
711-
/* userContent= */ Optional.empty(),
712-
/* runConfig= */ null,
713-
/* endInvocation= */ false))
672+
InvocationContext.builder().session(Session.builder("123").build()).build())
714673
.functionCallId("functionCallId")
715674
.build();
716675

@@ -727,18 +686,7 @@ public void create_staticMethodWithConfirmation_requestsConfirmation() throws Ex
727686
FunctionTool tool = FunctionTool.create(method, /* requireConfirmation= */ true);
728687
ToolContext toolContext =
729688
ToolContext.builder(
730-
new InvocationContext(
731-
/* sessionService= */ null,
732-
/* artifactService= */ null,
733-
/* memoryService= */ null,
734-
/* liveRequestQueue= */ Optional.empty(),
735-
/* branch= */ Optional.empty(),
736-
/* invocationId= */ null,
737-
/* agent= */ null,
738-
/* session= */ Session.builder("123").build(),
739-
/* userContent= */ Optional.empty(),
740-
/* runConfig= */ null,
741-
/* endInvocation= */ false))
689+
InvocationContext.builder().session(Session.builder("123").build()).build())
742690
.functionCallId("functionCallId")
743691
.build();
744692

@@ -756,18 +704,7 @@ public void create_classMethodNameWithConfirmation_requestsConfirmation() throws
756704
Functions.class, "voidReturnWithoutSchema", /* requireConfirmation= */ true);
757705
ToolContext toolContext =
758706
ToolContext.builder(
759-
new InvocationContext(
760-
/* sessionService= */ null,
761-
/* artifactService= */ null,
762-
/* memoryService= */ null,
763-
/* liveRequestQueue= */ Optional.empty(),
764-
/* branch= */ Optional.empty(),
765-
/* invocationId= */ null,
766-
/* agent= */ null,
767-
/* session= */ Session.builder("123").build(),
768-
/* userContent= */ Optional.empty(),
769-
/* runConfig= */ null,
770-
/* endInvocation= */ false))
707+
InvocationContext.builder().session(Session.builder("123").build()).build())
771708
.functionCallId("functionCallId")
772709
.build();
773710

@@ -786,18 +723,7 @@ public void create_instanceMethodNameWithConfirmation_requestsConfirmation() thr
786723
functions, "nonStaticVoidReturnWithoutSchema", /* requireConfirmation= */ true);
787724
ToolContext toolContext =
788725
ToolContext.builder(
789-
new InvocationContext(
790-
/* sessionService= */ null,
791-
/* artifactService= */ null,
792-
/* memoryService= */ null,
793-
/* liveRequestQueue= */ Optional.empty(),
794-
/* branch= */ Optional.empty(),
795-
/* invocationId= */ null,
796-
/* agent= */ null,
797-
/* session= */ Session.builder("123").build(),
798-
/* userContent= */ Optional.empty(),
799-
/* runConfig= */ null,
800-
/* endInvocation= */ false))
726+
InvocationContext.builder().session(Session.builder("123").build()).build())
801727
.functionCallId("functionCallId")
802728
.build();
803729

‎core/src/test/java/com/google/adk/tools/ToolContextTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.google.adk.agents.LlmAgent;
1111
import com.google.adk.artifacts.BaseArtifactService;
1212
import com.google.adk.artifacts.ListArtifactsResponse;
13+
import com.google.adk.events.ToolConfirmation;
1314
import com.google.adk.sessions.Session;
1415
import com.google.common.collect.ImmutableList;
1516
import io.reactivex.rxjava3.core.Single;

0 commit comments

Comments
 (0)