modelfusion 0.119.0 → 0.120.0

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## v0.120.0 - 2024-01-09
+
+### Added
+
+- `OllamaCompletionModel` supports setting the prompt template in the settings. Prompt formats are available under `ollama.prompt.*`. You can then call `.withTextPrompt()`, `.withInstructionPrompt()` or `.withChatPrompt()` to use a standardized prompt.
+
+  ```ts
+  const model = ollama
+    .CompletionTextGenerator({
+      model: "mistral",
+      promptTemplate: ollama.prompt.Mistral,
+      raw: true, // required when using custom prompt template
+      maxGenerationTokens: 120,
+    })
+    .withTextPrompt();
+  ```
+
+### Removed
+
+- **breaking change**: removed `.withTextPromptTemplate` on `OllamaCompletionModel`.
+
+## v0.119.1 - 2024-01-08
+
+### Fixed
+
+- Incorrect export. Thanks [@mloenow](https://github.com/mloenow) for the fix!
+
 ## v0.119.0 - 2024-01-07
 
 ### Added

package/model-provider/llamacpp/LlamaCppGrammars.cjs

@@ -82,5 +82,5 @@ root ::= item+
 # Excludes various line break characters
 item ::= "- " [^\r\n\x0b\x0c\x85\u2028\u2029]+ "\n"
 `;
-var convertJsonSchemaToGBNF_1 = require("./convertJsonSchemaToGBNF");
-Object.defineProperty(exports, "fromJsonSchema", { enumerable: true, get: function () { return convertJsonSchemaToGBNF_1.convertJsonSchemaToGBNF; } });
+var convertJsonSchemaToGBNF_js_1 = require("./convertJsonSchemaToGBNF.cjs");
+Object.defineProperty(exports, "fromJsonSchema", { enumerable: true, get: function () { return convertJsonSchemaToGBNF_js_1.convertJsonSchemaToGBNF; } });

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

@@ -16,4 +16,4 @@ export declare const jsonArray: string;
  * @see https://github.com/ggerganov/llama.cpp/blob/master/grammars/list.gbnf
  */
 export declare const list: string;
-export { convertJsonSchemaToGBNF as fromJsonSchema } from "./convertJsonSchemaToGBNF";
+export { convertJsonSchemaToGBNF as fromJsonSchema } from "./convertJsonSchemaToGBNF.js";

package/model-provider/llamacpp/LlamaCppGrammars.js

@@ -79,4 +79,4 @@ root ::= item+
 # Excludes various line break characters
 item ::= "- " [^\r\n\x0b\x0c\x85\u2028\u2029]+ "\n"
 `;
-export { convertJsonSchemaToGBNF as fromJsonSchema } from "./convertJsonSchemaToGBNF";
+export { convertJsonSchemaToGBNF as fromJsonSchema } from "./convertJsonSchemaToGBNF.js";

package/model-provider/llamacpp/LlamaCppPrompt.cjs

@@ -50,6 +50,38 @@ function asLlamaCppTextPromptTemplateProvider(promptTemplateProvider) {
 }
 exports.asLlamaCppTextPromptTemplateProvider = asLlamaCppTextPromptTemplateProvider;
 exports.Text = asLlamaCppTextPromptTemplateProvider(textPrompt);
+/**
+ * Formats text, instruction or chat prompts as a Mistral instruct prompt.
+ *
+ * Note that Mistral does not support system prompts. We emulate them.
+ *
+ * Text prompt:
+ * ```
+ * <s>[INST] { instruction } [/INST]
+ * ```
+ *
+ * Instruction prompt when system prompt is set:
+ * ```
+ * <s>[INST] ${ system prompt } [/INST] </s>[INST] ${instruction} [/INST] ${ response prefix }
+ * ```
+ *
+ * Instruction prompt template when there is no system prompt:
+ * ```
+ * <s>[INST] ${ instruction } [/INST] ${ response prefix }
+ * ```
+ *
+ * Chat prompt when system prompt is set:
+ * ```
+ * <s>[INST] ${ system prompt } [/INST] </s> [INST] ${ user msg 1 } [/INST] ${ model response 1 } [INST] ${ user msg 2 } [/INST] ${ model response 2 } [INST] ${ user msg 3 } [/INST]
+ * ```
+ *
+ * Chat prompt when there is no system prompt:
+ * ```
+ * <s>[INST] ${ user msg 1 } [/INST] ${ model response 1 } </s>[INST] ${ user msg 2 } [/INST] ${ model response 2 } [INST] ${ user msg 3 } [/INST]
+ * ```
+ *
+ * @see https://docs.mistral.ai/models/#chat-template
+ */
 exports.Mistral = asLlamaCppTextPromptTemplateProvider(mistralPrompt);
 exports.ChatML = asLlamaCppTextPromptTemplateProvider(chatMlPrompt);
 exports.Llama2 = asLlamaCppTextPromptTemplateProvider(llama2Prompt);

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

@@ -5,6 +5,38 @@ import { LlamaCppCompletionPrompt } from "./LlamaCppCompletionModel.js";
 export declare function asLlamaCppPromptTemplate<SOURCE_PROMPT>(promptTemplate: TextGenerationPromptTemplate<SOURCE_PROMPT, string>): TextGenerationPromptTemplate<SOURCE_PROMPT, LlamaCppCompletionPrompt>;
 export declare function asLlamaCppTextPromptTemplateProvider(promptTemplateProvider: TextGenerationPromptTemplateProvider<string>): TextGenerationPromptTemplateProvider<LlamaCppCompletionPrompt>;
 export declare const Text: TextGenerationPromptTemplateProvider<LlamaCppCompletionPrompt>;
+/**
+ * Formats text, instruction or chat prompts as a Mistral instruct prompt.
+ *
+ * Note that Mistral does not support system prompts. We emulate them.
+ *
+ * Text prompt:
+ * ```
+ * <s>[INST] { instruction } [/INST]
+ * ```
+ *
+ * Instruction prompt when system prompt is set:
+ * ```
+ * <s>[INST] ${ system prompt } [/INST] </s>[INST] ${instruction} [/INST] ${ response prefix }
+ * ```
+ *
+ * Instruction prompt template when there is no system prompt:
+ * ```
+ * <s>[INST] ${ instruction } [/INST] ${ response prefix }
+ * ```
+ *
+ * Chat prompt when system prompt is set:
+ * ```
+ * <s>[INST] ${ system prompt } [/INST] </s> [INST] ${ user msg 1 } [/INST] ${ model response 1 } [INST] ${ user msg 2 } [/INST] ${ model response 2 } [INST] ${ user msg 3 } [/INST]
+ * ```
+ *
+ * Chat prompt when there is no system prompt:
+ * ```
+ * <s>[INST] ${ user msg 1 } [/INST] ${ model response 1 } </s>[INST] ${ user msg 2 } [/INST] ${ model response 2 } [INST] ${ user msg 3 } [/INST]
+ * ```
+ *
+ * @see https://docs.mistral.ai/models/#chat-template
+ */
 export declare const Mistral: TextGenerationPromptTemplateProvider<LlamaCppCompletionPrompt>;
 export declare const ChatML: TextGenerationPromptTemplateProvider<LlamaCppCompletionPrompt>;
 export declare const Llama2: TextGenerationPromptTemplateProvider<LlamaCppCompletionPrompt>;

package/model-provider/llamacpp/LlamaCppPrompt.js

@@ -22,6 +22,38 @@ export function asLlamaCppTextPromptTemplateProvider(promptTemplateProvider) {
     };
 }
 export const Text = asLlamaCppTextPromptTemplateProvider(textPrompt);
