@google/adk 0.2.5 → 0.4.0

package/dist/web/agents/llm_agent.js

@@ -3,6 +3,9 @@ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
 var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __spreadValues = (a, b) => {
   for (var prop in b || (b = {}))
@@ -30,6 +33,34 @@ var __asyncGenerator = (__this, __arguments, generator) => {
   }, method = (k) => it[k] = (x) => new Promise((yes, no) => resume(k, x, yes, no)), it = {};
   return generator = generator.apply(__this, __arguments), it[__knownSymbol("asyncIterator")] = () => it, method("next"), method("throw"), method("return"), it;
 };
+var __yieldStar = (value) => {
+  var obj = value[__knownSymbol("asyncIterator")], isAwait = false, method, it = {};
+  if (obj == null) {
+    obj = value[__knownSymbol("iterator")]();
+    method = (k) => it[k] = (x) => obj[k](x);
+  } else {
+    obj = obj.call(value);
+    method = (k) => it[k] = (v) => {
+      if (isAwait) {
+        isAwait = false;
+        if (k === "throw") throw v;
+        return v;
+      }
+      isAwait = true;
+      return {
+        done: false,
+        value: new __await(new Promise((resolve) => {
+          var x = obj[k](v);
+          if (!(x instanceof Object)) __typeError("Object expected");
+          resolve(x);
+        }), 1)
+      };
+    };
+  }
+  return it[__knownSymbol("iterator")] = () => it, method("next"), "throw" in obj ? method("throw") : it.throw = (x) => {
+    throw x;
+  }, "return" in obj && method("return"), it;
+};
 var __forAwait = (obj, it, method) => (it = obj[__knownSymbol("asyncIterator")]) ? it.call(obj) : (obj = obj[__knownSymbol("iterator")](), it = {}, method = (key, fn) => (fn = obj[key]) && (it[key] = (arg) => new Promise((yes, no, done) => (arg = fn.call(obj, arg), done = arg.done, Promise.resolve(arg.value).then((value) => yes({ value, done }), no)))), method("next"), method("return"), it);
 /**
  * @license
@@ -37,6 +68,7 @@ var __forAwait = (obj, it, method) => (it = obj[__knownSymbol("asyncIterator")])
  * 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 {
@@ -65,12 +97,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
@@ -93,13 +131,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
   runAsync(invocationContext, llmRequest) {
     return __asyncGenerator(this, null, function* () {
       var _a2;
@@ -126,6 +165,7 @@ class BasicLlmRequestProcessor extends BaseLlmRequestProcessor {
 }
 const BASIC_LLM_REQUEST_PROCESSOR = new BasicLlmRequestProcessor();
 class IdentityLlmRequestProcessor extends BaseLlmRequestProcessor {
+  // eslint-disable-next-line require-yield
   runAsync(invocationContext, llmRequest) {
     return __asyncGenerator(this, null, function* () {
       const agent = invocationContext.agent;
@@ -142,10 +182,11 @@ class InstructionsLlmRequestProcessor extends BaseLlmRequestProcessor {
   /**
    * Handles instructions and global instructions for LLM flow.
    */
