promptfoo 0.93.2 → 0.94.0

package/dist/src/providers/vertexUtil.d.ts

@@ -1,3 +1,4 @@
+import { z } from 'zod';
 type Probability = 'NEGLIGIBLE' | 'LOW' | 'MEDIUM' | 'HIGH';
 interface SafetyRating {
     category: 'HARM_CATEGORY_HARASSMENT' | 'HARM_CATEGORY_HATE_SPEECH' | 'HARM_CATEGORY_SEXUALLY_EXPLICIT' | 'HARM_CATEGORY_DANGEROUS_CONTENT';
@@ -66,9 +67,85 @@ export interface Palm2ApiResponse {
         }
     ];
 }
+declare const PartSchema: z.ZodObject<{
+    text: z.ZodOptional<z.ZodString>;
+    inline_data: z.ZodOptional<z.ZodObject<{
+        mime_type: z.ZodString;
+        data: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        data: string;
+        mime_type: string;
+    }, {
+        data: string;
+        mime_type: string;
+    }>>;
+}, "strip", z.ZodTypeAny, {
+    text?: string | undefined;
+    inline_data?: {
+        data: string;
+        mime_type: string;
+    } | undefined;
+}, {
+    text?: string | undefined;
+    inline_data?: {
+        data: string;
+        mime_type: string;
+    } | undefined;
+}>;
+declare const GeminiFormatSchema: z.ZodArray<z.ZodObject<{
+    role: z.ZodOptional<z.ZodEnum<["user", "model"]>>;
+    parts: z.ZodArray<z.ZodObject<{
+        text: z.ZodOptional<z.ZodString>;
+        inline_data: z.ZodOptional<z.ZodObject<{
+            mime_type: z.ZodString;
+            data: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            data: string;
+            mime_type: string;
+        }, {
+            data: string;
+            mime_type: string;
+        }>>;
+    }, "strip", z.ZodTypeAny, {
+        text?: string | undefined;
+        inline_data?: {
+            data: string;
+            mime_type: string;
+        } | undefined;
+    }, {
+        text?: string | undefined;
+        inline_data?: {
+            data: string;
+            mime_type: string;
+        } | undefined;
+    }>, "many">;
+}, "strip", z.ZodTypeAny, {
+    parts: {
+        text?: string | undefined;
+        inline_data?: {
+            data: string;
+            mime_type: string;
+        } | undefined;
+    }[];
+    role?: "user" | "model" | undefined;
+}, {
+    parts: {
+        text?: string | undefined;
+        inline_data?: {
+            data: string;
+            mime_type: string;
+        } | undefined;
+    }[];
+    role?: "user" | "model" | undefined;
+}>, "many">;
+export type GeminiFormat = z.infer<typeof GeminiFormatSchema>;
+export type GeminiPart = z.infer<typeof PartSchema>;
 export declare function maybeCoerceToGeminiFormat(contents: any): {
-    contents: any;
+    contents: GeminiFormat;
     coerced: boolean;
+    systemInstruction: {
+        parts: [GeminiPart, ...GeminiPart[]];
+    } | undefined;
 };
 export declare function getGoogleClient(): Promise<{
     client: import("google-auth-library").JWT | import("google-auth-library").UserRefreshClient | import("google-auth-library").BaseExternalAccountClient | import("google-auth-library/build/src/auth/externalAccountAuthorizedUserClient").ExternalAccountAuthorizedUserClient | import("google-auth-library").Impersonated | import("google-auth-library").AuthClient | import("google-auth-library").OAuth2Client | import("google-auth-library").Compute | import("google-auth-library").IdTokenClient | import("google-auth-library").AwsClient | import("google-auth-library").IdentityPoolClient | import("google-auth-library").PluggableAuthClient | import("google-auth-library").PassThroughClient;

package/dist/src/providers/vertexUtil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vertexUtil.d.ts","sourceRoot":"","sources":["../../../src/providers/vertexUtil.ts"],"names":[],"mappings":"AAGA,KAAK,WAAW,GAAG,YAAY,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;AAE5D,UAAU,YAAY;IACpB,QAAQ,EACJ,0BAA0B,GAC1B,2BAA2B,GAC3B,iCAAiC,GACjC,iCAAiC,CAAC;IACtC,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,UAAU,QAAQ;IAChB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,gBAAgB;IACxB,YAAY,EAAE;QACZ,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAC9B,CAAC;CACH;AAED,KAAK,IAAI,GAAG,QAAQ,GAAG,gBAAgB,CAAC;AAExC,UAAU,OAAO;IACf,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,UAAU,SAAS;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,oBAAoB,GAAG,MAAM,GAAG,QAAQ,CAAC;IACxD,aAAa,EAAE,YAAY,EAAE,CAAC;CAC/B;AAED,UAAU,mBAAmB;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,aAAa,CAAC,EAAE,mBAAmB,CAAC;CACrC;AAED,UAAU,oBAAoB;IAC5B,WAAW,CAAC,EAAE,oBAAoB,CAAC;CACpC;AAED,UAAU,mBAAmB;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,UAAU,qBAAqB;IAC7B,cAAc,EAAE,oBAAoB,CAAC;IACrC,aAAa,EAAE,mBAAmB,CAAC;CACpC;AAED,MAAM,MAAM,iBAAiB,GAAG,CAC5B,kBAAkB,GAClB,mBAAmB,GACnB,qBAAqB,CACxB,EAAE,CAAC;AAEJ,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE;QACN,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,WAAW,CAAC,EAAE;QACZ;YACE,UAAU,EAAE;gBACV;oBACE,OAAO,EAAE,MAAM,CAAC;iBACjB;aACF,CAAC;SACH;KACF,CAAC;CACH;AAED,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,GAAG;;;EAuBtD;AAGD,wBAAsB,eAAe;;;GAkBpC;AAED,wBAAsB,2BAA2B,qBAOhD"}
+{"version":3,"file":"vertexUtil.d.ts","sourceRoot":"","sources":["../../../src/providers/vertexUtil.ts"],"names":[],"mappings":"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"}

package/dist/src/providers/vertexUtil.js

@@ -29,32 +29,74 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.maybeCoerceToGeminiFormat = maybeCoerceToGeminiFormat;
 exports.getGoogleClient = getGoogleClient;
 exports.hasGoogleDefaultCredentials = hasGoogleDefaultCredentials;
+const zod_1 = require("zod");
 const logger_1 = __importDefault(require("../logger"));
+const PartSchema = zod_1.z.object({
+    text: zod_1.z.string().optional(),
+    inline_data: zod_1.z
+        .object({
+        mime_type: zod_1.z.string(),
+        data: zod_1.z.string(),
+    })
+        .optional(),
+});
+const ContentSchema = zod_1.z.object({
+    role: zod_1.z.enum(['user', 'model']).optional(),
+    parts: zod_1.z.array(PartSchema),
+});
+const GeminiFormatSchema = zod_1.z.array(ContentSchema);
 function maybeCoerceToGeminiFormat(contents) {
     let coerced = false;
-    if (Array.isArray(contents) && typeof contents[0].content === 'string') {
-        // This looks like an OpenAI chat prompt.  Convert it to a compatible format
-        contents = {
-            role: 'user',
-            parts: {
-                text: contents.map((item) => item.content).join(''),
-            },
+    const parseResult = GeminiFormatSchema.safeParse(contents);
+    if (parseResult.success) {
+        return {
+            contents: parseResult.data,
+            coerced,
+            systemInstruction: undefined,
         };
-        coerced = true;
     }
-    else if (typeof contents === 'string') {
-        contents = {
-            role: 'user',
-            parts: {
-                text: contents,
+    let coercedContents;
+    if (typeof contents === 'string') {
+        coercedContents = [
+            {
+                parts: [{ text: contents }],
             },
-        };
+        ];
+        coerced = true;
+    }
+    else if (Array.isArray(contents) &&
+        contents.every((item) => typeof item.content === 'string')) {
+        // This looks like an OpenAI chat format
+        coercedContents = contents.map((item) => ({
+            role: item.role,
+            parts: [{ text: item.content }],
+        }));
+        coerced = true;
+    }
+    else if (typeof contents === 'object' && 'parts' in contents) {
+        // This might be a single content object
+        coercedContents = [contents];
         coerced = true;
     }
     else {
         logger_1.default.warn(`Unknown format for Gemini: ${JSON.stringify(contents)}`);
+        return { contents: contents, coerced: false, systemInstruction: undefined };
     }
-    return { contents, coerced };
+    const systemPromptParts = [];
+    coercedContents = coercedContents.filter((message) => {
+        if (message.role === 'system' && message.parts.length > 0) {
+            systemPromptParts.push(...message.parts.filter((part) => 'text' in part && typeof part.text === 'string'));
+            return false;
+        }
+        return true;
+    });
+    return {
+        contents: coercedContents,
+        coerced,
+        systemInstruction: systemPromptParts.length > 0
+            ? { parts: systemPromptParts }
+            : undefined,
+    };
 }
 let cachedAuth;
 async function getGoogleClient() {

package/dist/src/providers/vertexUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"vertexUtil.js","sourceRoot":"","sources":["../../../src/providers/vertexUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8FA,8DAuBC;AAGD,0CAkBC;AAED,kEAOC;AAlJD,uDAA+B;AA6F/B,SAAgB,yBAAyB,CAAC,QAAa;IACrD,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QACvE,4EAA4E;QAC5E,QAAQ,GAAG;YACT,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE;gBACL,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;aACpD;SACF,CAAC;QACF,OAAO,GAAG,IAAI,CAAC;IACjB,CAAC;SAAM,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACxC,QAAQ,GAAG;YACT,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE;gBACL,IAAI,EAAE,QAAQ;aACf;SACF,CAAC;QACF,OAAO,GAAG,IAAI,CAAC;IACjB,CAAC;SAAM,CAAC;QACN,gBAAM,CAAC,IAAI,CAAC,8BAA8B,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACxE,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;AAC/B,CAAC;AAED,IAAI,UAAkC,CAAC;AAChC,KAAK,UAAU,eAAe;IACnC,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,IAAI,UAAU,CAAC;QACf,IAAI,CAAC;YACH,MAAM,cAAc,GAAG,wDAAa,qBAAqB,GAAC,CAAC;YAC3D,UAAU,GAAG,cAAc,CAAC,UAAU,CAAC;QACzC,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CACb,kHAAkH,CACnH,CAAC;QACJ,CAAC;QACD,UAAU,GAAG,IAAI,UAAU,CAAC;YAC1B,MAAM,EAAE,gDAAgD;SACzD,CAAC,CAAC;IACL,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,EAAE,CAAC;IAC5C,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,YAAY,EAAE,CAAC;IAClD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;AAC/B,CAAC;AAEM,KAAK,UAAU,2BAA2B;IAC/C,IAAI,CAAC;QACH,MAAM,eAAe,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
+{"version":3,"file":"vertexUtil.js","sourceRoot":"","sources":["../../../src/providers/vertexUtil.ts"],"names":[],"mappings":"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"}

package/dist/src/providers/watsonx.d.ts

@@ -1,20 +1,55 @@
 import type { WatsonXAI as WatsonXAIClient } from '@ibm-cloud/watsonx-ai';
+import type { IamAuthenticator, BearerTokenAuthenticator } from 'ibm-cloud-sdk-core';
+import { z } from 'zod';
 import type { ApiProvider, EnvOverrides, ProviderResponse } from '../types';
 import type { ProviderOptions } from '../types/providers';
+declare const ConfigSchema: z.ZodObject<{
+    apiKey: z.ZodOptional<z.ZodString>;
+    apiKeyEnvar: z.ZodOptional<z.ZodString>;
+    apiBearerToken: z.ZodOptional<z.ZodString>;
+    apiBearerTokenEnvar: z.ZodOptional<z.ZodString>;
+    serviceUrl: z.ZodOptional<z.ZodString>;
+    version: z.ZodOptional<z.ZodString>;
+    projectId: z.ZodOptional<z.ZodString>;
+    modelId: z.ZodOptional<z.ZodString>;
+    maxNewTokens: z.ZodOptional<z.ZodNumber>;
+}, "strip", z.ZodTypeAny, {
+    version?: string | undefined;
+    apiKey?: string | undefined;
+    apiKeyEnvar?: string | undefined;
+    modelId?: string | undefined;
+    projectId?: string | undefined;
+    apiBearerToken?: string | undefined;
+    apiBearerTokenEnvar?: string | undefined;
+    serviceUrl?: string | undefined;
+    maxNewTokens?: number | undefined;
+}, {
+    version?: string | undefined;
+    apiKey?: string | undefined;
+    apiKeyEnvar?: string | undefined;
+    modelId?: string | undefined;
+    projectId?: string | undefined;
+    apiBearerToken?: string | undefined;
+    apiBearerTokenEnvar?: string | undefined;
+    serviceUrl?: string | undefined;
+    maxNewTokens?: number | undefined;
+}>;
 export declare function generateConfigHash(config: any): string;
+export declare function calculateWatsonXCost(modelName: string, config: any, promptTokens?: number, completionTokens?: number): number | undefined;
 export declare class WatsonXProvider implements ApiProvider {
     modelName: string;
     options: ProviderOptions;
     env?: EnvOverrides;
-    apiKey: string;
-    client: WatsonXAIClient;
+    client?: WatsonXAIClient;
+    config: z.infer<typeof ConfigSchema>;
     constructor(modelName: string, options: ProviderOptions);
     id(): string;
     toString(): string;
-    getApiKey(): string;
+    getAuth(): Promise<IamAuthenticator | BearerTokenAuthenticator>;
     getProjectId(): string;
     getModelId(): string;
-    getClient(): WatsonXAIClient;
+    getClient(): Promise<WatsonXAIClient>;
     callApi(prompt: string): Promise<ProviderResponse>;
 }
+export {};
 //# sourceMappingURL=watsonx.d.ts.map

package/dist/src/providers/watsonx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watsonx.d.ts","sourceRoot":"","sources":["../../../src/providers/watsonx.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,IAAI,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAS1E,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,gBAAgB,EAAc,MAAM,UAAU,CAAC;AACxF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAmF1D,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,CAGtD;AAED,qBAAa,eAAgB,YAAW,WAAW;IACjD,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,eAAe,CAAC;IACzB,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,eAAe,CAAC;gBAEZ,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe;IAoBvD,EAAE,IAAI,MAAM;IAIZ,QAAQ,IAAI,MAAM;IAIlB,SAAS,IAAI,MAAM;IAgBnB,YAAY,IAAI,MAAM;IAgBtB,UAAU,IAAI,MAAM;IAgBpB,SAAS,IAAI,eAAe;IAItB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CA6DzD"}
+{"version":3,"file":"watsonx.d.ts","sourceRoot":"","sources":["../../../src/providers/watsonx.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,IAAI,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE1E,OAAO,KAAK,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAErF,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,gBAAgB,EAAc,MAAM,UAAU,CAAC;AACxF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAc1D,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAUhB,CAAC;AA0RH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,CAGtD;AAED,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,GAAG,EACX,YAAY,CAAC,EAAE,MAAM,EACrB,gBAAgB,CAAC,EAAE,MAAM,GACxB,MAAM,GAAG,SAAS,CAEpB;AAED,qBAAa,eAAgB,YAAW,WAAW;IACjD,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,eAAe,CAAC;IACzB,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC;gBAEzB,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe;IAgBvD,EAAE,IAAI,MAAM;IAIZ,QAAQ,IAAI,MAAM;IAIZ,OAAO,IAAI,OAAO,CAAC,gBAAgB,GAAG,wBAAwB,CAAC;IAkCrE,YAAY,IAAI,MAAM;IAgBtB,UAAU,IAAI,MAAM;IAgBd,SAAS,IAAI,OAAO,CAAC,eAAe,CAAC;IAerC,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAqEzD"}

package/dist/src/providers/watsonx.js

@@ -1,21 +1,46 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WatsonXProvider = void 0;
 exports.generateConfigHash = generateConfigHash;
-const watsonx_ai_1 = require("@ibm-cloud/watsonx-ai");
+exports.calculateWatsonXCost = calculateWatsonXCost;
 const crypto_1 = __importDefault(require("crypto"));
-const ibm_cloud_sdk_core_1 = require("ibm-cloud-sdk-core");
 const tiny_invariant_1 = __importDefault(require("tiny-invariant"));
 const zod_1 = require("zod");
 const cache_1 = require("../cache");
 const envars_1 = require("../envars");
 const logger_1 = __importDefault(require("../logger"));
+const shared_1 = require("./shared");
 const ConfigSchema = zod_1.z.object({
     apiKey: zod_1.z.string().optional(),
     apiKeyEnvar: zod_1.z.string().optional(),
+    apiBearerToken: zod_1.z.string().optional(),
+    apiBearerTokenEnvar: zod_1.z.string().optional(),
     serviceUrl: zod_1.z.string().optional(),
     version: zod_1.z.string().optional(),
     projectId: zod_1.z.string().optional(),
@@ -33,6 +58,225 @@ const TextGenResponseSchema = zod_1.z.object({
         stop_reason: zod_1.z.string().optional(),
     })),
 });
+const WATSONX_MODELS = [
+    {
+        id: 'ibm/granite-20b-multilingual',
+        cost: {
+            input: 0.6 / 1e6,
+            output: 0.6 / 1e6,
+        },
+    },
+    {
+        id: 'ibm/granite-13b-chat',
+        cost: {
+            input: 0.6 / 1e6,
+            output: 0.6 / 1e6,
+        },
+    },
+    {
+        id: 'ibm/granite-13b-instruct',
+        cost: {
+            input: 0.6 / 1e6,
+            output: 0.6 / 1e6,
+        },
+    },
+    {
+        id: 'ibm/granite-34b-code-instruct',
+        cost: {
+            input: 0.6 / 1e6,
+            output: 0.6 / 1e6,
+        },
+    },
+    {
+        id: 'ibm/granite-20b-code-instruct',
+        cost: {
+            input: 0.6 / 1e6,
+            output: 0.6 / 1e6,
+        },
+    },
+    {
+        id: 'ibm/granite-8b-code-instruct',
+        cost: {
+            input: 0.6 / 1e6,
+            output: 0.6 / 1e6,
+        },
+    },
+    {
+        id: 'ibm/granite-3b-code-instruct',
+        cost: {
+            input: 0.6 / 1e6,
+            output: 0.6 / 1e6,
+        },
+    },
+    {
+        id: 'ibm/granite-8b-japanese',
+        cost: {
+            input: 0.6 / 1e6,
+            output: 0.6 / 1e6,
+        },
+    },
+    {
+        id: 'ibm/granite-7b-lab',
+        cost: {
+            input: 0.6 / 1e6,
+            output: 0.6 / 1e6,
+        },
+    },
+    {
+        id: 'meta-llama/llama-3-2-11b-vision-instruct',
+        cost: {
+            input: 0.35 / 1e6,
+            output: 0.35 / 1e6,
+        },
+    },
+    {
+        id: 'meta-llama/llama-3-2-90b-vision-instruct',
+        cost: {
+            input: 2.0 / 1e6,
+            output: 2.0 / 1e6,
+        },
+    },
+    {
+        id: 'meta-llama/llama-3-2-11b-vision-instruct',
+        cost: {
+            input: 0.35 / 1e6,
+            output: 0.35 / 1e6,
+        },
+    },
+    {
+        id: 'meta-llama/llama-guard-3-11b-vision',
+        cost: {
+            input: 0.35 / 1e6,
+            output: 0.35 / 1e6,
+        },
+    },
+    {
+        id: 'meta-llama/llama-3-2-1b-instruct',
+        cost: {
+            input: 0.1 / 1e6,
+            output: 0.1 / 1e6,
+        },
+    },
+    {
+        id: 'meta-llama/llama-3-2-3b-instruct',
+        cost: {
+            input: 0.15 / 1e6,
+            output: 0.15 / 1e6,
+        },
+    },
+    {
+        id: 'meta-llama/llama-3-1-70b-instruct',
+        cost: {
+            input: 1.8 / 1e6,
+            output: 1.8 / 1e6,
+        },
+    },
+    {
+        id: 'meta-llama/llama-3-1-8b-instruct',
+        cost: {
+            input: 0.6 / 1e6,
+            output: 0.6 / 1e6,
+        },
+    },
+    {
+        id: 'meta-llama/llama-3-405b-instruct',
+        cost: {
+            input: 5.0 / 1e6,
+            output: 16.0 / 1e6,
+        },
+    },
+    {
+        id: 'meta-llama/llama-3-8b-instruct',
+        cost: {
+            input: 0.6 / 1e6,
+            output: 0.6 / 1e6,
+        },
+    },
+    {
+        id: 'meta-llama/llama-3-70b-instruct',
+        cost: {
+            input: 1.8 / 1e6,
+            output: 1.8 / 1e6,
+        },
+    },
+    {
+        id: 'mindsandcompany/llama2-13b-dpo-v7-korean',
+        cost: {
+            input: 1.8 / 1e6,
+            output: 1.8 / 1e6,
+        },
+    },
+    {
+        id: 'sdaia/allam-1-13b-instruct',
+        cost: {
+            input: 1.8 / 1e6,
+            output: 1.8 / 1e6,
+        },
+    },
+    {
+        id: 'meta/codellama-34b-instruct',
+        cost: {
+            input: 1.8 / 1e6,
+            output: 1.8 / 1e6,
+        },
+    },
+    {
+        id: 'mistral/mistral-large-2',
+        cost: {
+            input: 10.0 / 1e6,
+            output: 10.0 / 1e6,
+        },
+    },
+    {
+        id: 'mistral/mixtal-8x7b-instruct',
+        cost: {
+            input: 0.6 / 1e6,
+            output: 0.6 / 1e6,
+        },
+    },
+    {
+        id: 'core42/jais-13b-chat-arabic',
+        cost: {
+            input: 1.8 / 1e6,
+            output: 1.8 / 1e6,
+        },
+    },
+    {
+        id: 'google/flan-t5-xl-3b',
+        cost: {
+            input: 0.6 / 1e6,
+            output: 0.6 / 1e6,
+        },
+    },
+    {
+        id: 'google/flan-t5-xxl-11b',
+        cost: {
+            input: 1.8 / 1e6,
+            output: 1.8 / 1e6,
+        },
+    },
+    {
+        id: 'google/flan-ul2-20b',
+        cost: {
+            input: 5.0 / 1e6,
+            output: 5.0 / 1e6,
+        },
+    },
+    {
+        id: 'elyza/elyza-japanese-llama-2-7b-instruct',
+        cost: {
+            input: 1.8 / 1e6,
+            output: 1.8 / 1e6,
+        },
+    },
+    {
+        id: 'bigscience/mt0-xxl-13b',
+        cost: {
+            input: 1.8 / 1e6,
+            output: 1.8 / 1e6,
+        },
+    },
+];
 function convertResponse(response) {
     const firstResult = response.results && response.results[0];
     if (!firstResult) {
@@ -76,6 +320,9 @@ function generateConfigHash(config) {
     const sortedConfig = sortObject(config);
     return crypto_1.default.createHash('md5').update(JSON.stringify(sortedConfig)).digest('hex');
 }
+function calculateWatsonXCost(modelName, config, promptTokens, completionTokens) {
+    return (0, shared_1.calculateCost)(modelName, config, promptTokens, completionTokens, WATSONX_MODELS);
+}
 class WatsonXProvider {
     constructor(modelName, options) {
         const validationResult = ConfigSchema.safeParse(options.config);
@@ -83,16 +330,12 @@ class WatsonXProvider {
             const errors = validationResult.error.errors.map((e) => e.message).join(', ');
             throw new Error(`WatsonXProvider requires a valid config. Issues: ${errors}`);
         }
+        const validatedConfig = validationResult.data;
         const { env } = options;
         this.modelName = modelName;
         this.options = options;
         this.env = env;
-        this.apiKey = this.getApiKey();
-        this.client = watsonx_ai_1.WatsonXAI.newInstance({
-            version: this.options.config.version || '2023-05-29',
-            serviceUrl: this.options.config.serviceUrl || 'https://us-south.ml.cloud.ibm.com',
-            authenticator: new ibm_cloud_sdk_core_1.IamAuthenticator({ apikey: this.apiKey }),
-        });
+        this.config = validatedConfig;
     }
     id() {
         return `watsonx:${this.modelName}`;
@@ -100,16 +343,33 @@ class WatsonXProvider {
     toString() {
         return `[Watsonx Provider ${this.modelName}]`;
     }
-    getApiKey() {
-        const apiKey = this.options.config.apiKey ||
-            (this.options.config.apiKeyEnvar
-                ? process.env[this.options.config.apiKeyEnvar] ||
-                    this.env?.[this.options.config.apiKeyEnvar]
+    async getAuth() {
+        const { IamAuthenticator, BearerTokenAuthenticator } = await Promise.resolve().then(() => __importStar(require('ibm-cloud-sdk-core')));
+        const apiKey = this.config.apiKey ||
+            (this.config.apiKeyEnvar
+                ? process.env[this.config.apiKeyEnvar] ||
+                    this.env?.[this.config.apiKeyEnvar]
                 : undefined) ||
-            this.env?.WATSONX_API_KEY ||
-            (0, envars_1.getEnvString)('WATSONX_API_KEY');
-        (0, tiny_invariant_1.default)(apiKey, 'WatsonX API key is not set. Set the WATSONX_API_KEY environment variable or add `apiKey` to the provider config.');
-        return apiKey;
+            this.env?.WATSONX_AI_APIKEY ||
+            (0, envars_1.getEnvString)('WATSONX_AI_APIKEY');
+        const bearerToken = this.config.apiBearerToken ||
+            (this.config.apiBearerTokenEnvar
+                ? process.env[this.config.apiBearerTokenEnvar] ||
+                    this.env?.[this.config.apiBearerTokenEnvar]
+                : undefined) ||
+            this.env?.WATSONX_AI_BEARER_TOKEN ||
+            (0, envars_1.getEnvString)('WATSONX_AI_BEARER_TOKEN');
+        if (apiKey) {
+            logger_1.default.info('Using IAM Authentication.');
+            return new IamAuthenticator({ apikey: apiKey });
+        }
+        else if (bearerToken) {
+            logger_1.default.info('Using Bearer Token Authentication.');
+            return new BearerTokenAuthenticator({ bearerToken });
+        }
+        else {
+            throw new Error('Authentication credentials not provided. Please set either `WATSONX_AI_APIKEY` for IAM Authentication or `WATSONX_AI_BEARER_TOKEN` for Bearer Token Authentication.');
+        }
     }
     getProjectId() {
         const projectId = this.options.config.projectId ||
@@ -117,9 +377,9 @@ class WatsonXProvider {
                 ? process.env[this.options.config.projectIdEnvar] ||
                     this.env?.[this.options.config.projectIdEnvar]
                 : undefined) ||
-            this.env?.WATSONX_PROJECT_ID ||
-            (0, envars_1.getEnvString)('WATSONX_PROJECT_ID');
-        (0, tiny_invariant_1.default)(projectId && projectId.trim() !== '', 'WatsonX project ID is not set. Set the WATSONX_PROJECT_ID environment variable or add `projectId` to the provider config.');
+            this.env?.WATSONX_AI_PROJECT_ID ||
+            (0, envars_1.getEnvString)('WATSONX_AI_PROJECT_ID');
+        (0, tiny_invariant_1.default)(projectId && projectId.trim() !== '', 'WatsonX project ID is not set. Set the WATSONX_AI_PROJECT_ID environment variable or add `projectId` to the provider config.');
         return projectId;
     }
     getModelId() {
@@ -137,13 +397,23 @@ class WatsonXProvider {
         (0, tiny_invariant_1.default)(modelId, 'Model ID is required for WatsonX API call.');
         return modelId;
     }
-    getClient() {
+    async getClient() {
+        if (this.client) {
+            return this.client;
+        }
+        const authenticator = await this.getAuth();
+        const { WatsonXAI } = await Promise.resolve().then(() => __importStar(require('@ibm-cloud/watsonx-ai')));
+        this.client = WatsonXAI.newInstance({
+            version: this.options.config.version || '2023-05-29',
+            serviceUrl: this.options.config.serviceUrl || 'https://us-south.ml.cloud.ibm.com',
+            authenticator,
+        });
         return this.client;
     }
     async callApi(prompt) {
+        const client = await this.getClient();
         const modelId = this.getModelId();
         const projectId = this.getProjectId();
-        const client = this.getClient();
         const cache = (0, cache_1.getCache)();
         const configHash = generateConfigHash(this.options.config);
         const cacheKey = `watsonx:${this.modelName}:${configHash}:${prompt}`;
@@ -173,6 +443,7 @@ class WatsonXProvider {
             }
             const textGenResponse = parsedResponse.data;
             const providerResponse = convertResponse(textGenResponse);
+            providerResponse.cost = calculateWatsonXCost(this.modelName, this.options.config, providerResponse.tokenUsage?.prompt, providerResponse.tokenUsage?.completion);
             if ((0, cache_1.isCacheEnabled)()) {
                 await cache.set(cacheKey, JSON.stringify(providerResponse));
             }