@google/adk 0.2.5 → 0.4.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,7 +52,7 @@ 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 { context, trace } from "@opentelemetry/api";
 import {
   InvocationContext,
   newInvocationContextId
@@ -35,6 +66,10 @@ import {
 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 {
@@ -48,6 +83,39 @@ class Runner {
     this.memoryService = input.memoryService;
     this.credentialService = input.credentialService;
   }
+  /**
+   * Runs the agent with a new, ephemeral session.
+   *
+   * @param params.userId The user 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.
+   */
+  runEphemeral(params) {
+    return __asyncGenerator(this, null, function* () {
+      const session = yield new __await(this.sessionService.createSession({
+        appName: this.appName,
+        userId: params.userId
+      }));
+      const sessionId = session.id;
+      try {
+        yield* __yieldStar(this.runAsync({
+          userId: params.userId,
+          sessionId,
+          newMessage: params.newMessage,
+          stateDelta: params.stateDelta,
+          runConfig: params.runConfig
+        }));
+      } finally {
+        yield new __await(this.sessionService.deleteSession({
+          appName: this.appName,
+          userId: params.userId,
+          sessionId
+        }));
+      }
+    });
+  }
   /**
    * Runs the agent with the given message, and returns an async generator of
    * events.
@@ -62,121 +130,137 @@ class Runner {
   // TODO - b/425992518: user, sessionId, and runConfig can be internalized.
   runAsync(params) {
     return __asyncGenerator(this, null, function* () {
-      var _a;
       const { userId, sessionId, stateDelta } = params;
       const runConfig = createRunConfig(params.runConfig);
       let newMessage = params.newMessage;
-      const span = trace.getTracer("gcp.vertex.agent").startSpan("invocation");
+      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 && 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
-            })
-          }));
-        }
-        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 modifiedEvent = yield new __await(this.pluginManager.runOnEventCallback({
-                invocationContext,
-                event
+              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 (modifiedEvent) {
-                yield modifiedEvent;
-              } else {
-                yield event;
+              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
+              );
+              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();
       }

package/dist/web/sessions/base_session_service.js

@@ -3,8 +3,29 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { cloneDeep } from "lodash-es";
 import { State } from "./state.js";
 class BaseSessionService {
+  /**
+   * Gets a session or creates one if it doesn't exist.
+   *
+   * @param request The request to get or create a session.
+   * @return A promise that resolves to the session instance.
+   */
+  async getOrCreateSession(request) {
+    if (!request.sessionId) {
+      return this.createSession(request);
+    }
+    const session = await this.getSession({
+      appName: request.appName,
+      userId: request.userId,
+      sessionId: request.sessionId
+    });
+    if (session) {
+      return session;
+    }
+    return this.createSession(request);
+  }
   /**
    * Appends an event to a session.
    *
@@ -15,6 +36,7 @@ class BaseSessionService {
     if (event.partial) {
       return event;
     }
+    event = trimTempDeltaState(event);
     this.updateSessionState({ session, event });
     session.events.push(event);
     return event;
@@ -36,6 +58,32 @@ class BaseSessionService {
     }
   }
 }
+function trimTempDeltaState(event) {
+  if (!event.actions || !event.actions.stateDelta) {
+    return event;
+  }
+  const stateDelta = event.actions.stateDelta;
+  const filteredStateDelta = {};
+  for (const [key, value] of Object.entries(stateDelta)) {
+    if (!key.startsWith(State.TEMP_PREFIX)) {
+      filteredStateDelta[key] = value;
+    }
+  }
+  event.actions.stateDelta = filteredStateDelta;
+  return event;
+}
+function mergeStates(appState = {}, userState = {}, sessionState = {}) {
+  const merged = cloneDeep(sessionState);
+  for (const [k, v] of Object.entries(appState)) {
+    merged[State.APP_PREFIX + k] = v;
+  }
+  for (const [k, v] of Object.entries(userState)) {
+    merged[State.USER_PREFIX + k] = v;
+  }
+  return merged;
+}
 export {
-  BaseSessionService
+  BaseSessionService,
+  mergeStates,
+  trimTempDeltaState
 };