+  // eslint-disable-next-line require-yield
   runAsync(invocationContext, llmRequest) {
     return __asyncGenerator(this, null, function* () {
       const agent = invocationContext.agent;
-      if (!(agent instanceof LlmAgent) || !(agent.rootAgent instanceof LlmAgent)) {
+      if (!isLlmAgent(agent) || !isLlmAgent(agent.rootAgent)) {
         return;
       }
       const rootAgent = agent.rootAgent;
@@ -180,6 +221,7 @@ class InstructionsLlmRequestProcessor extends BaseLlmRequestProcessor {
 }
 const INSTRUCTIONS_LLM_REQUEST_PROCESSOR = new InstructionsLlmRequestProcessor();
 class ContentRequestProcessor {
+  // eslint-disable-next-line require-yield
   runAsync(invocationContext, llmRequest) {
     return __asyncGenerator(this, null, function* () {
       const agent = invocationContext.agent;
@@ -223,9 +265,10 @@ class AgentTransferLlmRequestProcessor extends BaseLlmRequestProcessor {
       }
     });
   }
+  // eslint-disable-next-line require-yield
   runAsync(invocationContext, llmRequest) {
     return __asyncGenerator(this, null, function* () {
-      if (!(invocationContext.agent instanceof LlmAgent)) {
+      if (!isLlmAgent(invocationContext.agent)) {
         return;
       }
       const transferTargets = this.getTransferTargets(invocationContext.agent);
@@ -274,7 +317,7 @@ class AgentTransferLlmRequestProcessor extends BaseLlmRequestProcessor {
 const AGENT_TRANSFER_LLM_REQUEST_PROCESSOR = new AgentTransferLlmRequestProcessor();
 class RequestConfirmationLlmRequestProcessor extends BaseLlmRequestProcessor {
   /** Handles tool confirmation information to build the LLM request. */
-  runAsync(invocationContext, llmRequest) {
+  runAsync(invocationContext) {
     return __asyncGenerator(this, null, function* () {
       const agent = invocationContext.agent;
       if (!isLlmAgent(agent)) {
@@ -396,7 +439,7 @@ const REQUEST_CONFIRMATION_LLM_REQUEST_PROCESSOR = new RequestConfirmationLlmReq
 class CodeExecutionRequestProcessor extends BaseLlmRequestProcessor {
   runAsync(invocationContext, llmRequest) {
     return __asyncGenerator(this, null, function* () {
-      if (!(invocationContext.agent instanceof LlmAgent)) {
+      if (!isLlmAgent(invocationContext.agent)) {
         return;
       }
       if (!invocationContext.agent.codeExecutor) {
@@ -422,7 +465,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
@@ -613,7 +656,7 @@ function runPostProcessor(invocationContext, llmResponse) {
       codeExecutorContext,
       codeExecutionResult
     ));
-    llmResponse.content = null;
+    llmResponse.content = void 0;
   });
 }
 function extractAndReplaceInlineFiles(codeExecutorContext, llmRequest) {
@@ -730,8 +773,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;
@@ -776,16 +819,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 ".concat(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 ".concat(this.name, ": if outputSchema is set, tools must be empty")
-        );
-      }
     }
   }
   /**
@@ -817,12 +850,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
     };
   }
@@ -833,12 +866,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
     };
   }
@@ -847,10 +883,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;
@@ -954,12 +990,12 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
     }
     event.actions.stateDelta[this.outputKey] = result;
   }
-  runAsyncImpl(context) {
+  runAsyncImpl(context2) {
     return __asyncGenerator(this, null, function* () {
       while (true) {
         let lastEvent = void 0;
         try {
-          for (var iter = __forAwait(this.runOneStepAsync(context)), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
+          for (var iter = __forAwait(this.runOneStepAsync(context2)), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
             const event = temp.value;
             lastEvent = event;
             this.maybeSaveOutputToState(event);
@@ -985,10 +1021,10 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
       }
     });
   }
-  runLiveImpl(context) {
+  runLiveImpl(context2) {
     return __asyncGenerator(this, null, function* () {
       try {
-        for (var iter = __forAwait(this.runLiveFlow(context)), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
+        for (var iter = __forAwait(this.runLiveFlow(context2)), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
           const event = temp.value;
           this.maybeSaveOutputToState(event);
           yield event;
@@ -1003,7 +1039,7 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
             throw error[0];
         }
       }
-      if (context.endInvocation) {
+      if (context2.endInvocation) {
         return;
       }
     });
@@ -1011,7 +1047,8 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
   // --------------------------------------------------------------------------
   // #START LlmFlow Logic
   // --------------------------------------------------------------------------
-  runLiveFlow(invocationContext) {
+  // eslint-disable-next-line require-yield
+  runLiveFlow(_invocationContext) {
     return __asyncGenerator(this, null, function* () {
       yield new __await(Promise.resolve());
       throw new Error("LlmAgent.runLiveFlow not implemented");
@@ -1062,51 +1099,72 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
         author: this.name,
         branch: invocationContext.branch
       });
-      try {
-        for (var iter3 = __forAwait(this.callLlmAsync(
-          invocationContext,
-          llmRequest,
-          modelResponseEvent
-        )), more3, temp3, error3; more3 = !(temp3 = yield new __await(iter3.next())).done; more3 = false) {
-          const llmResponse = temp3.value;
-          try {
-            for (var iter2 = __forAwait(this.postprocess(
+      const span = tracer.startSpan("call_llm");
+      const ctx = trace.setSpan(context.active(), span);
+      yield* __yieldStar(runAsyncGeneratorWithOtelContext(
+        ctx,
+        this,
+        function() {
+          return __asyncGenerator(this, null, function* () {
+            const responsesGenerator = function() {
+              return __asyncGenerator(this, null, function* () {
+                try {
+                  for (var iter3 = __forAwait(this.callLlmAsync(
+                    invocationContext,
+                    llmRequest,
+                    modelResponseEvent
+                  )), more3, temp3, error3; more3 = !(temp3 = yield new __await(iter3.next())).done; more3 = false) {
+                    const llmResponse = temp3.value;
+                    try {
+                      for (var iter2 = __forAwait(this.postprocess(
+                        invocationContext,
+                        llmRequest,
+                        llmResponse,
+                        modelResponseEvent
+                      )), more2, temp2, error2; more2 = !(temp2 = yield new __await(iter2.next())).done; more2 = false) {
+                        const event = temp2.value;
+                        modelResponseEvent.id = createNewEventId();
+                        modelResponseEvent.timestamp = (/* @__PURE__ */ new Date()).getTime();
+                        yield event;
+                      }
+                    } catch (temp2) {
+                      error2 = [temp2];
+                    } finally {
+                      try {
+                        more2 && (temp2 = iter2.return) && (yield new __await(temp2.call(iter2)));
+                      } finally {
+                        if (error2)
+                          throw error2[0];
+                      }
+                    }
+                  }
+                } catch (temp3) {
+                  error3 = [temp3];
+                } finally {
+                  try {
+                    more3 && (temp3 = iter3.return) && (yield new __await(temp3.call(iter3)));
+                  } finally {
+                    if (error3)
+                      throw error3[0];
+                  }
+                }
+              });
+            };
+            yield* __yieldStar(this.runAndHandleError(
+              responsesGenerator.call(this),
               invocationContext,
               llmRequest,
-              llmResponse,
               modelResponseEvent
-            )), more2, temp2, error2; more2 = !(temp2 = yield new __await(iter2.next())).done; more2 = false) {
-              const event = temp2.value;
-              modelResponseEvent.id = createNewEventId();
-              modelResponseEvent.timestamp = (/* @__PURE__ */ new Date()).getTime();
-              yield event;
-            }
-          } catch (temp2) {
-            error2 = [temp2];
-          } finally {
-            try {
-              more2 && (temp2 = iter2.return) && (yield new __await(temp2.call(iter2)));
-            } finally {
-              if (error2)
-                throw error2[0];
-            }
-          }
-        }
-      } catch (temp3) {
-        error3 = [temp3];
-      } finally {
-        try {
-          more3 && (temp3 = iter3.return) && (yield new __await(temp3.call(iter3)));
-        } finally {
-          if (error3)
-            throw error3[0];
+            ));
+          });
         }
