azure/bedrock api integration

lib/index.ts

@@ -595,14 +595,11 @@ export class Stagehand {
         // Temporary add for legacy providers
         modelApiKey =
           LLMProvider.getModelProvider(this.modelName) === "openai"
-            ? process.env.OPENAI_API_KEY ||
-              this.llmClient?.clientOptions?.apiKey
+            ? process.env.OPENAI_API_KEY
             : LLMProvider.getModelProvider(this.modelName) === "anthropic"
-              ? process.env.ANTHROPIC_API_KEY ||
-                this.llmClient?.clientOptions?.apiKey
+              ? process.env.ANTHROPIC_API_KEY
               : LLMProvider.getModelProvider(this.modelName) === "google"
-                ? process.env.GOOGLE_API_KEY ||
-                  this.llmClient?.clientOptions?.apiKey
+                ? process.env.GOOGLE_API_KEY
                 : undefined;
       }
       this.modelClientOptions = {

lib/llm/AnthropicClient.ts

@@ -1,3 +1,4 @@
+import { CreateChatCompletionResponseError } from "@/types/stagehandErrors";
 import Anthropic, { ClientOptions } from "@anthropic-ai/sdk";
 import {
   ImageBlockParam,
@@ -14,14 +15,13 @@ import {
   LLMClient,
   LLMResponse,
 } from "./LLMClient";
-import { CreateChatCompletionResponseError } from "@/types/stagehandErrors";
 
 export class AnthropicClient extends LLMClient {
   public type = "anthropic" as const;
   private client: Anthropic;
   private cache: LLMCache | undefined;
   private enableCaching: boolean;
-  public clientOptions: ClientOptions;
+  public clientOptions?: ClientOptions;
 
   constructor({
     enableCaching = false,

lib/llm/CerebrasClient.ts

@@ -1,5 +1,6 @@
-import OpenAI from "openai";
+import { CreateChatCompletionResponseError } from "@/types/stagehandErrors";
 import type { ClientOptions } from "openai";
+import OpenAI from "openai";
 import { zodToJsonSchema } from "zod-to-json-schema";
 import { LogLine } from "../../types/log";
 import { AvailableModel } from "../../types/model";
@@ -10,14 +11,13 @@ import {
   LLMClient,
   LLMResponse,
 } from "./LLMClient";
-import { CreateChatCompletionResponseError } from "@/types/stagehandErrors";
 
 export class CerebrasClient extends LLMClient {
   public type = "cerebras" as const;
   private client: OpenAI;
   private cache: LLMCache | undefined;
   private enableCaching: boolean;
-  public clientOptions: ClientOptions;
+  public clientOptions?: ClientOptions;
   public hasVision = false;
 
   constructor({
@@ -31,7 +31,7 @@ export class CerebrasClient extends LLMClient {
     enableCaching?: boolean;
     cache?: LLMCache;
     modelName: AvailableModel;
-    clientOptions?: ClientOptions;
+    clientOptions?: OpenAI.ClientOptions;
     userProvidedInstructions?: string;
   }) {
     super(modelName, userProvidedInstructions);

lib/llm/LLMClient.ts

@@ -12,7 +12,7 @@ import {
 } from "ai";
 import { ZodType } from "zod/v3";
 import { LogLine } from "../../types/log";
-import { AvailableModel, ClientOptions } from "../../types/model";
+import { AvailableModel } from "../../types/model";
 
 export interface ChatMessage {
   role: "system" | "user" | "assistant";
@@ -100,7 +100,6 @@ export abstract class LLMClient {
   public type: "openai" | "anthropic" | "cerebras" | "groq" | (string & {});
   public modelName: AvailableModel | (string & {});
   public hasVision: boolean;
-  public clientOptions: ClientOptions;
   public userProvidedInstructions?: string;
 
   constructor(modelName: AvailableModel, userProvidedInstructions?: string) {

lib/llm/LLMProvider.ts

@@ -1,8 +1,21 @@
+import { AISDKCustomProvider, AISDKProvider } from "@/types/llm";
 import {
   UnsupportedAISDKModelProviderError,
   UnsupportedModelError,
   UnsupportedModelProviderError,
 } from "@/types/stagehandErrors";
+import { anthropic, createAnthropic } from "@ai-sdk/anthropic";
+import { azure, createAzure } from "@ai-sdk/azure";
+import { cerebras, createCerebras } from "@ai-sdk/cerebras";
+import { createDeepSeek, deepseek } from "@ai-sdk/deepseek";
+import { createGoogleGenerativeAI, google } from "@ai-sdk/google";
+import { createGroq, groq } from "@ai-sdk/groq";
+import { createMistral, mistral } from "@ai-sdk/mistral";
+import { createOpenAI, openai } from "@ai-sdk/openai";
+import { createPerplexity, perplexity } from "@ai-sdk/perplexity";
+import { createTogetherAI, togetherai } from "@ai-sdk/togetherai";
+import { createXai, xai } from "@ai-sdk/xai";
+import { ollama } from "ollama-ai-provider";
 import { LogLine } from "../../types/log";
 import {
   AvailableModel,
@@ -17,19 +30,6 @@ import { GoogleClient } from "./GoogleClient";
 import { GroqClient } from "./GroqClient";
 import { LLMClient } from "./LLMClient";
 import { OpenAIClient } from "./OpenAIClient";
-import { openai, createOpenAI } from "@ai-sdk/openai";
-import { anthropic, createAnthropic } from "@ai-sdk/anthropic";
-import { google, createGoogleGenerativeAI } from "@ai-sdk/google";
-import { xai, createXai } from "@ai-sdk/xai";
-import { azure, createAzure } from "@ai-sdk/azure";
-import { groq, createGroq } from "@ai-sdk/groq";
-import { cerebras, createCerebras } from "@ai-sdk/cerebras";
-import { togetherai, createTogetherAI } from "@ai-sdk/togetherai";
-import { mistral, createMistral } from "@ai-sdk/mistral";
-import { deepseek, createDeepSeek } from "@ai-sdk/deepseek";
-import { perplexity, createPerplexity } from "@ai-sdk/perplexity";
-import { ollama } from "ollama-ai-provider";
-import { AISDKProvider, AISDKCustomProvider } from "@/types/llm";
 
 const AISDKProviders: Record<string, AISDKProvider> = {
   openai,
@@ -97,23 +97,18 @@ const modelToProviderMap: { [key in AvailableModel]: ModelProvider } = {
 export function getAISDKLanguageModel(
   subProvider: string,
   subModelName: string,
-  apiKey?: string,
-  baseURL?: string,
+  modelClientOptions?: ClientOptions,
 ) {
-  if (apiKey) {
+  if (modelClientOptions && Object.keys(modelClientOptions).length > 0) {
     const creator = AISDKProvidersWithAPIKey[subProvider];
     if (!creator) {
       throw new UnsupportedAISDKModelProviderError(
         subProvider,
         Object.keys(AISDKProvidersWithAPIKey),
       );
     }
-    // Create the provider instance with the API key and baseURL if provided
-    const providerConfig: { apiKey: string; baseURL?: string } = { apiKey };
-    if (baseURL) {
-      providerConfig.baseURL = baseURL;
-    }
-    const provider = creator(providerConfig);
+    // Create the provider instance with the custom configuration options
+    const provider = creator(modelClientOptions);
     // Get the specific model from the provider
     return provider(subModelName);
   } else {
@@ -170,8 +165,7 @@ export class LLMProvider {
       const languageModel = getAISDKLanguageModel(
         subProvider,
         subModelName,
-        clientOptions?.apiKey,
-        clientOptions?.baseURL,
+        clientOptions,
       );
 
       return new AISdkClient({

lib/llm/OpenAIClient.ts

@@ -1,3 +1,8 @@
+import {
+  CreateChatCompletionResponseError,
+  StagehandError,
+  ZodSchemaValidationError,
+} from "@/types/stagehandErrors";
 import OpenAI, { ClientOptions } from "openai";
 import { zodResponseFormat } from "openai/helpers/zod";
 import {
@@ -21,11 +26,6 @@ import {
   LLMClient,
   LLMResponse,
 } from "./LLMClient";
-import {
-  CreateChatCompletionResponseError,
-  StagehandError,
-  ZodSchemaValidationError,
-} from "@/types/stagehandErrors";
 
 export class OpenAIClient extends LLMClient {
   public type = "openai" as const;

types/llm.ts

@@ -1,4 +1,5 @@
 import { LanguageModel } from "ai";
+import { ClientOptions } from "./model";
 
 export interface LLMTool {
   type: "function";
@@ -9,6 +10,4 @@ export interface LLMTool {
 
 export type AISDKProvider = (modelName: string) => LanguageModel;
 // Represents a function that takes options (like apiKey) and returns an AISDKProvider
-export type AISDKCustomProvider = (options: {
-  apiKey: string;
-}) => AISDKProvider;
+export type AISDKCustomProvider = (options: ClientOptions) => AISDKProvider;

types/model.ts

@@ -44,7 +44,10 @@ export type ModelProvider =
   | "google"
   | "aisdk";
 
-export type ClientOptions = OpenAIClientOptions | AnthropicClientOptions;
+export type ClientOptions =
+  | Record<string, string>
+  | OpenAIClientOptions
+  | AnthropicClientOptions;
 
 export interface AnthropicJsonSchemaObject {
   definitions?: {