@google/adk 2.2.1 → 2.4.0

package/dist/esm/agents/llm_agent.js

@@ -8,6 +8,7 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
  * SPDX-License-Identifier: Apache-2.0
  */
 var _a, _b;
+import { Modality } from "@google/genai";
 import { context, trace } from "@opentelemetry/api";
 import { FinishTaskTool } from "../tools/finish_task_tool.js";
 import { FunctionTool } from "../tools/function_tool.js";
@@ -20,6 +21,8 @@ import {
   createNewEventId,
   getFunctionCalls,
   getFunctionResponses,
+  hasTrailingCodeExecutionResult,
+  isEvent,
   isFinalResponse,
   populateClientFunctionCallId
 } from "../events/event.js";
@@ -28,13 +31,15 @@ import { isBaseLlm } from "../models/base_llm.js";
 import { LLMRegistry } from "../models/registry.js";
 import { isBuiltInPlanner } from "../planners/built_in_planner.js";
 import { isBaseTool } from "../tools/base_tool.js";
+import { isBaseToolset } from "../tools/base_toolset.js";
 import { logger } from "../utils/logger.js";
 import { canUseOutputSchemaWithTools } from "../utils/output_schema_utils.js";
 import { Context } from "./context.js";
 import {
   runAsyncGeneratorWithOtelContext,
   traceCallLlm,
-  tracer
+  tracer,
+  traceSendData
 } from "../telemetry/tracing.js";
 import { parseWithSchema } from "../utils/schema.js";
 import { isZodObject, zodObjectToSchema } from "../utils/simple_zod_to_json.js";
@@ -43,13 +48,18 @@ import {
   generateAuthEvent,
   generateRequestConfirmationEvent,
   getLongRunningFunctionCalls,
-  handleFunctionCallsAsync
+  handleFunctionCallsAsync,
+  handleFunctionCallsLive
 } from "./functions.js";
 import { AUTH_PREPROCESSOR } from "../auth/auth_preprocessor.js";
 import { requireAgent } from "./invocation_context.js";
+import { LiveRequestQueue } from "./live_request_queue.js";
 import { AGENT_TRANSFER_LLM_REQUEST_PROCESSOR } from "./processors/agent_transfer_llm_request_processor.js";
 import { BASIC_LLM_REQUEST_PROCESSOR } from "./processors/basic_llm_request_processor.js";
-import { CODE_EXECUTION_REQUEST_PROCESSOR } from "./processors/code_execution_request_processor.js";
+import {
+  CODE_EXECUTION_REQUEST_PROCESSOR,
+  responseProcessor as CODE_EXECUTION_RESPONSE_PROCESSOR
+} from "./processors/code_execution_request_processor.js";
 import { CONTENT_REQUEST_PROCESSOR } from "./processors/content_request_processor.js";
 import { ContextCompactorRequestProcessor } from "./processors/context_compactor_request_processor.js";
 import { IDENTITY_LLM_REQUEST_PROCESSOR } from "./processors/identity_llm_request_processor.js";
@@ -112,6 +122,9 @@ function applyLiveRunConfig(runConfig, llmRequest) {
       liveConfig[k] = runConfig[k];
     }
   }
+  if (runConfig.supportCfc) {
+    liveConfig.responseModalities = [Modality.TEXT];
+  }
 }
 __name(applyLiveRunConfig, "applyLiveRunConfig");
 const ADK_AGENT_NAME_LABEL_KEY = "adk_agent_name";
