@google/adk 2.3.0 → 2.5.0

package/dist/esm/agents/functions.js

@@ -8,7 +8,9 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
  * SPDX-License-Identifier: Apache-2.0
  */
 var _a, _b;
-import { createUserContent } from "@google/genai";
+import {
+  createUserContent
+} from "@google/genai";
 import { isEmpty } from "lodash-es";
 import {
   createEvent,
@@ -21,6 +23,7 @@ import {
   mergeEventActions
 } from "../events/event_actions.js";
 import { BaseTool } from "../tools/base_tool.js";
+import { isComputerUseTool } from "../tools/computer_use/computer_use_tool.js";
 import { isFunctionTool } from "../tools/function_tool.js";
 import { logger } from "../utils/logger.js";
 import { Task } from "../utils/task.js";
@@ -31,10 +34,9 @@ import {
   REQUEST_CREDENTIAL_FUNCTION_CALL_NAME
 } from "./framework_function_calls.js";
 import {
-  traceMergedToolCalls,
-  tracer,
-  traceToolCall
-} from "../telemetry/tracing.js";
+  recordMergedToolCalls,
+  recordToolExecution
+} from "../telemetry/api/instrumentation.js";
 function toolEventAuthor(invocationContext) {
   var _a2, _b2;
   return (_b2 = (_a2 = invocationContext.agent) == null ? void 0 : _a2.name) != null ? _b2 : "";
@@ -145,28 +147,45 @@ function generateRequestConfirmationEvent({
 }
 __name(generateRequestConfirmationEvent, "generateRequestConfirmationEvent");
 async function callToolAsync(tool, args, toolContext) {
-  return tracer.startActiveSpan(`execute_tool ${tool.name}`, async (span) => {
-    try {
+  return recordToolExecution(
+    { tool, args, invocationContext: toolContext.invocationContext },
+    async (scope) => {
       logger.debug(`callToolAsync ${tool.name}`);
       const result = await tool.runAsync({ args, toolContext });
-      traceToolCall({
-        tool,
-        args,
+      scope.recordSuccess({
         functionResponseEvent: buildResponseEvent(
           tool,
           result,
           toolContext,
           toolContext.invocationContext
         ),
-        invocationContext: toolContext.invocationContext
+        rawResult: result
       });
       return result;
-    } finally {
-      span.end();
     }
-  });
+  );
 }
 __name(callToolAsync, "callToolAsync");
+const BASE64 = /^[A-Za-z0-9+/]*={0,2}$/;
+function buildFunctionResponse({
+  tool,
+  id,
+  response
+}) {
+  const image = isComputerUseTool(tool) ? response == null ? void 0 : response["image"] : void 0;
+  if (typeof image !== "object" || image === null || !("data" in image) || !("mimetype" in image) || typeof image.data !== "string" || typeof image.mimetype !== "string" || !BASE64.test(image.data)) {
+    return { id, name: tool.name, response };
+  }
+  const rest = { ...response };
+  delete rest["image"];
+  return {
+    id,
+    name: tool.name,
+    response: rest,
+    parts: [{ inlineData: { data: image.data, mimeType: image.mimetype } }]
+  };
+}
+__name(buildFunctionResponse, "buildFunctionResponse");
 function buildResponseEvent(tool, functionResult, toolContext, invocationContext) {
   let responseResult;
   if (typeof functionResult !== "object" || functionResult == null) {
@@ -177,11 +196,11 @@ function buildResponseEvent(tool, functionResult, toolContext, invocationContext
     responseResult = functionResult;
   }
   const partFunctionResponse = {
-    functionResponse: {
-      name: tool.name,
-      response: responseResult,
-      id: toolContext.functionCallId
-    }
+    functionResponse: buildFunctionResponse({
+      tool,
+      id: toolContext.functionCallId,
+      response: responseResult
+    })
   };
   const content = {
     role: "user",
@@ -284,38 +303,35 @@ async function answerUnresolvableCall({
   toolsDict,
   toolContext
 }) {
-  return tracer.startActiveSpan(
-    `execute_tool ${functionCall.name || "<unnamed>"}`,
-    async (span) => {
-      var _a2, _b2;
-      try {
-        const toolName = functionCall.name || "<unnamed>";
-        const error = new Error(
-          `Function ${toolName} is not found in the toolsDict.`
-        );
-        const tool = new ToolNotFoundPlaceholder(toolName, error);
-        const onToolErrorResponse = await invocationContext.pluginManager.runOnToolErrorCallback({
-          tool,
-          toolArgs: (_a2 = functionCall.args) != null ? _a2 : {},
-          toolContext,
-          error
-        });
-        if (onToolErrorResponse == null) {
-          const callableTools = Object.keys(toolsDict);
-          logger.warn(
-            `Could not resolve tool '${toolName}' for function call '${(_b2 = functionCall.id) != null ? _b2 : ""}'. Callable tools: ${callableTools.length ? callableTools.join(", ") : "(none)"}.
+  var _a2;
+  const toolName = functionCall.name || "<unnamed>";
+  const error = new Error(
+    `Function ${toolName} is not found in the toolsDict.`
+  );
+  const tool = new ToolNotFoundPlaceholder(toolName, error);
+  return recordToolExecution(
+    { tool, args: (_a2 = functionCall.args) != null ? _a2 : {}, invocationContext },
+    async () => {
+      var _a3, _b2;
+      const onToolErrorResponse = await invocationContext.pluginManager.runOnToolErrorCallback({
+        tool,
+        toolArgs: (_a3 = functionCall.args) != null ? _a3 : {},
+        toolContext,
+        error
+      });
+      if (onToolErrorResponse == null) {
+        const callableTools = Object.keys(toolsDict);
+        logger.warn(
+          `Could not resolve tool '${toolName}' for function call '${(_b2 = functionCall.id) != null ? _b2 : ""}'. Callable tools: ${callableTools.length ? callableTools.join(", ") : "(none)"}.
 ` + RESOLUTION_FAILURE_CAUSES
-          );
-        }
-        return buildResponseEvent(
-          tool,
-          onToolErrorResponse != null ? onToolErrorResponse : { error: error.message },
-          toolContext,
-          invocationContext
         );
-      } finally {
-        span.end();
       }
+      return buildResponseEvent(
+        tool,
+        onToolErrorResponse != null ? onToolErrorResponse : { error: error.message },
+        toolContext,
+        invocationContext
+      );
     }
   );
 }
@@ -456,11 +472,11 @@ async function handleFunctionCallList({
       invocationId: invocationContext.invocationId,
       author: toolEventAuthor(invocationContext),
       content: createUserContent({
-        functionResponse: {
+        functionResponse: buildFunctionResponse({
+          tool,
           id: toolContext.functionCallId,
-          name: tool.name,
           response: functionResponse
-        }
+        })
       }),
       actions: toolContext.actions,
       branch: invocationContext.branch
@@ -474,18 +490,8 @@ async function handleFunctionCallList({
     functionResponseEvents
   );
   if (functionResponseEvents.length > 1) {
-    tracer.startActiveSpan("execute_tool (merged)", (span) => {
-      try {
-        logger.debug("execute_tool (merged)");
-        traceMergedToolCalls({
-          responseEventId: mergedEvent.id,
-          functionResponseEvent: mergedEvent,
-          invocationContext
-        });
-      } finally {
-        span.end();
-      }
-    });
+    logger.debug("execute_tool (merged)");
+    recordMergedToolCalls({ responseEventId: mergedEvent.id });
   }
   return mergedEvent;
 }

package/dist/esm/agents/instructions.js

@@ -8,6 +8,7 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
  * SPDX-License-Identifier: Apache-2.0
  */
 import { State } from "../sessions/state.js";
+import { asSafePartForLlm } from "../tools/load_artifacts_tool.js";
 const ARTIFACT_PREFIX = "artifact.";
 const WORKFLOW_FIELD_KEY = /^[A-Za-z_]\w*\.[A-Za-z_]\w*$/;
 const SOURCE_NODE_PLACEHOLDER = /<\s*[A-Za-z_]\w*\.([A-Za-z_]\w*)\s+from\s+([A-Za-z_]\w*)\s*>/g;
@@ -36,10 +37,13 @@ async function resolveKey(key, isOptional, rawMatch, readonlyContext) {
       }
       throw new Error(`Artifact ${fileName} not found.`);
     }
-    return formatValue(artifact, true);
+    return formatValue(
+      asSafePartForLlm(artifact, fileName, { inlineMediaAsPlaceholder: true }),
+      true
+    );
   }
   if (isValidStateName(key)) {
-    if (key in invocationContext.session.state) {
+    if (Object.hasOwn(invocationContext.session.state, key)) {
       return formatValue(invocationContext.session.state[key], false);
     }
     if (isOptional) {
@@ -161,14 +165,12 @@ async function injectSessionState(template, readonlyContext) {
   return result.join("");
 }
 __name(injectSessionState, "injectSessionState");
-const isIdentifierPattern = /* @__PURE__ */ (() => {
-  return /^[a-zA-Z_][a-zA-Z0-9_]*$/;
-})();
+const IDENTIFIER_PATTERN = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
 function isIdentifier(s) {
   if (s === "" || s === void 0) {
     return false;
   }
-  return isIdentifierPattern.test(s);
+  return IDENTIFIER_PATTERN.test(s);
 }
 __name(isIdentifier, "isIdentifier");
 const VALID_PREFIXES = [State.APP_PREFIX, State.USER_PREFIX, State.TEMP_PREFIX];

package/dist/esm/agents/invocation_context.js

@@ -8,7 +8,7 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
  * SPDX-License-Identifier: Apache-2.0
  */
 var _a, _b;
-import { randomUUID } from "../utils/env_aware_utils.js";
+import { newId } from "../utils/id_provider.js";
 const LLM_CALLS_LIMIT_EXCEEDED_ERROR_SIGNATURE_SYMBOL = /* @__PURE__ */ Symbol.for(
   "google.adk.llmCallsLimitExceededError"
 );
@@ -111,7 +111,7 @@ const _InvocationContext = class _InvocationContext {
 __name(_InvocationContext, "InvocationContext");
 let InvocationContext = _InvocationContext;
 function newInvocationContextId() {
-  return `e-${randomUUID()}`;
+  return `e-${newId()}`;
 }
 __name(newInvocationContextId, "newInvocationContextId");
 function requireAgent(ctx) {