+/**
+ * Formats text, instruction or chat prompts as a Mistral instruct prompt.
+ *
+ * Note that Mistral does not support system prompts. We emulate them.
+ *
+ * Text prompt:
+ * ```
+ * <s>[INST] { instruction } [/INST]
+ * ```
+ *
+ * Instruction prompt when system prompt is set:
+ * ```
+ * <s>[INST] ${ system prompt } [/INST] </s>[INST] ${instruction} [/INST] ${ response prefix }
+ * ```
+ *
+ * Instruction prompt template when there is no system prompt:
+ * ```
+ * <s>[INST] ${ instruction } [/INST] ${ response prefix }
+ * ```
+ *
+ * Chat prompt when system prompt is set:
+ * ```
+ * <s>[INST] ${ system prompt } [/INST] </s> [INST] ${ user msg 1 } [/INST] ${ model response 1 } [INST] ${ user msg 2 } [/INST] ${ model response 2 } [INST] ${ user msg 3 } [/INST]
+ * ```
+ *
+ * Chat prompt when there is no system prompt:
+ * ```
+ * <s>[INST] ${ user msg 1 } [/INST] ${ model response 1 } </s>[INST] ${ user msg 2 } [/INST] ${ model response 2 } [INST] ${ user msg 3 } [/INST]
+ * ```
+ *
+ * @see https://docs.mistral.ai/models/#chat-template
+ */
 export const Mistral = asLlamaCppTextPromptTemplateProvider(mistralPrompt);
 export const ChatML = asLlamaCppTextPromptTemplateProvider(chatMlPrompt);
 export const Llama2 = asLlamaCppTextPromptTemplateProvider(llama2Prompt);

package/model-provider/ollama/OllamaCompletionModel.cjs

