modelfusion 0.117.0 → 0.118.0

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

@@ -2,6 +2,10 @@ import { TextGenerationPromptTemplate } from "../../model-function/generate-text
 import { ChatPrompt } from "../../model-function/generate-text/prompt-template/ChatPrompt.js";
 import { InstructionPrompt } from "../../model-function/generate-text/prompt-template/InstructionPrompt.js";
 import { LlamaCppCompletionPrompt } from "./LlamaCppCompletionModel.js";
+/**
+ * Text prompt.
+ */
+export declare function text(): TextGenerationPromptTemplate<string, LlamaCppCompletionPrompt>;
 /**
  * BakLLaVA 1 uses a Vicuna 1 prompt. This mapping combines it with the LlamaCpp prompt structure.
  *

package/model-provider/llamacpp/LlamaCppBakLLaVA1PromptTemplate.js

@@ -1,8 +1,21 @@
 import { validateContentIsString } from "../../model-function/generate-text/prompt-template/ContentPart.js";
 import { InvalidPromptError } from "../../model-function/generate-text/prompt-template/InvalidPromptError.js";
+import { text as vicunaText } from "../../model-function/generate-text/prompt-template/TextPromptTemplate.js";
 // 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.";
+/**
+ * Text prompt.
+ */
+export function text() {
+    const delegate = vicunaText();
+    return {
+        stopSequences: [],
+        format(prompt) {
+            return { text: delegate.format(prompt) };
+        },
+    };
+}
 /**
  * BakLLaVA 1 uses a Vicuna 1 prompt. This mapping combines it with the LlamaCpp prompt structure.
  *

package/model-provider/llamacpp/LlamaCppCompletionModel.cjs

@@ -8,14 +8,16 @@ 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 AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
 const parseEventSourceStream_js_1 = require("../../util/streaming/parseEventSourceStream.cjs");
 const LlamaCppApiConfiguration_js_1 = require("./LlamaCppApiConfiguration.cjs");
 const LlamaCppError_js_1 = require("./LlamaCppError.cjs");
-const LlamaCppTokenizer_js_1 = require("./LlamaCppTokenizer.cjs");
 const LlamaCppGrammars_js_1 = require("./LlamaCppGrammars.cjs");
+const LlamaCppPrompt_js_1 = require("./LlamaCppPrompt.cjs");
+const LlamaCppTokenizer_js_1 = require("./LlamaCppTokenizer.cjs");
 class LlamaCppCompletionModel extends AbstractModel_js_1.AbstractModel {
     constructor(settings = {}) {
         super({ settings });
@@ -140,23 +142,23 @@ class LlamaCppCompletionModel extends AbstractModel_js_1.AbstractModel {
             schema: (0, ZodSchema_js_1.zodSchema)(llamaCppTextGenerationResponseSchema),
         }));
     }
-    processTextGenerationResponse(response) {
+    processTextGenerationResponse(rawResponse) {
         return {
-            response,
+            rawResponse,
             textGenerationResults: [
                 {
-                    text: response.content,
-                    finishReason: response.stopped_eos || response.stopped_word
+                    text: rawResponse.content,
+                    finishReason: rawResponse.stopped_eos || rawResponse.stopped_word
                         ? "stop"
-                        : response.stopped_limit
+                        : rawResponse.stopped_limit
                             ? "length"
                             : "unknown",
                 },
             ],
             usage: {
-                promptTokens: response.tokens_evaluated,
-                completionTokens: response.tokens_predicted,
-                totalTokens: response.tokens_evaluated + response.tokens_predicted,
+                promptTokens: rawResponse.tokens_evaluated,
+                completionTokens: rawResponse.tokens_predicted,
+                totalTokens: rawResponse.tokens_evaluated + rawResponse.tokens_predicted,
             },
         };
     }
@@ -168,33 +170,34 @@ class LlamaCppCompletionModel extends AbstractModel_js_1.AbstractModel {
     extractTextDelta(delta) {
         return delta.content;
     }
+    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,
+            });
+    }
     withJsonOutput() {
         // don't override the grammar if it's already set (to support more restrictive grammars)
         return this.settings.grammar == null
             ? this.withSettings({ grammar: LlamaCppGrammars_js_1.json })
             : this;
     }
+    get promptTemplateProvider() {
+        return this.settings.promptTemplate ?? LlamaCppPrompt_js_1.Text;
+    }
     withTextPrompt() {
-        return this.withPromptTemplate({
-            format(prompt) {
-                return { text: prompt };
-            },
-            stopSequences: [],
-        });
+        return this.withPromptTemplate(this.promptTemplateProvider.text());
     }
-    /**
-     * Maps the prompt for a text version of the Llama.cpp 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());
     }
     /**
      * Maps the prompt for the full Llama.cpp prompt template (incl. image support).

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

@@ -4,9 +4,14 @@ import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { Delta } from "../../model-function/Delta.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 { TextGenerationModelSettings, 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 { LlamaCppTokenizer } from "./LlamaCppTokenizer.js";
 export interface LlamaCppCompletionModelSettings<CONTEXT_WINDOW_SIZE extends number | undefined> extends TextGenerationModelSettings {
     api?: ApiConfiguration;
@@ -121,6 +126,10 @@ export interface LlamaCppCompletionModelSettings<CONTEXT_WINDOW_SIZE extends num
      * If is -1 the task will be assigned to a Idle slot (default: -1)
      */
     slotId?: number;
