promptfoo 0.67.0 → 0.68.1

package/dist/src/prompts/utils.js

@@ -1,31 +1,6 @@
 "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;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parsePathOrGlob = exports.normalizeInput = exports.maybeFilePath = void 0;
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
+exports.normalizeInput = exports.maybeFilePath = void 0;
 const constants_1 = require("./constants");
 /**
  * Determines if a string is a valid file path.
@@ -102,42 +77,4 @@ function normalizeInput(promptPathOrGlobs) {
     throw new Error(`Invalid input prompt: ${JSON.stringify(promptPathOrGlobs)}`);
 }
 exports.normalizeInput = normalizeInput;
-/**
- * Parses a file path or glob pattern to extract function names and file extensions.
- * Function names can be specified in the filename like this:
- * prompt.py:myFunction or prompts.js:myFunction.
- * @param basePath - The base path for file resolution.
- * @param promptPath - The path or glob pattern.
- * @returns Parsed details including function name, file extension, and directory status.
- */
-function parsePathOrGlob(basePath, promptPath) {
-    let filePath = path.join(basePath, promptPath);
-    if (filePath.includes('file:')) {
-        filePath = filePath.split('file:')[1];
-    }
-    let stats;
-    try {
-        stats = fs.statSync(filePath);
-    }
-    catch (err) {
-        if (process.env.PROMPTFOO_STRICT_FILES) {
-            throw err;
-        }
-    }
-    let filename = path.parse(filePath).base;
-    let functionName;
-    if (filename.includes(':')) {
-        const splits = filename.split(':');
-        if (splits[0] && ['.js', '.cjs', '.mjs', '.py'].some((ext) => splits[0].endsWith(ext))) {
-            [filename, functionName] = splits;
-        }
-    }
-    return {
-        extension: path.parse(filename).ext,
-        functionName,
-        isPathPattern: stats?.isDirectory() || /[*?{}\[\]]/.test(filePath), // glob pattern
-        promptPath: path.join(basePath, filename),
-    };
-}
-exports.parsePathOrGlob = parsePathOrGlob;
 //# sourceMappingURL=utils.js.map

package/dist/src/prompts/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/prompts/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/prompts/utils.ts"],"names":[],"mappings":"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"}

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

@@ -13,11 +13,11 @@ interface AnthropicMessageOptions {
     tool_choice?: Anthropic.MessageCreateParams.ToolChoiceAny | Anthropic.MessageCreateParams.ToolChoiceAuto | Anthropic.MessageCreateParams.ToolChoiceTool;
 }
 export declare function outputFromMessage(message: Anthropic.Messages.Message): string;
-export declare function calculateCost(modelName: string, config: AnthropicMessageOptions, promptTokens?: number, completionTokens?: number): number | undefined;
 export declare function parseMessages(messages: string): {
     system: string | undefined;
     extractedMessages: Anthropic.Messages.MessageParam[];
 };
