@llumiverse/drivers 0.22.1 → 0.23.0-dev-20251118

package/README.md

@@ -28,7 +28,7 @@ New capabilities and platform can easily be added by creating a new driver for t
 
 ## Requirements
 
-* node v18+, or bun 1.0+
+* node v22+, or bun 1.0+
 
 ## Installation 
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@llumiverse/drivers",
-    "version": "0.22.1",
+    "version": "0.23.0-dev-20251118",
     "type": "module",
     "description": "LLM driver implementations. Currently supported are: openai, huggingface, bedrock, replicate.",
     "files": [
@@ -47,41 +47,46 @@
     ],
     "devDependencies": {
         "dotenv": "^16.6.1",
-        "rimraf": "^6.0.1",
+        "rimraf": "^6.1.0",
         "ts-dual-module": "^0.6.3",
-        "typescript": "^5.9.2",
+        "typescript": "^5.9.3",
         "vitest": "^3.2.4"
     },
     "dependencies": {
-        "@anthropic-ai/sdk": "^0.66.0",
+        "@anthropic-ai/sdk": "^0.68.0",
         "@anthropic-ai/vertex-sdk": "^0.14.0",
-        "@aws-sdk/client-bedrock": "^3.840.0",
-        "@aws-sdk/client-bedrock-runtime": "^3.840.0",
-        "@aws-sdk/client-s3": "^3.840.0",
-        "@aws-sdk/credential-providers": "^3.840.0",
-        "@aws-sdk/lib-storage": "^3.840.0",
-        "@aws-sdk/types": "^3.840.0",
+        "@aws-sdk/client-bedrock": "^3.922.0",
+        "@aws-sdk/client-bedrock-runtime": "^3.922.0",
+        "@aws-sdk/client-s3": "^3.922.0",
+        "@aws-sdk/credential-providers": "^3.922.0",
+        "@aws-sdk/lib-storage": "^3.922.0",
+        "@aws-sdk/types": "^3.922.0",
         "@azure-rest/ai-inference": "1.0.0-beta.6",
         "@azure/ai-projects": "1.0.0-beta.10",
-        "@azure/core-auth": "^1.10.0",
+        "@azure/core-auth": "^1.10.1",
         "@azure/core-sse": "^2.3.0",
-        "@azure/identity": "^4.10.1",
+        "@azure/identity": "^4.13.0",
         "@azure/openai": "2.0.0",
-        "@google-cloud/aiplatform": "^3.35.0",
-        "@google/genai": "^1.25.0",
-        "@huggingface/inference": "2.6.7",
+        "@google-cloud/aiplatform": "^5.12.0",
+        "@google/genai": "^1.28.0",
+        "@huggingface/inference": "4.13.0",
         "@llumiverse/common": "workspace:*",
         "@llumiverse/core": "workspace:*",
-        "@vertesia/api-fetch-client": "^0.74.0",
+        "@vertesia/api-fetch-client": "^0.79.0",
         "eventsource": "^4.0.0",
-        "google-auth-library": "^9.15.1",
+        "google-auth-library": "^10.5.0",
         "groq-sdk": "^0.34.0",
         "mnemonist": "^0.40.3",
         "node-web-stream-adapters": "^0.2.1",
         "openai": "^4.104.0",
-        "replicate": "^1.0.1"
+        "replicate": "^1.3.1"
     },
     "ts_dual_module": {
         "outDir": "lib"
+    },
+    "pnpm": {
+        "overrides": {
+            "google-auth-library": "^10.5.0"
+        }
     }
 }

package/src/adobe/firefly.ts

@@ -134,7 +134,7 @@ export class FireflyDriver extends AbstractDriver<FireflyDriverOptions> {
             };
 
         } catch (error: any) {
-            this.logger.error("[Firefly] Image generation failed", { error });
+            this.logger.error({ error }, "[Firefly] Image generation failed");
             return {
                 result: [],
                 error: {
@@ -188,7 +188,7 @@ export class FireflyDriver extends AbstractDriver<FireflyDriverOptions> {
             });
             return response.ok;
         } catch (error) {
-            this.logger.error("[Firefly] Connection validation failed", { error });
+            this.logger.error({ error }, "[Firefly] Connection validation failed");
             return false;
         }
     }

package/src/azure/azure_foundry.ts

@@ -54,7 +54,7 @@ export class AzureFoundryDriver extends AbstractDriver<AzureFoundryDriverOptions
                 opts.azureADTokenProvider = new DefaultAzureCredential();
             }
         } catch (error) {
-            this.logger.error("Failed to initialize Azure AD token provider:", error);
+            this.logger.error({ error }, "Failed to initialize Azure AD token provider:");
             throw new Error("Failed to initialize Azure AD token provider");
         }
 