+    /**
+     * Prompt template provider that is used when calling `.withTextPrompt()`, `withInstructionPrompt()` or `withChatPrompt()`.
+     */
+    promptTemplate?: TextGenerationPromptTemplateProvider<LlamaCppCompletionPrompt>;
 }
 export interface LlamaCppCompletionPrompt {
     /**
@@ -144,7 +153,7 @@ export declare class LlamaCppCompletionModel<CONTEXT_WINDOW_SIZE extends number
     get settingsForEvent(): Partial<LlamaCppCompletionModelSettings<CONTEXT_WINDOW_SIZE>>;
     countPromptTokens(prompt: LlamaCppCompletionPrompt): Promise<number>;
     doGenerateTexts(prompt: LlamaCppCompletionPrompt, options: FunctionCallOptions): Promise<{
-        response: {
+        rawResponse: {
             model: string;
             stop: true;
             content: string;
@@ -204,7 +213,7 @@ export declare class LlamaCppCompletionModel<CONTEXT_WINDOW_SIZE extends number
         };
     }>;
     restoreGeneratedTexts(rawResponse: unknown): {
-        response: {
+        rawResponse: {
             model: string;
             stop: true;
             content: string;
@@ -263,8 +272,8 @@ export declare class LlamaCppCompletionModel<CONTEXT_WINDOW_SIZE extends number
             totalTokens: number;
         };
     };
-    processTextGenerationResponse(response: LlamaCppTextGenerationResponse): {
-        response: {
+    processTextGenerationResponse(rawResponse: LlamaCppTextGenerationResponse): {
+        rawResponse: {
             model: string;
             stop: true;
             content: string;
@@ -376,12 +385,12 @@ export declare class LlamaCppCompletionModel<CONTEXT_WINDOW_SIZE extends number
         content: string;
     }>>>;
     extractTextDelta(delta: unknown): string;
+    asStructureGenerationModel<INPUT_PROMPT, LlamaCppPrompt>(promptTemplate: StructureFromTextPromptTemplate<INPUT_PROMPT, LlamaCppPrompt> | FlexibleStructureFromTextPromptTemplate<INPUT_PROMPT, unknown>): StructureFromTextStreamingModel<INPUT_PROMPT, unknown, TextStreamingModel<unknown, TextGenerationModelSettings>> | StructureFromTextStreamingModel<INPUT_PROMPT, LlamaCppPrompt, TextStreamingModel<LlamaCppPrompt, TextGenerationModelSettings>>;
     withJsonOutput(): this;
+    private get promptTemplateProvider();
     withTextPrompt(): PromptTemplateTextStreamingModel<string, LlamaCppCompletionPrompt, LlamaCppCompletionModelSettings<CONTEXT_WINDOW_SIZE>, this>;
-    /**
-     * Maps the prompt for a text version of the Llama.cpp prompt template (without image support).
-     */
-    withTextPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, string>): PromptTemplateTextStreamingModel<INPUT_PROMPT, string, LlamaCppCompletionModelSettings<CONTEXT_WINDOW_SIZE>, PromptTemplateTextStreamingModel<string, LlamaCppCompletionPrompt, LlamaCppCompletionModelSettings<CONTEXT_WINDOW_SIZE>, this>>;
+    withInstructionPrompt(): PromptTemplateTextStreamingModel<InstructionPrompt, LlamaCppCompletionPrompt, LlamaCppCompletionModelSettings<CONTEXT_WINDOW_SIZE>, this>;
+    withChatPrompt(): PromptTemplateTextStreamingModel<ChatPrompt, LlamaCppCompletionPrompt, LlamaCppCompletionModelSettings<CONTEXT_WINDOW_SIZE>, this>;
     /**
      * Maps the prompt for the full Llama.cpp prompt template (incl. image support).
      */

