@google/adk 0.2.5 → 0.4.0

package/dist/esm/agents/llm_agent.js

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 var _a, _b;
+import { context, trace } from "@opentelemetry/api";
 import { cloneDeep } from "lodash-es";
 import { z } from "zod";
 import {
@@ -32,12 +33,18 @@ import {
 } from "../models/llm_request.js";
 import { LLMRegistry } from "../models/registry.js";
 import { State } from "../sessions/state.js";
-import { BaseTool } from "../tools/base_tool.js";
+import { isBaseTool } from "../tools/base_tool.js";
 import { FunctionTool } from "../tools/function_tool.js";
 import { ToolConfirmation } from "../tools/tool_confirmation.js";
 import { ToolContext } from "../tools/tool_context.js";
 import { base64Decode } from "../utils/env_aware_utils.js";
 import { logger } from "../utils/logger.js";
+import {
+  runAsyncGeneratorWithOtelContext,
+  traceCallLlm,
+  tracer
+} from "../telemetry/tracing.js";
+import { isZodObject, zodObjectToSchema } from "../utils/simple_zod_to_json.js";
 import { BaseAgent } from "./base_agent.js";
 import {
   BaseLlmRequestProcessor
@@ -60,13 +67,14 @@ import { injectSessionState } from "./instructions.js";
 import { ReadonlyContext } from "./readonly_context.js";
 import { StreamingMode } from "./run_config.js";
 const ADK_AGENT_NAME_LABEL_KEY = "adk_agent_name";
-async function convertToolUnionToTools(toolUnion, context) {
-  if (toolUnion instanceof BaseTool) {
+async function convertToolUnionToTools(toolUnion, context2) {
+  if (isBaseTool(toolUnion)) {
     return [toolUnion];
   }
-  return await toolUnion.getTools(context);
+  return await toolUnion.getTools(context2);
 }
 class BasicLlmRequestProcessor extends BaseLlmRequestProcessor {
+  // eslint-disable-next-line require-yield
   async *runAsync(invocationContext, llmRequest) {
     var _a2;
     const agent = invocationContext.agent;
@@ -91,6 +99,7 @@ class BasicLlmRequestProcessor extends BaseLlmRequestProcessor {
 }
 const BASIC_LLM_REQUEST_PROCESSOR = new BasicLlmRequestProcessor();
 class IdentityLlmRequestProcessor extends BaseLlmRequestProcessor {
+  // eslint-disable-next-line require-yield
   async *runAsync(invocationContext, llmRequest) {
     const agent = invocationContext.agent;
     const si = [`You are an agent. Your internal name is "${agent.name}".`];
@@ -105,9 +114,10 @@ class InstructionsLlmRequestProcessor extends BaseLlmRequestProcessor {
   /**
    * Handles instructions and global instructions for LLM flow.
    */
+  // eslint-disable-next-line require-yield
   async *runAsync(invocationContext, llmRequest) {
     const agent = invocationContext.agent;
-    if (!(agent instanceof LlmAgent) || !(agent.rootAgent instanceof LlmAgent)) {
+    if (!isLlmAgent(agent) || !isLlmAgent(agent.rootAgent)) {
       return;
     }
     const rootAgent = agent.rootAgent;
@@ -141,6 +151,7 @@ class InstructionsLlmRequestProcessor extends BaseLlmRequestProcessor {
 }
 const INSTRUCTIONS_LLM_REQUEST_PROCESSOR = new InstructionsLlmRequestProcessor();
 class ContentRequestProcessor {
+  // eslint-disable-next-line require-yield
   async *runAsync(invocationContext, llmRequest) {
     const agent = invocationContext.agent;
     if (!agent || !isLlmAgent(agent)) {
@@ -182,8 +193,9 @@ class AgentTransferLlmRequestProcessor extends BaseLlmRequestProcessor {
       }
     });
   }
+  // eslint-disable-next-line require-yield
   async *runAsync(invocationContext, llmRequest) {
-    if (!(invocationContext.agent instanceof LlmAgent)) {
+    if (!isLlmAgent(invocationContext.agent)) {
       return;
     }
     const transferTargets = this.getTransferTargets(invocationContext.agent);
@@ -250,7 +262,7 @@ to your parent agent.
 const AGENT_TRANSFER_LLM_REQUEST_PROCESSOR = new AgentTransferLlmRequestProcessor();
 class RequestConfirmationLlmRequestProcessor extends BaseLlmRequestProcessor {
   /** Handles tool confirmation information to build the LLM request. */
-  async *runAsync(invocationContext, llmRequest) {
+  async *runAsync(invocationContext) {
     const agent = invocationContext.agent;
     if (!isLlmAgent(agent)) {
       return;
@@ -369,7 +381,7 @@ class RequestConfirmationLlmRequestProcessor extends BaseLlmRequestProcessor {
 const REQUEST_CONFIRMATION_LLM_REQUEST_PROCESSOR = new RequestConfirmationLlmRequestProcessor();
 class CodeExecutionRequestProcessor extends BaseLlmRequestProcessor {
   async *runAsync(invocationContext, llmRequest) {
-    if (!(invocationContext.agent instanceof LlmAgent)) {
+    if (!isLlmAgent(invocationContext.agent)) {
       return;
     }
     if (!invocationContext.agent.codeExecutor) {
@@ -383,7 +395,7 @@ class CodeExecutionRequestProcessor extends BaseLlmRequestProcessor {
     }
     for (const content of llmRequest.contents) {
       const delimeters = invocationContext.agent.codeExecutor.codeBlockDelimiters.length ? invocationContext.agent.codeExecutor.codeBlockDelimiters[0] : ["", ""];
-      const codeExecutionParts = convertCodeExecutionParts(
+      convertCodeExecutionParts(
         content,
         delimeters,
         invocationContext.agent.codeExecutor.executionResultDelimiters
@@ -593,7 +605,7 @@ async function* runPostProcessor(invocationContext, llmResponse) {
     codeExecutorContext,
     codeExecutionResult
   );
-  llmResponse.content = null;
+  llmResponse.content = void 0;
 }
 function extractAndReplaceInlineFiles(codeExecutorContext, llmRequest) {
   var _a2;
@@ -719,8 +731,8 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
     this.disallowTransferToParent = (_d = config.disallowTransferToParent) != null ? _d : false;
     this.disallowTransferToPeers = (_e = config.disallowTransferToPeers) != null ? _e : false;
     this.includeContents = (_f = config.includeContents) != null ? _f : "default";
-    this.inputSchema = config.inputSchema;
-    this.outputSchema = config.outputSchema;
+    this.inputSchema = isZodObject(config.inputSchema) ? zodObjectToSchema(config.inputSchema) : config.inputSchema;
+    this.outputSchema = isZodObject(config.outputSchema) ? zodObjectToSchema(config.outputSchema) : config.outputSchema;
     this.outputKey = config.outputKey;
     this.beforeModelCallback = config.beforeModelCallback;
     this.afterModelCallback = config.afterModelCallback;
@@ -765,16 +777,6 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
         this.disallowTransferToParent = true;
         this.disallowTransferToPeers = true;
       }
-      if (this.subAgents && this.subAgents.length > 0) {
-        throw new Error(
-          `Invalid config for agent ${this.name}: if outputSchema is set, subAgents must be empty to disable agent transfer.`
-        );
-      }
-      if (this.tools && this.tools.length > 0) {
-        throw new Error(
-          `Invalid config for agent ${this.name}: if outputSchema is set, tools must be empty`
-        );
-      }
     }
   }
   /**
@@ -806,12 +808,12 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
    * @param context The context to retrieve the session state.
    * @returns The resolved instruction field.
    */
-  async canonicalInstruction(context) {
+  async canonicalInstruction(context2) {
     if (typeof this.instruction === "string") {
       return { instruction: this.instruction, requireStateInjection: true };
     }
     return {
-      instruction: await this.instruction(context),
+      instruction: await this.instruction(context2),
       requireStateInjection: false
     };
   }
@@ -822,12 +824,15 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
    * @param context The context to retrieve the session state.
    * @returns The resolved globalInstruction field.
    */
-  async canonicalGlobalInstruction(context) {
+  async canonicalGlobalInstruction(context2) {
     if (typeof this.globalInstruction === "string") {
-      return { instruction: this.globalInstruction, requireStateInjection: true };
+      return {
+        instruction: this.globalInstruction,
+        requireStateInjection: true
+      };
     }
     return {
-      instruction: await this.globalInstruction(context),
+      instruction: await this.globalInstruction(context2),
       requireStateInjection: false
     };
   }
@@ -836,10 +841,10 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
    *
    * This method is only for use by Agent Development Kit.
    */
-  async canonicalTools(context) {
+  async canonicalTools(context2) {
     const resolvedTools = [];
     for (const toolUnion of this.tools) {
-      const tools = await convertToolUnionToTools(toolUnion, context);
+      const tools = await convertToolUnionToTools(toolUnion, context2);
       resolvedTools.push(...tools);
     }
     return resolvedTools;
@@ -943,10 +948,10 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
     }
     event.actions.stateDelta[this.outputKey] = result;
   }
-  async *runAsyncImpl(context) {
+  async *runAsyncImpl(context2) {
     while (true) {
       let lastEvent = void 0;
-      for await (const event of this.runOneStepAsync(context)) {
+      for await (const event of this.runOneStepAsync(context2)) {
         lastEvent = event;
         this.maybeSaveOutputToState(event);
         yield event;
@@ -960,19 +965,20 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
       }
     }
   }
-  async *runLiveImpl(context) {
-    for await (const event of this.runLiveFlow(context)) {
+  async *runLiveImpl(context2) {
+    for await (const event of this.runLiveFlow(context2)) {
       this.maybeSaveOutputToState(event);
       yield event;
     }
-    if (context.endInvocation) {
+    if (context2.endInvocation) {
       return;
     }
   }
   // --------------------------------------------------------------------------
   // #START LlmFlow Logic
   // --------------------------------------------------------------------------
-  async *runLiveFlow(invocationContext) {
+  // eslint-disable-next-line require-yield
+  async *runLiveFlow(_invocationContext) {
     await Promise.resolve();
     throw new Error("LlmAgent.runLiveFlow not implemented");
   }
@@ -1008,25 +1014,42 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
       author: this.name,
       branch: invocationContext.branch
     });
-    for await (const llmResponse of this.callLlmAsync(
-      invocationContext,
-      llmRequest,
-      modelResponseEvent
-    )) {
-      for await (const event of this.postprocess(
-        invocationContext,
-        llmRequest,
-        llmResponse,
-        modelResponseEvent
-      )) {
-        modelResponseEvent.id = createNewEventId();
-        modelResponseEvent.timestamp = (/* @__PURE__ */ new Date()).getTime();
-        yield event;
+    const span = tracer.startSpan("call_llm");
+    const ctx = trace.setSpan(context.active(), span);
+    yield* runAsyncGeneratorWithOtelContext(
+      ctx,
+      this,
+      async function* () {
+        const responsesGenerator = async function* () {
+          for await (const llmResponse of this.callLlmAsync(
+            invocationContext,
+            llmRequest,
+            modelResponseEvent
+          )) {
+            for await (const event of this.postprocess(
+              invocationContext,
+              llmRequest,
+              llmResponse,
+              modelResponseEvent
+            )) {
+              modelResponseEvent.id = createNewEventId();
+              modelResponseEvent.timestamp = (/* @__PURE__ */ new Date()).getTime();
+              yield event;
+            }
+          }
+        };
+        yield* this.runAndHandleError(
+          responsesGenerator.call(this),
+          invocationContext,
+          llmRequest,
+          modelResponseEvent
+        );
       }
-    }
+    );
+    span.end();
   }
   async *postprocess(invocationContext, llmRequest, llmResponse, modelResponseEvent) {
-    var _a2;
+    var _a2, _b2;
     for (const processor of this.responseProcessors) {
       for await (const event of processor.runAsync(
         invocationContext,
@@ -1055,6 +1078,10 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
     if (!((_a2 = getFunctionCalls(mergedEvent)) == null ? void 0 : _a2.length)) {
       return;
     }
+    if ((_b2 = invocationContext.runConfig) == null ? void 0 : _b2.pauseOnToolCalls) {
+      invocationContext.endInvocation = true;
+      return;
+    }
     const functionResponseEvent = await handleFunctionCallsAsync({
       invocationContext,
       functionCallEvent: mergedEvent,
@@ -1079,6 +1106,8 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
     });
     if (toolConfirmationEvent) {
       yield toolConfirmationEvent;
+      invocationContext.endInvocation = true;
+      return;
     }
     yield functionResponseEvent;
     const nextAgentName = functionResponseEvent.actions.transferToAgent;
@@ -1135,12 +1164,13 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
         /* stream= */
         ((_e = invocationContext.runConfig) == null ? void 0 : _e.streamingMode) === StreamingMode.SSE
       );
-      for await (const llmResponse of this.runAndHandleError(
-        responsesGenerator,
-        invocationContext,
-        llmRequest,
-        modelResponseEvent
-      )) {
+      for await (const llmResponse of responsesGenerator) {
+        traceCallLlm({
+          invocationContext,
+          eventId: modelResponseEvent.id,
+          llmRequest,
+          llmResponse
+        });
         const alteredLlmResponse = await this.handleAfterModelCallback(
           invocationContext,
           llmResponse,
@@ -1215,11 +1245,29 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
         if (onModelErrorCallbackResponse) {
           yield onModelErrorCallbackResponse;
         } else {
-          const errorResponse = JSON.parse(modelError.message);
-          yield {
-            errorCode: String(errorResponse.error.code),
-            errorMessage: errorResponse.error.message
-          };
+          let errorCode = "UNKNOWN_ERROR";
+          let errorMessage = modelError.message;
+          try {
+            const errorResponse = JSON.parse(modelError.message);
+            if (errorResponse == null ? void 0 : errorResponse.error) {
+              errorCode = String(errorResponse.error.code || "UNKNOWN_ERROR");
+              errorMessage = errorResponse.error.message || errorMessage;
+            }
+          } catch {
+          }
+          if (modelResponseEvent.actions) {
+            yield createEvent({
+              invocationId: invocationContext.invocationId,
+              author: this.name,
+              errorCode,
+              errorMessage
+            });
+          } else {
+            yield {
+              errorCode,
+              errorMessage
+            };
+          }
         }
       } else {
         logger.error("Unknown error during response generation", modelError);

package/dist/esm/agents/loop_agent.js

@@ -38,7 +38,8 @@ class LoopAgent extends (_b = BaseAgent, _a = LOOP_AGENT_SIGNATURE_SYMBOL, _b) {
     }
     return;
   }
-  async *runLiveImpl(context) {
+  // eslint-disable-next-line require-yield
+  async *runLiveImpl(_context) {
     throw new Error("This is not supported yet for LoopAgent.");
   }
 }

package/dist/esm/agents/parallel_agent.js

@@ -20,15 +20,14 @@ class ParallelAgent extends (_b = BaseAgent, _a = PARALLEL_AGENT_SIGNATURE_SYMBO
   }
   async *runAsyncImpl(context) {
     const agentRuns = this.subAgents.map(
-      (subAgent) => subAgent.runAsync(
-        createBranchCtxForSubAgent(this, subAgent, context)
-      )
+      (subAgent) => subAgent.runAsync(createBranchCtxForSubAgent(this, subAgent, context))
     );
     for await (const event of mergeAgentRuns(agentRuns)) {
       yield event;
     }
   }
-  async *runLiveImpl(context) {
+  // eslint-disable-next-line require-yield
+  async *runLiveImpl(_context) {
     throw new Error("This is not supported yet for ParallelAgent.");
   }
 }

package/dist/esm/agents/readonly_context.js

@@ -20,6 +20,18 @@ class ReadonlyContext {
   get invocationId() {
     return this.invocationContext.invocationId;
   }
+  /**
+   * The user ID of the current session.
+   */
+  get userId() {
+    return this.invocationContext.userId;
+  }
+  /**
+   * The ID of the current session.
+   */
+  get sessionId() {
+    return this.invocationContext.session.id;
+  }
   /**
    * The current agent name.
    */

package/dist/esm/agents/run_config.js

@@ -17,6 +17,7 @@ function createRunConfig(params = {}) {
     enableAffectiveDialog: false,
     streamingMode: "none" /* NONE */,
     maxLlmCalls: validateMaxLlmCalls(params.maxLlmCalls || 500),
+    pauseOnToolCalls: false,
     ...params
   };
 }