@google/adk 0.2.4 → 0.3.0

package/dist/web/runner/runner.js

@@ -1,4 +1,7 @@
 var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
 var __await = function(promise, isYieldStar) {
   this[0] = promise;
   this[1] = isYieldStar;
@@ -14,6 +17,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
@@ -21,14 +52,24 @@ var __forAwait = (obj, it, method) => (it = obj[__knownSymbol("asyncIterator")])
  * SPDX-License-Identifier: Apache-2.0
  */
 import { createPartFromText } from "@google/genai";
-import { trace } from "@opentelemetry/api";
-import { InvocationContext, newInvocationContextId } from "../agents/invocation_context.js";
-import { LlmAgent } from "../agents/llm_agent.js";
+import { context, trace } from "@opentelemetry/api";
+import {
+  InvocationContext,
+  newInvocationContextId
+} from "../agents/invocation_context.js";
+import { isLlmAgent } from "../agents/llm_agent.js";
 import { createRunConfig } from "../agents/run_config.js";
-import { BuiltInCodeExecutor } from "../code_executors/built_in_code_executor.js";
+import {
+  BuiltInCodeExecutor,
+  isBuiltInCodeExecutor
+} from "../code_executors/built_in_code_executor.js";
 import { createEvent, getFunctionCalls } from "../events/event.js";
 import { createEventActions } from "../events/event_actions.js";
 import { PluginManager } from "../plugins/plugin_manager.js";
+import {
+  runAsyncGeneratorWithOtelContext,
+  tracer
+} from "../telemetry/tracing.js";
 import { logger } from "../utils/logger.js";
 import { isGemini2OrAbove } from "../utils/model_name.js";
 class Runner {
@@ -46,125 +87,147 @@ class Runner {
    * Runs the agent with the given message, and returns an async generator of
    * events.
    *
-   * @param userId The user ID of the session.
-   * @param sessionId The session ID of the session.
-   * @param newMessage A new message to append to the session.
-   * @param stateDelta An optional state delta to apply to the session.
-   * @param runConfig The run config for the agent.
+   * @param params.userId The user ID of the session.
+   * @param params.sessionId The session ID of the session.
+   * @param params.newMessage A new message to append to the session.
+   * @param params.stateDelta An optional state delta to apply to the session.
+   * @param params.runConfig The run config for the agent.
    * @yields The events generated by the agent.
    */
   // TODO - b/425992518: user, sessionId, and runConfig can be internalized.
-  runAsync(_0) {
-    return __asyncGenerator(this, arguments, function* ({
-      userId,
-      sessionId,
-      newMessage,
-      stateDelta,
-      runConfig
-    }) {
-      var _a;
-      runConfig = createRunConfig(runConfig);
-      const span = trace.getTracer("gcp.vertex.agent").startSpan("invocation");
+  runAsync(params) {
+    return __asyncGenerator(this, null, function* () {
+      const { userId, sessionId, stateDelta } = params;
+      const runConfig = createRunConfig(params.runConfig);
+      let newMessage = params.newMessage;
+      const span = tracer.startSpan("invocation");
+      const ctx = trace.setSpan(context.active(), span);
       try {
-        const session = yield new __await(this.sessionService.getSession({ appName: this.appName, userId, sessionId }));
-        if (!session) {
-          if (!this.appName) {
-            throw new Error(
-              "Session lookup failed: appName must be provided in runner constructor"
-            );
-          }
-          throw new Error("Session not found: ".concat(sessionId));
-        }
-        if (runConfig.supportCfc && this.agent instanceof LlmAgent) {
-          const modelName = this.agent.canonicalModel.model;
-          if (!isGemini2OrAbove(modelName)) {
-            throw new Error("CFC is not supported for model: ".concat(modelName, " in agent: ").concat(this.agent.name));
-          }
-          if (!(this.agent.codeExecutor instanceof BuiltInCodeExecutor)) {
-            this.agent.codeExecutor = new BuiltInCodeExecutor();
-          }
-        }
-        const invocationContext = new InvocationContext({
-          artifactService: this.artifactService,
-          sessionService: this.sessionService,
-          memoryService: this.memoryService,
-          credentialService: this.credentialService,
-          invocationId: newInvocationContextId(),
-          agent: this.agent,
-          session,
-          userContent: newMessage,
-          runConfig,
-          pluginManager: this.pluginManager
-        });
-        const pluginUserMessage = yield new __await(this.pluginManager.runOnUserMessageCallback({
-          userMessage: newMessage,
-          invocationContext
-        }));
-        if (pluginUserMessage) {
-          newMessage = pluginUserMessage;
-        }
-        if (newMessage) {
-          if (!((_a = newMessage.parts) == null ? void 0 : _a.length)) {
-            throw new Error("No parts in the newMessage.");
-          }
-          if (runConfig.saveInputBlobsAsArtifacts) {
-            yield new __await(this.saveArtifacts(
-              invocationContext.invocationId,
-              session.userId,
-              session.id,
-              newMessage
-            ));
-          }
-          yield new __await(this.sessionService.appendEvent({
-            session,
-            event: createEvent({
-              invocationId: invocationContext.invocationId,
-              author: "user",
-              actions: stateDelta ? createEventActions({ stateDelta }) : void 0,
-              content: newMessage
-            })
-          }));
-        }
-        invocationContext.agent = this.determineAgentForResumption(session, this.agent);
-        const beforeRunCallbackResponse = yield new __await(this.pluginManager.runBeforeRunCallback({ invocationContext }));
-        if (beforeRunCallbackResponse) {
-          const earlyExitEvent = createEvent({
-            invocationId: invocationContext.invocationId,
-            author: "model",
-            content: beforeRunCallbackResponse
-          });
-          yield new __await(this.sessionService.appendEvent({ session, event: earlyExitEvent }));
-          yield earlyExitEvent;
-        } else {
-          try {
-            for (var iter = __forAwait(invocationContext.agent.runAsync(
-              invocationContext
-            )), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
-              const event = temp.value;
-              if (!event.partial) {
-                yield new __await(this.sessionService.appendEvent({ session, event }));
+        yield* __yieldStar(runAsyncGeneratorWithOtelContext(
+          ctx,
+          this,
+          function() {
+            return __asyncGenerator(this, null, function* () {
+              var _a;
+              const session = yield new __await(this.sessionService.getSession({
+                appName: this.appName,
+                userId,
+                sessionId
+              }));
+              if (!session) {
+                if (!this.appName) {
+                  throw new Error(
+                    "Session lookup failed: appName must be provided in runner constructor"
+                  );
+                }
+                throw new Error("Session not found: ".concat(sessionId));
+              }
+              if (runConfig.supportCfc && isLlmAgent(this.agent)) {
+                const modelName = this.agent.canonicalModel.model;
+                if (!isGemini2OrAbove(modelName)) {
+                  throw new Error(
+                    "CFC is not supported for model: ".concat(modelName, " in agent: ").concat(this.agent.name)
+                  );
+                }
+                if (!isBuiltInCodeExecutor(this.agent.codeExecutor)) {
+                  this.agent.codeExecutor = new BuiltInCodeExecutor();
+                }
+              }
+              const invocationContext = new InvocationContext({
+                artifactService: this.artifactService,
+                sessionService: this.sessionService,
+                memoryService: this.memoryService,
+                credentialService: this.credentialService,
+                invocationId: newInvocationContextId(),
+                agent: this.agent,
+                session,
+                userContent: newMessage,
+                runConfig,
+                pluginManager: this.pluginManager
+              });
+              const pluginUserMessage = yield new __await(this.pluginManager.runOnUserMessageCallback({
+                userMessage: newMessage,
+                invocationContext
+              }));
+              if (pluginUserMessage) {
+                newMessage = pluginUserMessage;
+              }
+              if (newMessage) {
+                if (!((_a = newMessage.parts) == null ? void 0 : _a.length)) {
+                  throw new Error("No parts in the newMessage.");
+                }
+                if (runConfig.saveInputBlobsAsArtifacts) {
+                  yield new __await(this.saveArtifacts(
+                    invocationContext.invocationId,
+                    session.userId,
+                    session.id,
+                    newMessage
+                  ));
+                }
+                yield new __await(this.sessionService.appendEvent({
+                  session,
+                  event: createEvent({
+                    invocationId: invocationContext.invocationId,
+                    author: "user",
+                    actions: stateDelta ? createEventActions({ stateDelta }) : void 0,
+                    content: newMessage
+                  })
+                }));
               }
-              const modifiedEvent = yield new __await(this.pluginManager.runOnEventCallback(
-                { invocationContext, event }
-              ));
-              if (modifiedEvent) {
-                yield modifiedEvent;
-              } else {
-                yield event;
+              invocationContext.agent = this.determineAgentForResumption(
+                session,
+                this.agent
+              );
+              if (newMessage) {
+                const beforeRunCallbackResponse = yield new __await(this.pluginManager.runBeforeRunCallback({
+                  invocationContext
+                }));
+                if (beforeRunCallbackResponse) {
+                  const earlyExitEvent = createEvent({
+                    invocationId: invocationContext.invocationId,
+                    author: "model",
+                    content: beforeRunCallbackResponse
+                  });
+                  yield new __await(this.sessionService.appendEvent({
+                    session,
+                    event: earlyExitEvent
+                  }));
+                  yield earlyExitEvent;
+                } else {
+                  try {
+                    for (var iter = __forAwait(invocationContext.agent.runAsync(
+                      invocationContext
+                    )), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
+                      const event = temp.value;
+                      if (!event.partial) {
+                        yield new __await(this.sessionService.appendEvent({ session, event }));
+                      }
+                      const modifiedEvent = yield new __await(this.pluginManager.runOnEventCallback({
+                        invocationContext,
+                        event
+                      }));
+                      if (modifiedEvent) {
+                        yield modifiedEvent;
+                      } else {
+                        yield event;
+                      }
+                    }
+                  } catch (temp) {
+                    error = [temp];
+                  } finally {
+                    try {
+                      more && (temp = iter.return) && (yield new __await(temp.call(iter)));
+                    } finally {
+                      if (error)
+                        throw error[0];
+                    }
+                  }
+                  yield new __await(this.pluginManager.runAfterRunCallback({ invocationContext }));
+                }
               }
-            }
-          } catch (temp) {
-            error = [temp];
-          } finally {
-            try {
-              more && (temp = iter.return) && (yield new __await(temp.call(iter)));
-            } finally {
-              if (error)
-                throw error[0];
-            }
+            });
           }
-        }
-        yield new __await(this.pluginManager.runAfterRunCallback({ invocationContext }));
+        ));
       } finally {
         span.end();
       }
@@ -224,7 +287,9 @@ class Runner {
       }
       const agent = rootAgent.findSubAgent(event2.author);
       if (!agent) {
-        logger.warn("Event from an unknown agent: ".concat(event2.author, ", event id: ").concat(event2.id));
+        logger.warn(
+          "Event from an unknown agent: ".concat(event2.author, ", event id: ").concat(event2.id)
+        );
         continue;
       }
       if (this.isRoutableLlmAgent(agent)) {
@@ -247,7 +312,7 @@ class Runner {
   isRoutableLlmAgent(agentToRun) {
     let agent = agentToRun;
     while (agent) {
-      if (!(agent instanceof LlmAgent)) {
+      if (!isLlmAgent(agent)) {
         return false;
       }
       if (agent.disallowTransferToParent) {
@@ -265,7 +330,9 @@ function findEventByLastFunctionResponseId(events) {
     return null;
   }
   const lastEvent = events[events.length - 1];
-  const functionCallId = (_d = (_c = (_b = (_a = lastEvent.content) == null ? void 0 : _a.parts) == null ? void 0 : _b.find((part) => part.functionResponse)) == null ? void 0 : _c.functionResponse) == null ? void 0 : _d.id;
+  const functionCallId = (_d = (_c = (_b = (_a = lastEvent.content) == null ? void 0 : _a.parts) == null ? void 0 : _b.find(
+    (part) => part.functionResponse
+  )) == null ? void 0 : _c.functionResponse) == null ? void 0 : _d.id;
   if (!functionCallId) {
     return null;
   }

package/dist/web/sessions/in_memory_session_service.js

@@ -6,7 +6,9 @@
 import { cloneDeep } from "lodash-es";
 import { randomUUID } from "../utils/env_aware_utils.js";
 import { logger } from "../utils/logger.js";
-import { BaseSessionService } from "./base_session_service.js";
+import {
+  BaseSessionService
+} from "./base_session_service.js";
 import { createSession } from "./session.js";
 import { State } from "./state.js";
 class InMemorySessionService extends BaseSessionService {
@@ -26,7 +28,12 @@ class InMemorySessionService extends BaseSessionService {
      */
     this.appState = {};
   }
-  createSession({ appName, userId, state, sessionId }) {
+  createSession({
+    appName,
+    userId,
+    state,
+    sessionId
+  }) {
     const session = createSession({
       id: sessionId || randomUUID(),
       appName,
@@ -46,7 +53,12 @@ class InMemorySessionService extends BaseSessionService {
       this.mergeState(appName, userId, cloneDeep(session))
     );
   }
-  getSession({ appName, userId, sessionId, config }) {
+  getSession({
+    appName,
+    userId,
+    sessionId,
+    config
+  }) {
     if (!this.sessions[appName] || !this.sessions[appName][userId] || !this.sessions[appName][userId][sessionId]) {
       return Promise.resolve(void 0);
     }
@@ -54,7 +66,9 @@ class InMemorySessionService extends BaseSessionService {
     const copiedSession = cloneDeep(session);
     if (config) {
       if (config.numRecentEvents) {
-        copiedSession.events = copiedSession.events.slice(-config.numRecentEvents);
+        copiedSession.events = copiedSession.events.slice(
+          -config.numRecentEvents
+        );
       }
       if (config.afterTimestamp) {
         let i = copiedSession.events.length - 1;
@@ -71,31 +85,43 @@ class InMemorySessionService extends BaseSessionService {
     }
     return Promise.resolve(this.mergeState(appName, userId, copiedSession));
   }
-  listSessions({ appName, userId }) {
+  listSessions({
+    appName,
+    userId
+  }) {
     if (!this.sessions[appName] || !this.sessions[appName][userId]) {
       return Promise.resolve({ sessions: [] });
     }
     const sessionsWithoutEvents = [];
     for (const session of Object.values(this.sessions[appName][userId])) {
-      sessionsWithoutEvents.push(createSession({
-        id: session.id,
-        appName: session.appName,
-        userId: session.userId,
-        state: {},
-        events: [],
-        lastUpdateTime: session.lastUpdateTime
-      }));
+      sessionsWithoutEvents.push(
+        createSession({
+          id: session.id,
+          appName: session.appName,
+          userId: session.userId,
+          state: {},
+          events: [],
+          lastUpdateTime: session.lastUpdateTime
+        })
+      );
     }
     return Promise.resolve({ sessions: sessionsWithoutEvents });
   }
-  async deleteSession({ appName, userId, sessionId }) {
+  async deleteSession({
+    appName,
+    userId,
+    sessionId
+  }) {
     const session = await this.getSession({ appName, userId, sessionId });
     if (!session) {
       return;
     }
     delete this.sessions[appName][userId][sessionId];
   }
-  async appendEvent({ session, event }) {
+  async appendEvent({
+    session,
+    event
+  }) {
     await super.appendEvent({ session, event });
     session.lastUpdateTime = event.timestamp;
     const appName = session.appName;

package/dist/web/telemetry/google_cloud.js

@@ -3,13 +3,13 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { GoogleAuth } from "google-auth-library";
-import { PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
-import { detectResources } from "@opentelemetry/resources";
-import { gcpDetector } from "@opentelemetry/resource-detector-gcp";
+import { MetricExporter } from "@google-cloud/opentelemetry-cloud-monitoring-exporter";
 import { TraceExporter } from "@google-cloud/opentelemetry-cloud-trace-exporter";
+import { gcpDetector } from "@opentelemetry/resource-detector-gcp";
+import { detectResources } from "@opentelemetry/resources";
+import { PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
 import { BatchSpanProcessor } from "@opentelemetry/sdk-trace-base";
-import { MetricExporter } from "@google-cloud/opentelemetry-cloud-monitoring-exporter";
+import { GoogleAuth } from "google-auth-library";
 import { logger } from "../utils/logger.js";
 const GCP_PROJECT_ERROR_MESSAGE = "Cannot determine GCP Project. OTel GCP Exporters cannot be set up. Please make sure to log into correct GCP Project.";
 async function getGcpProjectId() {
@@ -17,7 +17,7 @@ async function getGcpProjectId() {
     const auth = new GoogleAuth();
     const projectId = await auth.getProjectId();
     return projectId || void 0;
-  } catch (error) {
+  } catch (_e) {
     return void 0;
   }
 }
@@ -33,9 +33,7 @@ async function getGcpExporters(config = {}) {
     return {};
   }
   return {
-    spanProcessors: enableTracing ? [
-      new BatchSpanProcessor(new TraceExporter({ projectId }))
-    ] : [],
+    spanProcessors: enableTracing ? [new BatchSpanProcessor(new TraceExporter({ projectId }))] : [],
     metricReaders: enableMetrics ? [
       new PeriodicExportingMetricReader({
         exporter: new MetricExporter({ projectId }),

package/dist/web/telemetry/setup.js

@@ -3,22 +3,32 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { trace, metrics } from "@opentelemetry/api";
+import { metrics, trace } from "@opentelemetry/api";
 import { logs } from "@opentelemetry/api-logs";
-import { LoggerProvider, BatchLogRecordProcessor } from "@opentelemetry/sdk-logs";
-import { MeterProvider, PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
+import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";
+import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-http";
+import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
 import { detectResources } from "@opentelemetry/resources";
+import {
+  BatchLogRecordProcessor,
+  LoggerProvider
+} from "@opentelemetry/sdk-logs";
+import {
+  MeterProvider,
+  PeriodicExportingMetricReader
+} from "@opentelemetry/sdk-metrics";
 import { BatchSpanProcessor } from "@opentelemetry/sdk-trace-base";
 import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
-import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
-import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-http";
-import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";
 function maybeSetOtelProviders(otelHooksToSetup = [], otelResource) {
   const resource = otelResource || getOtelResource();
   const allHooks = [...otelHooksToSetup, getOtelExporters()];
-  const spanProcessors = allHooks.flatMap((hooks) => hooks.spanProcessors || []);
+  const spanProcessors = allHooks.flatMap(
+    (hooks) => hooks.spanProcessors || []
+  );
   const metricReaders = allHooks.flatMap((hooks) => hooks.metricReaders || []);
-  const logRecordProcessors = allHooks.flatMap((hooks) => hooks.logRecordProcessors || []);
+  const logRecordProcessors = allHooks.flatMap(
+    (hooks) => hooks.logRecordProcessors || []
+  );
   if (spanProcessors.length > 0) {
     const tracerProvider = new NodeTracerProvider({
       resource,
@@ -58,7 +68,11 @@ function getOtelExporters(config = getOtelExportersConfig()) {
   const { enableTracing, enableMetrics, enableLogging } = config;
   return {
     spanProcessors: enableTracing ? [new BatchSpanProcessor(new OTLPTraceExporter())] : [],
-    metricReaders: enableMetrics ? [new PeriodicExportingMetricReader({ exporter: new OTLPMetricExporter() })] : [],
+    metricReaders: enableMetrics ? [
+      new PeriodicExportingMetricReader({
+        exporter: new OTLPMetricExporter()
+      })
+    ] : [],
     logRecordProcessors: enableLogging ? [new BatchLogRecordProcessor(new OTLPLogExporter())] : []
   };
 }