@google/adk 2.2.1 → 2.4.0

package/dist/cjs/agents/llm_agent.js

@@ -29,6 +29,7 @@ __export(llm_agent_exports, {
   isLlmAgent: () => isLlmAgent
 });
 module.exports = __toCommonJS(llm_agent_exports);
+var import_genai = require("@google/genai");
 var import_api = require("@opentelemetry/api");
 var import_finish_task_tool = require("../tools/finish_task_tool.js");
 var import_function_tool = require("../tools/function_tool.js");
@@ -42,6 +43,7 @@ var import_base_llm = require("../models/base_llm.js");
 var import_registry = require("../models/registry.js");
 var import_built_in_planner = require("../planners/built_in_planner.js");
 var import_base_tool = require("../tools/base_tool.js");
+var import_base_toolset = require("../tools/base_toolset.js");
 var import_logger = require("../utils/logger.js");
 var import_output_schema_utils = require("../utils/output_schema_utils.js");
 var import_context = require("./context.js");
@@ -52,6 +54,7 @@ var import_base_agent = require("./base_agent.js");
 var import_functions = require("./functions.js");
 var import_auth_preprocessor = require("../auth/auth_preprocessor.js");
 var import_invocation_context = require("./invocation_context.js");
+var import_live_request_queue = require("./live_request_queue.js");
 var import_agent_transfer_llm_request_processor = require("./processors/agent_transfer_llm_request_processor.js");
 var import_basic_llm_request_processor = require("./processors/basic_llm_request_processor.js");
 var import_code_execution_request_processor = require("./processors/code_execution_request_processor.js");
@@ -120,6 +123,9 @@ function applyLiveRunConfig(runConfig, llmRequest) {
       liveConfig[k] = runConfig[k];
     }
   }
+  if (runConfig.supportCfc) {
+    liveConfig.responseModalities = [import_genai.Modality.TEXT];
+  }
 }
 __name(applyLiveRunConfig, "applyLiveRunConfig");
 const ADK_AGENT_NAME_LABEL_KEY = "adk_agent_name";
@@ -202,7 +208,9 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
       }
     }
     this.responseProcessors = (_j = config.responseProcessors) != null ? _j : [
-      import_nl_planning_processor.NL_PLANNING_RESPONSE_PROCESSOR
+      import_nl_planning_processor.NL_PLANNING_RESPONSE_PROCESSOR,
+      // Runs the code blocks that a client-side code executor receives.
+      import_code_execution_request_processor.responseProcessor
     ];
     const agentTransferDisabled = this.disallowTransferToParent && this.disallowTransferToPeers && !((_k = this.subAgents) == null ? void 0 : _k.length);
     if (!agentTransferDisabled) {
@@ -465,14 +473,18 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
     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 ((0, import_event.getFunctionCalls)(event).length > 0 || (0, import_event.getFunctionResponses)(event).length > 0) {
+        if ((0, import_event.getFunctionCalls)(event).length > 0 || (0, import_event.getFunctionResponses)(event).length > 0 || !event.partial && (0, import_event.hasTrailingCodeExecutionResult)(event)) {
           stepHadToolCalls = true;
         }
+        if (event.author === this.name && event.actions.transferToAgent) {
+          stepTransferred = true;
+        }
         this.maybeSaveOutputToState(event);
         yield event;
       }
@@ -480,7 +492,7 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
         break;
       }
       const isEmptyMetadataEvent = lastEvent.author === this.name && !lastEvent.partial && (!((_b2 = lastEvent.content) == null ? void 0 : _b2.parts) || lastEvent.content.parts.length === 0) && (0, import_event_actions.isDefaultEventActions)(lastEvent.actions);
