@browserbasehq/orca 3.5.0-vertex-test → 3.5.1-preview.0

package/dist/esm/lib/v3/v3.js

@@ -38,7 +38,7 @@ import path from "path";
 import process from "process";
 import { v7 as uuidv7 } from "uuid";
 import { toJsonSchema, } from "./zodCompat.js";
-import { loadApiKeyFromEnv } from "../utils.js";
+import { getInheritableModelOptions, hasModelProviderAuth, loadApiKeyFromEnv, } from "../utils.js";
 import { extractModelName } from "../modelUtils.js";
 import { StagehandLogger } from "../logger.js";
 import { ActCache } from "./cache/ActCache.js";
@@ -316,9 +316,9 @@ let V3 = (() => {
                 this.disableAPI = true;
             }
             else {
-                // Ensure API key is set
+                // Ensure API key is set unless provider-native auth was configured.
                 let apiKey = baseClientOptions.apiKey;
-                if (!apiKey) {
+                if (!apiKey && !hasModelProviderAuth(baseClientOptions)) {
                     try {
                         apiKey = loadApiKeyFromEnv(this.modelName.split("/")[0], // "openai", "anthropic", etc
                         this.logger);
@@ -334,7 +334,7 @@ let V3 = (() => {
                 }
                 this.modelClientOptions = {
                     ...baseClientOptions,
-                    apiKey,
+                    ...(apiKey ? { apiKey } : {}),
                 };
                 // Get the default client for this model
                 this.llmClient = this.llmProvider.getClient(this.modelName, this.modelClientOptions, { experimental: this.experimental, disableAPI: this.disableAPI });
@@ -464,7 +464,8 @@ let V3 = (() => {
             return {
                 modelName: this.modelName,
                 ...clientOptions,
-                ...(this.modelClientOptions.apiKey
+                ...(!hasModelProviderAuth(this.modelClientOptions) &&
+                    this.modelClientOptions.apiKey
                     ? { apiKey: this.modelClientOptions.apiKey }
                     : {}),
             };
@@ -492,12 +493,20 @@ let V3 = (() => {
             }
             const overrideProvider = String(modelName).split("/")[0];
             const baseProvider = String(this.modelName).split("/")[0];
+            const overrideHasCredentials = hasModelProviderAuth(clientOptions) ||
+                Boolean(clientOptions?.apiKey);
+            const inheritedOptions = overrideProvider === baseProvider
+                ? overrideHasCredentials
+                    ? getInheritableModelOptions(this.modelClientOptions)
+                    : this.modelClientOptions
+                : undefined;
             const mergedOptions = {
-                ...(overrideProvider === baseProvider ? this.modelClientOptions : {}),
+                ...(inheritedOptions ?? {}),
                 ...(clientOptions ?? {}),
             };
             const providerKey = overrideProvider;
-            if (!mergedOptions.apiKey) {
+            if (!hasModelProviderAuth(mergedOptions) &&
+                !mergedOptions.apiKey) {
                 const apiKey = loadApiKeyFromEnv(providerKey, this.logger);
                 if (apiKey) {
                     mergedOptions.apiKey = apiKey;