modelfusion 0.117.0 → 0.119.0

package/model-function/generate-text/prompt-template/index.js

@@ -7,6 +7,7 @@ export * from "./InvalidPromptError.js";
 export * as Llama2Prompt from "./Llama2PromptTemplate.js";
 export * as MistralInstructPrompt from "./MistralInstructPromptTemplate.js";
 export * as NeuralChatPrompt from "./NeuralChatPromptTemplate.js";
+export * from "./PromptTemplateProvider.js";
 export * as TextPrompt from "./TextPromptTemplate.js";
 export * as VicunaPrompt from "./VicunaPromptTemplate.js";
 export * from "./trimChatPrompt.js";

package/model-function/generate-transcription/TranscriptionEvent.d.ts

@@ -4,7 +4,7 @@ export interface TranscriptionStartedEvent extends BaseModelCallStartedEvent {
 }
 export type TranscriptionFinishedEventResult = {
     status: "success";
-    response: unknown;
+    rawResponse: unknown;
     value: string;
 } | {
     status: "error";

package/model-function/generate-transcription/TranscriptionModel.d.ts

@@ -4,7 +4,7 @@ export interface TranscriptionModelSettings extends ModelSettings {
 }
 export interface TranscriptionModel<DATA, SETTINGS extends TranscriptionModelSettings = TranscriptionModelSettings> extends Model<SETTINGS> {
     doTranscribe: (data: DATA, options: FunctionCallOptions) => PromiseLike<{
-        response: unknown;
+        rawResponse: unknown;
         transcription: string;
     }>;
 }

package/model-function/generate-transcription/generateTranscription.cjs

@@ -11,7 +11,7 @@ async function generateTranscription(model, data, options) {
         generateResponse: async (options) => {
             const result = await model.doTranscribe(data, options);
             return {
-                response: result.response,
+                rawResponse: result.rawResponse,
                 extractedValue: result.transcription,
             };
         },

package/model-function/generate-transcription/generateTranscription.d.ts

@@ -27,6 +27,6 @@ export declare function generateTranscription<DATA>(model: TranscriptionModel<DA
     fullResponse: true;
 }): Promise<{
     value: string;
-    response: unknown;
+    rawResponse: unknown;
     metadata: ModelCallMetadata;
 }>;

package/model-function/generate-transcription/generateTranscription.js

@@ -8,7 +8,7 @@ export async function generateTranscription(model, data, options) {
         generateResponse: async (options) => {
             const result = await model.doTranscribe(data, options);
             return {
-                response: result.response,
+                rawResponse: result.rawResponse,
                 extractedValue: result.transcription,
             };
         },

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.cjs

@@ -74,10 +74,10 @@ class Automatic1111ImageGenerationModel extends AbstractModel_js_1.AbstractModel
         return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
     async doGenerateImages(prompt, options) {
-        const response = await this.callAPI(prompt, options);
+        const rawResponse = await this.callAPI(prompt, options);
         return {
-            response,
-            base64Images: response.images,
+            rawResponse,
+            base64Images: rawResponse.images,
         };
     }
     withTextPrompt() {

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.d.ts

@@ -40,7 +40,7 @@ export declare class Automatic1111ImageGenerationModel extends AbstractModel<Aut
     callAPI(input: Automatic1111ImageGenerationPrompt, callOptions: FunctionCallOptions): Promise<Automatic1111ImageGenerationResponse>;
     get settingsForEvent(): Partial<Automatic1111ImageGenerationSettings>;
     doGenerateImages(prompt: Automatic1111ImageGenerationPrompt, options: FunctionCallOptions): Promise<{
-        response: {
+        rawResponse: {
             images: string[];
             parameters: {};
             info: string;

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.js

@@ -71,10 +71,10 @@ export class Automatic1111ImageGenerationModel extends AbstractModel {
         return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
     async doGenerateImages(prompt, options) {
-        const response = await this.callAPI(prompt, options);
+        const rawResponse = await this.callAPI(prompt, options);
         return {
-            response,
-            base64Images: response.images,
+            rawResponse,
+            base64Images: rawResponse.images,
         };
     }
     withTextPrompt() {

package/model-provider/cohere/CohereTextEmbeddingModel.cjs

@@ -148,10 +148,10 @@ class CohereTextEmbeddingModel 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.embeddings,
+            rawResponse,
+            embeddings: rawResponse.embeddings,
         };
     }
     withSettings(additionalSettings) {

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

@@ -73,7 +73,7 @@ export declare class CohereTextEmbeddingModel extends AbstractModel<CohereTextEm
     callAPI(texts: Array<string>, callOptions: FunctionCallOptions): Promise<CohereTextEmbeddingResponse>;
     get settingsForEvent(): Partial<CohereTextEmbeddingModelSettings>;
     doEmbedValues(texts: string[], options: FunctionCallOptions): Promise<{
-        response: {
+        rawResponse: {
             embeddings: number[][];
             texts: string[];
             id: string;

package/model-provider/cohere/CohereTextEmbeddingModel.js

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

package/model-provider/cohere/CohereTextGenerationModel.cjs

@@ -138,10 +138,10 @@ class CohereTextGenerationModel extends AbstractModel_js_1.AbstractModel {
             schema: (0, ZodSchema_js_1.zodSchema)(cohereTextGenerationResponseSchema),
         }));
     }
-    processTextGenerationResponse(response) {
+    processTextGenerationResponse(rawResponse) {
         return {
-            response,
-            textGenerationResults: response.generations.map((generation) => ({
+            rawResponse,
+            textGenerationResults: rawResponse.generations.map((generation) => ({
                 text: generation.text,
                 finishReason: this.translateFinishReason(generation.finish_reason),
             })),
@@ -182,6 +182,9 @@ class CohereTextGenerationModel extends AbstractModel_js_1.AbstractModel {
     withChatPrompt(options) {
         return this.withPromptTemplate((0, TextPromptTemplate_js_1.chat)(options));
     }
+    withJsonOutput() {
+        return this;
+    }
     withPromptTemplate(promptTemplate) {
         return new PromptTemplateTextStreamingModel_js_1.PromptTemplateTextStreamingModel({
             model: this.withSettings({

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

@@ -59,7 +59,7 @@ export declare class CohereTextGenerationModel extends AbstractModel<CohereTextG
     }): Promise<RESPONSE>;
     get settingsForEvent(): Partial<CohereTextGenerationModelSettings>;
     doGenerateTexts(prompt: string, options: FunctionCallOptions): Promise<{
-        response: {
+        rawResponse: {
             id: string;
             prompt: string;
             generations: {
@@ -79,7 +79,7 @@ export declare class CohereTextGenerationModel extends AbstractModel<CohereTextG
         }[];
     }>;
     restoreGeneratedTexts(rawResponse: unknown): {
-        response: {
+        rawResponse: {
             id: string;
             prompt: string;
             generations: {
@@ -98,8 +98,8 @@ export declare class CohereTextGenerationModel extends AbstractModel<CohereTextG
             finishReason: TextGenerationFinishReason;
         }[];
     };
-    processTextGenerationResponse(response: CohereTextGenerationResponse): {
-        response: {
+    processTextGenerationResponse(rawResponse: CohereTextGenerationResponse): {
+        rawResponse: {
             id: string;
             prompt: string;
             generations: {
@@ -152,6 +152,7 @@ export declare class CohereTextGenerationModel extends AbstractModel<CohereTextG
         user?: string;
         assistant?: string;
     }): PromptTemplateTextStreamingModel<import("../../index.js").ChatPrompt, string, CohereTextGenerationModelSettings, this>;
+    withJsonOutput(): this;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, string>): PromptTemplateTextStreamingModel<INPUT_PROMPT, string, CohereTextGenerationModelSettings, this>;
     withSettings(additionalSettings: Partial<CohereTextGenerationModelSettings>): this;
 }

package/model-provider/cohere/CohereTextGenerationModel.js

@@ -135,10 +135,10 @@ export class CohereTextGenerationModel extends AbstractModel {
             schema: zodSchema(cohereTextGenerationResponseSchema),
         }));
     }
-    processTextGenerationResponse(response) {
+    processTextGenerationResponse(rawResponse) {
         return {
-            response,
-            textGenerationResults: response.generations.map((generation) => ({
+            rawResponse,
+            textGenerationResults: rawResponse.generations.map((generation) => ({
                 text: generation.text,
                 finishReason: this.translateFinishReason(generation.finish_reason),
             })),
@@ -179,6 +179,9 @@ export class CohereTextGenerationModel extends AbstractModel {
     withChatPrompt(options) {
         return this.withPromptTemplate(chat(options));
     }
+    withJsonOutput() {
+        return this;
+    }
     withPromptTemplate(promptTemplate) {
         return new PromptTemplateTextStreamingModel({
             model: this.withSettings({

package/model-provider/huggingface/HuggingFaceTextEmbeddingModel.cjs

@@ -117,10 +117,10 @@ class HuggingFaceTextEmbeddingModel 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,
+            rawResponse,
+            embeddings: rawResponse,
         };
     }
     withSettings(additionalSettings) {

package/model-provider/huggingface/HuggingFaceTextEmbeddingModel.d.ts

@@ -46,7 +46,7 @@ export declare class HuggingFaceTextEmbeddingModel extends AbstractModel<Hugging
     get settingsForEvent(): Partial<HuggingFaceTextEmbeddingModelSettings>;
     readonly countPromptTokens: undefined;
     doEmbedValues(texts: string[], options: FunctionCallOptions): Promise<{
-        response: number[][];
+        rawResponse: number[][];
         embeddings: number[][];
     }>;
     withSettings(additionalSettings: Partial<HuggingFaceTextEmbeddingModelSettings>): this;

package/model-provider/huggingface/HuggingFaceTextEmbeddingModel.js

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

package/model-provider/huggingface/HuggingFaceTextGenerationModel.cjs

@@ -116,15 +116,18 @@ class HuggingFaceTextGenerationModel extends AbstractModel_js_1.AbstractModel {
             schema: (0, ZodSchema_js_1.zodSchema)(huggingFaceTextGenerationResponseSchema),
         }));
     }
-    processTextGenerationResponse(response) {
+    processTextGenerationResponse(rawResponse) {
         return {
-            response,
-            textGenerationResults: response.map((response) => ({
+            rawResponse,
+            textGenerationResults: rawResponse.map((response) => ({
                 text: response.generated_text,
                 finishReason: "unknown",
             })),
         };
     }
+    withJsonOutput() {
+        return this;
+    }
     withPromptTemplate(promptTemplate) {
         return new PromptTemplateTextGenerationModel_js_1.PromptTemplateTextGenerationModel({
             model: this, // stop tokens are not supported by this model

package/model-provider/huggingface/HuggingFaceTextGenerationModel.d.ts

@@ -43,7 +43,7 @@ export declare class HuggingFaceTextGenerationModel extends AbstractModel<Huggin
     callAPI(prompt: string, callOptions: FunctionCallOptions): Promise<HuggingFaceTextGenerationResponse>;
     get settingsForEvent(): Partial<HuggingFaceTextGenerationModelSettings>;
     doGenerateTexts(prompt: string, options: FunctionCallOptions): Promise<{
-        response: {
+        rawResponse: {
             generated_text: string;
         }[];
         textGenerationResults: {
@@ -52,7 +52,7 @@ export declare class HuggingFaceTextGenerationModel extends AbstractModel<Huggin
         }[];
     }>;
     restoreGeneratedTexts(rawResponse: unknown): {
-        response: {
+        rawResponse: {
             generated_text: string;
         }[];
         textGenerationResults: {
@@ -60,8 +60,8 @@ export declare class HuggingFaceTextGenerationModel extends AbstractModel<Huggin
             finishReason: "unknown";
         }[];
     };
-    processTextGenerationResponse(response: HuggingFaceTextGenerationResponse): {
-        response: {
+    processTextGenerationResponse(rawResponse: HuggingFaceTextGenerationResponse): {
+        rawResponse: {
             generated_text: string;
         }[];
         textGenerationResults: {
@@ -69,6 +69,7 @@ export declare class HuggingFaceTextGenerationModel extends AbstractModel<Huggin
             finishReason: "unknown";
         }[];
     };
+    withJsonOutput(): this;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, string>): PromptTemplateTextGenerationModel<INPUT_PROMPT, string, HuggingFaceTextGenerationModelSettings, this>;
     withSettings(additionalSettings: Partial<HuggingFaceTextGenerationModelSettings>): this;
 }

package/model-provider/huggingface/HuggingFaceTextGenerationModel.js

@@ -113,15 +113,18 @@ export class HuggingFaceTextGenerationModel extends AbstractModel {
             schema: zodSchema(huggingFaceTextGenerationResponseSchema),
         }));
     }
-    processTextGenerationResponse(response) {
+    processTextGenerationResponse(rawResponse) {
         return {
-            response,
-            textGenerationResults: response.map((response) => ({
+            rawResponse,
+            textGenerationResults: rawResponse.map((response) => ({
                 text: response.generated_text,
                 finishReason: "unknown",
             })),
         };
     }
+    withJsonOutput() {
+        return this;
+    }
     withPromptTemplate(promptTemplate) {
         return new PromptTemplateTextGenerationModel({
             model: this, // stop tokens are not supported by this model

package/model-provider/llamacpp/LlamaCppBakLLaVA1PromptTemplate.cjs

@@ -1,11 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.chat = exports.instruction = void 0;
+exports.chat = exports.instruction = exports.text = void 0;
 const ContentPart_js_1 = require("../../model-function/generate-text/prompt-template/ContentPart.cjs");
 const InvalidPromptError_js_1 = require("../../model-function/generate-text/prompt-template/InvalidPromptError.cjs");
+const TextPromptTemplate_js_1 = require("../../model-function/generate-text/prompt-template/TextPromptTemplate.cjs");
 // 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.
+ */
+function text() {
+    const delegate = (0, TextPromptTemplate_js_1.text)();
+    return {
+        stopSequences: [],
+        format(prompt) {
+            return { text: delegate.format(prompt) };
+        },
+    };
+}
+exports.text = text;
 /**
  * BakLLaVA 1 uses a Vicuna 1 prompt. This mapping combines it with the LlamaCpp prompt structure.
  *

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 LlamaCppPrompt_js_1 = require("./LlamaCppPrompt.cjs");
 const LlamaCppTokenizer_js_1 = require("./LlamaCppTokenizer.cjs");
-const LlamaCppGrammars_js_1 = require("./LlamaCppGrammars.cjs");
+const convertJsonSchemaToGBNF_js_1 = require("./convertJsonSchemaToGBNF.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,38 @@ class LlamaCppCompletionModel extends AbstractModel_js_1.AbstractModel {
     extractTextDelta(delta) {
         return delta.content;
     }
-    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;
+    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,
+            });
     }
-    withTextPrompt() {
-        return this.withPromptTemplate({
-            format(prompt) {
-                return { text: prompt };
-            },
-            stopSequences: [],
+    withJsonOutput(schema) {
+        // don't override the grammar if it's already set (to allow user to override)
+        if (this.settings.grammar != null) {
+            return this;
+        }
+        const grammar = (0, convertJsonSchemaToGBNF_js_1.convertJsonSchemaToGBNF)(schema.getJsonSchema());
+        return this.withSettings({
+            grammar: grammar,
         });
     }
-    /**
-     * 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,
-        });
+    get promptTemplateProvider() {
+        return this.settings.promptTemplate ?? LlamaCppPrompt_js_1.Text;
+    }
+    withTextPrompt() {
+        return this.withPromptTemplate(this.promptTemplateProvider.text());
+    }
+    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

@@ -2,11 +2,18 @@ import { z } from "zod";
 import { FunctionCallOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
+import { JsonSchemaProducer } from "../../core/schema/JsonSchemaProducer.js";
+import { Schema } from "../../core/schema/Schema.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 +128,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 +155,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 +215,7 @@ export declare class LlamaCppCompletionModel<CONTEXT_WINDOW_SIZE extends number
         };
     }>;
     restoreGeneratedTexts(rawResponse: unknown): {
-        response: {
+        rawResponse: {
             model: string;
             stop: true;
             content: string;
@@ -263,8 +274,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 +387,12 @@ export declare class LlamaCppCompletionModel<CONTEXT_WINDOW_SIZE extends number
         content: string;
     }>>>;
     extractTextDelta(delta: unknown): string;
-    withJsonOutput(): this;
+    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(schema: Schema<unknown> & JsonSchemaProducer): 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).
      */