modelfusion 0.69.0 → 0.71.0

package/model-function/generate-tool-call/generateToolCallsOrText.js

@@ -0,0 +1,59 @@
+import { executeStandardCall } from "../executeStandardCall.js";
+import { NoSuchToolDefinitionError } from "./NoSuchToolDefinitionError.js";
+import { ToolCallParametersValidationError } from "./ToolCallParametersValidationError.js";
+export async function generateToolCallsOrText(model, tools, prompt, options) {
+    // Note: PROMPT must not be a function.
+    const expandedPrompt = typeof prompt === "function"
+        ? prompt(tools)
+        : prompt;
+    const fullResponse = await executeStandardCall({
+        functionType: "generate-tool-calls-or-text",
+        input: expandedPrompt,
+        model,
+        options,
+        generateResponse: async (options) => {
+            const result = await model.doGenerateToolCallsOrText(tools, expandedPrompt, options);
+            const { text, toolCalls: rawToolCalls } = result;
+            // no tool calls:
+            if (rawToolCalls == null) {
+                return {
+                    response: result.response,
+                    extractedValue: { text, toolCalls: null },
+                    usage: result.usage,
+                };
+            }
+            // map tool calls:
+            const toolCalls = rawToolCalls.map((rawToolCall) => {
+                const tool = tools.find((tool) => tool.name === rawToolCall.name);
+                if (tool == undefined) {
+                    throw new NoSuchToolDefinitionError({
+                        toolName: rawToolCall.name,
+                        parameters: rawToolCall.parameters,
+                    });
+                }
+                const parseResult = tool.parameters.validate(rawToolCall.parameters);
+                if (!parseResult.success) {
+                    throw new ToolCallParametersValidationError({
+                        toolName: tool.name,
+                        parameters: rawToolCall.parameters,
+                        cause: parseResult.error,
+                    });
+                }
+                return {
+                    id: rawToolCall.id,
+                    name: tool.name,
+                    parameters: parseResult.data,
+                };
+            });
+            return {
+                response: result.response,
+                extractedValue: {
+                    text,
+                    toolCalls: toolCalls,
+                },
+                usage: result.usage,
+            };
+        },
+    });
+    return options?.returnType === "full" ? fullResponse : fullResponse.value;
+}

package/model-function/generate-tool-call/index.cjs

@@ -14,8 +14,13 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./ToolCallDefinition.cjs"), exports);
-__exportStar(require("./ToolCallParametersValidationError.cjs"), exports);
+__exportStar(require("./ToolCall.cjs"), exports);
+__exportStar(require("./ToolCallGenerationError.cjs"), exports);
 __exportStar(require("./ToolCallGenerationEvent.cjs"), exports);
 __exportStar(require("./ToolCallGenerationModel.cjs"), exports);
+__exportStar(require("./ToolCallParametersValidationError.cjs"), exports);
+__exportStar(require("./ToolCallsOrTextGenerationEvent.cjs"), exports);
+__exportStar(require("./ToolCallsOrTextGenerationModel.cjs"), exports);
+__exportStar(require("./ToolDefinition.cjs"), exports);
 __exportStar(require("./generateToolCall.cjs"), exports);
+__exportStar(require("./generateToolCallsOrText.cjs"), exports);

package/model-function/generate-tool-call/index.d.ts

@@ -1,5 +1,10 @@
-export * from "./ToolCallDefinition.js";
-export * from "./ToolCallParametersValidationError.js";
+export * from "./ToolCall.js";
+export * from "./ToolCallGenerationError.js";
 export * from "./ToolCallGenerationEvent.js";
 export * from "./ToolCallGenerationModel.js";
+export * from "./ToolCallParametersValidationError.js";
+export * from "./ToolCallsOrTextGenerationEvent.js";
+export * from "./ToolCallsOrTextGenerationModel.js";
+export * from "./ToolDefinition.js";
 export * from "./generateToolCall.js";
+export * from "./generateToolCallsOrText.js";

package/model-function/generate-tool-call/index.js

@@ -1,5 +1,10 @@
-export * from "./ToolCallDefinition.js";
-export * from "./ToolCallParametersValidationError.js";
+export * from "./ToolCall.js";
+export * from "./ToolCallGenerationError.js";
 export * from "./ToolCallGenerationEvent.js";
 export * from "./ToolCallGenerationModel.js";
