@google/adk 0.3.0 → 0.4.0

package/dist/web/agents/llm_agent.js

@@ -97,7 +97,7 @@ 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";
@@ -108,6 +108,7 @@ import {
   traceCallLlm,
   tracer
 } from "../telemetry/tracing.js";
+import { isZodObject, zodObjectToSchema } from "../utils/simple_zod_to_json.js";
 import { BaseAgent } from "./base_agent.js";
 import {
   BaseLlmRequestProcessor
@@ -131,7 +132,7 @@ 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, context2) {
-  if (toolUnion instanceof BaseTool) {
+  if (isBaseTool(toolUnion)) {
     return [toolUnion];
   }
   return await toolUnion.getTools(context2);
@@ -185,7 +186,7 @@ class InstructionsLlmRequestProcessor extends BaseLlmRequestProcessor {
   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;
@@ -267,7 +268,7 @@ 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);
@@ -438,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) {
@@ -772,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;
@@ -818,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")
-        );
-      }
     }
   }
   /**
@@ -1115,46 +1106,56 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
         this,
         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;
+            const responsesGenerator = function() {
+              return __asyncGenerator(this, null, function* () {
                 try {
-                  for (var iter2 = __forAwait(this.postprocess(
+                  for (var iter3 = __forAwait(this.callLlmAsync(
                     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;
+                  )), 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 (temp2) {
-                  error2 = [temp2];
+                } catch (temp3) {
+                  error3 = [temp3];
                 } finally {
                   try {
-                    more2 && (temp2 = iter2.return) && (yield new __await(temp2.call(iter2)));
+                    more3 && (temp3 = iter3.return) && (yield new __await(temp3.call(iter3)));
                   } finally {
-                    if (error2)
-                      throw error2[0];
+                    if (error3)
+                      throw error3[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,
+              modelResponseEvent
+            ));
           });
         }
       ));
@@ -1163,7 +1164,7 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
   }
   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(
@@ -1201,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,
@@ -1225,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;
@@ -1296,12 +1303,7 @@ 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,
@@ -1407,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/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) {