@@ -194,7 +207,9 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
       }
     }
     this.responseProcessors = (_j = config.responseProcessors) != null ? _j : [
-      NL_PLANNING_RESPONSE_PROCESSOR
+      NL_PLANNING_RESPONSE_PROCESSOR,
+      // Runs the code blocks that a client-side code executor receives.
+      CODE_EXECUTION_RESPONSE_PROCESSOR
     ];
     const agentTransferDisabled = this.disallowTransferToParent && this.disallowTransferToPeers && !((_k = this.subAgents) == null ? void 0 : _k.length);
     if (!agentTransferDisabled) {
@@ -457,14 +472,18 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
     while (true) {
       let lastEvent = void 0;
       let stepHadToolCalls = false;
+      let stepTransferred = false;
       for await (const event of this.runOneStepAsync(context2)) {
         if ((_a2 = context2.abortSignal) == null ? void 0 : _a2.aborted) {
           return;
         }
         lastEvent = event;
-        if (getFunctionCalls(event).length > 0 || getFunctionResponses(event).length > 0) {
+        if (getFunctionCalls(event).length > 0 || getFunctionResponses(event).length > 0 || !event.partial && hasTrailingCodeExecutionResult(event)) {
           stepHadToolCalls = true;
         }
+        if (event.author === this.name && event.actions.transferToAgent) {
+          stepTransferred = true;
+        }
         this.maybeSaveOutputToState(event);
         yield event;
       }
@@ -472,7 +491,7 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
         break;
       }
       const isEmptyMetadataEvent = lastEvent.author === this.name && !lastEvent.partial && (!((_b2 = lastEvent.content) == null ? void 0 : _b2.parts) || lastEvent.content.parts.length === 0) && isDefaultEventActions(lastEvent.actions);
-      if (isFinalResponse(lastEvent) && !(isEmptyMetadataEvent && stepHadToolCalls)) {
+      if (isFinalResponse(lastEvent) && !(isEmptyMetadataEvent && stepHadToolCalls && !stepTransferred)) {
         break;
       }
       if (lastEvent.partial) {
@@ -512,7 +531,7 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
    * already holds the conversation state associated with the handle.
    */
   async *runLiveFlow(invocationContext) {
-    var _a2, _b2, _c, _d;
+    var _a2, _b2, _c, _d, _e;
     if (!invocationContext.liveRequestQueue) {
       throw new Error("liveRequestQueue is required for LlmAgent.runLiveFlow.");
     }
@@ -567,16 +586,29 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
         throw err;
       }
       if (llmRequest.contents.length > 0 && !invocationContext.liveSessionResumptionHandle) {
-        await connection.sendHistory(llmRequest.contents);
+        await tracer.startActiveSpan("send_data", async (span) => {
+          try {
+            await connection.sendHistory(llmRequest.contents);
+            traceSendData({
+              invocationContext,
+              eventId: createNewEventId(),
+              data: llmRequest.contents
+            });
+          } finally {
+            span.end();
+          }
+        });
       }
       let sendError;
       const sendAbort = new AbortController();
       const combinedAbort = invocationContext.abortSignal ? AbortSignal.any([invocationContext.abortSignal, sendAbort.signal]) : sendAbort.signal;
+      (_d = invocationContext.activeStreamingTools) != null ? _d : invocationContext.activeStreamingTools = {};
       const sendTask = this.runSendLoop(
         connection,
         invocationContext.liveRequestQueue,
         combinedAbort,
-        invocationContext.abortSignal
+        invocationContext.abortSignal,
+        invocationContext.activeStreamingTools
       );
       sendTask.catch((error) => {
         logger.error("Error in live send loop:", error);
@@ -608,7 +640,7 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
         }
       }
       await this.teardownLiveConnection(sendAbort, connection, sendTask);
-      if ((_d = invocationContext.abortSignal) == null ? void 0 : _d.aborted) {
+      if ((_e = invocationContext.abortSignal) == null ? void 0 : _e.aborted) {
         return;
       }
       if (sendError) {
@@ -626,7 +658,7 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
     }
   }
   async *runLivePreprocess(invocationContext, llmRequest) {
-    var _a2, _b2;
+    var _a2, _b2, _c;
     for (const processor of this.requestProcessors) {
       for await (const event of processor.runAsync(
         invocationContext,
@@ -640,6 +672,12 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
     }
     for (const toolUnion of this.tools) {
       const toolContext = new Context({ invocationContext });
+      if (isBaseToolset(toolUnion)) {
+        await toolUnion.processLlmRequest(toolContext, llmRequest);
+        if ((_b2 = invocationContext.abortSignal) == null ? void 0 : _b2.aborted) {
+          return;
+        }
+      }
       const tools = (await convertToolUnionToTools(
         toolUnion,
         new ReadonlyContext(invocationContext)
@@ -648,13 +686,13 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
       );
       for (const tool of tools) {
         await tool.processLlmRequest({ toolContext, llmRequest });
-        if ((_b2 = invocationContext.abortSignal) == null ? void 0 : _b2.aborted) {
+        if ((_c = invocationContext.abortSignal) == null ? void 0 : _c.aborted) {
           return;
         }
       }
     }
   }
-  async runSendLoop(connection, liveRequestQueue, sendAbortSignal, invocationAbortSignal) {
+  async runSendLoop(connection, liveRequestQueue, sendAbortSignal, invocationAbortSignal, activeStreamingTools) {
     while (true) {
       if ((sendAbortSignal == null ? void 0 : sendAbortSignal.aborted) || (invocationAbortSignal == null ? void 0 : invocationAbortSignal.aborted)) {
         return;
@@ -668,6 +706,13 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
         }
         throw error;
       }
+      if (activeStreamingTools) {
+        for (const activeStreamingTool of Object.values(activeStreamingTools)) {
+          if (activeStreamingTool.stream) {
+            activeStreamingTool.stream.send(liveRequest);
+          }
+        }
+      }
       try {
         await this.dispatchLiveRequest(connection, liveRequest);
       } catch (error) {
@@ -722,67 +767,74 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
   }
   async *runReceiveLoop(invocationContext, connection, llmRequest, sendAbort) {
     var _a2, _b2, _c, _d;
-    for await (const llmResponse of connection.receive()) {
-      if ((_a2 = invocationContext.abortSignal) == null ? void 0 : _a2.aborted) {
-        return;
-      }
-      if (sendAbort.signal.aborted) {
-        return;
-      }
-      if ((_b2 = llmResponse.liveSessionResumptionUpdate) == null ? void 0 : _b2.newHandle) {
-        invocationContext.liveSessionResumptionHandle = llmResponse.liveSessionResumptionUpdate.newHandle;
-      }
-      if (llmResponse.goAway) {
-        logger.info("Received goAway from live server; triggering reconnect.");
-        throw new LiveReconnectSignal("goAway");
-      }
-      const author = llmResponse.inputTranscription || ((_c = llmResponse.content) == null ? void 0 : _c.role) === "user" ? "user" : this.name;
-      const modelResponseEvent = createEvent({
-        invocationId: invocationContext.invocationId,
-        author,
-        branch: invocationContext.branch
-      });
-      for await (const event of this.postprocessLive(
-        invocationContext,
-        llmRequest,
-        llmResponse,
-        modelResponseEvent
-      )) {
-        yield event;
-        if (event.content && getFunctionResponses(event).length > 0) {
-          await connection.sendContent(event.content);
+    let receivedAny = true;
+    while (receivedAny) {
+      receivedAny = false;
+      for await (const llmResponse of connection.receive()) {
+        receivedAny = true;
+        if ((_a2 = invocationContext.abortSignal) == null ? void 0 : _a2.aborted) {
+          return;
         }
-        const taskCompleted = getFunctionResponses(event).some(
-          (r) => r.name === "task_completed"
-        );
-        if (taskCompleted) {
-          await sleep(TRANSFER_AGENT_DELAY_MS);
+        if (sendAbort.signal.aborted) {
           return;
         }
-        const transferTo = (_d = event.actions) == null ? void 0 : _d.transferToAgent;
-        if (transferTo) {
-          await sleep(TRANSFER_AGENT_DELAY_MS);
-          sendAbort.abort();
-          await connection.close();
-          const agent = requireAgent(invocationContext);
-          const subAgent = agent.rootAgent.findAgent(transferTo);
-          if (subAgent) {
-            const previousAgent = invocationContext.agent;
-            invocationContext.agent = subAgent;
-            const previousHandle = invocationContext.liveSessionResumptionHandle;
-            invocationContext.liveSessionResumptionHandle = void 0;
-            try {
-              for await (const subEvent of subAgent.runLive(
-                invocationContext
-              )) {
-                yield subEvent;
+        if ((_b2 = llmResponse.liveSessionResumptionUpdate) == null ? void 0 : _b2.newHandle) {
+          invocationContext.liveSessionResumptionHandle = llmResponse.liveSessionResumptionUpdate.newHandle;
+        }
+        if (llmResponse.goAway) {
+          logger.info(
+            "Received goAway from live server; triggering reconnect."
+          );
+          throw new LiveReconnectSignal("goAway");
+        }
+        const author = llmResponse.inputTranscription || ((_c = llmResponse.content) == null ? void 0 : _c.role) === "user" ? "user" : this.name;
+        const modelResponseEvent = createEvent({
+          invocationId: invocationContext.invocationId,
+          author,
+          branch: invocationContext.branch
+        });
+        for await (const event of this.postprocessLive(
+          invocationContext,
+          llmRequest,
+          llmResponse,
+          modelResponseEvent
+        )) {
+          yield event;
+          if (event.content && getFunctionResponses(event).length > 0) {
+            await connection.sendContent(event.content);
+          }
+          const taskCompleted = getFunctionResponses(event).some(
+            (r) => r.name === "task_completed"
+          );
+          if (taskCompleted) {
+            await sleep(TRANSFER_AGENT_DELAY_MS);
+            return;
+          }
+          const transferTo = (_d = event.actions) == null ? void 0 : _d.transferToAgent;
+          if (transferTo) {
+            await sleep(TRANSFER_AGENT_DELAY_MS);
+            sendAbort.abort();
+            await connection.close();
+            const agent = requireAgent(invocationContext);
+            const subAgent = agent.rootAgent.findAgent(transferTo);
+            if (subAgent) {
+              const previousAgent = invocationContext.agent;
+              invocationContext.agent = subAgent;
+              const previousHandle = invocationContext.liveSessionResumptionHandle;
+              invocationContext.liveSessionResumptionHandle = void 0;
+              try {
+                for await (const subEvent of subAgent.runLive(
+                  invocationContext
+                )) {
+                  yield subEvent;
+                }
+              } finally {
+                invocationContext.agent = previousAgent;
+                invocationContext.liveSessionResumptionHandle = previousHandle;
               }
-            } finally {
-              invocationContext.agent = previousAgent;
-              invocationContext.liveSessionResumptionHandle = previousHandle;
             }
+            return;
           }
-          return;
         }
       }
     }
@@ -837,7 +889,7 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
     if (!functionCalls.length) {
       return;
     }
-    const functionResponseEvent = await handleFunctionCallsAsync({
+    const functionResponseEvent = await handleFunctionCallsLive({
       invocationContext,
       functionCallEvent: mergedEvent,
       toolsDict: llmRequest.toolsDict,
@@ -857,7 +909,7 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
     yield functionResponseEvent;
   }
   async *runOneStepAsync(invocationContext) {
-    var _a2, _b2, _c;
+    var _a2, _b2, _c, _d;
     const llmRequest = {
       contents: [],
       toolsDict: {},
@@ -877,7 +929,7 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
     const allTools = [...this.tools];
     if (this.mode === "task") {
       allTools.push(this.finishTaskTool);
-    } else if (this.outputSchema && allTools.length > 0 && !canUseOutputSchemaWithTools(this.canonicalModel.model)) {
+    } else if (this.outputSchema && allTools.length > 0 && !canUseOutputSchemaWithTools(this.canonicalModel)) {
       const setModelResponseTool = new FunctionTool({
         name: "set_model_response",
         description: "Call this tool to submit your final response conforming to the output schema. Use this tool only when you have collected all the information and are ready to return the final answer.",
@@ -901,6 +953,12 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
         invocationContext,
         eventActions: modelResponseEvent.actions
       });
+      if (isBaseToolset(toolUnion)) {
+        await toolUnion.processLlmRequest(toolContext, llmRequest);
+        if ((_b2 = invocationContext.abortSignal) == null ? void 0 : _b2.aborted) {
+          return;
+        }
+      }
       const tools = (await convertToolUnionToTools(
         toolUnion,
         new ReadonlyContext(invocationContext)
@@ -909,54 +967,65 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
       });
       for (const tool of tools) {
         await tool.processLlmRequest({ toolContext, llmRequest });
-        if ((_b2 = invocationContext.abortSignal) == null ? void 0 : _b2.aborted) {
+        if ((_c = invocationContext.abortSignal) == null ? void 0 : _c.aborted) {
           return;
         }
       }
     }
-    if (invocationContext.endInvocation || ((_c = invocationContext.abortSignal) == null ? void 0 : _c.aborted)) {
+    if (invocationContext.endInvocation || ((_d = invocationContext.abortSignal) == null ? void 0 : _d.aborted)) {
       return;
     }
     const span = tracer.startSpan("call_llm");
     const ctx = trace.setSpan(context.active(), span);
-    yield* runAsyncGeneratorWithOtelContext(
-      ctx,
-      this,
-      async function* () {
-        const responsesGenerator = /* @__PURE__ */ __name(async function* () {
-          var _a3, _b3;
-          for await (const llmResponse of this.callLlmAsync(
-            invocationContext,
-            llmRequest,
-            modelResponseEvent
-          )) {
-            if ((_a3 = invocationContext.abortSignal) == null ? void 0 : _a3.aborted) {
-              return;
-            }
-            for await (const event of this.postprocess(
+    try {
+      yield* runAsyncGeneratorWithOtelContext(
+        ctx,
+        this,
+        async function* () {
+          const responsesGenerator = /* @__PURE__ */ __name(async function* () {
+            var _a3, _b3, _c2;
+            for await (const llmResponse of this.callLlmAsync(
               invocationContext,
               llmRequest,
-              llmResponse,
               modelResponseEvent
             )) {
-              if ((_b3 = invocationContext.abortSignal) == null ? void 0 : _b3.aborted) {
+              if ((_a3 = invocationContext.abortSignal) == null ? void 0 : _a3.aborted) {
                 return;
               }
-              modelResponseEvent.id = createNewEventId();
-              modelResponseEvent.timestamp = (/* @__PURE__ */ new Date()).getTime();
-              yield event;
+              if (((_b3 = invocationContext.runConfig) == null ? void 0 : _b3.supportCfc) && isEvent(llmResponse)) {
+                modelResponseEvent.id = createNewEventId();
+                modelResponseEvent.timestamp = (/* @__PURE__ */ new Date()).getTime();
+                yield llmResponse;
+                continue;
+              }
+              for await (const event of this.postprocess(
+                invocationContext,
+                llmRequest,
+                llmResponse,
+                modelResponseEvent
+              )) {
+                if ((_c2 = invocationContext.abortSignal) == null ? void 0 : _c2.aborted) {
+                  return;
+                }
+                if (!event.partial) {
+                  modelResponseEvent.id = createNewEventId();
+                  modelResponseEvent.timestamp = (/* @__PURE__ */ new Date()).getTime();
+                }
+                yield event;
+              }
             }
-          }
-        }, "responsesGenerator");
-        yield* this.runAndHandleError(
-          responsesGenerator.call(this),
-          invocationContext,
-          llmRequest,
-          modelResponseEvent
-        );
-      }
-    );
-    span.end();
+          }, "responsesGenerator");
+          yield* this.runAndHandleError(
+            responsesGenerator.call(this),
+            invocationContext,
+            llmRequest,
+            modelResponseEvent
+          );
+        }
+      );
+    } finally {
+      span.end();
+    }
   }
   async *postprocess(invocationContext, llmRequest, llmResponse, modelResponseEvent) {
     var _a2, _b2, _c, _d, _e, _f;
@@ -1082,7 +1151,7 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
     return agentToRun;
   }
   async *callLlmAsync(invocationContext, llmRequest, modelResponseEvent) {
-    var _a2, _b2, _c, _d, _e, _f, _g, _h;
+    var _a2, _b2, _c, _d, _e, _f, _g, _h, _i, _j, _k;
     const beforeModelResponse = await this.handleBeforeModelCallback(
       invocationContext,
       llmRequest,
@@ -1101,14 +1170,39 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
       llmRequest.config.labels[ADK_AGENT_NAME_LABEL_KEY] = this.name;
     }
     const llm = this.canonicalModel;
+    invocationContext.incrementLlmCallCount();
     if ((_e = invocationContext.runConfig) == null ? void 0 : _e.supportCfc) {
-      throw new Error("CFC is not yet supported in callLlmAsync");
+      (_f = invocationContext.liveRequestQueue) != null ? _f : invocationContext.liveRequestQueue = new LiveRequestQueue();
+      const liveRequestQueue = invocationContext.liveRequestQueue;
+      try {
+        for await (const llmResponse of this.runLiveFlow(invocationContext)) {
+          if ((_g = invocationContext.abortSignal) == null ? void 0 : _g.aborted) {
+            return;
+          }
+          const alteredLlmResponse = await this.handleAfterModelCallback(
+            invocationContext,
+            llmResponse,
+            modelResponseEvent
+          );
+          if ((_h = invocationContext.abortSignal) == null ? void 0 : _h.aborted) {
+            return;
+          }
+          const effectiveResponse = alteredLlmResponse ? createEvent({ ...llmResponse, ...alteredLlmResponse }) : llmResponse;
+          if (invocationContext.runConfig.streamingMode === StreamingMode.SSE || !effectiveResponse.partial) {
+            yield effectiveResponse;
+          }
+          if (effectiveResponse.turnComplete) {
+            liveRequestQueue.close();
+          }
+        }
+      } finally {
+        liveRequestQueue.close();
+      }
     } else {
-      invocationContext.incrementLlmCallCount();
       const responsesGenerator = llm.generateContentAsync(
         llmRequest,
         /* stream= */
-        ((_f = invocationContext.runConfig) == null ? void 0 : _f.streamingMode) === StreamingMode.SSE,
+        ((_i = invocationContext.runConfig) == null ? void 0 : _i.streamingMode) === StreamingMode.SSE,
         invocationContext.abortSignal
       );
       for await (const llmResponse of responsesGenerator) {
@@ -1118,7 +1212,7 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
           llmRequest,
           llmResponse
         });
-        if ((_g = invocationContext.abortSignal) == null ? void 0 : _g.aborted) {
+        if ((_j = invocationContext.abortSignal) == null ? void 0 : _j.aborted) {
           return;
         }
         const alteredLlmResponse = await this.handleAfterModelCallback(
@@ -1126,7 +1220,7 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
           llmResponse,
           modelResponseEvent
         );
-        if ((_h = invocationContext.abortSignal) == null ? void 0 : _h.aborted) {
+        if ((_k = invocationContext.abortSignal) == null ? void 0 : _k.aborted) {
           return;
         }
         yield alteredLlmResponse != null ? alteredLlmResponse : llmResponse;

package/dist/esm/agents/processors/basic_llm_request_processor.js

@@ -28,7 +28,7 @@ const _BasicLlmRequestProcessor = class _BasicLlmRequestProcessor extends BaseLl
     }
     llmRequest.model = agent.canonicalModel.model;
     llmRequest.config = { ...(_a = agent.generateContentConfig) != null ? _a : {} };
-    if (agent.outputSchema && agent.mode !== "task" && (!((_b = agent.tools) == null ? void 0 : _b.length) || canUseOutputSchemaWithTools(agent.canonicalModel.model))) {
+    if (agent.outputSchema && agent.mode !== "task" && (!((_b = agent.tools) == null ? void 0 : _b.length) || canUseOutputSchemaWithTools(agent.canonicalModel))) {
       setOutputSchema(llmRequest, agent.outputSchema);
     }
     if (invocationContext.runConfig) {

package/dist/esm/agents/processors/code_execution_request_processor.js

@@ -15,13 +15,14 @@ import {
   buildExecutableCodePart,
   CodeExecutionLanguage,
   convertCodeExecutionParts,
-  extractCodeAndTruncateContent
+  extractCodeBlockAndTruncateContent,
+  FileContentEncoding
 } from "../../code_executors/code_execution_utils.js";
 import { CodeExecutorContext } from "../../code_executors/code_executor_context.js";
 import { createEvent } from "../../events/event.js";
 import { createEventActions } from "../../events/event_actions.js";
 import { State } from "../../sessions/state.js";
-import { base64Decode } from "../../utils/env_aware_utils.js";
+import { base64Decode, base64Encode } from "../../utils/env_aware_utils.js";
 import { requireAgent } from "../invocation_context.js";
 import { isLlmAgent } from "../llm_agent.js";
 import {
@@ -62,6 +63,14 @@ const DATA_FILE_UTIL_MAP = {
 const DATA_FILE_HELPER_LIB = `
 import pandas as pd
 
+def crop(s: str, max_chars: int = 64) -> str:
+  """Crops a string to max_chars characters."""
+  if len(s) <= max_chars:
+    return s
+  if max_chars >= 3:
+    return s[:max_chars - 3] + '...'
+  return s[:max_chars]
+
 def explore_df(df: pd.DataFrame) -> None:
   """Prints some information about a pandas DataFrame."""
 
@@ -223,7 +232,7 @@ async function* runPostProcessor(invocationContext, llmResponse) {
     return;
   }
   const responseContent = llmResponse.content;
-  const codeStr = extractCodeAndTruncateContent(
+  const { code: codeStr, language } = extractCodeBlockAndTruncateContent(
     responseContent,
     codeExecutor.codeBlockDelimiters
   );
@@ -244,7 +253,7 @@ async function* runPostProcessor(invocationContext, llmResponse) {
     invocationContext,
     codeExecutionInput: {
       code: codeStr,
-      language: CodeExecutionLanguage.PYTHON,
+      language,
       inputFiles: codeExecutorContext.getInputFiles(),
       executionId
     }
@@ -279,14 +288,15 @@ function extractAndReplaceInlineFiles(codeExecutorContext, llmRequest) {
         continue;
       }
       const fileName = `data_${i + 1}_${j + 1}${DATA_FILE_UTIL_MAP[mimeType].extension}`;
-      part.text = `
-Available file: \`${fileName}\`
-`;
       const file = {
         name: fileName,
         content: base64Decode(part.inlineData.data),
         mimeType
       };
+      part.text = `
+Available file: \`${fileName}\`
+`;
+      delete part.inlineData;
       if (!savedFileNames.has(fileName)) {
         codeExecutorContext.addInputFiles([file]);
         allInputFiles.push(file);
@@ -330,7 +340,10 @@ async function postProcessCodeExecutionResult(invocationContext, codeExecutorCon
     const version = await invocationContext.artifactService.saveArtifact({
       filename: outputFile.name,
       artifact: {
-        inlineData: { data: outputFile.content, mimeType: outputFile.mimeType }
+        inlineData: {
+          data: outputFile.contentEncoding === FileContentEncoding.UTF8 ? base64Encode(outputFile.content) : outputFile.content,
+          mimeType: outputFile.mimeType
+        }
       }
     });
     eventActions.artifactDelta[outputFile.name] = version;