Merge pull request #326 from glaforge:main

PiperOrigin-RevId: 792814097

Author: copybara-github

contrib/langchain4j/pom.xml

@@ -136,4 +136,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>

core/src/main/java/com/google/adk/agents/CallbackContext.java

@@ -16,10 +16,13 @@
 
 package com.google.adk.agents;
 
+import com.google.adk.artifacts.ListArtifactsResponse;
 import com.google.adk.events.EventActions;
 import com.google.adk.sessions.State;
 import com.google.genai.types.Part;
 import io.reactivex.rxjava3.core.Maybe;
+import io.reactivex.rxjava3.core.Single;
+import java.util.List;
 import java.util.Optional;
 
 /** The context of various callbacks for an agent invocation. */
@@ -51,6 +54,24 @@ public EventActions eventActions() {
     return eventActions;
   }
 
+  /**
+   * Lists the filenames of the artifacts attached to the current session.
+   *
+   * @return the list of artifact filenames
+   */
+  public Single<List<String>> listArtifacts() {
+    if (invocationContext.artifactService() == null) {
+      throw new IllegalStateException("Artifact service is not initialized.");
+    }
+    return invocationContext
+        .artifactService()
+        .listArtifactKeys(
+            invocationContext.session().appName(),
+            invocationContext.session().userId(),
+            invocationContext.session().id())
+        .map(ListArtifactsResponse::filenames);
+  }
+
   /**
    * Loads an artifact from the artifact service associated with the current session.
    *

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

@@ -18,11 +18,8 @@
 
 import com.google.adk.agents.CallbackContext;
 import com.google.adk.agents.InvocationContext;
-import com.google.adk.artifacts.ListArtifactsResponse;
 import com.google.adk.events.EventActions;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import io.reactivex.rxjava3.core.Single;
-import java.util.List;
 import java.util.Optional;
 
 /** ToolContext object provides a structured context for executing tools or functions. */
@@ -71,20 +68,6 @@ private void searchMemory() {
     throw new UnsupportedOperationException("Search memory not implemented yet.");
   }
 
-  /** Lists the filenames of the artifacts attached to the current session. */
-  public Single<List<String>> listArtifacts() {
-    if (invocationContext.artifactService() == null) {
-      throw new IllegalStateException("Artifact service is not initialized.");
-    }
-    return invocationContext
-        .artifactService()
-        .listArtifactKeys(
-            invocationContext.session().appName(),
-            invocationContext.session().userId(),
-            invocationContext.session().id())
-        .map(ListArtifactsResponse::filenames);
-  }
-
   public static Builder builder(InvocationContext invocationContext) {
     return new Builder(invocationContext);
   }