+export declare function calculateCost(modelName: string, config: AnthropicMessageOptions, promptTokens?: number, completionTokens?: number): number | undefined;
 export declare class AnthropicMessagesProvider implements ApiProvider {
     modelName: string;
     config: AnthropicMessageOptions;

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

@@ -1 +1 @@
-{"version":3,"file":"anthropic.d.ts","sourceRoot":"","sources":["../../../src/providers/anthropic.ts"],"names":[],"mappings":"AAAA,OAAO,SAAuB,MAAM,mBAAmB,CAAC;AAGxD,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,gBAAgB,EAAc,MAAM,aAAa,CAAC;AAG3F,UAAU,uBAAuB;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC;IACzB,WAAW,CAAC,EACR,SAAS,CAAC,mBAAmB,CAAC,aAAa,GAC3C,SAAS,CAAC,mBAAmB,CAAC,cAAc,GAC5C,SAAS,CAAC,mBAAmB,CAAC,cAAc,CAAC;CAClD;AAkBD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,SAAS,CAAC,QAAQ,CAAC,OAAO,UAiBpE;AAED,wBAAgB,aAAa,CAC3B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,uBAAuB,EAC/B,YAAY,CAAC,EAAE,MAAM,EACrB,gBAAgB,CAAC,EAAE,MAAM,GACxB,MAAM,GAAG,SAAS,CAapB;AAOD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM;;;EAwB7C;AAED,qBAAa,yBAA0B,YAAW,WAAW;IAC3D,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,uBAAuB,CAAC;IAChC,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IAErB,MAAM,CAAC,gBAAgB;;;;;;QAkDrB;IAEF,MAAM,CAAC,sBAAsB,WAE3B;gBAGA,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,uBAAuB,CAAC;QAAC,GAAG,CAAC,EAAE,YAAY,CAAA;KAAO;IAcrF,EAAE,IAAI,MAAM;IAIZ,QAAQ,IAAI,MAAM;IAIZ,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAkFzD;AAED,UAAU,0BAA0B;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,2BAA4B,YAAW,WAAW;IAC7D,MAAM,CAAC,2BAA2B,WAQhC;IAEF,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,0BAA0B,CAAC;gBAGjC,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,0BAA0B,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,YAAY,CAAA;KAAO;IAUxF,EAAE,IAAI,MAAM;IAIZ,QAAQ,IAAI,MAAM;IAIZ,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAqEzD;AAED,eAAO,MAAM,sBAAsB,2BAA0D,CAAC;AAC9F,eAAO,MAAM,0BAA0B,2BAA0D,CAAC;AAClG,eAAO,MAAM,0BAA0B,2BAA0D,CAAC"}
+{"version":3,"file":"anthropic.d.ts","sourceRoot":"","sources":["../../../src/providers/anthropic.ts"],"names":[],"mappings":"AAAA,OAAO,SAAuB,MAAM,mBAAmB,CAAC;AAGxD,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,gBAAgB,EAAc,MAAM,aAAa,CAAC;AAuD3F,UAAU,uBAAuB;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC;IACzB,WAAW,CAAC,EACR,SAAS,CAAC,mBAAmB,CAAC,aAAa,GAC3C,SAAS,CAAC,mBAAmB,CAAC,cAAc,GAC5C,SAAS,CAAC,mBAAmB,CAAC,cAAc,CAAC;CAClD;AAkBD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,SAAS,CAAC,QAAQ,CAAC,OAAO,UAiBpE;AAOD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM;;;EAwB7C;AAED,wBAAgB,aAAa,CAC3B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,uBAAuB,EAC/B,YAAY,CAAC,EAAE,MAAM,EACrB,gBAAgB,CAAC,EAAE,MAAM,GACxB,MAAM,GAAG,SAAS,CAapB;AAED,qBAAa,yBAA0B,YAAW,WAAW;IAC3D,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,uBAAuB,CAAC;IAChC,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IAErB,MAAM,CAAC,gBAAgB;;;;;;QAAoB;IAE3C,MAAM,CAAC,sBAAsB,WAA6C;gBAGxE,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,uBAAuB,CAAC;QAAC,GAAG,CAAC,EAAE,YAAY,CAAA;KAAO;IAcrF,EAAE,IAAI,MAAM;IAIZ,QAAQ,IAAI,MAAM;IAIZ,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAkFzD;AAED,UAAU,0BAA0B;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,2BAA4B,YAAW,WAAW;IAC7D,MAAM,CAAC,2BAA2B,WAQhC;IAEF,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,0BAA0B,CAAC;gBAGjC,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,0BAA0B,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,YAAY,CAAA;KAAO;IAUxF,EAAE,IAAI,MAAM;IAIZ,QAAQ,IAAI,MAAM;IAIZ,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAqEzD;AAED,eAAO,MAAM,sBAAsB,2BAA0D,CAAC;AAC9F,eAAO,MAAM,0BAA0B,2BAA0D,CAAC;AAClG,eAAO,MAAM,0BAA0B,2BAA0D,CAAC"}

package/dist/src/providers/anthropic.js

@@ -26,11 +26,62 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultSuggestionsProvider = exports.DefaultGradingJsonProvider = exports.DefaultGradingProvider = exports.AnthropicCompletionProvider = exports.AnthropicMessagesProvider = exports.parseMessages = exports.calculateCost = exports.outputFromMessage = void 0;
+exports.DefaultSuggestionsProvider = exports.DefaultGradingJsonProvider = exports.DefaultGradingProvider = exports.AnthropicCompletionProvider = exports.AnthropicMessagesProvider = exports.calculateCost = exports.parseMessages = exports.outputFromMessage = void 0;
 const sdk_1 = __importStar(require("@anthropic-ai/sdk"));
 const cache_1 = require("../cache");
 const logger_1 = __importDefault(require("../logger"));
 const shared_1 = require("./shared");
+const ANTHROPIC_MODELS = [
+    ...['claude-instant-1.2'].map((model) => ({
+        id: model,
+        cost: {
+            input: 0.0008 / 1000,
+            output: 0.0024 / 1000,
+        },
+    })),
+    ...['claude-2.0'].map((model) => ({
+        id: model,
+        cost: {
+            input: 0.008 / 1000,
+            output: 0.024 / 1000,
+        },
+    })),
+    ...['claude-2.1'].map((model) => ({
+        id: model,
+        cost: {
+            input: 0.008 / 1000,
+            output: 0.024 / 1000,
+        },
+    })),
+    ...['claude-3-haiku-20240307'].map((model) => ({
+        id: model,
+        cost: {
+            input: 0.00025 / 1000,
+            output: 0.00125 / 1000,
+        },
+    })),
+    ...['claude-3-sonnet-20240229'].map((model) => ({
+        id: model,
+        cost: {
+            input: 0.003 / 1000,
+            output: 0.015 / 1000,
+        },
+    })),
+    ...['claude-3-opus-20240229'].map((model) => ({
+        id: model,
+        cost: {
+            input: 0.015 / 1000,
+            output: 0.075 / 1000,
+        },
+    })),
+    ...['claude-3-5-sonnet-20240620'].map((model) => ({
+        id: model,
+        cost: {
+            input: 3 / 1e6,
+            output: 15 / 1e6,
+        },
+    })),
+];
 function getTokenUsage(data, cached) {
     if (data.usage) {
         const total_tokens = data.usage.input_tokens + data.usage.output_tokens;
@@ -66,19 +117,6 @@ function outputFromMessage(message) {
         .join('\n\n');
 }
 exports.outputFromMessage = outputFromMessage;
-function calculateCost(modelName, config, promptTokens, completionTokens) {
-    if (!promptTokens || !completionTokens) {
-        return undefined;
-    }
-    const model = [...AnthropicMessagesProvider.ANTHROPIC_MODELS].find((m) => m.id === modelName);
-    if (!model || !model.cost) {
-        return undefined;
-    }
-    const inputCost = config.cost ?? model.cost.input;
-    const outputCost = config.cost ?? model.cost.output;
-    return inputCost * promptTokens + outputCost * completionTokens || undefined;
-}
-exports.calculateCost = calculateCost;
 function parseMessages(messages) {
     // We need to be able to handle the 'system' role prompts that
     // are in the style of OpenAI's chat prompts.
@@ -106,6 +144,19 @@ function parseMessages(messages) {
     return { system, extractedMessages };
 }
 exports.parseMessages = parseMessages;
+function calculateCost(modelName, config, promptTokens, completionTokens) {
+    if (!promptTokens || !completionTokens) {
+        return undefined;
+    }
+    const model = ANTHROPIC_MODELS.find((m) => m.id === modelName);
+    if (!model || !model.cost) {
+        return undefined;
+    }
+    const inputCost = config.cost ?? model.cost.input;
+    const outputCost = config.cost ?? model.cost.output;
+    return inputCost * promptTokens + outputCost * completionTokens || undefined;
+}
+exports.calculateCost = calculateCost;
 class AnthropicMessagesProvider {
     constructor(modelName, options = {}) {
         if (!AnthropicMessagesProvider.ANTHROPIC_MODELS_NAMES.includes(modelName)) {
@@ -196,58 +247,8 @@ class AnthropicMessagesProvider {
     }
 }
 exports.AnthropicMessagesProvider = AnthropicMessagesProvider;
-AnthropicMessagesProvider.ANTHROPIC_MODELS = [
-    ...['claude-instant-1.2'].map((model) => ({
-        id: model,
-        cost: {
-            input: 0.0008 / 1000,
-            output: 0.0024 / 1000,
-        },
-    })),
-    ...['claude-2.0'].map((model) => ({
-        id: model,
-        cost: {
-            input: 0.008 / 1000,
-            output: 0.024 / 1000,
-        },
-    })),
-    ...['claude-2.1'].map((model) => ({
-        id: model,
-        cost: {
-            input: 0.008 / 1000,
-            output: 0.024 / 1000,
-        },
-    })),
-    ...['claude-3-haiku-20240307'].map((model) => ({
-        id: model,
-        cost: {
-            input: 0.00025 / 1000,
-            output: 0.00125 / 1000,
-        },
-    })),
-    ...['claude-3-sonnet-20240229'].map((model) => ({
-        id: model,
-        cost: {
-            input: 0.003 / 1000,
-            output: 0.015 / 1000,
-        },
-    })),
-    ...['claude-3-opus-20240229'].map((model) => ({
-        id: model,
-        cost: {
-            input: 0.015 / 1000,
-            output: 0.075 / 1000,
-        },
-    })),
-    ...['claude-3-5-sonnet-20240620'].map((model) => ({
-        id: model,
-        cost: {
-            input: 3 / 1e6,
-            output: 15 / 1e6,
-        },
-    })),
-];
-AnthropicMessagesProvider.ANTHROPIC_MODELS_NAMES = AnthropicMessagesProvider.ANTHROPIC_MODELS.map((model) => model.id);
+AnthropicMessagesProvider.ANTHROPIC_MODELS = ANTHROPIC_MODELS;
+AnthropicMessagesProvider.ANTHROPIC_MODELS_NAMES = ANTHROPIC_MODELS.map((model) => model.id);
 class AnthropicCompletionProvider {
     constructor(modelName, options = {}) {
         const { config, id, env } = options;

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

@@ -1 +1 @@
-{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../../src/providers/anthropic.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAAwD;AACxD,oCAAoD;AACpD,uDAA+B;AAE/B,qCAA2C;AAkB3C,SAAS,aAAa,CAAC,IAAS,EAAE,MAAe;IAC/C,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;QACxE,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;QACvD,CAAC;aAAM,CAAC;YACN,OAAO;gBACL,KAAK,EAAE,YAAY;gBACnB,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC;gBACpC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,IAAI,CAAC;aAC1C,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAgB,iBAAiB,CAAC,OAAmC;IACnE,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;IAC9E,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,OAAO,CAAC,OAAO;aACnB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACb,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBAC1B,OAAO,KAAK,CAAC,IAAI,CAAC;YACpB,CAAC;YACD,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC,CAAC;aACD,IAAI,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC;IACD,OAAO,OAAO,CAAC,OAAO;SACnB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACb,OAAQ,KAAsC,CAAC,IAAI,CAAC;IACtD,CAAC,CAAC;SACD,IAAI,CAAC,MAAM,CAAC,CAAC;AAClB,CAAC;AAjBD,8CAiBC;AAED,SAAgB,aAAa,CAC3B,SAAiB,EACjB,MAA+B,EAC/B,YAAqB,EACrB,gBAAyB;IAEzB,IAAI,CAAC,YAAY,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACvC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,KAAK,GAAG,CAAC,GAAG,yBAAyB,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC;IAC9F,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QAC1B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;IAClD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC;IACpD,OAAO,SAAS,GAAG,YAAY,GAAG,UAAU,GAAG,gBAAgB,IAAI,SAAS,CAAC;AAC/E,CAAC;AAlBD,sCAkBC;AAOD,SAAgB,aAAa,CAAC,QAAgB;IAC5C,8DAA8D;IAC9D,6CAA6C;IAC7C,2EAA2E;IAC3E,qCAAqC;IACrC,MAAM,KAAK,GAAG,IAAA,wBAAe,EAA0B,QAAQ,EAAE;QAC/D,EAAE,IAAI,EAAE,MAAe,EAAE,OAAO,EAAE,QAAQ,EAAE;KAC7C,CAAC,CAAC;IACH,0CAA0C;IAC1C,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,EAAE,OAAO,CAAC;IACtE,MAAM,MAAM,GAAG,OAAO,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7E,MAAM,iBAAiB,GAA6B,KAAK;SACtD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC;SAC1D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACT,MAAM,IAAI,GAAG,CAAC,CAAC,IAA4B,CAAC;QAC5C,IAAI,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YAClC,MAAM,OAAO,GAAG,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YAC7D,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,MAAM,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC;YAC/B,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAC3B,CAAC;IACH,CAAC,CAAC,CAAC;IACL,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC;AACvC,CAAC;AAxBD,sCAwBC;AAED,MAAa,yBAAyB;IA+DpC,YACE,SAAiB,EACjB,UAAiF,EAAE;QAEnF,IAAI,CAAC,yBAAyB,CAAC,sBAAsB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC1E,gBAAM,CAAC,IAAI,CAAC,kCAAkC,SAAS,EAAE,CAAC,CAAC;QAC7D,CAAC;QACD,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;QACpC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;QAClC,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,IAAI,GAAG,EAAE,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;QACxF,IAAI,CAAC,SAAS,GAAG,IAAI,aAAS,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;IAC3F,CAAC;IAED,EAAE;QACA,OAAO,sBAAsB,IAAI,CAAC,SAAS,IAAI,YAAY,EAAE,CAAC;IAChE,CAAC;IAED,QAAQ;QACN,OAAO,gCAAgC,IAAI,CAAC,SAAS,IAAI,YAAY,GAAG,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,MAAc;QAC1B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CACb,sHAAsH,CACvH,CAAC;QACJ,CAAC;QAED,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;QAC5D,MAAM,MAAM,GAAkC;YAC5C,KAAK,EAAE,IAAI,CAAC,SAAS;YACrB,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7B,UAAU,EACR,IAAI,CAAC,MAAM,EAAE,UAAU,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,MAAM,EAAE,EAAE,CAAC;YACrF,QAAQ,EAAE,iBAAiB;YAC3B,MAAM,EAAE,KAAK;YACb,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,GAAG,CAAC;YAC5F,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1D,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC7E,CAAC;QAEF,gBAAM,CAAC,KAAK,CAAC,mCAAmC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE1E,MAAM,KAAK,GAAG,MAAM,IAAA,gBAAQ,GAAE,CAAC;QAC/B,MAAM,QAAQ,GAAG,aAAa,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;QAEvD,IAAI,IAAA,sBAAc,GAAE,EAAE,CAAC;YACrB,iCAAiC;YACjC,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,GAAG,CAAqB,QAAQ,CAAC,CAAC;YACrE,IAAI,cAAc,EAAE,CAAC;gBACnB,gBAAM,CAAC,KAAK,CAAC,iCAAiC,MAAM,KAAK,cAAc,EAAE,CAAC,CAAC;gBAC3E,IAAI,CAAC;oBACH,MAAM,oBAAoB,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAA+B,CAAC;oBACtF,OAAO;wBACL,MAAM,EAAE,iBAAiB,CAAC,oBAAoB,CAAC;wBAC/C,UAAU,EAAE,EAAE;qBACf,CAAC;gBACJ,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,8EAA8E;oBAC9E,OAAO;wBACL,MAAM,EAAE,cAAc;wBACtB,UAAU,EAAE,EAAE;qBACf,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAE9D,gBAAM,CAAC,KAAK,CAAC,oCAAoC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAE7E,IAAI,IAAA,sBAAc,GAAE,EAAE,CAAC;gBACrB,IAAI,CAAC;oBACH,MAAM,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACtD,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,gBAAM,CAAC,KAAK,CAAC,6BAA6B,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAC3D,CAAC;YACH,CAAC;YAED,OAAO;gBACL,MAAM,EAAE,iBAAiB,CAAC,QAAQ,CAAC;gBACnC,UAAU,EAAE,aAAa,CAAC,QAAQ,EAAE,KAAK,CAAC;gBAC1C,IAAI,EAAE,aAAa,CACjB,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,MAAM,EACX,QAAQ,CAAC,KAAK,EAAE,YAAY,EAC5B,QAAQ,CAAC,KAAK,EAAE,aAAa,CAC9B;aACF,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,gBAAM,CAAC,KAAK,CAAC,sCAAsC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAClE,IAAI,GAAG,YAAY,cAAQ,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;gBACzC,MAAM,YAAY,GAAG,GAAG,CAAC,KAAqD,CAAC;gBAC/E,OAAO;oBACL,KAAK,EAAE,mBAAmB,YAAY,CAAC,KAAK,CAAC,OAAO,YAAY,GAAG,CAAC,MAAM,UAAU,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE;iBAC9G,CAAC;YACJ,CAAC;YACD,OAAO;gBACL,KAAK,EAAE,mBAAmB,MAAM,CAAC,GAAG,CAAC,EAAE;aACxC,CAAC;QACJ,CAAC;IACH,CAAC;;AAxKH,8DAyKC;AAlKQ,0CAAgB,GAAG;IACxB,GAAG,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACxC,EAAE,EAAE,KAAK;QACT,IAAI,EAAE;YACJ,KAAK,EAAE,MAAM,GAAG,IAAI;YACpB,MAAM,EAAE,MAAM,GAAG,IAAI;SACtB;KACF,CAAC,CAAC;IACH,GAAG,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAChC,EAAE,EAAE,KAAK;QACT,IAAI,EAAE;YACJ,KAAK,EAAE,KAAK,GAAG,IAAI;YACnB,MAAM,EAAE,KAAK,GAAG,IAAI;SACrB;KACF,CAAC,CAAC;IACH,GAAG,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAChC,EAAE,EAAE,KAAK;QACT,IAAI,EAAE;YACJ,KAAK,EAAE,KAAK,GAAG,IAAI;YACnB,MAAM,EAAE,KAAK,GAAG,IAAI;SACrB;KACF,CAAC,CAAC;IACH,GAAG,CAAC,yBAAyB,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC7C,EAAE,EAAE,KAAK;QACT,IAAI,EAAE;YACJ,KAAK,EAAE,OAAO,GAAG,IAAI;YACrB,MAAM,EAAE,OAAO,GAAG,IAAI;SACvB;KACF,CAAC,CAAC;IACH,GAAG,CAAC,0BAA0B,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC9C,EAAE,EAAE,KAAK;QACT,IAAI,EAAE;YACJ,KAAK,EAAE,KAAK,GAAG,IAAI;YACnB,MAAM,EAAE,KAAK,GAAG,IAAI;SACrB;KACF,CAAC,CAAC;IACH,GAAG,CAAC,wBAAwB,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC5C,EAAE,EAAE,KAAK;QACT,IAAI,EAAE;YACJ,KAAK,EAAE,KAAK,GAAG,IAAI;YACnB,MAAM,EAAE,KAAK,GAAG,IAAI;SACrB;KACF,CAAC,CAAC;IACH,GAAG,CAAC,4BAA4B,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAChD,EAAE,EAAE,KAAK;QACT,IAAI,EAAE;YACJ,KAAK,EAAE,CAAC,GAAG,GAAG;YACd,MAAM,EAAE,EAAE,GAAG,GAAG;SACjB;KACF,CAAC,CAAC;CACJ,CAAC;AAEK,gDAAsB,GAAG,yBAAyB,CAAC,gBAAgB,CAAC,GAAG,CAC5E,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CACpB,CAAC;AAsHJ,MAAa,2BAA2B;IAgBtC,YACE,SAAiB,EACjB,UAAoF,EAAE;QAEtF,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;QACpC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,IAAI,GAAG,EAAE,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;QACxF,IAAI,CAAC,SAAS,GAAG,IAAI,aAAS,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACxD,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QAC3B,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;IACpC,CAAC;IAED,EAAE;QACA,OAAO,aAAa,IAAI,CAAC,SAAS,EAAE,CAAC;IACvC,CAAC;IAED,QAAQ;QACN,OAAO,uBAAuB,IAAI,CAAC,SAAS,GAAG,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,MAAc;QAC1B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CACb,sHAAsH,CACvH,CAAC;QACJ,CAAC;QAED,IAAI,IAAc,CAAC;QACnB,IAAI,CAAC;YACH,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc;gBAC/B,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;gBACxC,CAAC,CAAC,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;QACtC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,8CAA8C,GAAG,EAAE,CAAC,CAAC;QACvE,CAAC;QAED,MAAM,MAAM,GAAqC;YAC/C,KAAK,EAAE,IAAI,CAAC,SAAS;YACrB,MAAM,EAAE,GAAG,aAAS,CAAC,YAAY,IAAI,MAAM,IAAI,aAAS,CAAC,SAAS,EAAE;YACpE,oBAAoB,EAClB,IAAI,CAAC,MAAM,EAAE,oBAAoB,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,MAAM,CAAC;YAC3F,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,GAAG,CAAC;YAC5F,cAAc,EAAE,IAAI;SACrB,CAAC;QAEF,gBAAM,CAAC,KAAK,CAAC,0BAA0B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEjE,MAAM,KAAK,GAAG,MAAM,IAAA,gBAAQ,GAAE,CAAC;QAC/B,MAAM,QAAQ,GAAG,aAAa,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;QAEvD,IAAI,IAAA,sBAAc,GAAE,EAAE,CAAC;YACrB,iCAAiC;YACjC,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACjD,IAAI,cAAc,EAAE,CAAC;gBACnB,gBAAM,CAAC,KAAK,CAAC,iCAAiC,MAAM,KAAK,cAAc,EAAE,CAAC,CAAC;gBAC3E,OAAO;oBACL,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,cAAwB,CAAC;oBAC5C,UAAU,EAAE,EAAE;iBACf,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,QAAQ,CAAC;QACb,IAAI,CAAC;YACH,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC7D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,KAAK,EAAE,mBAAmB,MAAM,CAAC,GAAG,CAAC,EAAE;aACxC,CAAC;QACJ,CAAC;QACD,gBAAM,CAAC,KAAK,CAAC,6BAA6B,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACtE,IAAI,IAAA,sBAAc,GAAE,EAAE,CAAC;YACrB,IAAI,CAAC;gBACH,MAAM,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;YACjE,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,gBAAM,CAAC,KAAK,CAAC,6BAA6B,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;QACD,IAAI,CAAC;YACH,OAAO;gBACL,MAAM,EAAE,QAAQ,CAAC,UAAU;gBAC3B,UAAU,EAAE,EAAE,EAAE,uDAAuD;aACxE,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,KAAK,EAAE,uBAAuB,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE;aACzE,CAAC;QACJ,CAAC;IACH,CAAC;;AAxGH,kEAyGC;AAxGQ,uDAA2B,GAAG;IACnC,UAAU;IACV,eAAe;IACf,kBAAkB;IAClB,oBAAoB;IACpB,uBAAuB;IACvB,UAAU;IACV,YAAY;CACb,CAAC;AAkGS,QAAA,sBAAsB,GAAG,IAAI,yBAAyB,CAAC,wBAAwB,CAAC,CAAC;AACjF,QAAA,0BAA0B,GAAG,IAAI,yBAAyB,CAAC,wBAAwB,CAAC,CAAC;AACrF,QAAA,0BAA0B,GAAG,IAAI,yBAAyB,CAAC,wBAAwB,CAAC,CAAC"}
+{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../../src/providers/anthropic.ts"],"names":[],"mappings":"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"}

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

@@ -3,8 +3,31 @@ import type { ApiProvider, ApiEmbeddingProvider, EnvOverrides, ProviderResponse,
 interface BedrockOptions {
     region?: string;
 }
-export declare function addConfigParam(params: any, key: string, configValue: any, envValue?: string | undefined, defaultValue?: any): void;
+interface BedrockLlamaGenerationOptions extends BedrockOptions {
+    temperature?: number;
+    top_p?: number;
+    max_gen_len?: number;
+}
 export declare function parseValue(value: string, defaultValue: any): string | number;
+export declare function addConfigParam(params: any, key: string, configValue: any, envValue?: string | undefined, defaultValue?: any): void;
+export declare enum LlamaVersion {
+    V2 = 2,
+    V3 = 3
+}
+export interface LlamaMessage {
+    role: 'system' | 'user' | 'assistant';
+    content: string;
+}
+export declare const formatPromptLlama2Chat: (messages: LlamaMessage[]) => string;
+export declare const getLlamaModelHandler: (version: LlamaVersion) => {
+    params: (config: BedrockLlamaGenerationOptions, prompt: string) => {
+        prompt: string;
+        temperature?: number | undefined;
+        top_p?: number | undefined;
+        max_gen_len?: number | undefined;
+    };
+    output: (responseJson: any) => any;
+};
 export declare abstract class AwsBedrockGenericProvider {
     modelName: string;
     env?: EnvOverrides;

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

@@ -1 +1 @@
-{"version":3,"file":"bedrock.d.ts","sourceRoot":"","sources":["../../../src/providers/bedrock.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAItE,OAAO,KAAK,EACV,WAAW,EACX,oBAAoB,EACpB,YAAY,EACZ,gBAAgB,EAChB,yBAAyB,EAC1B,MAAM,aAAa,CAAC;AAIrB,UAAU,cAAc;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAsJD,wBAAgB,cAAc,CAC5B,MAAM,EAAE,GAAG,EACX,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,GAAG,EAChB,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,EAC7B,YAAY,CAAC,EAAE,GAAG,QAMnB;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,mBAK1D;AA6OD,8BAAsB,yBAAyB;IAC7C,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,MAAM,EAAE,cAAc,CAAC;gBAGrB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,cAAc,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,YAAY,CAAA;KAAO;IAS5E,EAAE,IAAI,MAAM;IAIZ,QAAQ,IAAI,MAAM;IAIZ,kBAAkB;IA+BxB,SAAS,IAAI,MAAM;CAQpB;AAED,qBAAa,4BAA6B,SAAQ,yBAA0B,YAAW,WAAW;IAChG,MAAM,CAAC,6BAA6B,WAAmC;IAEjE,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAqEzD;AAED,qBAAa,2BACX,SAAQ,yBACR,YAAW,oBAAoB;IAEzB,OAAO,IAAI,OAAO,CAAC,yBAAyB,CAAC;IAI7C,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;CAiDzE"}
+{"version":3,"file":"bedrock.d.ts","sourceRoot":"","sources":["../../../src/providers/bedrock.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAItE,OAAO,KAAK,EACV,WAAW,EACX,oBAAoB,EACpB,YAAY,EACZ,gBAAgB,EAChB,yBAAyB,EAC1B,MAAM,aAAa,CAAC;AAIrB,UAAU,cAAc;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AA0BD,UAAU,6BAA8B,SAAQ,cAAc;IAC5D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAwHD,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,mBAK1D;AAED,wBAAgB,cAAc,CAC5B,MAAM,EAAE,GAAG,EACX,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,GAAG,EAChB,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,EAC7B,YAAY,CAAC,EAAE,GAAG,QAMnB;AAED,oBAAY,YAAY;IACtB,EAAE,IAAI;IACN,EAAE,IAAI;CACP;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,WAAW,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC;CACjB;AAGD,eAAO,MAAM,sBAAsB,aAAc,YAAY,EAAE,KAAG,MAuCjE,CAAC;AAgBF,eAAO,MAAM,oBAAoB,YAAa,YAAY;qBAMrC,6BAA6B,UAAU,MAAM;gBAcpC,MAAM;;;;;2BAqBT,GAAG;CAE7B,CAAC;AAyNF,8BAAsB,yBAAyB;IAC7C,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,MAAM,EAAE,cAAc,CAAC;gBAGrB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,cAAc,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,YAAY,CAAA;KAAO;IAS5E,EAAE,IAAI,MAAM;IAIZ,QAAQ,IAAI,MAAM;IAIZ,kBAAkB;IA+BxB,SAAS,IAAI,MAAM;CAQpB;AAED,qBAAa,4BAA6B,SAAQ,yBAA0B,YAAW,WAAW;IAChG,MAAM,CAAC,6BAA6B,WAAmC;IAEjE,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAwEzD;AAED,qBAAa,2BACX,SAAQ,yBACR,YAAW,oBAAoB;IAEzB,OAAO,IAAI,OAAO,CAAC,yBAAyB,CAAC;IAI7C,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;CAiDzE"}

package/dist/src/providers/bedrock.js

@@ -26,13 +26,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AwsBedrockEmbeddingProvider = exports.AwsBedrockCompletionProvider = exports.AwsBedrockGenericProvider = exports.parseValue = exports.addConfigParam = void 0;
+exports.AwsBedrockEmbeddingProvider = exports.AwsBedrockCompletionProvider = exports.AwsBedrockGenericProvider = exports.getLlamaModelHandler = exports.formatPromptLlama2Chat = exports.LlamaVersion = exports.addConfigParam = exports.parseValue = void 0;
 const sdk_1 = __importDefault(require("@anthropic-ai/sdk"));
 const dedent_1 = __importDefault(require("dedent"));
 const cache_1 = require("../cache");
 const logger_1 = __importDefault(require("../logger"));
 const anthropic_1 = require("./anthropic");
 const shared_1 = require("./shared");
+function parseValue(value, defaultValue) {
+    if (typeof defaultValue === 'number') {
+        return Number.isNaN(parseFloat(value)) ? defaultValue : parseFloat(value);
+    }
+    return value;
+}
+exports.parseValue = parseValue;
 function addConfigParam(params, key, configValue, envValue, defaultValue) {
     if (configValue !== undefined || envValue !== undefined || defaultValue !== undefined) {
         params[key] =
@@ -40,13 +47,91 @@ function addConfigParam(params, key, configValue, envValue, defaultValue) {
     }
 }
 exports.addConfigParam = addConfigParam;
-function parseValue(value, defaultValue) {
-    if (typeof defaultValue === 'number') {
-        return Number.isNaN(parseFloat(value)) ? defaultValue : parseFloat(value);
+var LlamaVersion;
+(function (LlamaVersion) {
+    LlamaVersion[LlamaVersion["V2"] = 2] = "V2";
+    LlamaVersion[LlamaVersion["V3"] = 3] = "V3";
+})(LlamaVersion || (exports.LlamaVersion = LlamaVersion = {}));
+// see https://github.com/meta-llama/llama/blob/main/llama/generation.py#L284-L395
+const formatPromptLlama2Chat = (messages) => {
+    if (messages.length === 0)
+        return '';
+    let formattedPrompt = '<s>';
+    let systemMessageIncluded = false;
+    for (let i = 0; i < messages.length; i++) {
+        const message = messages[i];
+        switch (message.role) {
+            case 'system':
+                if (!systemMessageIncluded) {
+                    formattedPrompt += `[INST] <<SYS>>\n${message.content.trim()}\n<</SYS>>\n\n`;
+                    systemMessageIncluded = true;
+                }
+                break;
+            case 'user':
+                if (i === 0 && !systemMessageIncluded) {
+                    formattedPrompt += `[INST] ${message.content.trim()} [/INST]`;
+                }
+                else if (i === 0 && systemMessageIncluded) {
+                    formattedPrompt += `${message.content.trim()} [/INST]`;
+                }
+                else if (i > 0 && messages[i - 1].role === 'assistant') {
+                    formattedPrompt += `<s>[INST] ${message.content.trim()} [/INST]`;
+                }
+                else {
+                    formattedPrompt += `${message.content.trim()} [/INST]`;
+                }
+                break;
+            case 'assistant':
+                formattedPrompt += ` ${message.content.trim()} </s>`;
+                break;
+            default:
+                throw new Error(`Unexpected role: ${message.role}`);
+        }
     }
-    return value;
-}
-exports.parseValue = parseValue;
+    return formattedPrompt;
+};
+exports.formatPromptLlama2Chat = formatPromptLlama2Chat;
+const formatPromptLlama3Instruct = (messages) => {
+    let formattedPrompt = '<|begin_of_text|>';
+    for (const message of messages) {
+        formattedPrompt += (0, dedent_1.default) `
+      <|start_header_id|>${message.role}<|end_header_id|>
+
+      ${message.content.trim()}<|eot_id|>`;
+    }
+    formattedPrompt += '<|start_header_id|>assistant<|end_header_id|>';
+    return formattedPrompt;
+};
+const getLlamaModelHandler = (version) => {
+    if (version !== LlamaVersion.V2 && version !== LlamaVersion.V3) {
+        throw new Error(`Unsupported LLAMA version: ${version}`);
+    }
+    return {
+        params: (config, prompt) => {
+            const messages = (0, shared_1.parseChatPrompt)(prompt, [{ role: 'user', content: prompt }]);
+            let finalPrompt;
+            switch (version) {
+                case LlamaVersion.V2:
+                    finalPrompt = (0, exports.formatPromptLlama2Chat)(messages);
+                    break;
+                case LlamaVersion.V3:
+                    finalPrompt = formatPromptLlama3Instruct(messages);
+                    break;
+                default:
+                    throw new Error(`Unsupported LLAMA version: ${version}`);
+            }
+            const params = {
+                prompt: finalPrompt,
+            };
+            addConfigParam(params, 'temperature', config?.temperature, process.env.AWS_BEDROCK_TEMPERATURE, 0.01);
+            addConfigParam(params, 'top_p', config?.top_p, process.env.AWS_BEDROCK_TOP_P, 1);
+            addConfigParam(params, 'max_gen_len', config?.max_gen_len, process.env.AWS_BEDROCK_MAX_GEN_LEN, 1024);
+            return params;
+        },
+        output: (responseJson) => responseJson?.generation,
+    };
+};
+exports.getLlamaModelHandler = getLlamaModelHandler;
 const BEDROCK_MODEL = {
     CLAUDE_COMPLETION: {
         params: (config, prompt, stop) => {
@@ -83,34 +168,8 @@ const BEDROCK_MODEL = {
         },
         output: (responseJson) => responseJson?.results[0]?.outputText,
     },
-    LLAMA: {
-        params: (config, prompt) => {
-            const messages = (0, shared_1.parseChatPrompt)(prompt, [{ role: 'user', content: prompt }]);
-            let finalPrompt;
-            if (messages.length > 0 && messages[0].role === 'system') {
-                const userMessages = messages
-                    .slice(1)
-                    .map((m) => `${m.content}`)
-                    .join('\n');
-                finalPrompt = (0, dedent_1.default) `
-          <s>[INST] <<SYS>>
-          ${messages[0].content}
-          <</SYS>>
-
-          ${userMessages} [/INST]
-        `;
-            }
-            else {
-                finalPrompt = `<s>[INST] ${messages.map((m) => `${m.content}`).join('\n')} [/INST]`;
-            }
-            const params = { prompt: finalPrompt };
-            addConfigParam(params, 'temperature', config?.temperature, process.env.AWS_BEDROCK_TEMPERATURE, 0.01);
-            addConfigParam(params, 'top_p', config?.top_p, process.env.AWS_BEDROCK_TOP_P, 1);
-            addConfigParam(params, 'max_gen_len', config?.max_gen_len, process.env.AWS_BEDROCK_MAX_GEN_LEN, 1024);
-            return params;
-        },
-        output: (responseJson) => responseJson?.generation,
-    },
+    LLAMA2: (0, exports.getLlamaModelHandler)(LlamaVersion.V2),
+    LLAMA3: (0, exports.getLlamaModelHandler)(LlamaVersion.V3), // Prompt format of llama3 instruct differs from llama2.
     COHERE_COMMAND: {
         params: (config, prompt, stop) => {
             const params = { prompt: prompt };
@@ -175,13 +234,29 @@ const BEDROCK_MODEL = {
     },
 };
 const AWS_BEDROCK_MODELS = {
+    'amazon.titan-text-express-v1': BEDROCK_MODEL.TITAN_TEXT,
+    'amazon.titan-text-lite-v1': BEDROCK_MODEL.TITAN_TEXT,
+    'amazon.titan-text-premier-v1:0': BEDROCK_MODEL.TITAN_TEXT,
+    'anthropic.claude-3-5-sonnet-20240620-v1:0': BEDROCK_MODEL.CLAUDE_MESSAGES,
+    'anthropic.claude-3-haiku-20240307-v1:0': BEDROCK_MODEL.CLAUDE_MESSAGES,
+    'anthropic.claude-3-opus-20240229-v1:0': BEDROCK_MODEL.CLAUDE_MESSAGES,
+    'anthropic.claude-3-sonnet-20240229-v1:0': BEDROCK_MODEL.CLAUDE_MESSAGES,
     'anthropic.claude-instant-v1': BEDROCK_MODEL.CLAUDE_COMPLETION,
     'anthropic.claude-v1': BEDROCK_MODEL.CLAUDE_COMPLETION,
-    'anthropic.claude-v2': BEDROCK_MODEL.CLAUDE_COMPLETION,
     'anthropic.claude-v2:1': BEDROCK_MODEL.CLAUDE_COMPLETION,
-    'amazon.titan-text-lite-v1': BEDROCK_MODEL.TITAN_TEXT,
-    'amazon.titan-text-express-v1': BEDROCK_MODEL.TITAN_TEXT,
-    'amazon.titan-text-premier-v1:0': BEDROCK_MODEL.TITAN_TEXT,
+    'anthropic.claude-v2': BEDROCK_MODEL.CLAUDE_COMPLETION,
+    'cohere.command-light-text-v14': BEDROCK_MODEL.COHERE_COMMAND,
+    'cohere.command-r-plus-v1:0': BEDROCK_MODEL.COHERE_COMMAND_R,
+    'cohere.command-r-v1:0': BEDROCK_MODEL.COHERE_COMMAND_R,
+    'cohere.command-text-v14': BEDROCK_MODEL.COHERE_COMMAND,
+    'meta.llama2-13b-chat-v1': BEDROCK_MODEL.LLAMA2,
+    'meta.llama2-70b-chat-v1': BEDROCK_MODEL.LLAMA2,
+    'meta.llama3-70b-instruct-v1:0': BEDROCK_MODEL.LLAMA3,
+    'meta.llama3-8b-instruct-v1:0': BEDROCK_MODEL.LLAMA3,
+    'mistral.mistral-7b-instruct-v0:2': BEDROCK_MODEL.MISTRAL,
+    'mistral.mistral-large-2402-v1:0': BEDROCK_MODEL.MISTRAL,
+    'mistral.mistral-small-2402-v1:0': BEDROCK_MODEL.MISTRAL,
+    'mistral.mixtral-8x7b-instruct-v0:1': BEDROCK_MODEL.MISTRAL,
 };
 // See https://docs.aws.amazon.com/bedrock/latest/userguide/model-ids.html
 function getHandlerForModel(modelName) {
@@ -192,8 +267,11 @@ function getHandlerForModel(modelName) {
     if (modelName.startsWith('anthropic.claude')) {
         return BEDROCK_MODEL.CLAUDE_MESSAGES;
     }
-    if (modelName.startsWith('meta.llama')) {
-        return BEDROCK_MODEL.LLAMA;
+    if (modelName.startsWith('meta.llama2')) {
+        return BEDROCK_MODEL.LLAMA2;
+    }
+    if (modelName.startsWith('meta.llama3')) {
+        return BEDROCK_MODEL.LLAMA3;
     }
     if (modelName.startsWith('cohere.command-r')) {
         return BEDROCK_MODEL.COHERE_COMMAND_R;
@@ -300,19 +378,24 @@ class AwsBedrockCompletionProvider extends AwsBedrockGenericProvider {
                 error: `API call error: ${String(err)}`,
             };
         }
-        logger_1.default.debug(`\tAmazon Bedrock API response: ${JSON.stringify(JSON.parse(response.body.transformToString()))}`);
+        logger_1.default.debug(`\tAmazon Bedrock API response: ${response.body.transformToString()}`);
         if ((0, cache_1.isCacheEnabled)()) {
             try {
-                await cache.set(cacheKey, response.body.transformToString());
+                await cache.set(cacheKey, new TextDecoder().decode(response.body));
             }
             catch (err) {
                 logger_1.default.error(`Failed to cache response: ${String(err)}`);
             }
         }
         try {
+            const output = JSON.parse(new TextDecoder().decode(response.body));
             return {
-                output: model.output(JSON.parse(response.body.transformToString())),
-                tokenUsage: {}, // TODO: add token usage once Amazon Bedrock API supports it
+                output: model.output(output),
+                tokenUsage: {
+                    total: output.prompt_token_count + output.generation_token_count,
+                    prompt: output.prompt_token_count,
+                    completion: output.generation_token_count,
+                },
             };
         }
         catch (err) {