@google/adk 0.2.4 → 0.3.0

package/dist/esm/agents/base_agent.js

@@ -4,8 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 var _a;
-import { trace } from "@opentelemetry/api";
+import { context, trace } from "@opentelemetry/api";
 import { createEvent } from "../events/event.js";
+import {
+  runAsyncGeneratorWithOtelContext,
+  traceAgentInvocation,
+  tracer
+} from "../telemetry/tracing.js";
 import { CallbackContext } from "./callback_context.js";
 import { InvocationContext } from "./invocation_context.js";
 const BASE_AGENT_SIGNATURE_SYMBOL = Symbol.for("google.adk.baseAgent");
@@ -23,11 +28,19 @@ class BaseAgent {
     this.description = config.description;
     this.parentAgent = config.parentAgent;
     this.subAgents = config.subAgents || [];
-    this.rootAgent = getRootAgent(this);
-    this.beforeAgentCallback = getCannonicalCallback(config.beforeAgentCallback);
+    this.beforeAgentCallback = getCannonicalCallback(
+      config.beforeAgentCallback
+    );
     this.afterAgentCallback = getCannonicalCallback(config.afterAgentCallback);
     this.setParentAgentForSubAgents();
   }
+  /**
+   * Root agent of this agent.
+   * Computed dynamically by traversing up the parent chain.
+   */
+  get rootAgent() {
+    return getRootAgent(this);
+  }
   /**
    * Entry method to run an agent via text-based conversation.
    *
@@ -36,26 +49,34 @@ class BaseAgent {
    * @returns An AsyncGenerator that yields the events generated by the agent.
    */
   async *runAsync(parentContext) {
-    const span = trace.getTracer("gcp.vertex.agent").startSpan(`agent_run [${this.name}]`);
+    const span = tracer.startSpan(`invoke_agent ${this.name}`);
+    const ctx = trace.setSpan(context.active(), span);
     try {
-      const context = this.createInvocationContext(parentContext);
-      const beforeAgentCallbackEvent = await this.handleBeforeAgentCallback(context);
-      if (beforeAgentCallbackEvent) {
-        yield beforeAgentCallbackEvent;
-      }
-      if (context.endInvocation) {
-        return;
-      }
-      for await (const event of this.runAsyncImpl(context)) {
-        yield event;
-      }
-      if (context.endInvocation) {
-        return;
-      }
-      const afterAgentCallbackEvent = await this.handleAfterAgentCallback(context);
-      if (afterAgentCallbackEvent) {
-        yield afterAgentCallbackEvent;
-      }
+      yield* runAsyncGeneratorWithOtelContext(
+        ctx,
+        this,
+        async function* () {
+          const context2 = this.createInvocationContext(parentContext);
+          const beforeAgentCallbackEvent = await this.handleBeforeAgentCallback(context2);
+          if (beforeAgentCallbackEvent) {
+            yield beforeAgentCallbackEvent;
+          }
+          if (context2.endInvocation) {
+            return;
+          }
+          traceAgentInvocation({ agent: this, invocationContext: context2 });
+          for await (const event of this.runAsyncImpl(context2)) {
+            yield event;
+          }
+          if (context2.endInvocation) {
+            return;
+          }
+          const afterAgentCallbackEvent = await this.handleAfterAgentCallback(context2);
+          if (afterAgentCallbackEvent) {
+            yield afterAgentCallbackEvent;
+          }
+        }
+      );
     } finally {
       span.end();
     }
@@ -68,8 +89,15 @@ class BaseAgent {
    * @returns An AsyncGenerator that yields the events generated by the agent.
    */
   async *runLive(parentContext) {
-    const span = trace.getTracer("gcp.vertex.agent").startSpan(`agent_run [${this.name}]`);
+    const span = tracer.startSpan(`invoke_agent ${this.name}`);
+    const ctx = trace.setSpan(context.active(), span);
     try {
+      yield* runAsyncGeneratorWithOtelContext(
+        ctx,
+        this,
+        async function* () {
+        }
+      );
       throw new Error("Live mode is not implemented yet.");
     } finally {
       span.end();
@@ -186,7 +214,9 @@ class BaseAgent {
   setParentAgentForSubAgents() {
     for (const subAgent of this.subAgents) {
       if (subAgent.parentAgent) {
-        throw new Error(`Agent "${subAgent.name}" already has a parent agent, current parent: "${subAgent.parentAgent.name}", trying to add: "${this.name}"`);
+        throw new Error(
+          `Agent "${subAgent.name}" already has a parent agent, current parent: "${subAgent.parentAgent.name}", trying to add: "${this.name}"`
+        );
       }
       subAgent.parentAgent = this;
     }
@@ -194,7 +224,9 @@ class BaseAgent {
 }
 function validateAgentName(name) {
   if (!isIdentifier(name)) {
-    throw new Error(`Found invalid agent name: "${name}". Agent name must be a valid identifier. It should start with a letter (a-z, A-Z) or an underscore (_), and can only contain letters, digits (0-9), and underscores.`);
+    throw new Error(
+      `Found invalid agent name: "${name}". Agent name must be a valid identifier. It should start with a letter (a-z, A-Z) or an underscore (_), and can only contain letters, digits (0-9), and underscores.`
+    );
   }
   if (name === "user") {
     throw new Error(

package/dist/esm/agents/callback_context.js

@@ -7,7 +7,10 @@ import { createEventActions } from "../events/event_actions.js";
 import { State } from "../sessions/state.js";
 import { ReadonlyContext } from "./readonly_context.js";
 class CallbackContext extends ReadonlyContext {
-  constructor({ invocationContext, eventActions }) {
+  constructor({
+    invocationContext,
+    eventActions
+  }) {
     super(invocationContext);
     this.eventActions = eventActions || createEventActions();
     this._state = new State(

package/dist/esm/agents/content_processor_utils.js

@@ -4,8 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { cloneDeep } from "lodash-es";
-import { createEvent, getFunctionCalls, getFunctionResponses } from "../events/event.js";
-import { removeClientFunctionCallId, REQUEST_CONFIRMATION_FUNCTION_CALL_NAME, REQUEST_EUC_FUNCTION_CALL_NAME } from "./functions.js";
+import {
+  createEvent,
+  getFunctionCalls,
+  getFunctionResponses
+} from "../events/event.js";
+import {
+  removeClientFunctionCallId,
+  REQUEST_CONFIRMATION_FUNCTION_CALL_NAME,
+  REQUEST_EUC_FUNCTION_CALL_NAME
+} from "./functions.js";
 function getContents(events, agentName, currentBranch) {
   var _a, _b, _c;
   const filteredEvents = [];
@@ -79,9 +87,11 @@ function convertForeignEvent(event) {
   }
   const content = {
     role: "user",
-    parts: [{
-      text: "For context:"
-    }]
+    parts: [
+      {
+        text: "For context:"
+      }
+    ]
   };
   for (const part of event.content.parts) {
     if (part.text && !part.thought) {
@@ -183,10 +193,14 @@ function rearrangeEventsForLatestFunctionResponse(events) {
         const functionCallIds = new Set(
           functionCalls.map((fc) => fc.id).filter((id) => !!id)
         );
-        const isSubset = Array.from(functionResponsesIds).every((id) => functionCallIds.has(id));
+        const isSubset = Array.from(functionResponsesIds).every(
+          (id) => functionCallIds.has(id)
+        );
         if (!isSubset) {
           throw new Error(
-            `Last response event should only contain the responses for the function calls in the same function call event. Function call ids found : ${Array.from(functionCallIds).join(", ")}, function response ids provided: ${Array.from(functionResponsesIds).join(", ")}`
+            `Last response event should only contain the responses for the function calls in the same function call event. Function call ids found : ${Array.from(functionCallIds).join(
+              ", "
+            )}, function response ids provided: ${Array.from(functionResponsesIds).join(", ")}`
           );
         }
         functionResponsesIds = functionCallIds;
@@ -254,7 +268,9 @@ function rearrangeEventsForAsyncFunctionResponsesInHistory(events) {
         const [responseIndex] = [...functionResponseEventsIndices];
         resultEvents.push(events[responseIndex]);
       } else {
-        const indicesArray = Array.from(functionResponseEventsIndices).sort((a, b) => a - b);
+        const indicesArray = Array.from(functionResponseEventsIndices).sort(
+          (a, b) => a - b
+        );
         const eventsToMerge = indicesArray.map((index) => events[index]);
         resultEvents.push(mergeFunctionResponseEvents(eventsToMerge));
       }
@@ -270,7 +286,7 @@ function safeStringify(obj) {
   }
   try {
     return JSON.stringify(obj);
-  } catch (e) {
+  } catch (_e) {
     return String(obj);
   }
 }

package/dist/esm/agents/functions.js

@@ -10,6 +10,11 @@ import { mergeEventActions } from "../events/event_actions.js";
 import { ToolContext } from "../tools/tool_context.js";
 import { randomUUID } from "../utils/env_aware_utils.js";
 import { logger } from "../utils/logger.js";
+import {
+  traceMergedToolCalls,
+  tracer,
+  traceToolCall
+} from "../telemetry/tracing.js";
 const AF_FUNCTION_CALL_ID_PREFIX = "adk-";
 const REQUEST_EUC_FUNCTION_CALL_NAME = "adk_request_credential";
 const REQUEST_CONFIRMATION_FUNCTION_CALL_NAME = "adk_request_confirmation";
@@ -127,8 +132,51 @@ function generateRequestConfirmationEvent({
   });
 }
 async function callToolAsync(tool, args, toolContext) {
-  logger.debug(`callToolAsync ${tool.name}`);
-  return await tool.runAsync({ args, toolContext });
+  return tracer.startActiveSpan(`execute_tool ${tool.name}`, async (span) => {
+    try {
+      logger.debug(`callToolAsync ${tool.name}`);
+      const result = await tool.runAsync({ args, toolContext });
+      traceToolCall({
+        tool,
+        args,
+        functionResponseEvent: buildResponseEvent(
+          tool,
+          result,
+          toolContext,
+          toolContext.invocationContext
+        )
+      });
+      return result;
+    } finally {
+      span.end();
+    }
+  });
+}
+function buildResponseEvent(tool, functionResult, toolContext, invocationContext) {
+  let responseResult;
+  if (typeof functionResult !== "object" || functionResult == null) {
+    responseResult = { result: functionResult };
+  } else {
+    responseResult = functionResult;
+  }
+  const partFunctionResponse = {
+    functionResponse: {
+      name: tool.name,
+      response: responseResult,
+      id: toolContext.functionCallId
+    }
+  };
+  const content = {
+    role: "user",
+    parts: [partFunctionResponse]
+  };
+  return createEvent({
+    invocationId: invocationContext.invocationId,
+    author: invocationContext.agent.name,
+    content,
+    actions: toolContext.actions,
+    branch: invocationContext.branch
+  });
 }
 async function handleFunctionCallsAsync({
   invocationContext,
@@ -169,14 +217,12 @@ async function handleFunctionCallList({
     if (toolConfirmationDict && functionCall.id) {
       toolConfirmation = toolConfirmationDict[functionCall.id];
     }
-    const { tool, toolContext } = getToolAndContext(
-      {
-        invocationContext,
-        functionCall,
-        toolsDict,
-        toolConfirmation
-      }
-    );
+    const { tool, toolContext } = getToolAndContext({
+      invocationContext,
+      functionCall,
+      toolsDict,
+      toolConfirmation
+    });
     logger.debug(`execute_tool ${tool.name}`);
     const functionArgs = (_a = functionCall.args) != null ? _a : {};
     let functionResponse = null;
@@ -200,21 +246,15 @@ async function handleFunctionCallList({
     }
     if (functionResponse == null) {
       try {
-        functionResponse = await callToolAsync(
-          tool,
-          functionArgs,
-          toolContext
-        );
+        functionResponse = await callToolAsync(tool, functionArgs, toolContext);
       } catch (e) {
         if (e instanceof Error) {
-          const onToolErrorResponse = await invocationContext.pluginManager.runOnToolErrorCallback(
-            {
-              tool,
-              toolArgs: functionArgs,
-              toolContext,
-              error: e
-            }
-          );
+          const onToolErrorResponse = await invocationContext.pluginManager.runOnToolErrorCallback({
+            tool,
+            toolArgs: functionArgs,
+            toolContext,
+            error: e
+          });
           if (onToolErrorResponse) {
             functionResponse = onToolErrorResponse;
           } else {
@@ -278,12 +318,24 @@ async function handleFunctionCallList({
   if (!functionResponseEvents.length) {
     return null;
   }
-  const mergedEvent = mergeParallelFunctionResponseEvents(functionResponseEvents);
+  const mergedEvent = mergeParallelFunctionResponseEvents(
+    functionResponseEvents
+  );
   if (functionResponseEvents.length > 1) {
-    logger.debug("execute_tool (merged)");
-    logger.debug("traceMergedToolCalls", {
-      responseEventId: mergedEvent.id,
-      functionResponseEvent: mergedEvent.id
+    tracer.startActiveSpan("execute_tool (merged)", (span) => {
+      try {
+        logger.debug("execute_tool (merged)");
+        logger.debug("traceMergedToolCalls", {
+          responseEventId: mergedEvent.id,
+          functionResponseEvent: mergedEvent.id
+        });
+        traceMergedToolCalls({
+          responseEventId: mergedEvent.id,
+          functionResponseEvent: mergedEvent
+        });
+      } finally {
+        span.end();
+      }
     });
   }
   return mergedEvent;
@@ -321,7 +373,9 @@ function mergeParallelFunctionResponseEvents(functionResponseEvents) {
     }
   }
   const baseEvent = functionResponseEvents[0];
-  const actionsList = functionResponseEvents.map((event) => event.actions || {});
+  const actionsList = functionResponseEvents.map(
+    (event) => event.actions || {}
+  );
   const mergedActions = mergeEventActions(actionsList);
   return createEvent({
     author: baseEvent.author,

package/dist/esm/agents/invocation_context.js

@@ -17,7 +17,9 @@ class InvocationCostManager {
   incrementAndEnforceLlmCallsLimit(runConfig) {
     this.numberOfLlmCalls++;
     if (runConfig && runConfig.maxLlmCalls > 0 && this.numberOfLlmCalls > runConfig.maxLlmCalls) {
-      throw new Error(`Max number of llm calls limit of ${runConfig.maxLlmCalls} exceeded`);
+      throw new Error(
+        `Max number of llm calls limit of ${runConfig.maxLlmCalls} exceeded`
+      );
     }
   }
 }