@@ -89,7 +89,7 @@ export class AzureFoundryDriver extends AbstractDriver<AzureFoundryDriverOptions
             deployment = await this.service.deployments.get(deploymentName);
             this.logger.debug(`[Azure Foundry] Deployment ${deploymentName} found`);
         } catch (deploymentError) {
-            this.logger.error(`[Azure Foundry] Deployment ${deploymentName} not found:`, deploymentError);
+            this.logger.error({ deploymentError }, `[Azure Foundry] Deployment ${deploymentName} not found:`);
         }
 
         return (deployment as ModelDeployment).modelPublisher == "OpenAI";
@@ -131,7 +131,7 @@ export class AzureFoundryDriver extends AbstractDriver<AzureFoundryDriverOptions
                 }
             });
             if (response.status !== "200") {
-                this.logger.error(`[Azure Foundry] Chat completion request failed:`, response);
+                this.logger.error({ response }, `[Azure Foundry] Chat completion request failed:`);
                 throw new Error(`Chat completion request failed with status ${response.status}: ${response.body}`);
             }
 
@@ -213,12 +213,12 @@ export class AzureFoundryDriver extends AbstractDriver<AzureFoundryDriverOptions
 
                     yield chunk;
                 } catch (parseError) {
-                    this.logger.warn(`[Azure Foundry] Failed to parse streaming response:`, parseError);
+                    this.logger.warn({ parseError }, `[Azure Foundry] Failed to parse streaming response:`);
                     continue;
                 }
             }
         } catch (error) {
-            this.logger.error(`[Azure Foundry] Streaming error:`, error);
+            this.logger.error({ error }, `[Azure Foundry] Streaming error:`);
             throw error;
         }
     }
@@ -233,7 +233,7 @@ export class AzureFoundryDriver extends AbstractDriver<AzureFoundryDriverOptions
 
         const choice = result.choices?.[0];
         if (!choice) {
-            this.logger?.error("[Azure Foundry] No choices in response", result);
+            this.logger.error({ result }, "[Azure Foundry] No choices in response");
             throw new Error("No choices in response");
         }
 
@@ -241,7 +241,7 @@ export class AzureFoundryDriver extends AbstractDriver<AzureFoundryDriverOptions
         const toolCalls = choice.message?.tool_calls;
 
         if (!data && !toolCalls) {
-            this.logger?.error("[Azure Foundry] Response is not valid", result);
+            this.logger.error({ result }, "[Azure Foundry] Response is not valid");
             throw new Error("Response is not valid: no content or tool calls");
         }
 
@@ -291,7 +291,7 @@ export class AzureFoundryDriver extends AbstractDriver<AzureFoundryDriverOptions
 
             return true;
         } catch (error) {
-            this.logger.error("Azure Foundry connection validation failed:", error);
+            this.logger.error({ error }, "Azure Foundry connection validation failed:");
             return false;
         }
     }
@@ -328,7 +328,7 @@ export class AzureFoundryDriver extends AbstractDriver<AzureFoundryDriverOptions
                 }
             });
         } catch (error) {
-            this.logger.error("Azure Foundry text embeddings error:", error);
+            this.logger.error({ error }, "Azure Foundry text embeddings error:");
             throw error;
         }
 
@@ -365,7 +365,7 @@ export class AzureFoundryDriver extends AbstractDriver<AzureFoundryDriverOptions
                 }
             });
         } catch (error) {
-            this.logger.error("Azure Foundry image embeddings error:", error);
+            this.logger.error({ error }, "Azure Foundry image embeddings error:");
             throw error;
         }
         if (isUnexpected(response)) {
@@ -395,7 +395,7 @@ export class AzureFoundryDriver extends AbstractDriver<AzureFoundryDriverOptions
             // List all deployments in the Azure AI Foundry project
             deploymentsIterable = this.service.deployments.list();
         } catch (error) {
-            this.logger.error("Failed to list deployments:", error);
+            this.logger.error({ error }, "Failed to list deployments:");
             throw new Error("Failed to list deployments in Azure AI Foundry project");
         }
         const deployments: DeploymentUnion[] = [];

package/src/bedrock/index.ts

@@ -169,7 +169,7 @@ export class BedrockDriver extends AbstractDriver<BedrockDriverOptions, BedrockP
                     const type = Object.keys(content).find(
                         key => key !== '$unknown' && content[key as keyof typeof content] !== undefined
                     );
-                    this.logger.info("[Bedrock] Unsupported content response type:", type);
+                    this.logger.info({ type }, "[Bedrock] Unsupported content response type:");
                 }
             }
 
@@ -235,7 +235,7 @@ export class BedrockDriver extends AbstractDriver<BedrockDriverOptions, BedrockP
                 const type = Object.keys(delta).find(
                     key => key !== '$unknown' && (delta as any)[key] !== undefined
                 );
-                this.logger.info("[Bedrock] Unsupported content response type:", type);
+                this.logger.info({ type }, "[Bedrock] Unsupported content response type:");
             }
         }
 