+export * from "./ToolCallParametersValidationError.js";
+export * from "./ToolCallsOrTextGenerationEvent.js";
+export * from "./ToolCallsOrTextGenerationModel.js";
+export * from "./ToolDefinition.js";
 export * from "./generateToolCall.js";
+export * from "./generateToolCallsOrText.js";

package/model-provider/anthropic/AnthropicPromptFormat.cjs

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapChatPromptToAnthropicFormat = exports.mapInstructionPromptToAnthropicFormat = void 0;
+exports.chat = exports.instruction = void 0;
 const validateChatPrompt_js_1 = require("../../model-function/generate-text/prompt-format/validateChatPrompt.cjs");
 /**
  * Formats an instruction prompt as an Anthropic prompt.
  */
-function mapInstructionPromptToAnthropicFormat() {
+function instruction() {
     return {
         format: (instruction) => {
             let text = "";
@@ -25,36 +25,32 @@ function mapInstructionPromptToAnthropicFormat() {
         stopSequences: [],
     };
 }
-exports.mapInstructionPromptToAnthropicFormat = mapInstructionPromptToAnthropicFormat;
+exports.instruction = instruction;
 /**
  * Formats a chat prompt as an Anthropic prompt.
+ *
+ * @see https://docs.anthropic.com/claude/docs/constructing-a-prompt
  */
-function mapChatPromptToAnthropicFormat() {
+function chat() {
     return {
         format: (chatPrompt) => {
             (0, validateChatPrompt_js_1.validateChatPrompt)(chatPrompt);
-            let text = "";
-            for (let i = 0; i < chatPrompt.length; i++) {
-                const message = chatPrompt[i];
-                // system message:
-                if (i === 0 &&
-                    "system" in message &&
-                    typeof message.system === "string") {
-                    text += `${message.system}\n\n`;
-                    continue;
-                }
-                // user message
-                if ("user" in message) {
-                    text += `\n\nHuman:${message.user}`;
-                    continue;
-                }
-                // ai message:
-                if ("ai" in message) {
-                    text += `\n\nAssistant:${message.ai}`;
-                    continue;
+            let text = chatPrompt.system != null ? `${chatPrompt.system}\n\n` : "";
+            for (const { role, content } of chatPrompt.messages) {
+                switch (role) {
+                    case "user": {
+                        text += `\n\nHuman:${content}`;
+                        break;
+                    }
+                    case "assistant": {
+                        text += `\n\nAssistant:${content}`;
+                        break;
+                    }
+                    default: {
+                        const _exhaustiveCheck = role;
+                        throw new Error(`Unsupported role: ${_exhaustiveCheck}`);
+                    }
                 }
-                // unsupported message:
-                throw new Error(`Unsupported message: ${JSON.stringify(message)}`);
             }
             // AI message prefix:
             text += `\n\nAssistant:`;
@@ -63,4 +59,4 @@ function mapChatPromptToAnthropicFormat() {
         stopSequences: [],
     };
 }
-exports.mapChatPromptToAnthropicFormat = mapChatPromptToAnthropicFormat;
+exports.chat = chat;

package/model-provider/anthropic/AnthropicPromptFormat.d.ts

@@ -4,8 +4,10 @@ import { TextGenerationPromptFormat } from "../../model-function/generate-text/T
 /**
  * Formats an instruction prompt as an Anthropic prompt.
  */
-export declare function mapInstructionPromptToAnthropicFormat(): TextGenerationPromptFormat<InstructionPrompt, string>;
+export declare function instruction(): TextGenerationPromptFormat<InstructionPrompt, string>;
 /**
  * Formats a chat prompt as an Anthropic prompt.
+ *
+ * @see https://docs.anthropic.com/claude/docs/constructing-a-prompt
  */
-export declare function mapChatPromptToAnthropicFormat(): TextGenerationPromptFormat<ChatPrompt, string>;
+export declare function chat(): TextGenerationPromptFormat<ChatPrompt, string>;

package/model-provider/anthropic/AnthropicPromptFormat.js

@@ -2,7 +2,7 @@ import { validateChatPrompt } from "../../model-function/generate-text/prompt-fo
 /**
  * Formats an instruction prompt as an Anthropic prompt.
  */
-export function mapInstructionPromptToAnthropicFormat() {
+export function instruction() {
     return {
         format: (instruction) => {
             let text = "";
@@ -24,33 +24,29 @@ export function mapInstructionPromptToAnthropicFormat() {
 }
 /**
  * Formats a chat prompt as an Anthropic prompt.
+ *
+ * @see https://docs.anthropic.com/claude/docs/constructing-a-prompt
  */
-export function mapChatPromptToAnthropicFormat() {
+export function chat() {
     return {
         format: (chatPrompt) => {
             validateChatPrompt(chatPrompt);
-            let text = "";
-            for (let i = 0; i < chatPrompt.length; i++) {
-                const message = chatPrompt[i];
-                // system message:
-                if (i === 0 &&
-                    "system" in message &&
-                    typeof message.system === "string") {
-                    text += `${message.system}\n\n`;
-                    continue;
-                }
-                // user message
-                if ("user" in message) {
-                    text += `\n\nHuman:${message.user}`;
-                    continue;
-                }
-                // ai message:
-                if ("ai" in message) {
-                    text += `\n\nAssistant:${message.ai}`;
-                    continue;
+            let text = chatPrompt.system != null ? `${chatPrompt.system}\n\n` : "";
+            for (const { role, content } of chatPrompt.messages) {
+                switch (role) {
+                    case "user": {
+                        text += `\n\nHuman:${content}`;
+                        break;
+                    }
+                    case "assistant": {
+                        text += `\n\nAssistant:${content}`;
+                        break;
+                    }
+                    default: {
+                        const _exhaustiveCheck = role;
+                        throw new Error(`Unsupported role: ${_exhaustiveCheck}`);
+                    }
                 }
-                // unsupported message:
-                throw new Error(`Unsupported message: ${JSON.stringify(message)}`);
             }
             // AI message prefix:
             text += `\n\nAssistant:`;

package/model-provider/anthropic/AnthropicTextGenerationModel.cjs

@@ -110,13 +110,13 @@ class AnthropicTextGenerationModel extends AbstractModel_js_1.AbstractModel {
      * Returns this model with an instruction prompt format.
      */
     withInstructionPrompt() {
-        return this.withPromptFormat((0, AnthropicPromptFormat_js_1.mapInstructionPromptToAnthropicFormat)());
+        return this.withPromptFormat((0, AnthropicPromptFormat_js_1.instruction)());
     }
     /**
      * Returns this model with a chat prompt format.
      */
     withChatPrompt() {
-        return this.withPromptFormat((0, AnthropicPromptFormat_js_1.mapChatPromptToAnthropicFormat)());
+        return this.withPromptFormat((0, AnthropicPromptFormat_js_1.chat)());
     }
     withPromptFormat(promptFormat) {
         return new PromptFormatTextStreamingModel_js_1.PromptFormatTextStreamingModel({

package/model-provider/anthropic/AnthropicTextGenerationModel.js

@@ -9,7 +9,7 @@ import { ZodSchema } from "../../core/schema/ZodSchema.js";
 import { parseJSON } from "../../core/schema/parseJSON.js";
 import { AnthropicApiConfiguration } from "./AnthropicApiConfiguration.js";
 import { failedAnthropicCallResponseHandler } from "./AnthropicError.js";
-import { mapChatPromptToAnthropicFormat, mapInstructionPromptToAnthropicFormat, } from "./AnthropicPromptFormat.js";
+import { instruction, chat } from "./AnthropicPromptFormat.js";
 export const ANTHROPIC_TEXT_GENERATION_MODELS = {
     "claude-instant-1": {
         contextWindowSize: 100000,
@@ -107,13 +107,13 @@ export class AnthropicTextGenerationModel extends AbstractModel {
      * Returns this model with an instruction prompt format.
      */
     withInstructionPrompt() {
-        return this.withPromptFormat(mapInstructionPromptToAnthropicFormat());
+        return this.withPromptFormat(instruction());
     }
     /**
      * Returns this model with a chat prompt format.
      */
     withChatPrompt() {
-        return this.withPromptFormat(mapChatPromptToAnthropicFormat());
+        return this.withPromptFormat(chat());
     }
     withPromptFormat(promptFormat) {
         return new PromptFormatTextStreamingModel({

package/model-provider/anthropic/index.cjs

@@ -10,14 +10,26 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     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 __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+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.anthropicErrorDataSchema = exports.AnthropicError = void 0;
+exports.AnthropicPromptFormat = exports.anthropicErrorDataSchema = exports.AnthropicError = void 0;
 __exportStar(require("./AnthropicApiConfiguration.cjs"), exports);
 var AnthropicError_js_1 = require("./AnthropicError.cjs");
 Object.defineProperty(exports, "AnthropicError", { enumerable: true, get: function () { return AnthropicError_js_1.AnthropicError; } });
 Object.defineProperty(exports, "anthropicErrorDataSchema", { enumerable: true, get: function () { return AnthropicError_js_1.anthropicErrorDataSchema; } });
-__exportStar(require("./AnthropicPromptFormat.cjs"), exports);
+exports.AnthropicPromptFormat = __importStar(require("./AnthropicPromptFormat.cjs"));
 __exportStar(require("./AnthropicTextGenerationModel.cjs"), exports);

package/model-provider/anthropic/index.d.ts

@@ -1,4 +1,4 @@
 export * from "./AnthropicApiConfiguration.js";
 export { AnthropicError, anthropicErrorDataSchema } from "./AnthropicError.js";
-export * from "./AnthropicPromptFormat.js";
+export * as AnthropicPromptFormat from "./AnthropicPromptFormat.js";
 export * from "./AnthropicTextGenerationModel.js";

package/model-provider/anthropic/index.js

@@ -1,4 +1,4 @@
 export * from "./AnthropicApiConfiguration.js";
 export { AnthropicError, anthropicErrorDataSchema } from "./AnthropicError.js";
-export * from "./AnthropicPromptFormat.js";
+export * as AnthropicPromptFormat from "./AnthropicPromptFormat.js";
 export * from "./AnthropicTextGenerationModel.js";

package/model-provider/cohere/CohereTextGenerationModel.cjs

@@ -4,6 +4,7 @@ exports.CohereTextGenerationResponseFormat = exports.CohereTextGenerationModel =
 const zod_1 = require("zod");
 const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
+const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const PromptFormatTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptFormatTextStreamingModel.cjs");
 const TextPromptFormat_js_1 = require("../../model-function/generate-text/prompt-format/TextPromptFormat.cjs");
@@ -13,7 +14,6 @@ const parseJsonStream_js_1 = require("../../util/streaming/parseJsonStream.cjs")
 const CohereApiConfiguration_js_1 = require("./CohereApiConfiguration.cjs");
 const CohereError_js_1 = require("./CohereError.cjs");
 const CohereTokenizer_js_1 = require("./CohereTokenizer.cjs");
-const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 exports.COHERE_TEXT_GENERATION_MODELS = {
     command: {
         contextWindowSize: 2048,
@@ -137,13 +137,13 @@ class CohereTextGenerationModel extends AbstractModel_js_1.AbstractModel {
      * Returns this model with an instruction prompt format.
      */
     withInstructionPrompt() {
-        return this.withPromptFormat((0, TextPromptFormat_js_1.mapInstructionPromptToTextFormat)());
+        return this.withPromptFormat((0, TextPromptFormat_js_1.instruction)());
     }
     /**
      * Returns this model with a chat prompt format.
      */
     withChatPrompt(options) {
-        return this.withPromptFormat((0, TextPromptFormat_js_1.mapChatPromptToTextFormat)(options));
+        return this.withPromptFormat((0, TextPromptFormat_js_1.chat)(options));
     }
     withPromptFormat(promptFormat) {
         return new PromptFormatTextStreamingModel_js_1.PromptFormatTextStreamingModel({

package/model-provider/cohere/CohereTextGenerationModel.d.ts

@@ -93,7 +93,7 @@ export declare class CohereTextGenerationModel extends AbstractModel<CohereTextG
      */
     withChatPrompt(options?: {
         user?: string;
-        ai?: string;
+        assistant?: string;
     }): PromptFormatTextStreamingModel<import("../../index.js").ChatPrompt, string, CohereTextGenerationModelSettings, this>;
     withPromptFormat<INPUT_PROMPT>(promptFormat: TextGenerationPromptFormat<INPUT_PROMPT, string>): PromptFormatTextStreamingModel<INPUT_PROMPT, string, CohereTextGenerationModelSettings, this>;
     withSettings(additionalSettings: Partial<CohereTextGenerationModelSettings>): this;

package/model-provider/cohere/CohereTextGenerationModel.js

@@ -1,16 +1,16 @@
 import { z } from "zod";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptFormatTextStreamingModel } from "../../model-function/generate-text/PromptFormatTextStreamingModel.js";
-import { mapChatPromptToTextFormat, mapInstructionPromptToTextFormat, } from "../../model-function/generate-text/prompt-format/TextPromptFormat.js";
+import { chat, instruction, } from "../../model-function/generate-text/prompt-format/TextPromptFormat.js";
 import { countTokens } from "../../model-function/tokenize-text/countTokens.js";
 import { AsyncQueue } from "../../util/AsyncQueue.js";
 import { parseJsonStream } from "../../util/streaming/parseJsonStream.js";
 import { CohereApiConfiguration } from "./CohereApiConfiguration.js";
 import { failedCohereCallResponseHandler } from "./CohereError.js";
 import { CohereTokenizer } from "./CohereTokenizer.js";
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
 export const COHERE_TEXT_GENERATION_MODELS = {
     command: {
         contextWindowSize: 2048,
@@ -134,13 +134,13 @@ export class CohereTextGenerationModel extends AbstractModel {
      * Returns this model with an instruction prompt format.
      */
     withInstructionPrompt() {
-        return this.withPromptFormat(mapInstructionPromptToTextFormat());
+        return this.withPromptFormat(instruction());
     }
     /**
      * Returns this model with a chat prompt format.
      */
     withChatPrompt(options) {
-        return this.withPromptFormat(mapChatPromptToTextFormat(options));
+        return this.withPromptFormat(chat(options));
     }
     withPromptFormat(promptFormat) {
         return new PromptFormatTextStreamingModel({

package/model-provider/llamacpp/{mapInstructionPromptToBakLLaVA1ForLlamaCppFormat.cjs → LlamaCppBakLLaVA1Format.cjs}

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapInstructionPromptToBakLLaVA1ForLlamaCppFormat = void 0;
+exports.instruction = void 0;
 // default Vicuna 1 system message
 const DEFAULT_SYSTEM_MESSAGE = "A chat between a curious user and an artificial intelligence assistant. " +
     "The assistant gives helpful, detailed, and polite answers to the user's questions.";
 /**
- * BakLLaVA 1 uses a Vicuna 1 prompt. This mapping combines it with the LlamaCpp prompts.
+ * BakLLaVA 1 uses a Vicuna 1 prompt. This mapping combines it with the LlamaCpp prompt structure.
  *
  * @see https://github.com/SkunkworksAI/BakLLaVA
  */
-function mapInstructionPromptToBakLLaVA1ForLlamaCppFormat() {
+function instruction() {
     return {
         format: (instruction) => {
             let text = "";
@@ -33,4 +33,4 @@ function mapInstructionPromptToBakLLaVA1ForLlamaCppFormat() {
         stopSequences: [`\nUSER:`],
     };
 }
-exports.mapInstructionPromptToBakLLaVA1ForLlamaCppFormat = mapInstructionPromptToBakLLaVA1ForLlamaCppFormat;
+exports.instruction = instruction;

package/model-provider/llamacpp/{mapInstructionPromptToBakLLaVA1ForLlamaCppFormat.d.ts → LlamaCppBakLLaVA1Format.d.ts}

@@ -2,8 +2,8 @@ import { InstructionPrompt } from "../../model-function/generate-text/prompt-for
 import { TextGenerationPromptFormat } from "../../model-function/generate-text/TextGenerationPromptFormat.js";
 import { LlamaCppTextGenerationPrompt } from "./LlamaCppTextGenerationModel.js";
 /**
- * BakLLaVA 1 uses a Vicuna 1 prompt. This mapping combines it with the LlamaCpp prompts.
+ * BakLLaVA 1 uses a Vicuna 1 prompt. This mapping combines it with the LlamaCpp prompt structure.
  *
  * @see https://github.com/SkunkworksAI/BakLLaVA
  */
-export declare function mapInstructionPromptToBakLLaVA1ForLlamaCppFormat(): TextGenerationPromptFormat<InstructionPrompt, LlamaCppTextGenerationPrompt>;
+export declare function instruction(): TextGenerationPromptFormat<InstructionPrompt, LlamaCppTextGenerationPrompt>;

package/model-provider/llamacpp/{mapInstructionPromptToBakLLaVA1ForLlamaCppFormat.js → LlamaCppBakLLaVA1Format.js}

@@ -2,11 +2,11 @@
 const DEFAULT_SYSTEM_MESSAGE = "A chat between a curious user and an artificial intelligence assistant. " +
     "The assistant gives helpful, detailed, and polite answers to the user's questions.";
 /**
- * BakLLaVA 1 uses a Vicuna 1 prompt. This mapping combines it with the LlamaCpp prompts.
+ * BakLLaVA 1 uses a Vicuna 1 prompt. This mapping combines it with the LlamaCpp prompt structure.
  *
  * @see https://github.com/SkunkworksAI/BakLLaVA
  */
-export function mapInstructionPromptToBakLLaVA1ForLlamaCppFormat() {
+export function instruction() {
     return {
         format: (instruction) => {
             let text = "";

package/model-provider/llamacpp/index.cjs

@@ -10,15 +10,27 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     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 __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+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.LlamaCppError = void 0;
+exports.LlamaCppError = exports.LlamaCppBakLLaVA1Format = void 0;
 __exportStar(require("./LlamaCppApiConfiguration.cjs"), exports);
+exports.LlamaCppBakLLaVA1Format = __importStar(require("./LlamaCppBakLLaVA1Format.cjs"));
 var LlamaCppError_js_1 = require("./LlamaCppError.cjs");
 Object.defineProperty(exports, "LlamaCppError", { enumerable: true, get: function () { return LlamaCppError_js_1.LlamaCppError; } });
 __exportStar(require("./LlamaCppTextEmbeddingModel.cjs"), exports);
 __exportStar(require("./LlamaCppTextGenerationModel.cjs"), exports);
 __exportStar(require("./LlamaCppTokenizer.cjs"), exports);
-__exportStar(require("./mapInstructionPromptToBakLLaVA1ForLlamaCppFormat.cjs"), exports);

package/model-provider/llamacpp/index.d.ts

@@ -1,6 +1,6 @@
 export * from "./LlamaCppApiConfiguration.js";
+export * as LlamaCppBakLLaVA1Format from "./LlamaCppBakLLaVA1Format.js";
 export { LlamaCppError, LlamaCppErrorData } from "./LlamaCppError.js";
 export * from "./LlamaCppTextEmbeddingModel.js";
 export * from "./LlamaCppTextGenerationModel.js";
 export * from "./LlamaCppTokenizer.js";
-export * from "./mapInstructionPromptToBakLLaVA1ForLlamaCppFormat.js";

package/model-provider/llamacpp/index.js

@@ -1,6 +1,6 @@
 export * from "./LlamaCppApiConfiguration.js";
+export * as LlamaCppBakLLaVA1Format from "./LlamaCppBakLLaVA1Format.js";
 export { LlamaCppError } from "./LlamaCppError.js";
 export * from "./LlamaCppTextEmbeddingModel.js";
 export * from "./LlamaCppTextGenerationModel.js";
 export * from "./LlamaCppTokenizer.js";
-export * from "./mapInstructionPromptToBakLLaVA1ForLlamaCppFormat.js";

package/model-provider/openai/OpenAICompletionModel.cjs

@@ -4,17 +4,17 @@ exports.OpenAITextResponseFormat = exports.OpenAICompletionModel = exports.calcu
 const zod_1 = require("zod");
 const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
+const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
+const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const PromptFormatTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptFormatTextStreamingModel.cjs");
 const TextPromptFormat_js_1 = require("../../model-function/generate-text/prompt-format/TextPromptFormat.cjs");
 const countTokens_js_1 = require("../../model-function/tokenize-text/countTokens.cjs");
 const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
-const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
 const parseEventSourceStream_js_1 = require("../../util/streaming/parseEventSourceStream.cjs");
 const OpenAIApiConfiguration_js_1 = require("./OpenAIApiConfiguration.cjs");
 const OpenAIError_js_1 = require("./OpenAIError.cjs");
 const TikTokenTokenizer_js_1 = require("./TikTokenTokenizer.cjs");
-const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 /**
  * @see https://platform.openai.com/docs/models/
  * @see https://openai.com/pricing
@@ -242,13 +242,13 @@ class OpenAICompletionModel extends AbstractModel_js_1.AbstractModel {
      * Returns this model with an instruction prompt format.
      */
     withInstructionPrompt() {
-        return this.withPromptFormat((0, TextPromptFormat_js_1.mapInstructionPromptToTextFormat)());
+        return this.withPromptFormat((0, TextPromptFormat_js_1.instruction)());
     }
     /**
      * Returns this model with a chat prompt format.
      */
     withChatPrompt(options) {
-        return this.withPromptFormat((0, TextPromptFormat_js_1.mapChatPromptToTextFormat)(options));
+        return this.withPromptFormat((0, TextPromptFormat_js_1.chat)(options));
     }
     withPromptFormat(promptFormat) {
         return new PromptFormatTextStreamingModel_js_1.PromptFormatTextStreamingModel({

package/model-provider/openai/OpenAICompletionModel.d.ts

@@ -182,7 +182,7 @@ export declare class OpenAICompletionModel extends AbstractModel<OpenAICompletio
      */
     withChatPrompt(options?: {
         user?: string;
-        ai?: string;
+        assistant?: string;
     }): PromptFormatTextStreamingModel<import("../../index.js").ChatPrompt, string, OpenAICompletionModelSettings, this>;
     withPromptFormat<INPUT_PROMPT>(promptFormat: TextGenerationPromptFormat<INPUT_PROMPT, string>): PromptFormatTextStreamingModel<INPUT_PROMPT, string, OpenAICompletionModelSettings, this>;
     withSettings(additionalSettings: Partial<OpenAICompletionModelSettings>): this;

package/model-provider/openai/OpenAICompletionModel.js

@@ -1,17 +1,17 @@
 import { z } from "zod";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
+import { parseJSON } from "../../core/schema/parseJSON.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptFormatTextStreamingModel } from "../../model-function/generate-text/PromptFormatTextStreamingModel.js";
-import { mapChatPromptToTextFormat, mapInstructionPromptToTextFormat, } from "../../model-function/generate-text/prompt-format/TextPromptFormat.js";
+import { chat, instruction, } from "../../model-function/generate-text/prompt-format/TextPromptFormat.js";
 import { countTokens } from "../../model-function/tokenize-text/countTokens.js";
 import { AsyncQueue } from "../../util/AsyncQueue.js";
-import { parseJSON } from "../../core/schema/parseJSON.js";
 import { parseEventSourceStream } from "../../util/streaming/parseEventSourceStream.js";
 import { OpenAIApiConfiguration } from "./OpenAIApiConfiguration.js";
 import { failedOpenAICallResponseHandler } from "./OpenAIError.js";
 import { TikTokenTokenizer } from "./TikTokenTokenizer.js";
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
 /**
  * @see https://platform.openai.com/docs/models/
  * @see https://openai.com/pricing
@@ -236,13 +236,13 @@ export class OpenAICompletionModel extends AbstractModel {
      * Returns this model with an instruction prompt format.
      */
     withInstructionPrompt() {
-        return this.withPromptFormat(mapInstructionPromptToTextFormat());
+        return this.withPromptFormat(instruction());
     }
     /**
      * Returns this model with a chat prompt format.
      */
     withChatPrompt(options) {
-        return this.withPromptFormat(mapChatPromptToTextFormat(options));
+        return this.withPromptFormat(chat(options));
     }
     withPromptFormat(promptFormat) {
         return new PromptFormatTextStreamingModel({

package/model-provider/openai/chat/OpenAIChatMessage.d.ts

@@ -9,7 +9,10 @@ export type OpenAIChatMessage = {
         text: string;
     } | {
         type: "image_url";
-        image_url: string;
+        image_url: string | {
+            url: string;
+            detail: "low" | "high" | "auto";
+        };
     }>;
     name?: string;
 } | {