-      if ((0, import_event.isFinalResponse)(lastEvent) && !(isEmptyMetadataEvent && stepHadToolCalls)) {
+      if ((0, import_event.isFinalResponse)(lastEvent) && !(isEmptyMetadataEvent && stepHadToolCalls && !stepTransferred)) {
         break;
       }
       if (lastEvent.partial) {
@@ -520,7 +532,7 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
    * 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.");
     }
@@ -575,16 +587,29 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
         throw err;
       }
       if (llmRequest.contents.length > 0 && !invocationContext.liveSessionResumptionHandle) {
-        await connection.sendHistory(llmRequest.contents);
+        await import_tracing.tracer.startActiveSpan("send_data", async (span) => {
+          try {
+            await connection.sendHistory(llmRequest.contents);
+            (0, import_tracing.traceSendData)({
+              invocationContext,
+              eventId: (0, import_event.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) => {
         import_logger.logger.error("Error in live send loop:", error);
@@ -616,7 +641,7 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
         }
       }
       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) {
@@ -634,7 +659,7 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
     }
   }
   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,
@@ -648,6 +673,12 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
     }
     for (const toolUnion of this.tools) {
       const toolContext = new import_context.Context({ invocationContext });
+      if ((0, import_base_toolset.isBaseToolset)(toolUnion)) {
+        await toolUnion.processLlmRequest(toolContext, llmRequest);
+        if ((_b2 = invocationContext.abortSignal) == null ? void 0 : _b2.aborted) {
+          return;
+        }
+      }
       const tools = (await convertToolUnionToTools(
         toolUnion,
         new import_readonly_context.ReadonlyContext(invocationContext)
@@ -656,13 +687,13 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
       );
       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;
@@ -676,6 +707,13 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
         }
         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) {
@@ -730,67 +768,74 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
   }
   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) {
-        import_logger.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 = (0, import_event.createEvent)({
-        invocationId: invocationContext.invocationId,
-        author,
-        branch: invocationContext.branch
-      });
-      for await (const event of this.postprocessLive(
-        invocationContext,
-        llmRequest,
-        llmResponse,
-        modelResponseEvent
-      )) {
-        yield event;
-        if (event.content && (0, import_event.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 = (0, import_event.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 = (0, import_invocation_context.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) {
+          import_logger.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 = (0, import_event.createEvent)({
+          invocationId: invocationContext.invocationId,
+          author,
+          branch: invocationContext.branch
+        });
+        for await (const event of this.postprocessLive(
+          invocationContext,
+          llmRequest,
+          llmResponse,
+          modelResponseEvent
+        )) {
+          yield event;
+          if (event.content && (0, import_event.getFunctionResponses)(event).length > 0) {
+            await connection.sendContent(event.content);
+          }
+          const taskCompleted = (0, import_event.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 = (0, import_invocation_context.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;
         }
       }
     }
@@ -845,7 +890,7 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
     if (!functionCalls.length) {
       return;
     }
-    const functionResponseEvent = await (0, import_functions.handleFunctionCallsAsync)({
+    const functionResponseEvent = await (0, import_functions.handleFunctionCallsLive)({
       invocationContext,
       functionCallEvent: mergedEvent,
       toolsDict: llmRequest.toolsDict,
@@ -865,7 +910,7 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
     yield functionResponseEvent;
   }
   async *runOneStepAsync(invocationContext) {
-    var _a2, _b2, _c;
+    var _a2, _b2, _c, _d;
     const llmRequest = {
       contents: [],
       toolsDict: {},
@@ -885,7 +930,7 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
     const allTools = [...this.tools];
     if (this.mode === "task") {
       allTools.push(this.finishTaskTool);
-    } else if (this.outputSchema && allTools.length > 0 && !(0, import_output_schema_utils.canUseOutputSchemaWithTools)(this.canonicalModel.model)) {
+    } else if (this.outputSchema && allTools.length > 0 && !(0, import_output_schema_utils.canUseOutputSchemaWithTools)(this.canonicalModel)) {
       const setModelResponseTool = new import_function_tool.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.",
@@ -909,6 +954,12 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
         invocationContext,
         eventActions: modelResponseEvent.actions
       });
+      if ((0, import_base_toolset.isBaseToolset)(toolUnion)) {
+        await toolUnion.processLlmRequest(toolContext, llmRequest);
+        if ((_b2 = invocationContext.abortSignal) == null ? void 0 : _b2.aborted) {
+          return;
+        }
+      }
       const tools = (await convertToolUnionToTools(
         toolUnion,
         new import_readonly_context.ReadonlyContext(invocationContext)
@@ -917,54 +968,65 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
       });
       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 = import_tracing.tracer.startSpan("call_llm");
     const ctx = import_api.trace.setSpan(import_api.context.active(), span);
-    yield* (0, import_tracing.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* (0, import_tracing.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 = (0, import_event.createNewEventId)();
-              modelResponseEvent.timestamp = (/* @__PURE__ */ new Date()).getTime();
-              yield event;
+              if (((_b3 = invocationContext.runConfig) == null ? void 0 : _b3.supportCfc) && (0, import_event.isEvent)(llmResponse)) {
+                modelResponseEvent.id = (0, import_event.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 = (0, import_event.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;
@@ -1090,7 +1152,7 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
     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,
@@ -1109,14 +1171,39 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
       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 import_live_request_queue.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 ? (0, import_event.createEvent)({ ...llmResponse, ...alteredLlmResponse }) : llmResponse;
+          if (invocationContext.runConfig.streamingMode === import_run_config.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) === import_run_config.StreamingMode.SSE,
+        ((_i = invocationContext.runConfig) == null ? void 0 : _i.streamingMode) === import_run_config.StreamingMode.SSE,
         invocationContext.abortSignal
       );
       for await (const llmResponse of responsesGenerator) {
@@ -1126,7 +1213,7 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
           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(
@@ -1134,7 +1221,7 @@ const _LlmAgent = class _LlmAgent extends (_b = import_base_agent.BaseAgent, _a
           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/cjs/agents/processors/basic_llm_request_processor.js

@@ -55,7 +55,7 @@ const _BasicLlmRequestProcessor = class _BasicLlmRequestProcessor extends import
     }
     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) || (0, import_output_schema_utils.canUseOutputSchemaWithTools)(agent.canonicalModel.model))) {
+    if (agent.outputSchema && agent.mode !== "task" && (!((_b = agent.tools) == null ? void 0 : _b.length) || (0, import_output_schema_utils.canUseOutputSchemaWithTools)(agent.canonicalModel))) {
       (0, import_llm_request.setOutputSchema)(llmRequest, agent.outputSchema);
     }
     if (invocationContext.runConfig) {

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

@@ -83,6 +83,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."""
 
@@ -244,7 +252,7 @@ async function* runPostProcessor(invocationContext, llmResponse) {
     return;
   }
   const responseContent = llmResponse.content;
-  const codeStr = (0, import_code_execution_utils.extractCodeAndTruncateContent)(
+  const { code: codeStr, language } = (0, import_code_execution_utils.extractCodeBlockAndTruncateContent)(
     responseContent,
     codeExecutor.codeBlockDelimiters
   );
@@ -265,7 +273,7 @@ async function* runPostProcessor(invocationContext, llmResponse) {
     invocationContext,
     codeExecutionInput: {
       code: codeStr,
-      language: import_code_execution_utils.CodeExecutionLanguage.PYTHON,
+      language,
       inputFiles: codeExecutorContext.getInputFiles(),
       executionId
     }
@@ -300,14 +308,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: (0, import_env_aware_utils.base64Decode)(part.inlineData.data),
         mimeType
       };
+      part.text = `
+Available file: \`${fileName}\`
+`;
+      delete part.inlineData;
       if (!savedFileNames.has(fileName)) {
         codeExecutorContext.addInputFiles([file]);
         allInputFiles.push(file);
@@ -351,7 +360,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 === import_code_execution_utils.FileContentEncoding.UTF8 ? (0, import_env_aware_utils.base64Encode)(outputFile.content) : outputFile.content,
+          mimeType: outputFile.mimeType
+        }
       }
     });
     eventActions.artifactDelta[outputFile.name] = version;