@@ -512,7 +512,7 @@ export class BedrockDriver extends AbstractDriver<BedrockDriverOptions, BedrockP
             });
 
         }).catch((err) => {
-            this.logger.error("[Bedrock] Failed to stream", { error: err });
+            this.logger.error({ error: err }, "[Bedrock] Failed to stream");
             throw err;
         });
     }
@@ -673,7 +673,7 @@ export class BedrockDriver extends AbstractDriver<BedrockDriverOptions, BedrockP
             throw new Error(`Image generation requires image output_modality`);
         }
         if (options.model_options?._option_id !== "bedrock-nova-canvas") {
-            this.logger.warn("Invalid model options", { options: options.model_options });
+            this.logger.warn({ options: options.model_options }, "Invalid model options");
         }
         const model_options = options.model_options as NovaCanvasOptions;
 

package/src/groq/index.ts

@@ -195,7 +195,7 @@ export class GroqDriver extends AbstractDriver<GroqDriverOptions, ChatCompletion
 
     async requestTextCompletion(messages: ChatCompletionMessageParam[], options: ExecutionOptions): Promise<Completion> {
         if (options.model_options?._option_id !== "text-fallback" && options.model_options?._option_id !== "groq-deepseek-thinking") {
-            this.logger.warn("Invalid model options", { options: options.model_options });
+            this.logger.warn({ options: options.model_options }, "Invalid model options");
         }
         options.model_options = options.model_options as TextFallbackOptions;
 
@@ -251,7 +251,7 @@ export class GroqDriver extends AbstractDriver<GroqDriverOptions, ChatCompletion
 
     async requestTextCompletionStream(messages: ChatCompletionMessageParam[], options: ExecutionOptions): Promise<AsyncIterable<CompletionChunkObject>> {
         if (options.model_options?._option_id !== "text-fallback") {
-            this.logger.warn("Invalid model options", { options: options.model_options });
+            this.logger.warn({ options: options.model_options }, "Invalid model options");
         }
         options.model_options = options.model_options as TextFallbackOptions;
 

package/src/huggingface_ie.ts

@@ -1,7 +1,6 @@
 import {
-    HfInference,
-    HfInferenceEndpoint,
-    TextGenerationStreamOutput
+    InferenceClient,
+    TextGenerationStreamOutput,
 } from "@huggingface/inference";
 import {
     AIModel,
@@ -25,7 +24,7 @@ export class HuggingFaceIEDriver extends AbstractDriver<HuggingFaceIEDriverOptio
     static PROVIDER = "huggingface_ie";
     provider = HuggingFaceIEDriver.PROVIDER;
     service: FetchClient;
-    _executor?: HfInferenceEndpoint;
+    _executor?: InferenceClient;
 
     constructor(
         options: HuggingFaceIEDriverOptions
@@ -60,7 +59,8 @@ export class HuggingFaceIEDriver extends AbstractDriver<HuggingFaceIEDriverOptio
                     `Endpoint ${model} is not running - current status: ${endpoint.status}`
                 );
 
-            this._executor = new HfInference(this.options.apiKey).endpoint(
+            // Use the new InferenceClient and bind it to the endpoint URL
+            this._executor = new InferenceClient(this.options.apiKey).endpoint(
                 endpoint.url
             );
         }
@@ -69,7 +69,7 @@ export class HuggingFaceIEDriver extends AbstractDriver<HuggingFaceIEDriverOptio
 
     async requestTextCompletionStream(prompt: string, options: ExecutionOptions) {
         if (options.model_options?._option_id !== "text-fallback") {
-            this.logger.warn("Invalid model options", { options: options.model_options });
+            this.logger.warn({ options: options.model_options }, "Invalid model options");
         }
         options.model_options = options.model_options as TextFallbackOptions;
 
@@ -82,8 +82,7 @@ export class HuggingFaceIEDriver extends AbstractDriver<HuggingFaceIEDriverOptio
             },
         });
 
-
-        return transformAsyncIterator(req, (val: TextGenerationStreamOutput) => {
+        return transformAsyncIterator(req, (val: TextGenerationStreamOutput): CompletionChunkObject => {
             //special like <s> are not part of the result
             if (val.token.special) return { result: [] };
             let finish_reason = val.details?.finish_reason as string;
@@ -96,13 +95,13 @@ export class HuggingFaceIEDriver extends AbstractDriver<HuggingFaceIEDriverOptio
                 token_usage: {
                     result: val.details?.generated_tokens ?? 0,
                 }
-            } as CompletionChunkObject;
+            };
         });
     }
 
     async requestTextCompletion(prompt: string, options: ExecutionOptions) {
         if (options.model_options?._option_id !== "text-fallback") {
-            this.logger.warn("Invalid model options", { options: options.model_options });
+            this.logger.warn({ options: options.model_options }, "Invalid model options");
         }
         options.model_options = options.model_options as TextFallbackOptions;
 

package/src/index.ts

@@ -1,12 +1,12 @@
+export * from "./azure/azure_foundry.js";
 export * from "./bedrock/index.js";
 export * from "./groq/index.js";
 export * from "./huggingface_ie.js";
 export * from "./mistral/index.js";
 export * from "./openai/azure_openai.js";
-export * from "./azure/azure_foundry.js";
 export * from "./openai/openai.js";
 export * from "./replicate.js";
-export * from "./test/index.js";
+export * from "./test-driver/index.js";
 export * from "./togetherai/index.js";
 export * from "./vertexai/index.js";
 export * from "./watsonx/index.js";

package/src/mistral/index.ts

@@ -64,7 +64,7 @@ export class MistralAIDriver extends AbstractDriver<MistralAIDriverOptions, Open
 
     async requestTextCompletion(messages: OpenAITextMessage[], options: ExecutionOptions): Promise<Completion> {
         if (options.model_options?._option_id !== "text-fallback") {
-            this.logger.warn("Invalid model options", { options: options.model_options });
+            this.logger.warn({ options: options.model_options }, "Invalid model options");
         }
         options.model_options = options.model_options as TextFallbackOptions;
 
@@ -95,7 +95,7 @@ export class MistralAIDriver extends AbstractDriver<MistralAIDriverOptions, Open
 
     async requestTextCompletionStream(messages: OpenAITextMessage[], options: ExecutionOptions): Promise<AsyncIterable<CompletionChunkObject>> {
         if (options.model_options?._option_id !== "text-fallback") {
-            this.logger.warn("Invalid model options", { options: options.model_options });
+            this.logger.warn({ options: options.model_options }, "Invalid model options");
         }
         options.model_options = options.model_options as TextFallbackOptions;
 

package/src/openai/azure_openai.ts

@@ -9,7 +9,7 @@ export interface AzureOpenAIDriverOptions extends DriverOptions {
      * The credentials to use to access Azure OpenAI
      */
     azureADTokenProvider?: any; //type with azure credentials
-    
+
     apiKey?: string;
 
     endpoint?: string;
@@ -41,7 +41,7 @@ export class AzureOpenAIDriver extends BaseOpenAIDriver {
 
         this.service = new AzureOpenAI({
             apiKey: opts.apiKey,
-            azureADTokenProvider: opts.azureADTokenProvider,          
+            azureADTokenProvider: opts.azureADTokenProvider,
             endpoint: opts.endpoint,
             apiVersion: opts.apiVersion ?? "2024-10-21",
             deployment: opts.deployment
@@ -56,7 +56,7 @@ export class AzureOpenAIDriver extends BaseOpenAIDriver {
         const azureADTokenProvider = getBearerTokenProvider(new DefaultAzureCredential(), scope);
         return azureADTokenProvider;
     }
-    
+
     async listModels(): Promise<AIModel[]> {
         return this._listModels();
     }
@@ -65,7 +65,7 @@ export class AzureOpenAIDriver extends BaseOpenAIDriver {
         if (!this.service.deploymentName) {
             throw new Error("A specific deployment is not set. Azure OpenAI cannot list deployments. Update your endpoint URL to include the deployment name, e.g., https://your-resource.openai.azure.com/openai/deployments/your-deployment/chat/completions");
         }
-            
+
         //Do a test execution to check if the model works and to get the model ID.
         let modelID = this.service.deploymentName;
         try {
@@ -76,7 +76,7 @@ export class AzureOpenAIDriver extends BaseOpenAIDriver {
             });
             modelID = testResponse.model;
         } catch (error) {
-            this.logger.error("Failed to test model for Azure OpenAI listing :", error);
+            this.logger.error({ error }, "Failed to test model for Azure OpenAI listing :");
         }
         const modelCapability = getModelCapabilities(modelID, "openai");
         return [{

package/src/openai/index.ts

@@ -76,7 +76,7 @@ export abstract class BaseOpenAIDriver extends AbstractDriver<
         const data = choice.message.content ?? undefined;
 
         if (!data && !tools) {
-            this.logger?.error("[OpenAI] Response is not valid", result);
+            this.logger.error({ result }, "[OpenAI] Response is not valid");
             throw new Error("Response is not valid: no data");
         }
 
@@ -90,7 +90,7 @@ export abstract class BaseOpenAIDriver extends AbstractDriver<
 
     async requestTextCompletionStream(prompt: ChatCompletionMessageParam[], options: ExecutionOptions): Promise<AsyncIterable<CompletionChunkObject>> {
         if (options.model_options?._option_id !== "openai-text" && options.model_options?._option_id !== "openai-thinking") {
-            this.logger.warn("Invalid model options", { options: options.model_options });
+            this.logger.warn({ options: options.model_options }, "Invalid model options");
         }
 
         const toolDefs = getToolDefinitions(options.tools);
@@ -163,7 +163,7 @@ export abstract class BaseOpenAIDriver extends AbstractDriver<
 
     async requestTextCompletion(prompt: ChatCompletionMessageParam[], options: ExecutionOptions): Promise<Completion> {
         if (options.model_options?._option_id !== "openai-text" && options.model_options?._option_id !== "openai-thinking") {
-            this.logger.warn("Invalid model options", { options: options.model_options });
+            this.logger.warn({ options: options.model_options }, "Invalid model options");
         }
 
         convertRoles(prompt, options.model);

package/src/replicate.ts

@@ -15,7 +15,7 @@ import {
 } from "@llumiverse/core";
 import { EventStream } from "@llumiverse/core/async";
 import { EventSource } from "eventsource";
-import Replicate, { Prediction } from "replicate";
+import Replicate, { Prediction, Training } from "replicate";
 
 let cachedTrainableModels: AIModel[] | undefined;
 let cachedTrainableModelsTimestamp: number = 0;
@@ -66,7 +66,7 @@ export class ReplicateDriver extends AbstractDriver<DriverOptions, string> {
 
     async requestTextCompletionStream(prompt: string, options: ExecutionOptions): Promise<AsyncIterable<CompletionChunkObject>> {
         if (options.model_options?._option_id !== "text-fallback") {
-            this.logger.warn("Invalid model options", { options: options.model_options });
+            this.logger.warn({ options: options.model_options }, "Invalid model options");
         }
         options.model_options = options.model_options as TextFallbackOptions;
 
@@ -88,7 +88,7 @@ export class ReplicateDriver extends AbstractDriver<DriverOptions, string> {
 
         const source = new EventSource(prediction.urls.stream!);
         source.addEventListener("output", (e: any) => {
-            stream.push({result: [{ type: "text", value: e.data }] });
+            stream.push({ result: [{ type: "text", value: e.data }] });
         });
         source.addEventListener("error", (e: any) => {
             let error: any;
@@ -97,7 +97,7 @@ export class ReplicateDriver extends AbstractDriver<DriverOptions, string> {
             } catch (error) {
                 error = JSON.stringify(e);
             }
-            this.logger?.error("Error in SSE stream", { e, error });
+            this.logger.error({ e, error }, "Error in SSE stream");
         });
         source.addEventListener("done", () => {
             try {
@@ -111,7 +111,7 @@ export class ReplicateDriver extends AbstractDriver<DriverOptions, string> {
 
     async requestTextCompletion(prompt: string, options: ExecutionOptions) {
         if (options.model_options?._option_id !== "text-fallback") {
-            this.logger.warn("Invalid model options", { options: options.model_options });
+            this.logger.warn({ options: options.model_options }, "Invalid model options");
         }
         options.model_options = options.model_options as TextFallbackOptions;
         const model = ReplicateDriver.parseModelId(options.model);
@@ -236,7 +236,7 @@ export class ReplicateDriver extends AbstractDriver<DriverOptions, string> {
             this.service.models.versions.list(owner, model),
         ]);
 
-        if (!rModel || !versions || versions.length === 0) {
+        if (!rModel || !versions || (versions as any).results?.length === 0) {
             throw new Error("Model not found or no versions available");
         }
 
@@ -289,7 +289,7 @@ export class ReplicateDriver extends AbstractDriver<DriverOptions, string> {
 
 }
 
-function jobInfo(job: Prediction, modelName?: string): TrainingJob {
+function jobInfo(job: Prediction | Training, modelName?: string): TrainingJob {
     // 'starting' | 'processing' | 'succeeded' | 'failed' | 'canceled'
     const jobStatus = job.status;
     let details: string | undefined;

package/src/togetherai/index.ts

@@ -31,7 +31,7 @@ export class TogetherAIDriver extends AbstractDriver<TogetherAIDriverOptions, st
 
     async requestTextCompletion(prompt: string, options: ExecutionOptions): Promise<Completion> {
         if (options.model_options?._option_id !== "text-fallback") {
-            this.logger.warn("Invalid model options", { options: options.model_options });
+            this.logger.warn({ options: options.model_options }, "Invalid model options");
         }
         options.model_options = options.model_options as TextFallbackOptions;
 
@@ -73,7 +73,7 @@ export class TogetherAIDriver extends AbstractDriver<TogetherAIDriverOptions, st
 
     async requestTextCompletionStream(prompt: string, options: ExecutionOptions): Promise<AsyncIterable<CompletionChunkObject>> {
         if (options.model_options?._option_id !== "text-fallback") {
-            this.logger.warn("Invalid model options", { options: options.model_options });
+            this.logger.warn({ options: options.model_options }, "Invalid model options");
         }
         options.model_options = options.model_options as TextFallbackOptions;
 

package/src/vertexai/index.ts

@@ -1,9 +1,13 @@
+import { AnthropicVertex } from "@anthropic-ai/vertex-sdk";
+import { PredictionServiceClient, v1beta1 } from "@google-cloud/aiplatform";
+import { Content, GoogleGenAI, Model } from "@google/genai";
 import {
     AIModel,
     AbstractDriver,
     Completion,
     CompletionChunkObject,
     DriverOptions,
+    EmbeddingsOptions,
     EmbeddingsResult,
     ExecutionOptions,
     Modalities,
@@ -13,17 +17,12 @@ import {
     modelModalitiesToArray,
 } from "@llumiverse/core";
 import { FetchClient } from "@vertesia/api-fetch-client";
-import { GoogleAuth, GoogleAuthOptions } from "google-auth-library";
-import { JSONClient } from "google-auth-library/build/src/auth/googleauth.js";
+import { GoogleAuth, GoogleAuthOptions, AuthClient } from "google-auth-library";
+import { getEmbeddingsForImages } from "./embeddings/embeddings-image.js";
 import { TextEmbeddingsOptions, getEmbeddingsForText } from "./embeddings/embeddings-text.js";
 import { getModelDefinition } from "./models.js";
-import { EmbeddingsOptions } from "@llumiverse/core";
-import { getEmbeddingsForImages } from "./embeddings/embeddings-image.js";
-import { PredictionServiceClient, v1beta1 } from "@google-cloud/aiplatform";
-import { AnthropicVertex } from "@anthropic-ai/vertex-sdk";
+import { ANTHROPIC_REGIONS, NON_GLOBAL_ANTHROPIC_MODELS } from "./models/claude.js";
 import { ImagenModelDefinition, ImagenPrompt } from "./models/imagen.js";
-import { GoogleGenAI, Content, Model } from "@google/genai";
-import { NON_GLOBAL_ANTHROPIC_MODELS, ANTHROPIC_REGIONS } from "./models/claude.js";
 
 export interface VertexAIDriverOptions extends DriverOptions {
     project: string;
@@ -56,7 +55,8 @@ export class VertexAIDriver extends AbstractDriver<VertexAIDriverOptions, Vertex
     modelGarden: v1beta1.ModelGardenServiceClient | undefined;
     imagenClient: PredictionServiceClient | undefined;
 
-    authClient: JSONClient | GoogleAuth<JSONClient>;
+    googleAuth: GoogleAuth<any>;
+    private authClientPromise: Promise<AuthClient> | undefined;
 
     constructor(options: VertexAIDriverOptions) {
         super(options);
@@ -69,7 +69,15 @@ export class VertexAIDriver extends AbstractDriver<VertexAIDriverOptions, Vertex
         this.llamaClient = undefined;
         this.imagenClient = undefined;
 
-        this.authClient = options.googleAuthOptions?.authClient ?? new GoogleAuth(options.googleAuthOptions);
+        this.googleAuth = new GoogleAuth(options.googleAuthOptions) as GoogleAuth<any>;
+        this.authClientPromise = undefined;
+    }
+
+    private async getAuthClient(): Promise<AuthClient> {
+        if (!this.authClientPromise) {
+            this.authClientPromise = this.googleAuth.getClient();
+        }
+        return this.authClientPromise;
     }
 
     public getGoogleGenAIClient(region: string = this.options.region): GoogleGenAI {
@@ -80,8 +88,8 @@ export class VertexAIDriver extends AbstractDriver<VertexAIDriverOptions, Vertex
                 project: this.options.project,
                 location: region,
                 vertexai: true,
-                googleAuthOptions: {
-                    authClient: this.authClient as JSONClient,
+                googleAuthOptions: this.options.googleAuthOptions || {
+                    scopes: ["https://www.googleapis.com/auth/cloud-platform"],
                 }
             });
         }
@@ -90,8 +98,8 @@ export class VertexAIDriver extends AbstractDriver<VertexAIDriverOptions, Vertex
                 project: this.options.project,
                 location: region,
                 vertexai: true,
-                googleAuthOptions: {
-                    authClient: this.authClient as JSONClient,
+                googleAuthOptions: this.options.googleAuthOptions || {
+                    scopes: ["https://www.googleapis.com/auth/cloud-platform"],
                 }
             });
         }
@@ -105,8 +113,7 @@ export class VertexAIDriver extends AbstractDriver<VertexAIDriverOptions, Vertex
                 region: this.options.region,
                 project: this.options.project,
             }).withAuthCallback(async () => {
-                const accessTokenResponse = await this.authClient.getAccessToken();
-                const token = typeof accessTokenResponse === 'string' ? accessTokenResponse : accessTokenResponse?.token;
+                const token = await this.googleAuth.getAccessToken();
                 return `Bearer ${token}`;
             });
         }
@@ -121,8 +128,7 @@ export class VertexAIDriver extends AbstractDriver<VertexAIDriverOptions, Vertex
                 project: this.options.project,
                 apiVersion: "v1beta1",
             }).withAuthCallback(async () => {
-                const accessTokenResponse = await this.authClient.getAccessToken();
-                const token = typeof accessTokenResponse === 'string' ? accessTokenResponse : accessTokenResponse?.token;
+                const token = await this.googleAuth.getAccessToken();
                 return `Bearer ${token}`;
             });
             // Store the region for potential client reuse
@@ -131,7 +137,7 @@ export class VertexAIDriver extends AbstractDriver<VertexAIDriverOptions, Vertex
         return this.llamaClient;
     }
 
-    public getAnthropicClient(region: string = this.options.region): AnthropicVertex {
+    public async getAnthropicClient(region: string = this.options.region): Promise<AnthropicVertex> {
         // Extract region prefix and map if it exists in ANTHROPIC_REGIONS, otherwise use as-is
         const getRegionPrefix = (r: string) => r.split('-')[0];
         const regionPrefix = getRegionPrefix(region);
@@ -140,17 +146,16 @@ export class VertexAIDriver extends AbstractDriver<VertexAIDriverOptions, Vertex
         const defaultRegionPrefix = getRegionPrefix(this.options.region);
         const defaultMappedRegion = ANTHROPIC_REGIONS[defaultRegionPrefix] || this.options.region;
 
+        // Get auth client to avoid version mismatch with GoogleAuth generic types
+        const authClient = await this.getAuthClient();
+
         // If mapped region is different from default mapped region, create one-off client
         if (mappedRegion !== defaultMappedRegion) {
             return new AnthropicVertex({
                 timeout: 20 * 60 * 10000, // Set to 20 minutes, 10 minute default, setting this disables long request error: https://github.com/anthropics/anthropic-sdk-typescript?#long-requests
                 region: mappedRegion,
                 projectId: this.options.project,
-                googleAuth: new GoogleAuth({
-                    scopes: ["https://www.googleapis.com/auth/cloud-platform"],
-                    authClient: this.authClient as JSONClient,
-                    projectId: this.options.project,
-                }),
+                authClient,
             });
         }
 
@@ -160,48 +165,47 @@ export class VertexAIDriver extends AbstractDriver<VertexAIDriverOptions, Vertex
                 timeout: 20 * 60 * 10000, // Set to 20 minutes, 10 minute default, setting this disables long request error: https://github.com/anthropics/anthropic-sdk-typescript?#long-requests
                 region: mappedRegion,
                 projectId: this.options.project,
-                googleAuth: new GoogleAuth({
-                    scopes: ["https://www.googleapis.com/auth/cloud-platform"],
-                    authClient: this.authClient as JSONClient,
-                    projectId: this.options.project,
-                }),
+                authClient,
             });
         }
         return this.anthropicClient;
     }
 
-    public getAIPlatformClient(): v1beta1.ModelServiceClient {
+    public async getAIPlatformClient(): Promise<v1beta1.ModelServiceClient> {
         //Lazy initialization
         if (!this.aiplatform) {
+            const authClient = await this.getAuthClient();
             this.aiplatform = new v1beta1.ModelServiceClient({
                 projectId: this.options.project,
                 apiEndpoint: `${this.options.region}-${API_BASE_PATH}`,
-                authClient: this.authClient as JSONClient,
+                authClient,
             });
         }
         return this.aiplatform;
     }
 
-    public getModelGardenClient(): v1beta1.ModelGardenServiceClient {
+    public async getModelGardenClient(): Promise<v1beta1.ModelGardenServiceClient> {
         //Lazy initialization
         if (!this.modelGarden) {
+            const authClient = await this.getAuthClient();
             this.modelGarden = new v1beta1.ModelGardenServiceClient({
                 projectId: this.options.project,
                 apiEndpoint: `${this.options.region}-${API_BASE_PATH}`,
-                authClient: this.authClient as JSONClient,
+                authClient,
             });
         }
         return this.modelGarden;
     }
 
-    public getImagenClient(): PredictionServiceClient {
+    public async getImagenClient(): Promise<PredictionServiceClient> {
         //Lazy initialization
         if (!this.imagenClient) {
             // TODO: make location configurable, fixed to us-central1 for now
+            const authClient = await this.getAuthClient();
             this.imagenClient = new PredictionServiceClient({
                 projectId: this.options.project,
                 apiEndpoint: `us-central1-${API_BASE_PATH}`,
-                authClient: this.authClient as JSONClient,
+                authClient,
             });
         }
         return this.imagenClient;
@@ -263,8 +267,8 @@ export class VertexAIDriver extends AbstractDriver<VertexAIDriverOptions, Vertex
 
     async listModels(_params?: ModelSearchPayload): Promise<AIModel<string>[]> {
         // Get clients
-        const modelGarden = this.getModelGardenClient();
-        const aiplatform = this.getAIPlatformClient();
+        const modelGarden = await this.getModelGardenClient();
+        const aiplatform = await this.getAIPlatformClient();
         const globalGenAiClient = this.getGoogleGenAIClient("global");
 
         let models: AIModel<string>[] = [];

package/src/vertexai/models/claude.ts

@@ -269,11 +269,11 @@ export class ClaudeModelDefinition implements ModelDefinition<ClaudePrompt> {
         const modelName = splits[splits.length - 1];
         options = { ...options, model: modelName };
 
-        const client = driver.getAnthropicClient(region);
+        const client = await driver.getAnthropicClient(region);
         options.model_options = options.model_options as VertexAIClaudeOptions;
 
         if (options.model_options?._option_id !== "vertexai-claude") {
-            driver.logger.warn("Invalid model options", { options: options.model_options });
+            driver.logger.warn({ options: options.model_options }, "Invalid model options");
         }
 
         let conversation = updateConversation(options.conversation as ClaudePrompt, prompt);
@@ -314,11 +314,11 @@ export class ClaudeModelDefinition implements ModelDefinition<ClaudePrompt> {
         const modelName = splits[splits.length - 1];
         options = { ...options, model: modelName };
 
-        const client = driver.getAnthropicClient(region);
+        const client = await driver.getAnthropicClient(region);
         const model_options = options.model_options as VertexAIClaudeOptions | undefined;
 
         if (model_options?._option_id !== "vertexai-claude") {
-            driver.logger.warn("Invalid model options", { options: options.model_options });
+            driver.logger.warn({ options: options.model_options }, "Invalid model options");
         }
 
         const { payload, requestOptions } = getClaudePayload(options, prompt);

package/src/vertexai/models/imagen.ts

@@ -324,7 +324,7 @@ export class ImagenModelDefinition {
 
     async requestImageGeneration(driver: VertexAIDriver, prompt: ImagenPrompt, options: ExecutionOptions): Promise<Completion> {
         if (options.model_options?._option_id !== "vertexai-imagen") {
-            driver.logger.warn("Invalid model options", { options: options.model_options });
+            driver.logger.warn({ options: options.model_options }, "Invalid model options");
         }
         options.model_options = options.model_options as ImagenOptions | undefined;
 
@@ -336,7 +336,7 @@ export class ImagenModelDefinition {
 
         driver.logger.info("Task type: " + taskType);
 
-            const modelName = options.model.split("/").pop() ?? '';
+        const modelName = options.model.split("/").pop() ?? '';
 
         // Configure the parent resource
         // TODO: make location configurable, fixed to us-central1 for now
@@ -348,7 +348,7 @@ export class ImagenModelDefinition {
         }
         const instances = [instanceValue];
 
-        let parameter: any = getImagenParameters(taskType, options.model_options ?? {_option_id: "vertexai-imagen"});
+        let parameter: any = getImagenParameters(taskType, options.model_options ?? { _option_id: "vertexai-imagen" });
         parameter.negativePrompt = prompt.negativePrompt ?? undefined;
 
         const numberOfImages = options.model_options?.number_of_images ?? 1;
@@ -366,7 +366,7 @@ export class ImagenModelDefinition {
             parameters,
         };
 
-        const client = driver.getImagenClient();
+        const client = await driver.getImagenClient();
 
         // Predict request
         const [response] = await client.predict(request, { timeout: 120000 * numberOfImages }); //Extended timeout for image generation

package/src/watsonx/index.ts

@@ -31,7 +31,7 @@ export class WatsonxDriver extends AbstractDriver<WatsonxDriverOptions, string>
 
     async requestTextCompletion(prompt: string, options: ExecutionOptions): Promise<Completion> {
         if (options.model_options?._option_id !== "text-fallback") {
-            this.logger.warn("Invalid model options", { options: options.model_options });
+            this.logger.warn({ options: options.model_options }, "Invalid model options");
         }
         options.model_options = options.model_options as TextFallbackOptions | undefined;
 
@@ -66,7 +66,7 @@ export class WatsonxDriver extends AbstractDriver<WatsonxDriverOptions, string>
 
     async requestTextCompletionStream(prompt: string, options: ExecutionOptions): Promise<AsyncIterable<CompletionChunkObject>> {
         if (options.model_options?._option_id !== "text-fallback") {
-            this.logger.warn("Invalid model options", { options: options.model_options });
+            this.logger.warn({ options: options.model_options }, "Invalid model options");
         }
         options.model_options = options.model_options as TextFallbackOptions | undefined;
         const payload: WatsonxTextGenerationPayload = {
@@ -152,7 +152,7 @@ export class WatsonxDriver extends AbstractDriver<WatsonxDriverOptions, string>
         return this.listModels()
             .then(() => true)
             .catch((err) => {
-                this.logger.warn("Failed to connect to WatsonX", { error: err });
+                this.logger.warn({ error: err }, "Failed to connect to WatsonX");
                 return false
             });
     }