package/model-provider/llamacpp/LlamaCppCompletionModel.js

@@ -5,14 +5,16 @@ import { zodSchema } from "../../core/schema/ZodSchema.js";
 import { parseJSON } 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 { AsyncQueue } from "../../util/AsyncQueue.js";
 import { parseEventSourceStream } from "../../util/streaming/parseEventSourceStream.js";
 import { LlamaCppApiConfiguration } from "./LlamaCppApiConfiguration.js";
 import { failedLlamaCppCallResponseHandler } from "./LlamaCppError.js";
-import { LlamaCppTokenizer } from "./LlamaCppTokenizer.js";
 import { json } from "./LlamaCppGrammars.js";
+import { Text } from "./LlamaCppPrompt.js";
+import { LlamaCppTokenizer } from "./LlamaCppTokenizer.js";
 export class LlamaCppCompletionModel extends AbstractModel {
     constructor(settings = {}) {
         super({ settings });
@@ -137,23 +139,23 @@ export class LlamaCppCompletionModel extends AbstractModel {
             schema: zodSchema(llamaCppTextGenerationResponseSchema),
         }));
     }
-    processTextGenerationResponse(response) {
+    processTextGenerationResponse(rawResponse) {
         return {
-            response,
+            rawResponse,
             textGenerationResults: [
                 {
-                    text: response.content,
-                    finishReason: response.stopped_eos || response.stopped_word
+                    text: rawResponse.content,
+                    finishReason: rawResponse.stopped_eos || rawResponse.stopped_word
                         ? "stop"
-                        : response.stopped_limit
+                        : rawResponse.stopped_limit
                             ? "length"
                             : "unknown",
                 },
             ],
             usage: {
-                promptTokens: response.tokens_evaluated,
-                completionTokens: response.tokens_predicted,
-                totalTokens: response.tokens_evaluated + response.tokens_predicted,
+                promptTokens: rawResponse.tokens_evaluated,
+                completionTokens: rawResponse.tokens_predicted,
+                totalTokens: rawResponse.tokens_evaluated + rawResponse.tokens_predicted,
             },
         };
     }
@@ -165,33 +167,34 @@ export class LlamaCppCompletionModel extends AbstractModel {
     extractTextDelta(delta) {
         return delta.content;
     }
+    asStructureGenerationModel(promptTemplate) {
+        return "adaptModel" in promptTemplate
+            ? new StructureFromTextStreamingModel({
+                model: promptTemplate.adaptModel(this),
+                template: promptTemplate,
+            })
+            : new StructureFromTextStreamingModel({
+                model: this,
+                template: promptTemplate,
+            });
+    }
     withJsonOutput() {
         // don't override the grammar if it's already set (to support more restrictive grammars)
         return this.settings.grammar == null
             ? this.withSettings({ grammar: json })
             : this;
     }
+    get promptTemplateProvider() {
+        return this.settings.promptTemplate ?? Text;
+    }
     withTextPrompt() {
-        return this.withPromptTemplate({
-            format(prompt) {
-                return { text: prompt };
-            },
-            stopSequences: [],
-        });
+        return this.withPromptTemplate(this.promptTemplateProvider.text());
     }
-    /**
-     * Maps the prompt for a text version of the Llama.cpp 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());
     }
     /**
      * Maps the prompt for the full Llama.cpp prompt template (incl. image support).

package/model-provider/llamacpp/LlamaCppFacade.cjs

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.grammar = exports.Tokenizer = exports.TextEmbedder = exports.TextGenerator = exports.Api = void 0;
+exports.prompt = exports.grammar = exports.Tokenizer = exports.TextEmbedder = exports.CompletionTextGenerator = exports.Api = void 0;
 const LlamaCppApiConfiguration_js_1 = require("./LlamaCppApiConfiguration.cjs");
 const LlamaCppCompletionModel_js_1 = require("./LlamaCppCompletionModel.cjs");
 const LlamaCppTextEmbeddingModel_js_1 = require("./LlamaCppTextEmbeddingModel.cjs");
@@ -36,10 +36,10 @@ function Api(settings) {
     return new LlamaCppApiConfiguration_js_1.LlamaCppApiConfiguration(settings);
 }
 exports.Api = Api;
-function TextGenerator(settings = {}) {
+function CompletionTextGenerator(settings = {}) {
     return new LlamaCppCompletionModel_js_1.LlamaCppCompletionModel(settings);
 }
-exports.TextGenerator = TextGenerator;
+exports.CompletionTextGenerator = CompletionTextGenerator;
 function TextEmbedder(settings = {}) {
     return new LlamaCppTextEmbeddingModel_js_1.LlamaCppTextEmbeddingModel(settings);
 }
@@ -52,3 +52,4 @@ exports.Tokenizer = Tokenizer;
  * GBNF grammars. You can use them in the `grammar` option of the `TextGenerator` model.
  */
 exports.grammar = __importStar(require("./LlamaCppGrammars.cjs"));
+exports.prompt = __importStar(require("./LlamaCppPrompt.cjs"));

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

@@ -9,10 +9,11 @@ import { LlamaCppTokenizer } from "./LlamaCppTokenizer.js";
  * It calls the API at http://127.0.0.1:8080 by default.
  */
 export declare function Api(settings: PartialBaseUrlPartsApiConfigurationOptions): LlamaCppApiConfiguration;
-export declare function TextGenerator<CONTEXT_WINDOW_SIZE extends number>(settings?: LlamaCppCompletionModelSettings<CONTEXT_WINDOW_SIZE>): LlamaCppCompletionModel<CONTEXT_WINDOW_SIZE>;
+export declare function CompletionTextGenerator<CONTEXT_WINDOW_SIZE extends number>(settings?: LlamaCppCompletionModelSettings<CONTEXT_WINDOW_SIZE>): LlamaCppCompletionModel<CONTEXT_WINDOW_SIZE>;
 export declare function TextEmbedder(settings?: LlamaCppTextEmbeddingModelSettings): LlamaCppTextEmbeddingModel;
 export declare function Tokenizer(api?: ApiConfiguration): LlamaCppTokenizer;
 /**
  * GBNF grammars. You can use them in the `grammar` option of the `TextGenerator` model.
  */
 export * as grammar from "./LlamaCppGrammars.js";
+export * as prompt from "./LlamaCppPrompt.js";

package/model-provider/llamacpp/LlamaCppFacade.js

@@ -9,7 +9,7 @@ import { LlamaCppTokenizer } from "./LlamaCppTokenizer.js";
 export function Api(settings) {
     return new LlamaCppApiConfiguration(settings);
 }
-export function TextGenerator(settings = {}) {
+export function CompletionTextGenerator(settings = {}) {
     return new LlamaCppCompletionModel(settings);
 }
 export function TextEmbedder(settings = {}) {
@@ -22,3 +22,4 @@ export function Tokenizer(api = new LlamaCppApiConfiguration()) {
  * GBNF grammars. You can use them in the `grammar` option of the `TextGenerator` model.
  */
 export * as grammar from "./LlamaCppGrammars.js";
+export * as prompt from "./LlamaCppPrompt.js";

package/model-provider/llamacpp/LlamaCppPrompt.cjs

@@ -0,0 +1,59 @@
+"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.BakLLaVA1 = exports.Vicuna = exports.Alpaca = exports.NeuralChat = exports.Llama2 = exports.ChatML = exports.Mistral = exports.Text = exports.asLlamaCppTextPromptTemplateProvider = exports.asLlamaCppPromptTemplate = 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"));
+const LlamaCppBakLLaVA1Prompt = __importStar(require("./LlamaCppBakLLaVA1PromptTemplate.cjs"));
+function asLlamaCppPromptTemplate(promptTemplate) {
+    return {
+        format: (prompt) => ({
+            text: promptTemplate.format(prompt),
+        }),
+        stopSequences: promptTemplate.stopSequences,
+    };
+}
+exports.asLlamaCppPromptTemplate = asLlamaCppPromptTemplate;
+function asLlamaCppTextPromptTemplateProvider(promptTemplateProvider) {
+    return {
+        text: () => asLlamaCppPromptTemplate(promptTemplateProvider.text()),
+        instruction: () => asLlamaCppPromptTemplate(promptTemplateProvider.instruction()),
+        chat: () => asLlamaCppPromptTemplate(promptTemplateProvider.chat()),
+    };
+}
+exports.asLlamaCppTextPromptTemplateProvider = asLlamaCppTextPromptTemplateProvider;
+exports.Text = asLlamaCppTextPromptTemplateProvider(textPrompt);
+exports.Mistral = asLlamaCppTextPromptTemplateProvider(mistralPrompt);
+exports.ChatML = asLlamaCppTextPromptTemplateProvider(chatMlPrompt);
+exports.Llama2 = asLlamaCppTextPromptTemplateProvider(llama2Prompt);
+exports.NeuralChat = asLlamaCppTextPromptTemplateProvider(neuralChatPrompt);
+exports.Alpaca = asLlamaCppTextPromptTemplateProvider(alpacaPrompt);
+exports.Vicuna = asLlamaCppTextPromptTemplateProvider(vicunaPrompt);
+exports.BakLLaVA1 = LlamaCppBakLLaVA1Prompt;

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

@@ -0,0 +1,14 @@
+import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
+import { TextGenerationPromptTemplateProvider } from "../../model-function/generate-text/prompt-template/PromptTemplateProvider.js";
+import * as LlamaCppBakLLaVA1Prompt from "./LlamaCppBakLLaVA1PromptTemplate.js";
+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>;
+export declare const Mistral: TextGenerationPromptTemplateProvider<LlamaCppCompletionPrompt>;
+export declare const ChatML: TextGenerationPromptTemplateProvider<LlamaCppCompletionPrompt>;
+export declare const Llama2: TextGenerationPromptTemplateProvider<LlamaCppCompletionPrompt>;
+export declare const NeuralChat: TextGenerationPromptTemplateProvider<LlamaCppCompletionPrompt>;
+export declare const Alpaca: TextGenerationPromptTemplateProvider<LlamaCppCompletionPrompt>;
+export declare const Vicuna: TextGenerationPromptTemplateProvider<LlamaCppCompletionPrompt>;
+export declare const BakLLaVA1: typeof LlamaCppBakLLaVA1Prompt;

package/model-provider/llamacpp/LlamaCppPrompt.js

@@ -0,0 +1,31 @@
+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";
+import * as LlamaCppBakLLaVA1Prompt from "./LlamaCppBakLLaVA1PromptTemplate.js";
+export function asLlamaCppPromptTemplate(promptTemplate) {
+    return {
+        format: (prompt) => ({
+            text: promptTemplate.format(prompt),
+        }),
+        stopSequences: promptTemplate.stopSequences,
+    };
+}
+export function asLlamaCppTextPromptTemplateProvider(promptTemplateProvider) {
+    return {
+        text: () => asLlamaCppPromptTemplate(promptTemplateProvider.text()),
+        instruction: () => asLlamaCppPromptTemplate(promptTemplateProvider.instruction()),
+        chat: () => asLlamaCppPromptTemplate(promptTemplateProvider.chat()),
+    };
+}
+export const Text = asLlamaCppTextPromptTemplateProvider(textPrompt);
+export const Mistral = asLlamaCppTextPromptTemplateProvider(mistralPrompt);
+export const ChatML = asLlamaCppTextPromptTemplateProvider(chatMlPrompt);
+export const Llama2 = asLlamaCppTextPromptTemplateProvider(llama2Prompt);
+export const NeuralChat = asLlamaCppTextPromptTemplateProvider(neuralChatPrompt);
+export const Alpaca = asLlamaCppTextPromptTemplateProvider(alpacaPrompt);
+export const Vicuna = asLlamaCppTextPromptTemplateProvider(vicunaPrompt);
+export const BakLLaVA1 = LlamaCppBakLLaVA1Prompt;

package/model-provider/llamacpp/LlamaCppTextEmbeddingModel.cjs

@@ -80,10 +80,10 @@ class LlamaCppTextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
         };
     }
     async doEmbedValues(texts, options) {
-        const response = await this.callAPI(texts, options);
+        const rawResponse = await this.callAPI(texts, options);
         return {
-            response,
-            embeddings: [response.embedding],
+            rawResponse,
+            embeddings: [rawResponse.embedding],
         };
     }
     withSettings(additionalSettings) {

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

@@ -21,7 +21,7 @@ export declare class LlamaCppTextEmbeddingModel extends AbstractModel<LlamaCppTe
     callAPI(texts: Array<string>, callOptions: FunctionCallOptions): Promise<LlamaCppTextEmbeddingResponse>;
     get settingsForEvent(): Partial<LlamaCppTextEmbeddingModelSettings>;
     doEmbedValues(texts: string[], options: FunctionCallOptions): Promise<{
-        response: {
+        rawResponse: {
             embedding: number[];
         };
         embeddings: number[][];

package/model-provider/llamacpp/LlamaCppTextEmbeddingModel.js

@@ -77,10 +77,10 @@ export class LlamaCppTextEmbeddingModel extends AbstractModel {
         };
     }
     async doEmbedValues(texts, options) {
-        const response = await this.callAPI(texts, options);
+        const rawResponse = await this.callAPI(texts, options);
         return {
-            response,
-            embeddings: [response.embedding],
+            rawResponse,
+            embeddings: [rawResponse.embedding],
         };
     }
     withSettings(additionalSettings) {

package/model-provider/llamacpp/index.cjs

@@ -26,10 +26,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.llamacpp = exports.LlamaCppBakLLaVA1Prompt = void 0;
+exports.llamacpp = void 0;
 __exportStar(require("./LlamaCppApiConfiguration.cjs"), exports);
-exports.LlamaCppBakLLaVA1Prompt = __importStar(require("./LlamaCppBakLLaVA1PromptTemplate.cjs"));
+__exportStar(require("./LlamaCppCompletionModel.cjs"), exports);
 exports.llamacpp = __importStar(require("./LlamaCppFacade.cjs"));
 __exportStar(require("./LlamaCppTextEmbeddingModel.cjs"), exports);
-__exportStar(require("./LlamaCppCompletionModel.cjs"), exports);
 __exportStar(require("./LlamaCppTokenizer.cjs"), exports);

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

@@ -1,7 +1,6 @@
 export * from "./LlamaCppApiConfiguration.js";
-export * as LlamaCppBakLLaVA1Prompt from "./LlamaCppBakLLaVA1PromptTemplate.js";
+export * from "./LlamaCppCompletionModel.js";
 export { LlamaCppErrorData } from "./LlamaCppError.js";
 export * as llamacpp from "./LlamaCppFacade.js";
 export * from "./LlamaCppTextEmbeddingModel.js";
-export * from "./LlamaCppCompletionModel.js";
 export * from "./LlamaCppTokenizer.js";

package/model-provider/llamacpp/index.js

@@ -1,6 +1,5 @@
 export * from "./LlamaCppApiConfiguration.js";
-export * as LlamaCppBakLLaVA1Prompt from "./LlamaCppBakLLaVA1PromptTemplate.js";
+export * from "./LlamaCppCompletionModel.js";
 export * as llamacpp from "./LlamaCppFacade.js";
 export * from "./LlamaCppTextEmbeddingModel.js";
-export * from "./LlamaCppCompletionModel.js";
 export * from "./LlamaCppTokenizer.js";

package/model-provider/mistral/MistralChatModel.cjs

@@ -97,10 +97,10 @@ class MistralChatModel extends AbstractModel_js_1.AbstractModel {
             schema: (0, ZodSchema_js_1.zodSchema)(mistralChatResponseSchema),
         }));
     }
-    processTextGenerationResponse(response) {
+    processTextGenerationResponse(rawResponse) {
         return {
-            response,
-            textGenerationResults: response.choices.map((choice) => ({
+            rawResponse,
+            textGenerationResults: rawResponse.choices.map((choice) => ({
                 text: choice.message.content,
                 finishReason: this.translateFinishReason(choice.finish_reason),
             })),

package/model-provider/mistral/MistralChatModel.d.ts

@@ -59,7 +59,7 @@ export declare class MistralChatModel extends AbstractModel<MistralChatModelSett
     }): Promise<RESULT>;
     get settingsForEvent(): Partial<MistralChatModelSettings>;
     doGenerateTexts(prompt: MistralChatPrompt, options: FunctionCallOptions): Promise<{
-        response: {
+        rawResponse: {
             object: string;
             model: string;
             usage: {
@@ -84,7 +84,7 @@ export declare class MistralChatModel extends AbstractModel<MistralChatModelSett
         }[];
     }>;
     restoreGeneratedTexts(rawResponse: unknown): {
-        response: {
+        rawResponse: {
             object: string;
             model: string;
             usage: {
@@ -108,8 +108,8 @@ export declare class MistralChatModel extends AbstractModel<MistralChatModelSett
             finishReason: TextGenerationFinishReason;
         }[];
     };
-    processTextGenerationResponse(response: MistralChatResponse): {
-        response: {
+    processTextGenerationResponse(rawResponse: MistralChatResponse): {
+        rawResponse: {
             object: string;
             model: string;
             usage: {

package/model-provider/mistral/MistralChatModel.js

@@ -94,10 +94,10 @@ export class MistralChatModel extends AbstractModel {
             schema: zodSchema(mistralChatResponseSchema),
         }));
     }
-    processTextGenerationResponse(response) {
+    processTextGenerationResponse(rawResponse) {
         return {
-            response,
-            textGenerationResults: response.choices.map((choice) => ({
+            rawResponse,
+            textGenerationResults: rawResponse.choices.map((choice) => ({
                 text: choice.message.content,
                 finishReason: this.translateFinishReason(choice.finish_reason),
             })),

package/model-provider/mistral/MistralTextEmbeddingModel.cjs

@@ -79,10 +79,10 @@ class MistralTextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
         };
     }
     async doEmbedValues(texts, options) {
-        const response = await this.callAPI(texts, options);
+        const rawResponse = await this.callAPI(texts, options);
         return {
-            response,
-            embeddings: response.data.map((entry) => entry.embedding),
+            rawResponse,
+            embeddings: rawResponse.data.map((entry) => entry.embedding),
         };
     }
     withSettings(additionalSettings) {

package/model-provider/mistral/MistralTextEmbeddingModel.d.ts

@@ -30,7 +30,7 @@ export declare class MistralTextEmbeddingModel extends AbstractModel<MistralText
     callAPI(texts: Array<string>, callOptions: FunctionCallOptions): Promise<MistralTextEmbeddingResponse>;
     get settingsForEvent(): Partial<MistralTextEmbeddingModelSettings>;
     doEmbedValues(texts: string[], options: FunctionCallOptions): Promise<{
-        response: {
+        rawResponse: {
             object: string;
             model: string;
             usage: {