-      }
+      ));
+      span.end();
     });
   }
   postprocess(invocationContext, llmRequest, llmResponse, modelResponseEvent) {
     return __asyncGenerator(this, null, function* () {
-      var _a2;
+      var _a2, _b2;
       for (const processor of this.responseProcessors) {
         try {
           for (var iter = __forAwait(processor.runAsync(
@@ -1144,6 +1202,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 = yield new __await(handleFunctionCallsAsync({
         invocationContext,
         functionCallEvent: mergedEvent,
@@ -1168,6 +1230,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;
@@ -1239,13 +1303,14 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
           ((_e = invocationContext.runConfig) == null ? void 0 : _e.streamingMode) === StreamingMode.SSE
         );
         try {
-          for (var iter = __forAwait(this.runAndHandleError(
-            responsesGenerator,
-            invocationContext,
-            llmRequest,
-            modelResponseEvent
-          )), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
+          for (var iter = __forAwait(responsesGenerator), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
             const llmResponse = temp.value;
+            traceCallLlm({
+              invocationContext,
+              eventId: modelResponseEvent.id,
+              llmRequest,
+              llmResponse
+            });
             const alteredLlmResponse = yield new __await(this.handleAfterModelCallback(
               invocationContext,
               llmResponse,
@@ -1344,11 +1409,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 (e) {
+            }
+            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/web/agents/loop_agent.js

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

package/dist/web/agents/parallel_agent.js

@@ -38,9 +38,7 @@ class ParallelAgent extends (_b = BaseAgent, _a = PARALLEL_AGENT_SIGNATURE_SYMBO
   runAsyncImpl(context) {
     return __asyncGenerator(this, null, function* () {
       const agentRuns = this.subAgents.map(
-        (subAgent) => subAgent.runAsync(
-          createBranchCtxForSubAgent(this, subAgent, context)
-        )
+        (subAgent) => subAgent.runAsync(createBranchCtxForSubAgent(this, subAgent, context))
       );
       try {
         for (var iter = __forAwait(mergeAgentRuns(agentRuns)), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
@@ -59,7 +57,8 @@ class ParallelAgent extends (_b = BaseAgent, _a = PARALLEL_AGENT_SIGNATURE_SYMBO
       }
     });
   }
-  runLiveImpl(context) {
+  // eslint-disable-next-line require-yield
+  runLiveImpl(_context) {
     return __asyncGenerator(this, null, function* () {
       throw new Error("This is not supported yet for ParallelAgent.");
     });

package/dist/web/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/web/agents/run_config.js

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