@google/adk 0.1.2 → 0.2.0

package/dist/cjs/agents/content_processor_utils.js

@@ -103,8 +103,8 @@ function isEventFromAnotherAgent(agentName, event) {
   return !!agentName && event.author !== agentName && event.author !== "user";
 }
 function convertForeignEvent(event) {
-  var _a, _b, _c, _d, _e;
-  if (!((_a = event.content) == null ? void 0 : _a.parts)) {
+  var _a, _b, _c, _d, _e, _f;
+  if (!((_b = (_a = event.content) == null ? void 0 : _a.parts) == null ? void 0 : _b.length)) {
     return event;
   }
   const content = {
@@ -115,19 +115,21 @@ function convertForeignEvent(event) {
   };
   for (const part of event.content.parts) {
     if (part.text && !part.thought) {
-      (_b = content.parts) == null ? void 0 : _b.push({
+      (_c = content.parts) == null ? void 0 : _c.push({
         text: `[${event.author}] said: ${part.text}`
       });
     } else if (part.functionCall) {
-      (_c = content.parts) == null ? void 0 : _c.push({
-        text: `[${event.author}] called tool \`${part.functionCall.name}\` with parameters: ${part.functionCall.args}`
+      const argsText = safeStringify(part.functionCall.args);
+      (_d = content.parts) == null ? void 0 : _d.push({
+        text: `[${event.author}] called tool \`${part.functionCall.name}\` with parameters: ${argsText}`
       });
     } else if (part.functionResponse) {
-      (_d = content.parts) == null ? void 0 : _d.push({
-        text: `[${event.author}] tool \`${part.functionResponse.name}\` returned result: ${part.functionResponse.response}`
+      const responseText = safeStringify(part.functionResponse.response);
+      (_e = content.parts) == null ? void 0 : _e.push({
+        text: `[${event.author}] tool \`${part.functionResponse.name}\` returned result: ${responseText}`
       });
     } else {
-      (_e = content.parts) == null ? void 0 : _e.push(part);
+      (_f = content.parts) == null ? void 0 : _f.push(part);
     }
   }
   return (0, import_event.createEvent)({
@@ -292,6 +294,16 @@ function rearrangeEventsForAsyncFunctionResponsesInHistory(events) {
   }
   return resultEvents;
 }
+function safeStringify(obj) {
+  if (typeof obj === "string") {
+    return obj;
+  }
+  try {
+    return JSON.stringify(obj);
+  } catch (e) {
+    return String(obj);
+  }
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getContents,

package/dist/cjs/agents/functions.js

@@ -38,6 +38,7 @@ __export(functions_exports, {
   removeClientFunctionCallId: () => removeClientFunctionCallId
 });
 module.exports = __toCommonJS(functions_exports);
+var import_genai = require("@google/genai");
 var import_event = require("../events/event.js");
 var import_event_actions = require("../events/event_actions.js");
 var import_tool_context = require("../tools/tool_context.js");
@@ -166,30 +167,6 @@ async function callToolAsync(tool, args, toolContext) {
   import_logger.logger.debug(`callToolAsync ${tool.name}`);
   return await tool.runAsync({ args, toolContext });
 }
-function buildResponseEvent(tool, functionResult, toolContext, invocationContext) {
-  let responseResult = functionResult;
-  if (typeof functionResult !== "object" || functionResult == null) {
-    responseResult = { result: functionResult };
-  }
-  const partFunctionResponse = {
-    functionResponse: {
-      name: tool.name,
-      response: responseResult,
-      id: toolContext.functionCallId
-    }
-  };
-  const content = {
-    role: "user",
-    parts: [partFunctionResponse]
-  };
-  return (0, import_event.createEvent)({
-    invocationId: invocationContext.invocationId,
-    author: invocationContext.agent.name,
-    content,
-    actions: toolContext.actions,
-    branch: invocationContext.branch
-  });
-}
 async function handleFunctionCallsAsync({
   invocationContext,
   functionCallEvent,
@@ -240,6 +217,7 @@ async function handleFunctionCallList({
     import_logger.logger.debug(`execute_tool ${tool.name}`);
     const functionArgs = (_a = functionCall.args) != null ? _a : {};
     let functionResponse = null;
+    let functionResponseError;
     functionResponse = await invocationContext.pluginManager.runBeforeToolCallback({
       tool,
       toolArgs: functionArgs,
@@ -276,10 +254,11 @@ async function handleFunctionCallList({
           );
           if (onToolErrorResponse) {
             functionResponse = onToolErrorResponse;
+          } else {
+            functionResponseError = e.message;
           }
         } else {
-          import_logger.logger.error("Unknown error on tool execution type", e);
-          throw e;
+          functionResponseError = e;
         }
       }
     }
@@ -308,12 +287,24 @@ async function handleFunctionCallList({
     if (tool.isLongRunning && !functionResponse) {
       continue;
     }
-    const functionResponseEvent = buildResponseEvent(
-      tool,
-      functionResponse,
-      toolContext,
-      invocationContext
-    );
+    if (functionResponseError) {
+      functionResponse = { error: functionResponseError };
+    } else if (typeof functionResponse !== "object" || functionResponse == null) {
+      functionResponse = { result: functionResponse };
+    }
+    const functionResponseEvent = (0, import_event.createEvent)({
+      invocationId: invocationContext.invocationId,
+      author: invocationContext.agent.name,
+      content: (0, import_genai.createUserContent)({
+        functionResponse: {
+          id: toolContext.functionCallId,
+          name: tool.name,
+          response: functionResponse
+        }
+      }),
+      actions: toolContext.actions,
+      branch: invocationContext.branch
+    });
     import_logger.logger.debug("traceToolCall", {
       tool: tool.name,
       args: functionArgs,

package/dist/cjs/agents/llm_agent.js

@@ -170,6 +170,7 @@ class AgentTransferLlmRequestProcessor extends import_base_llm_processor.BaseLlm
           throw new Error("toolContext is required.");
         }
         toolContext.actions.transferToAgent = args.agentName;
+        return "Transfer queued";
       }
     });
   }

package/dist/cjs/artifacts/gcs_artifact_service.js

@@ -0,0 +1,140 @@
+/**
+  * @license
+  * Copyright 2025 Google LLC
+  * SPDX-License-Identifier: Apache-2.0
+  */
+
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var gcs_artifact_service_exports = {};
+__export(gcs_artifact_service_exports, {
+  GcsArtifactService: () => GcsArtifactService
+});
+module.exports = __toCommonJS(gcs_artifact_service_exports);
+var import_storage = require("@google-cloud/storage");
+var import_genai = require("@google/genai");
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+class GcsArtifactService {
+  constructor(bucket) {
+    this.bucket = new import_storage.Storage().bucket(bucket);
+  }
+  async saveArtifact(request) {
+    const versions = await this.listVersions(request);
+    const version = versions.length > 0 ? Math.max(...versions) + 1 : 0;
+    const file = this.bucket.file(getFileName({
+      ...request,
+      version
+    }));
+    if (request.artifact.inlineData) {
+      await file.save(JSON.stringify(request.artifact.inlineData.data), {
+        contentType: request.artifact.inlineData.mimeType
+      });
+      return version;
+    }
+    if (request.artifact.text) {
+      await file.save(request.artifact.text, {
+        contentType: "text/plain"
+      });
+      return version;
+    }
+    throw new Error("Artifact must have either inlineData or text.");
+  }
+  async loadArtifact(request) {
+    let version = request.version;
+    if (version === void 0) {
+      const versions = await this.listVersions(request);
+      if (versions.length === 0) {
+        return void 0;
+      }
+      version = Math.max(...versions);
+    }
+    const file = this.bucket.file(getFileName({
+      ...request,
+      version
+    }));
+    const [[metadata], [rawDataBuffer]] = await Promise.all([file.getMetadata(), file.download()]);
+    if (metadata.contentType === "text/plain") {
+      return (0, import_genai.createPartFromText)(rawDataBuffer.toString("utf-8"));
+    }
+    return (0, import_genai.createPartFromBase64)(
+      rawDataBuffer.toString("base64"),
+      metadata.contentType
+    );
+  }
+  async listArtifactKeys(request) {
+    const fileNames = [];
+    const sessionPrefix = `${request.appName}/${request.userId}/${request.sessionId}/`;
+    const usernamePrefix = `${request.appName}/${request.userId}/user/`;
+    const [
+      [sessionFiles],
+      [userSessionFiles]
+    ] = await Promise.all([
+      this.bucket.getFiles({ prefix: sessionPrefix }),
+      this.bucket.getFiles({ prefix: usernamePrefix })
+    ]);
+    for (const file of sessionFiles) {
+      fileNames.push(file.name.split("/").pop());
+    }
+    for (const file of userSessionFiles) {
+      fileNames.push(file.name.split("/").pop());
+    }
+    return fileNames.sort((a, b) => a.localeCompare(b));
+  }
+  async deleteArtifact(request) {
+    const versions = await this.listVersions(request);
+    await Promise.all(versions.map((version) => {
+      const file = this.bucket.file(getFileName({
+        ...request,
+        version
+      }));
+      return file.delete();
+    }));
+    return;
+  }
+  async listVersions(request) {
+    const prefix = getFileName(request);
+    const [files] = await this.bucket.getFiles({ prefix });
+    const versions = [];
+    for (const file of files) {
+      const version = file.name.split("/").pop();
+      versions.push(parseInt(version, 10));
+    }
+    return versions;
+  }
+}
+function getFileName({
+  appName,
+  userId,
+  sessionId,
+  filename,
+  version
+}) {
+  if (filename.startsWith("user:")) {
+    return `${appName}/${userId}/user/${filename}/${version}`;
+  }
+  return `${appName}/${userId}/${sessionId}/${filename}/${version}`;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  GcsArtifactService
+});

package/dist/cjs/common.js

@@ -41,6 +41,7 @@ __export(common_exports, {
   InMemoryRunner: () => import_in_memory_runner.InMemoryRunner,
   InMemorySessionService: () => import_in_memory_session_service.InMemorySessionService,
   InvocationContext: () => import_invocation_context.InvocationContext,
+  LLMRegistry: () => import_registry.LLMRegistry,
   LiveRequestQueue: () => import_live_request_queue.LiveRequestQueue,
   LlmAgent: () => import_llm_agent.LlmAgent,
   LogLevel: () => import_logger.LogLevel,
@@ -54,10 +55,12 @@ __export(common_exports, {
   Runner: () => import_runner.Runner,
   SecurityPlugin: () => import_security_plugin.SecurityPlugin,
   SequentialAgent: () => import_sequential_agent.SequentialAgent,
+  State: () => import_state.State,
   StreamingMode: () => import_run_config.StreamingMode,
   ToolConfirmation: () => import_tool_confirmation.ToolConfirmation,
   ToolContext: () => import_tool_context.ToolContext,
   createEvent: () => import_event.createEvent,
+  createEventActions: () => import_event_actions.createEventActions,
   createSession: () => import_session.createSession,
   functionsExportedForTestingOnly: () => import_functions.functionsExportedForTestingOnly,
   getAskUserConfirmationFunctionCalls: () => import_security_plugin.getAskUserConfirmationFunctionCalls,
@@ -67,6 +70,7 @@ __export(common_exports, {
   isFinalResponse: () => import_event.isFinalResponse,
   setLogLevel: () => import_logger.setLogLevel,
   stringifyContent: () => import_event.stringifyContent,
+  version: () => import_version.version,
   zodObjectToSchema: () => import_simple_zod_to_json.zodObjectToSchema
 });
 module.exports = __toCommonJS(common_exports);
@@ -82,9 +86,11 @@ var import_run_config = require("./agents/run_config.js");
 var import_sequential_agent = require("./agents/sequential_agent.js");
 var import_in_memory_artifact_service = require("./artifacts/in_memory_artifact_service.js");
 var import_event = require("./events/event.js");
+var import_event_actions = require("./events/event_actions.js");
 var import_in_memory_memory_service = require("./memory/in_memory_memory_service.js");
 var import_base_llm = require("./models/base_llm.js");
 var import_google_llm = require("./models/google_llm.js");
+var import_registry = require("./models/registry.js");
 var import_base_plugin = require("./plugins/base_plugin.js");
 var import_logging_plugin = require("./plugins/logging_plugin.js");
 var import_plugin_manager = require("./plugins/plugin_manager.js");
@@ -93,6 +99,7 @@ var import_in_memory_runner = require("./runner/in_memory_runner.js");
 var import_runner = require("./runner/runner.js");
 var import_in_memory_session_service = require("./sessions/in_memory_session_service.js");
 var import_session = require("./sessions/session.js");
+var import_state = require("./sessions/state.js");
 var import_agent_tool = require("./tools/agent_tool.js");
 var import_base_tool = require("./tools/base_tool.js");
 var import_base_toolset = require("./tools/base_toolset.js");
@@ -103,6 +110,7 @@ var import_tool_confirmation = require("./tools/tool_confirmation.js");
 var import_tool_context = require("./tools/tool_context.js");
 var import_logger = require("./utils/logger.js");
 var import_simple_zod_to_json = require("./utils/simple_zod_to_json.js");
+var import_version = require("./version.js");
 __reExport(common_exports, require("./artifacts/base_artifact_service.js"), module.exports);
 __reExport(common_exports, require("./memory/base_memory_service.js"), module.exports);
 __reExport(common_exports, require("./sessions/base_session_service.js"), module.exports);
@@ -130,6 +138,7 @@ __reExport(common_exports, require("./tools/base_tool.js"), module.exports);
   InMemoryRunner,
   InMemorySessionService,
   InvocationContext,
+  LLMRegistry,
   LiveRequestQueue,
   LlmAgent,
   LogLevel,
@@ -143,10 +152,12 @@ __reExport(common_exports, require("./tools/base_tool.js"), module.exports);
   Runner,
   SecurityPlugin,
   SequentialAgent,
+  State,
   StreamingMode,
   ToolConfirmation,
   ToolContext,
   createEvent,
+  createEventActions,
   createSession,
   functionsExportedForTestingOnly,
   getAskUserConfirmationFunctionCalls,
@@ -156,6 +167,7 @@ __reExport(common_exports, require("./tools/base_tool.js"), module.exports);
   isFinalResponse,
   setLogLevel,
   stringifyContent,
+  version,
   zodObjectToSchema,
   ...require("./artifacts/base_artifact_service.js"),
   ...require("./memory/base_memory_service.js"),