@softactivate/adk 1.1.0 → 1.2.0

package/dist/web/utils/streaming_utils.js

@@ -1,6 +1,28 @@
 import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
 var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __await = function(promise, isYieldStar) {
   this[0] = promise;
   this[1] = isYieldStar;
@@ -16,6 +38,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;
+};
 /**
  * @license
  * Copyright 2026 Google LLC
@@ -28,15 +78,8 @@ import { JSONPath } from "jsonpath-plus";
 import { generateClientFunctionCallId } from "../agents/functions.js";
 import { FeatureName, isFeatureEnabled } from "../features/feature_registry.js";
 import { createLlmResponse } from "../models/llm_response.js";
-class StreamingResponseAggregator {
-  constructor(isProgressiveMode = isFeatureEnabled(
-    FeatureName.PROGRESSIVE_SSE_STREAMING
-  )) {
-    this.isProgressiveMode = isProgressiveMode;
-    // For non-progressive SSE streaming mode
-    this.text = "";
-    this.thoughtText = "";
-    // For progressive SSE streaming mode: accumulate parts in order
+class ProgressiveStrategy {
+  constructor() {
     this.partsSequence = [];
     this.currentTextBuffer = "";
     this.currentFcArgs = {};
@@ -163,11 +206,6 @@ class StreamingResponseAggregator {
     if (!fc) {
       return;
     }
-    if (part.thoughtSignature) {
-      this.lastThoughtSignature = part.thoughtSignature;
-    } else if (this.lastThoughtSignature) {
-      part.thoughtSignature = this.lastThoughtSignature.toString();
-    }
     if (fc.partialArgs || fc.willContinue) {
       if (!fc.id && !this.currentFcId) {
         fc.id = generateClientFunctionCallId();
@@ -186,110 +224,105 @@ class StreamingResponseAggregator {
       }
     }
   }
-  processResponse(response) {
+  processResponse(llmResponse) {
     return __asyncGenerator(this, null, function* () {
-      var _a, _b, _c;
-      this.response = response;
-      const llmResponse = createLlmResponse(response);
-      this.usageMetadata = llmResponse.usageMetadata;
-      if (llmResponse.groundingMetadata) {
-        this.groundingMetadata = llmResponse.groundingMetadata;
-      }
-      if (llmResponse.citationMetadata) {
-        this.citationMetadata = llmResponse.citationMetadata;
-      }
-      if (llmResponse.finishReason) {
-        this.finishReason = llmResponse.finishReason;
-      }
+      var _a;
       if (llmResponse.content && llmResponse.content.parts) {
         for (const part of llmResponse.content.parts) {
-          if (part.thoughtSignature) {
-            this.lastThoughtSignature = part.thoughtSignature;
-          } else if (part.functionCall && this.lastThoughtSignature) {
-            part.thoughtSignature = this.lastThoughtSignature.toString();
+          if (part.text) {
+            const isThought = (_a = part.thought) != null ? _a : false;
+            if (this.currentTextBuffer && isThought !== this.currentTextIsThought) {
+              this.flushTextBufferToSequence();
+            }
+            if (!this.currentTextBuffer) {
+              this.currentTextIsThought = isThought;
+            }
+            this.currentTextBuffer += part.text;
+          } else if (part.functionCall) {
+            this.processFunctionCallPart(part);
+          } else {
+            this.flushTextBufferToSequence();
+            this.partsSequence.push(part);
           }
         }
       }
-      if (this.isProgressiveMode) {
-        if (llmResponse.content && llmResponse.content.parts) {
-          for (const part of llmResponse.content.parts) {
-            if (part.text) {
-              const isThought = (_a = part.thought) != null ? _a : false;
-              if (this.currentTextBuffer && isThought !== this.currentTextIsThought) {
-                this.flushTextBufferToSequence();
-              }
-              if (!this.currentTextBuffer) {
-                this.currentTextIsThought = isThought;
-              }
-              this.currentTextBuffer += part.text;
-            } else if (part.functionCall) {
-              this.processFunctionCallPart(part);
+      llmResponse.partial = true;
+      yield llmResponse;
+    });
+  }
+  close() {
+    this.flushTextBufferToSequence();
+    this.flushFunctionCallToSequence();
+    const finalParts = this.partsSequence;
+    if (finalParts.length === 0) {
+      return void 0;
+    }
+    return finalParts;
+  }
+}
+class NonProgressiveStrategy {
+  constructor() {
+    this.text = "";
+    this.thoughtText = "";
+  }
+  processResponse(llmResponse) {
+    return __asyncGenerator(this, null, function* () {
+      var _a;
+      if ((_a = llmResponse.content) == null ? void 0 : _a.parts) {
+        const nonTextParts = [];
+        let sawTextPart = false;
+        for (const part of llmResponse.content.parts) {
+          if (typeof part.text === "string") {
+            sawTextPart = true;
+            if (part.thought) {
+              this.thoughtText += part.text;
             } else {
-              this.flushTextBufferToSequence();
-              this.partsSequence.push(part);
+              this.text += part.text;
             }
+            continue;
           }
+          if (part.functionCall && !part.functionCall.id) {
+            part.functionCall.id = generateClientFunctionCallId();
+          }
+          nonTextParts.push(part);
         }
-        llmResponse.partial = true;
-        yield llmResponse;
-        return;
-      }
-      if (llmResponse.content && llmResponse.content.parts && typeof ((_b = llmResponse.content.parts[0]) == null ? void 0 : _b.text) === "string") {
-        const part0 = llmResponse.content.parts[0];
-        const partText = part0.text || "";
-        if (part0.thought) {
-          this.thoughtText += partText;
-        } else {
-          this.text += partText;
-        }
-        llmResponse.partial = true;
-      } else if ((this.thoughtText || this.text) && (!llmResponse.content || !llmResponse.content.parts || !((_c = llmResponse.content.parts[0]) == null ? void 0 : _c.inlineData))) {
-        const parts = [];
-        if (this.thoughtText) {
-          parts.push({ text: this.thoughtText, thought: true });
+        if (nonTextParts.length > 0) {
+          if (this.thoughtText || this.text) {
+            const parts = [];
+            if (this.thoughtText) {
+              parts.push({ text: this.thoughtText, thought: true });
+            }
+            if (this.text) {
+              parts.push({ text: this.text });
+            }
+            yield {
+              content: {
+                role: "model",
+                parts
+              },
+              usageMetadata: llmResponse.usageMetadata,
+              partial: false
+            };
+            this.thoughtText = "";
+            this.text = "";
+          }
+          yield __spreadProps(__spreadValues({}, llmResponse), {
+            content: {
+              role: llmResponse.content.role,
+              parts: nonTextParts
+            },
+            partial: false
+          });
+          return;
         }
-        if (this.text) {
-          parts.push({ text: this.text });
+        if (sawTextPart) {
+          llmResponse.partial = true;
         }
-        yield {
-          content: {
-            role: "model",
-            parts
-          },
-          usageMetadata: llmResponse.usageMetadata,
-          partial: false
-        };
-        this.thoughtText = "";
-        this.text = "";
       }
       yield llmResponse;
     });
   }
   close() {
-    var _a, _b, _c, _d, _e, _f;
-    if (this.isProgressiveMode) {
-      this.flushTextBufferToSequence();
-      this.flushFunctionCallToSequence();
-      const finalParts = this.partsSequence;
-      if (finalParts.length === 0) {
-        return;
-      }
-      const candidate = (_b = (_a = this.response) == null ? void 0 : _a.candidates) == null ? void 0 : _b[0];
-      const finishReason = (_c = this.finishReason) != null ? _c : candidate == null ? void 0 : candidate.finishReason;
-      return {
-        content: {
-          role: "model",
-          parts: finalParts
-        },
-        groundingMetadata: this.groundingMetadata,
-        citationMetadata: this.citationMetadata,
-        errorCode: finishReason === FinishReason.STOP ? void 0 : finishReason,
-        errorMessage: finishReason === FinishReason.STOP ? void 0 : candidate == null ? void 0 : candidate.finishMessage,
-        usageMetadata: this.usageMetadata,
-        finishReason,
-        partial: false
-      };
-    }
     if (this.text || this.thoughtText) {
       const parts = [];
       if (this.thoughtText) {
@@ -298,25 +331,93 @@ class StreamingResponseAggregator {
       if (this.text) {
         parts.push({ text: this.text });
       }
-      const candidate = (_e = (_d = this.response) == null ? void 0 : _d.candidates) == null ? void 0 : _e[0];
-      const finishReason = (_f = this.finishReason) != null ? _f : candidate == null ? void 0 : candidate.finishReason;
-      return {
-        content: {
-          role: "model",
-          parts
-        },
-        groundingMetadata: this.groundingMetadata,
-        citationMetadata: this.citationMetadata,
-        errorCode: finishReason === FinishReason.STOP ? void 0 : finishReason,
-        errorMessage: finishReason === FinishReason.STOP ? void 0 : candidate == null ? void 0 : candidate.finishMessage,
-        usageMetadata: this.usageMetadata,
-        finishReason,
-        partial: false
-      };
+      return parts;
     }
     return void 0;
   }
 }
+class StreamingResponseAggregator {
+  constructor(isProgressiveMode = isFeatureEnabled(
+    FeatureName.PROGRESSIVE_SSE_STREAMING
+  )) {
+    this.isProgressiveMode = isProgressiveMode;
+    this.lastThoughtSignature = {};
+    this.sawFunctionCall = false;
+    this.strategy = this.isProgressiveMode ? new ProgressiveStrategy() : new NonProgressiveStrategy();
+  }
+  processResponse(response) {
+    return __asyncGenerator(this, null, function* () {
+      var _a, _b;
+      const llmResponse = createLlmResponse(response);
+      const parts = (_b = (_a = llmResponse.content) == null ? void 0 : _a.parts) != null ? _b : [];
+      if (parts.some((part) => part.functionCall)) {
+        this.sawFunctionCall = true;
+      }
+      if (this.sawFunctionCall && llmResponse.finishReason === FinishReason.STOP && parts.length > 0 && parts.every(isEmptyContentPart)) {
+        if (llmResponse.usageMetadata) {
+          this.usageMetadata = llmResponse.usageMetadata;
+        }
+        if (llmResponse.groundingMetadata) {
+          this.groundingMetadata = llmResponse.groundingMetadata;
+        }
+        if (llmResponse.citationMetadata) {
+          this.citationMetadata = llmResponse.citationMetadata;
+        }
+        if (llmResponse.finishReason) {
+          this.finishReason = llmResponse.finishReason;
+        }
+        return;
+      }
+      this.response = response;
+      this.usageMetadata = llmResponse.usageMetadata;
+      if (llmResponse.groundingMetadata) {
+        this.groundingMetadata = llmResponse.groundingMetadata;
+      }
+      if (llmResponse.citationMetadata) {
+        this.citationMetadata = llmResponse.citationMetadata;
+      }
+      if (llmResponse.finishReason) {
+        this.finishReason = llmResponse.finishReason;
+      }
+      if (llmResponse.content && llmResponse.content.parts) {
+        for (const part of llmResponse.content.parts) {
+          if (part.thoughtSignature) {
+            this.lastThoughtSignature.value = part.thoughtSignature;
+          } else if (part.functionCall && this.lastThoughtSignature.value) {
+            part.thoughtSignature = this.lastThoughtSignature.value.toString();
+          }
+        }
+      }
+      yield* __yieldStar(this.strategy.processResponse(llmResponse));
+    });
+  }
+  close() {
+    var _a, _b, _c;
+    const finalParts = this.strategy.close();
+    if (!finalParts) {
+      return void 0;
+    }
+    const candidate = (_b = (_a = this.response) == null ? void 0 : _a.candidates) == null ? void 0 : _b[0];
+    const finishReason = (_c = this.finishReason) != null ? _c : candidate == null ? void 0 : candidate.finishReason;
+    return {
+      content: {
+        role: "model",
+        parts: finalParts
+      },
+      groundingMetadata: this.groundingMetadata,
+      citationMetadata: this.citationMetadata,
+      errorCode: finishReason === FinishReason.STOP ? void 0 : finishReason,
+      errorMessage: finishReason === FinishReason.STOP ? void 0 : candidate == null ? void 0 : candidate.finishMessage,
+      usageMetadata: this.usageMetadata,
+      finishReason,
+      partial: false
+    };
+  }
+}
+function isEmptyContentPart(part) {
+  return !part.functionCall && !part.functionResponse && !part.fileData && !part.inlineData && !part.executableCode && !part.codeExecutionResult && (!part.text || part.text === "");
+}
 export {
-  StreamingResponseAggregator
+  StreamingResponseAggregator,
+  isEmptyContentPart
 };

package/dist/web/utils/vertex_ai_utils.js

@@ -0,0 +1,22 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { getBooleanEnvVar } from "./env_aware_utils.js";
+function getExpressModeApiKey(project, location, expressModeApiKey) {
+  if ((project || location) && expressModeApiKey) {
+    throw new Error(
+      "Cannot specify project or location and expressModeApiKey. Either use project and location, or just the expressModeApiKey."
+    );
+  }
+  if (getBooleanEnvVar("GOOGLE_GENAI_USE_VERTEXAI")) {
+    return expressModeApiKey || process.env.GOOGLE_API_KEY;
+  }
+  return void 0;
+}
+export {
+  getExpressModeApiKey
+};

package/dist/web/version.js

@@ -5,7 +5,7 @@ const require = topLevelCreateRequire(import.meta.url);
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-const version = "1.1.0";
+const version = "1.2.0";
 export {
   version
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softactivate/adk",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Google ADK JS",
   "author": "Google",
   "license": "Apache-2.0",
@@ -44,6 +44,7 @@
     "@google-cloud/opentelemetry-cloud-monitoring-exporter": "^0.21.0",
     "@google-cloud/opentelemetry-cloud-trace-exporter": "^3.0.0",
     "@google-cloud/storage": "^7.17.1",
+    "@google-cloud/vertexai": "^1.12.0",
     "@google/genai": "^1.37.0",
     "@mikro-orm/core": "^6.6.10",
     "@mikro-orm/reflection": "^6.6.6",