@@ -9,12 +9,14 @@ const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
 const validateTypes_js_1 = require("../../core/schema/validateTypes.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
+const StructureFromTextStreamingModel_js_1 = require("../../model-function/generate-structure/StructureFromTextStreamingModel.cjs");
 const PromptTemplateTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptTemplateTextStreamingModel.cjs");
 const TextGenerationModel_js_1 = require("../../model-function/generate-text/TextGenerationModel.cjs");
 const TextGenerationToolCallModel_js_1 = require("../../tool/generate-tool-call/TextGenerationToolCallModel.cjs");
 const TextGenerationToolCallsModel_js_1 = require("../../tool/generate-tool-calls/TextGenerationToolCallsModel.cjs");
 const createJsonStreamResponseHandler_js_1 = require("../../util/streaming/createJsonStreamResponseHandler.cjs");
 const OllamaApiConfiguration_js_1 = require("./OllamaApiConfiguration.cjs");
+const OllamaCompletionPrompt_js_1 = require("./OllamaCompletionPrompt.cjs");
 const OllamaError_js_1 = require("./OllamaError.cjs");
 class OllamaCompletionModel extends AbstractModel_js_1.AbstractModel {
     constructor(settings) {
@@ -151,6 +153,17 @@ class OllamaCompletionModel extends AbstractModel_js_1.AbstractModel {
         const chunk = delta;
         return chunk.done === true ? undefined : chunk.response;
     }
+    asStructureGenerationModel(promptTemplate) {
+        return "adaptModel" in promptTemplate
+            ? new StructureFromTextStreamingModel_js_1.StructureFromTextStreamingModel({
+                model: promptTemplate.adaptModel(this),
+                template: promptTemplate,
+            })
+            : new StructureFromTextStreamingModel_js_1.StructureFromTextStreamingModel({
+                model: this,
+                template: promptTemplate,
+            });
+    }
     asToolCallGenerationModel(promptTemplate) {
         return new TextGenerationToolCallModel_js_1.TextGenerationToolCallModel({
             model: this,
@@ -163,30 +176,20 @@ class OllamaCompletionModel extends AbstractModel_js_1.AbstractModel {
             template: promptTemplate,
         });
     }
+    get promptTemplateProvider() {
+        return this.settings.promptTemplate ?? OllamaCompletionPrompt_js_1.Text;
+    }
     withJsonOutput() {
         return this;
     }
     withTextPrompt() {
-        return this.withPromptTemplate({
-            format(prompt) {
-                return { prompt };
-            },
-            stopSequences: [],
-        });
+        return this.withPromptTemplate(this.promptTemplateProvider.text());
     }
-    /**
-     * Maps the prompt for a text version of the Ollama completion prompt template (without image support).
-     */
-    withTextPromptTemplate(promptTemplate) {
-        return new PromptTemplateTextStreamingModel_js_1.PromptTemplateTextStreamingModel({
-            model: this.withTextPrompt().withSettings({
-                stopSequences: [
-                    ...(this.settings.stopSequences ?? []),
-                    ...promptTemplate.stopSequences,
-                ],
-            }),
-            promptTemplate,
-        });
+    withInstructionPrompt() {
+        return this.withPromptTemplate(this.promptTemplateProvider.instruction());
+    }
+    withChatPrompt() {
+        return this.withPromptTemplate(this.promptTemplateProvider.chat());
     }
     withPromptTemplate(promptTemplate) {
         return new PromptTemplateTextStreamingModel_js_1.PromptTemplateTextStreamingModel({

package/model-provider/ollama/OllamaCompletionModel.d.ts

@@ -3,9 +3,14 @@ import { FunctionCallOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { FlexibleStructureFromTextPromptTemplate, StructureFromTextPromptTemplate } from "../../model-function/generate-structure/StructureFromTextPromptTemplate.js";
+import { StructureFromTextStreamingModel } from "../../model-function/generate-structure/StructureFromTextStreamingModel.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
+import { ChatPrompt } from "../../model-function/generate-text/prompt-template/ChatPrompt.js";
+import { InstructionPrompt } from "../../model-function/generate-text/prompt-template/InstructionPrompt.js";
+import { TextGenerationPromptTemplateProvider } from "../../model-function/generate-text/prompt-template/PromptTemplateProvider.js";
 import { TextGenerationToolCallModel, ToolCallPromptTemplate } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
 import { TextGenerationToolCallsModel } from "../../tool/generate-tool-calls/TextGenerationToolCallsModel.js";
 import { ToolCallsPromptTemplate } from "../../tool/generate-tool-calls/ToolCallsPromptTemplate.js";
@@ -39,6 +44,10 @@ export interface OllamaCompletionModelSettings<CONTEXT_WINDOW_SIZE extends numbe
     raw?: boolean;
     system?: string;
     context?: number[];
+    /**
+     * Prompt template provider that is used when calling `.withTextPrompt()`, `withInstructionPrompt()` or `withChatPrompt()`.
+     */
+    promptTemplate?: TextGenerationPromptTemplateProvider<OllamaCompletionPrompt>;
 }
 export declare class OllamaCompletionModel<CONTEXT_WINDOW_SIZE extends number | undefined> extends AbstractModel<OllamaCompletionModelSettings<CONTEXT_WINDOW_SIZE>> implements TextStreamingModel<OllamaCompletionPrompt, OllamaCompletionModelSettings<CONTEXT_WINDOW_SIZE>> {
     constructor(settings: OllamaCompletionModelSettings<CONTEXT_WINDOW_SIZE>);
@@ -128,14 +137,14 @@ export declare class OllamaCompletionModel<CONTEXT_WINDOW_SIZE extends number |
         context?: number[] | undefined;
     }>>>;
     extractTextDelta(delta: unknown): string | undefined;
+    asStructureGenerationModel<INPUT_PROMPT, OllamaCompletionPrompt>(promptTemplate: StructureFromTextPromptTemplate<INPUT_PROMPT, OllamaCompletionPrompt> | FlexibleStructureFromTextPromptTemplate<INPUT_PROMPT, unknown>): StructureFromTextStreamingModel<INPUT_PROMPT, unknown, TextStreamingModel<unknown, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>> | StructureFromTextStreamingModel<INPUT_PROMPT, OllamaCompletionPrompt, TextStreamingModel<OllamaCompletionPrompt, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>>;
     asToolCallGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallPromptTemplate<INPUT_PROMPT, OllamaCompletionPrompt>): TextGenerationToolCallModel<INPUT_PROMPT, OllamaCompletionPrompt, this>;
     asToolCallsOrTextGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallsPromptTemplate<INPUT_PROMPT, OllamaCompletionPrompt>): TextGenerationToolCallsModel<INPUT_PROMPT, OllamaCompletionPrompt, this>;
+    private get promptTemplateProvider();
     withJsonOutput(): this;
     withTextPrompt(): PromptTemplateTextStreamingModel<string, OllamaCompletionPrompt, OllamaCompletionModelSettings<CONTEXT_WINDOW_SIZE>, this>;
-    /**
-     * Maps the prompt for a text version of the Ollama completion prompt template (without image support).
-     */
-    withTextPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, string>): PromptTemplateTextStreamingModel<INPUT_PROMPT, string, OllamaCompletionModelSettings<CONTEXT_WINDOW_SIZE>, PromptTemplateTextStreamingModel<string, OllamaCompletionPrompt, OllamaCompletionModelSettings<CONTEXT_WINDOW_SIZE>, this>>;
+    withInstructionPrompt(): PromptTemplateTextStreamingModel<InstructionPrompt, OllamaCompletionPrompt, OllamaCompletionModelSettings<CONTEXT_WINDOW_SIZE>, this>;
+    withChatPrompt(): PromptTemplateTextStreamingModel<ChatPrompt, OllamaCompletionPrompt, OllamaCompletionModelSettings<CONTEXT_WINDOW_SIZE>, this>;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, OllamaCompletionPrompt>): PromptTemplateTextStreamingModel<INPUT_PROMPT, OllamaCompletionPrompt, OllamaCompletionModelSettings<CONTEXT_WINDOW_SIZE>, this>;
     withSettings(additionalSettings: Partial<OllamaCompletionModelSettings<CONTEXT_WINDOW_SIZE>>): this;
 }

package/model-provider/ollama/OllamaCompletionModel.js

@@ -6,12 +6,14 @@ import { zodSchema } from "../../core/schema/ZodSchema.js";
 import { safeParseJSON } from "../../core/schema/parseJSON.js";
 import { validateTypes } from "../../core/schema/validateTypes.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { StructureFromTextStreamingModel } from "../../model-function/generate-structure/StructureFromTextStreamingModel.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { textGenerationModelProperties, } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationToolCallModel, } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
 import { TextGenerationToolCallsModel } from "../../tool/generate-tool-calls/TextGenerationToolCallsModel.js";
 import { createJsonStreamResponseHandler } from "../../util/streaming/createJsonStreamResponseHandler.js";
 import { OllamaApiConfiguration } from "./OllamaApiConfiguration.js";
+import { Text } from "./OllamaCompletionPrompt.js";
 import { failedOllamaCallResponseHandler } from "./OllamaError.js";
 export class OllamaCompletionModel extends AbstractModel {
     constructor(settings) {
@@ -148,6 +150,17 @@ export class OllamaCompletionModel extends AbstractModel {
         const chunk = delta;
         return chunk.done === true ? undefined : chunk.response;
     }
+    asStructureGenerationModel(promptTemplate) {
+        return "adaptModel" in promptTemplate
+            ? new StructureFromTextStreamingModel({
+                model: promptTemplate.adaptModel(this),
+                template: promptTemplate,
+            })
+            : new StructureFromTextStreamingModel({
+                model: this,
+                template: promptTemplate,
+            });
+    }
     asToolCallGenerationModel(promptTemplate) {
         return new TextGenerationToolCallModel({
             model: this,
@@ -160,30 +173,20 @@ export class OllamaCompletionModel extends AbstractModel {
             template: promptTemplate,
         });
     }
+    get promptTemplateProvider() {
+        return this.settings.promptTemplate ?? Text;
+    }
     withJsonOutput() {
         return this;
     }
     withTextPrompt() {
-        return this.withPromptTemplate({
-            format(prompt) {
-                return { prompt };
-            },
-            stopSequences: [],
-        });
+        return this.withPromptTemplate(this.promptTemplateProvider.text());
     }
-    /**
-     * Maps the prompt for a text version of the Ollama completion prompt template (without image support).
-     */
-    withTextPromptTemplate(promptTemplate) {
-        return new PromptTemplateTextStreamingModel({
-            model: this.withTextPrompt().withSettings({
-                stopSequences: [
-                    ...(this.settings.stopSequences ?? []),
-                    ...promptTemplate.stopSequences,
-                ],
-            }),
-            promptTemplate,
-        });
+    withInstructionPrompt() {
+        return this.withPromptTemplate(this.promptTemplateProvider.instruction());
+    }
+    withChatPrompt() {
+        return this.withPromptTemplate(this.promptTemplateProvider.chat());
     }
     withPromptTemplate(promptTemplate) {
         return new PromptTemplateTextStreamingModel({

package/model-provider/ollama/OllamaCompletionModel.test.cjs

@@ -1,27 +1,4 @@
 "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 });
 const assert_1 = require("assert");
 const zod_1 = require("zod");
@@ -31,13 +8,13 @@ const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const jsonStructurePrompt_js_1 = require("../../model-function/generate-structure/jsonStructurePrompt.cjs");
 const streamStructure_js_1 = require("../../model-function/generate-structure/streamStructure.cjs");
 const generateText_js_1 = require("../../model-function/generate-text/generateText.cjs");
-const TextPrompt = __importStar(require("../../model-function/generate-text/prompt-template/TextPromptTemplate.cjs"));
 const streamText_js_1 = require("../../model-function/generate-text/streamText.cjs");
 const JsonTestServer_js_1 = require("../../test/JsonTestServer.cjs");
 const StreamingTestServer_js_1 = require("../../test/StreamingTestServer.cjs");
 const arrayFromAsync_js_1 = require("../../test/arrayFromAsync.cjs");
 const OllamaApiConfiguration_js_1 = require("./OllamaApiConfiguration.cjs");
 const OllamaCompletionModel_js_1 = require("./OllamaCompletionModel.cjs");
+const OllamaCompletionPrompt_js_1 = require("./OllamaCompletionPrompt.cjs");
 describe("generateText", () => {
     const server = new JsonTestServer_js_1.JsonTestServer("http://127.0.0.1:11434/api/generate");
     server.setupTestEnvironment();
@@ -128,11 +105,10 @@ describe("streamStructure", () => {
         ];
         const stream = await (0, streamStructure_js_1.streamStructure)(new OllamaCompletionModel_js_1.OllamaCompletionModel({
             model: "mistral:text",
+            promptTemplate: OllamaCompletionPrompt_js_1.Text,
             format: "json",
             raw: true,
-        })
-            .withTextPromptTemplate(TextPrompt.instruction())
-            .asStructureGenerationModel(jsonStructurePrompt_js_1.jsonStructurePrompt.text()), (0, ZodSchema_js_1.zodSchema)(zod_1.z.object({ name: zod_1.z.string() })), "generate a name");
+        }).asStructureGenerationModel(jsonStructurePrompt_js_1.jsonStructurePrompt.text()), (0, ZodSchema_js_1.zodSchema)(zod_1.z.object({ name: zod_1.z.string() })), "generate a name");
         // note: space moved to last chunk bc of trimming
         expect(await (0, arrayFromAsync_js_1.arrayFromAsync)(stream)).toStrictEqual([
             { isComplete: false, value: {} },

package/model-provider/ollama/OllamaCompletionModel.test.js

@@ -6,13 +6,13 @@ import { zodSchema } from "../../core/schema/ZodSchema.js";
 import { jsonStructurePrompt } from "../../model-function/generate-structure/jsonStructurePrompt.js";
 import { streamStructure } from "../../model-function/generate-structure/streamStructure.js";
 import { generateText } from "../../model-function/generate-text/generateText.js";
-import * as TextPrompt from "../../model-function/generate-text/prompt-template/TextPromptTemplate.js";
 import { streamText } from "../../model-function/generate-text/streamText.js";
 import { JsonTestServer } from "../../test/JsonTestServer.js";
 import { StreamingTestServer } from "../../test/StreamingTestServer.js";
 import { arrayFromAsync } from "../../test/arrayFromAsync.js";
 import { OllamaApiConfiguration } from "./OllamaApiConfiguration.js";
 import { OllamaCompletionModel } from "./OllamaCompletionModel.js";
+import { Text } from "./OllamaCompletionPrompt.js";
 describe("generateText", () => {
     const server = new JsonTestServer("http://127.0.0.1:11434/api/generate");
     server.setupTestEnvironment();
@@ -103,11 +103,10 @@ describe("streamStructure", () => {
         ];
         const stream = await streamStructure(new OllamaCompletionModel({
             model: "mistral:text",
+            promptTemplate: Text,
             format: "json",
             raw: true,
-        })
-            .withTextPromptTemplate(TextPrompt.instruction())
-            .asStructureGenerationModel(jsonStructurePrompt.text()), zodSchema(z.object({ name: z.string() })), "generate a name");
+        }).asStructureGenerationModel(jsonStructurePrompt.text()), zodSchema(z.object({ name: z.string() })), "generate a name");
         // note: space moved to last chunk bc of trimming
         expect(await arrayFromAsync(stream)).toStrictEqual([
             { isComplete: false, value: {} },

package/model-provider/ollama/OllamaCompletionPrompt.cjs

@@ -0,0 +1,89 @@
+"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.Vicuna = exports.Alpaca = exports.NeuralChat = exports.Llama2 = exports.ChatML = exports.Mistral = exports.Text = exports.asOllamaCompletionTextPromptTemplateProvider = exports.asOllamaCompletionPromptTemplate = void 0;
+const alpacaPrompt = __importStar(require("../../model-function/generate-text/prompt-template/AlpacaPromptTemplate.cjs"));
+const chatMlPrompt = __importStar(require("../../model-function/generate-text/prompt-template/ChatMLPromptTemplate.cjs"));
+const llama2Prompt = __importStar(require("../../model-function/generate-text/prompt-template/Llama2PromptTemplate.cjs"));
+const mistralPrompt = __importStar(require("../../model-function/generate-text/prompt-template/MistralInstructPromptTemplate.cjs"));
+const neuralChatPrompt = __importStar(require("../../model-function/generate-text/prompt-template/NeuralChatPromptTemplate.cjs"));
+const textPrompt = __importStar(require("../../model-function/generate-text/prompt-template/TextPromptTemplate.cjs"));
+const vicunaPrompt = __importStar(require("../../model-function/generate-text/prompt-template/VicunaPromptTemplate.cjs"));
+function asOllamaCompletionPromptTemplate(promptTemplate) {
+    return {
+        format: (prompt) => ({
+            prompt: promptTemplate.format(prompt),
+        }),
+        stopSequences: promptTemplate.stopSequences,
+    };
+}
+exports.asOllamaCompletionPromptTemplate = asOllamaCompletionPromptTemplate;
+function asOllamaCompletionTextPromptTemplateProvider(promptTemplateProvider) {
+    return {
+        text: () => asOllamaCompletionPromptTemplate(promptTemplateProvider.text()),
+        instruction: () => asOllamaCompletionPromptTemplate(promptTemplateProvider.instruction()),
+        chat: () => asOllamaCompletionPromptTemplate(promptTemplateProvider.chat()),
+    };
+}
+exports.asOllamaCompletionTextPromptTemplateProvider = asOllamaCompletionTextPromptTemplateProvider;
+exports.Text = asOllamaCompletionTextPromptTemplateProvider(textPrompt);
+/**
+ * Formats text, instruction or chat prompts as a Mistral instruct prompt.
+ *
+ * Note that Mistral does not support system prompts. We emulate them.
+ *
+ * Text prompt:
+ * ```
+ * <s>[INST] { instruction } [/INST]
+ * ```
+ *
+ * Instruction prompt when system prompt is set:
+ * ```
+ * <s>[INST] ${ system prompt } [/INST] </s>[INST] ${instruction} [/INST] ${ response prefix }
+ * ```
+ *
+ * Instruction prompt template when there is no system prompt:
+ * ```
+ * <s>[INST] ${ instruction } [/INST] ${ response prefix }
+ * ```
+ *
+ * Chat prompt when system prompt is set:
+ * ```
+ * <s>[INST] ${ system prompt } [/INST] </s> [INST] ${ user msg 1 } [/INST] ${ model response 1 } [INST] ${ user msg 2 } [/INST] ${ model response 2 } [INST] ${ user msg 3 } [/INST]
+ * ```
+ *
+ * Chat prompt when there is no system prompt:
+ * ```
+ * <s>[INST] ${ user msg 1 } [/INST] ${ model response 1 } </s>[INST] ${ user msg 2 } [/INST] ${ model response 2 } [INST] ${ user msg 3 } [/INST]
+ * ```
+ *
+ * @see https://docs.mistral.ai/models/#chat-template
+ */
+exports.Mistral = asOllamaCompletionTextPromptTemplateProvider(mistralPrompt);
+exports.ChatML = asOllamaCompletionTextPromptTemplateProvider(chatMlPrompt);
+exports.Llama2 = asOllamaCompletionTextPromptTemplateProvider(llama2Prompt);
+exports.NeuralChat = asOllamaCompletionTextPromptTemplateProvider(neuralChatPrompt);
+exports.Alpaca = asOllamaCompletionTextPromptTemplateProvider(alpacaPrompt);
+exports.Vicuna = asOllamaCompletionTextPromptTemplateProvider(vicunaPrompt);

package/model-provider/ollama/OllamaCompletionPrompt.d.ts

@@ -0,0 +1,44 @@
+import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
+import { TextGenerationPromptTemplateProvider } from "../../model-function/generate-text/prompt-template/PromptTemplateProvider.js";
+import { OllamaCompletionPrompt } from "./OllamaCompletionModel.js";
+export declare function asOllamaCompletionPromptTemplate<SOURCE_PROMPT>(promptTemplate: TextGenerationPromptTemplate<SOURCE_PROMPT, string>): TextGenerationPromptTemplate<SOURCE_PROMPT, OllamaCompletionPrompt>;
+export declare function asOllamaCompletionTextPromptTemplateProvider(promptTemplateProvider: TextGenerationPromptTemplateProvider<string>): TextGenerationPromptTemplateProvider<OllamaCompletionPrompt>;
+export declare const Text: TextGenerationPromptTemplateProvider<OllamaCompletionPrompt>;
+/**
+ * Formats text, instruction or chat prompts as a Mistral instruct prompt.
+ *
+ * Note that Mistral does not support system prompts. We emulate them.
+ *
+ * Text prompt:
+ * ```
+ * <s>[INST] { instruction } [/INST]
+ * ```
+ *
+ * Instruction prompt when system prompt is set:
+ * ```
+ * <s>[INST] ${ system prompt } [/INST] </s>[INST] ${instruction} [/INST] ${ response prefix }
+ * ```
+ *
+ * Instruction prompt template when there is no system prompt:
+ * ```
+ * <s>[INST] ${ instruction } [/INST] ${ response prefix }
+ * ```
+ *
+ * Chat prompt when system prompt is set:
+ * ```
+ * <s>[INST] ${ system prompt } [/INST] </s> [INST] ${ user msg 1 } [/INST] ${ model response 1 } [INST] ${ user msg 2 } [/INST] ${ model response 2 } [INST] ${ user msg 3 } [/INST]
+ * ```
+ *
+ * Chat prompt when there is no system prompt:
+ * ```
+ * <s>[INST] ${ user msg 1 } [/INST] ${ model response 1 } </s>[INST] ${ user msg 2 } [/INST] ${ model response 2 } [INST] ${ user msg 3 } [/INST]
+ * ```
+ *
+ * @see https://docs.mistral.ai/models/#chat-template
+ */
+export declare const Mistral: TextGenerationPromptTemplateProvider<OllamaCompletionPrompt>;
+export declare const ChatML: TextGenerationPromptTemplateProvider<OllamaCompletionPrompt>;
+export declare const Llama2: TextGenerationPromptTemplateProvider<OllamaCompletionPrompt>;
+export declare const NeuralChat: TextGenerationPromptTemplateProvider<OllamaCompletionPrompt>;
+export declare const Alpaca: TextGenerationPromptTemplateProvider<OllamaCompletionPrompt>;
+export declare const Vicuna: TextGenerationPromptTemplateProvider<OllamaCompletionPrompt>;

package/model-provider/ollama/OllamaCompletionPrompt.js

@@ -0,0 +1,61 @@
+import * as alpacaPrompt from "../../model-function/generate-text/prompt-template/AlpacaPromptTemplate.js";
+import * as chatMlPrompt from "../../model-function/generate-text/prompt-template/ChatMLPromptTemplate.js";
+import * as llama2Prompt from "../../model-function/generate-text/prompt-template/Llama2PromptTemplate.js";
+import * as mistralPrompt from "../../model-function/generate-text/prompt-template/MistralInstructPromptTemplate.js";
+import * as neuralChatPrompt from "../../model-function/generate-text/prompt-template/NeuralChatPromptTemplate.js";
+import * as textPrompt from "../../model-function/generate-text/prompt-template/TextPromptTemplate.js";
+import * as vicunaPrompt from "../../model-function/generate-text/prompt-template/VicunaPromptTemplate.js";
+export function asOllamaCompletionPromptTemplate(promptTemplate) {
+    return {
+        format: (prompt) => ({
+            prompt: promptTemplate.format(prompt),
+        }),
+        stopSequences: promptTemplate.stopSequences,
+    };
+}
+export function asOllamaCompletionTextPromptTemplateProvider(promptTemplateProvider) {
+    return {
+        text: () => asOllamaCompletionPromptTemplate(promptTemplateProvider.text()),
+        instruction: () => asOllamaCompletionPromptTemplate(promptTemplateProvider.instruction()),
+        chat: () => asOllamaCompletionPromptTemplate(promptTemplateProvider.chat()),
+    };
+}
+export const Text = asOllamaCompletionTextPromptTemplateProvider(textPrompt);
+/**
+ * Formats text, instruction or chat prompts as a Mistral instruct prompt.
+ *
+ * Note that Mistral does not support system prompts. We emulate them.
+ *
+ * Text prompt:
+ * ```
+ * <s>[INST] { instruction } [/INST]
+ * ```
+ *
+ * Instruction prompt when system prompt is set:
+ * ```
+ * <s>[INST] ${ system prompt } [/INST] </s>[INST] ${instruction} [/INST] ${ response prefix }
+ * ```
+ *
+ * Instruction prompt template when there is no system prompt:
+ * ```
+ * <s>[INST] ${ instruction } [/INST] ${ response prefix }
+ * ```
+ *
+ * Chat prompt when system prompt is set:
+ * ```
+ * <s>[INST] ${ system prompt } [/INST] </s> [INST] ${ user msg 1 } [/INST] ${ model response 1 } [INST] ${ user msg 2 } [/INST] ${ model response 2 } [INST] ${ user msg 3 } [/INST]
+ * ```
+ *
+ * Chat prompt when there is no system prompt:
+ * ```
+ * <s>[INST] ${ user msg 1 } [/INST] ${ model response 1 } </s>[INST] ${ user msg 2 } [/INST] ${ model response 2 } [INST] ${ user msg 3 } [/INST]
+ * ```
+ *
+ * @see https://docs.mistral.ai/models/#chat-template
+ */
+export const Mistral = asOllamaCompletionTextPromptTemplateProvider(mistralPrompt);
+export const ChatML = asOllamaCompletionTextPromptTemplateProvider(chatMlPrompt);
+export const Llama2 = asOllamaCompletionTextPromptTemplateProvider(llama2Prompt);
+export const NeuralChat = asOllamaCompletionTextPromptTemplateProvider(neuralChatPrompt);
+export const Alpaca = asOllamaCompletionTextPromptTemplateProvider(alpacaPrompt);
+export const Vicuna = asOllamaCompletionTextPromptTemplateProvider(vicunaPrompt);

package/model-provider/ollama/OllamaFacade.cjs

@@ -1,6 +1,29 @@
 "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.TextEmbedder = exports.ChatTextGenerator = exports.CompletionTextGenerator = exports.Api = void 0;
+exports.prompt = exports.TextEmbedder = exports.ChatTextGenerator = exports.CompletionTextGenerator = exports.Api = void 0;
 const OllamaApiConfiguration_js_1 = require("./OllamaApiConfiguration.cjs");
 const OllamaChatModel_js_1 = require("./OllamaChatModel.cjs");
 const OllamaCompletionModel_js_1 = require("./OllamaCompletionModel.cjs");
@@ -25,3 +48,4 @@ function TextEmbedder(settings) {
     return new OllamaTextEmbeddingModel_js_1.OllamaTextEmbeddingModel(settings);
 }
 exports.TextEmbedder = TextEmbedder;
+exports.prompt = __importStar(require("./OllamaCompletionPrompt.cjs"));

package/model-provider/ollama/OllamaFacade.d.ts

@@ -12,3 +12,4 @@ export declare function CompletionTextGenerator<CONTEXT_WINDOW_SIZE extends numb
 export declare function ChatTextGenerator(settings: OllamaChatModelSettings): OllamaChatModel;
 export declare function TextEmbedder(settings: OllamaTextEmbeddingModelSettings): OllamaTextEmbeddingModel;
 export { OllamaChatMessage as ChatMessage, OllamaChatPrompt as ChatPrompt, } from "./OllamaChatModel.js";
+export * as prompt from "./OllamaCompletionPrompt.js";

package/model-provider/ollama/OllamaFacade.js

@@ -18,3 +18,4 @@ export function ChatTextGenerator(settings) {
 export function TextEmbedder(settings) {
     return new OllamaTextEmbeddingModel(settings);
 }
+export * as prompt from "./OllamaCompletionPrompt.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modelfusion",
   "description": "The TypeScript library for building AI applications.",
-  "version": "0.119.0",
+  "version": "0.120.0",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [