modelfusion 0.123.0 → 0.125.0

package/model-provider/ollama/OllamaChatModel.cjs

@@ -172,21 +172,12 @@ class OllamaChatModel extends AbstractModel_js_1.AbstractModel {
                 template: promptTemplate,
             });
     }
-    /**
-     * Returns this model with a text prompt template.
-     */
     withTextPrompt() {
         return this.withPromptTemplate((0, OllamaChatPromptTemplate_js_1.text)());
     }
-    /**
-     * Returns this model with an instruction prompt template.
-     */
     withInstructionPrompt() {
         return this.withPromptTemplate((0, OllamaChatPromptTemplate_js_1.instruction)());
     }
-    /**
-     * Returns this model with a chat prompt template.
-     */
     withChatPrompt() {
         return this.withPromptTemplate((0, OllamaChatPromptTemplate_js_1.chat)());
     }

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

@@ -6,7 +6,7 @@ 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 { TextStreamingBaseModel, TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
 import { TextGenerationToolCallModel, ToolCallPromptTemplate } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
 import { TextGenerationToolCallsModel } from "../../tool/generate-tool-calls/TextGenerationToolCallsModel.js";
@@ -27,7 +27,7 @@ export interface OllamaChatModelSettings extends OllamaTextGenerationSettings {
 /**
  * Text generation model that uses the Ollama chat API.
  */
-export declare class OllamaChatModel extends AbstractModel<OllamaChatModelSettings> implements TextStreamingModel<OllamaChatPrompt, OllamaChatModelSettings> {
+export declare class OllamaChatModel extends AbstractModel<OllamaChatModelSettings> implements TextStreamingBaseModel<OllamaChatPrompt, OllamaChatModelSettings> {
     constructor(settings: OllamaChatModelSettings);
     readonly provider = "ollama";
     get modelName(): string;
@@ -104,17 +104,8 @@ export declare class OllamaChatModel extends AbstractModel<OllamaChatModelSettin
     asToolCallGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallPromptTemplate<INPUT_PROMPT, OllamaChatPrompt>): TextGenerationToolCallModel<INPUT_PROMPT, OllamaChatPrompt, this>;
     asToolCallsOrTextGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallsPromptTemplate<INPUT_PROMPT, OllamaChatPrompt>): TextGenerationToolCallsModel<INPUT_PROMPT, OllamaChatPrompt, this>;
     asStructureGenerationModel<INPUT_PROMPT, OllamaChatPrompt>(promptTemplate: StructureFromTextPromptTemplate<INPUT_PROMPT, OllamaChatPrompt> | FlexibleStructureFromTextPromptTemplate<INPUT_PROMPT, unknown>): StructureFromTextStreamingModel<INPUT_PROMPT, unknown, TextStreamingModel<unknown, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>> | StructureFromTextStreamingModel<INPUT_PROMPT, OllamaChatPrompt, TextStreamingModel<OllamaChatPrompt, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>>;
-    /**
-     * Returns this model with a text prompt template.
-     */
     withTextPrompt(): PromptTemplateTextStreamingModel<string, OllamaChatPrompt, OllamaChatModelSettings, this>;
-    /**
-     * Returns this model with an instruction prompt template.
-     */
     withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").InstructionPrompt, OllamaChatPrompt, OllamaChatModelSettings, this>;
-    /**
-     * Returns this model with a chat prompt template.
-     */
     withChatPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").ChatPrompt, OllamaChatPrompt, OllamaChatModelSettings, this>;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, OllamaChatPrompt>): PromptTemplateTextStreamingModel<INPUT_PROMPT, OllamaChatPrompt, OllamaChatModelSettings, this>;
     withJsonOutput(): this;

package/model-provider/ollama/OllamaChatModel.js

@@ -169,21 +169,12 @@ export class OllamaChatModel extends AbstractModel {
                 template: promptTemplate,
             });
     }
-    /**
-     * Returns this model with a text prompt template.
-     */
     withTextPrompt() {
         return this.withPromptTemplate(text());
     }
-    /**
-     * Returns this model with an instruction prompt template.
-     */
     withInstructionPrompt() {
         return this.withPromptTemplate(instruction());
     }
-    /**
-     * Returns this model with a chat prompt template.
-     */
     withChatPrompt() {
         return this.withPromptTemplate(chat());
     }

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

@@ -6,7 +6,7 @@ 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 { TextStreamingBaseModel, 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";
@@ -49,7 +49,7 @@ export interface OllamaCompletionModelSettings<CONTEXT_WINDOW_SIZE extends numbe
      */
     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>> {
+export declare class OllamaCompletionModel<CONTEXT_WINDOW_SIZE extends number | undefined> extends AbstractModel<OllamaCompletionModelSettings<CONTEXT_WINDOW_SIZE>> implements TextStreamingBaseModel<OllamaCompletionPrompt, OllamaCompletionModelSettings<CONTEXT_WINDOW_SIZE>> {
     constructor(settings: OllamaCompletionModelSettings<CONTEXT_WINDOW_SIZE>);
     readonly provider = "ollama";
     get modelName(): string;

package/model-provider/ollama/index.cjs

@@ -29,7 +29,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ollama = void 0;
 __exportStar(require("./OllamaApiConfiguration.cjs"), exports);
 __exportStar(require("./OllamaChatModel.cjs"), exports);
-__exportStar(require("./OllamaChatPromptTemplate.cjs"), exports);
 __exportStar(require("./OllamaCompletionModel.cjs"), exports);
 exports.ollama = __importStar(require("./OllamaFacade.cjs"));
 __exportStar(require("./OllamaTextEmbeddingModel.cjs"), exports);

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

@@ -1,6 +1,5 @@
 export * from "./OllamaApiConfiguration.js";
 export * from "./OllamaChatModel.js";
-export * from "./OllamaChatPromptTemplate.js";
 export * from "./OllamaCompletionModel.js";
 export { OllamaErrorData } from "./OllamaError.js";
 export * as ollama from "./OllamaFacade.js";

package/model-provider/ollama/index.js

@@ -1,6 +1,5 @@
 export * from "./OllamaApiConfiguration.js";
 export * from "./OllamaChatModel.js";
-export * from "./OllamaChatPromptTemplate.js";
 export * from "./OllamaCompletionModel.js";
 export * as ollama from "./OllamaFacade.js";
 export * from "./OllamaTextEmbeddingModel.js";

package/model-provider/openai/AbstractOpenAIChatModel.cjs

@@ -63,7 +63,7 @@ class AbstractOpenAIChatModel extends AbstractModel_js_1.AbstractModel {
                         temperature: this.settings.temperature,
                         top_p: this.settings.topP,
                         n: this.settings.numberOfGenerations,
-                        stop: this.settings.stopSequences,
+                        stop: stopSequences,
                         max_tokens: this.settings.maxGenerationTokens,
                         presence_penalty: this.settings.presencePenalty,
                         frequency_penalty: this.settings.frequencyPenalty,
@@ -122,7 +122,9 @@ class AbstractOpenAIChatModel extends AbstractModel_js_1.AbstractModel {
     }
     extractTextDelta(delta) {
         const chunk = delta;
-        if (chunk.object !== "chat.completion.chunk") {
+        if (chunk.object !== "chat.completion.chunk" &&
+            chunk.object !== "chat.completion" // for OpenAI-compatible models
+        ) {
             return undefined;
         }
         const chatChunk = chunk;
@@ -243,7 +245,7 @@ const openAIChatResponseSchema = zod_1.z.object({
     }),
 });
 const openaiChatChunkSchema = zod_1.z.object({
-    object: zod_1.z.literal("chat.completion.chunk"),
+    object: zod_1.z.string(), // generalized for openai compatible providers, z.literal("chat.completion.chunk")
     id: zod_1.z.string(),
     choices: zod_1.z.array(zod_1.z.object({
         delta: zod_1.z.object({

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

@@ -223,7 +223,7 @@ export declare abstract class AbstractOpenAIChatModel<SETTINGS extends AbstractO
     };
     private translateFinishReason;
     doStreamText(prompt: OpenAIChatPrompt, options: FunctionCallOptions): Promise<AsyncIterable<import("../../index.js").Delta<{
-        object: "chat.completion.chunk";
+        object: string;
         id: string;
         created: number;
         choices: {
@@ -549,7 +549,7 @@ declare const openAIChatResponseSchema: z.ZodObject<{
 }>;
 export type OpenAIChatResponse = z.infer<typeof openAIChatResponseSchema>;
 declare const openaiChatChunkSchema: z.ZodObject<{
-    object: z.ZodLiteral<"chat.completion.chunk">;
+    object: z.ZodString;
     id: z.ZodString;
     choices: z.ZodArray<z.ZodObject<{
         delta: z.ZodObject<{
@@ -669,7 +669,7 @@ declare const openaiChatChunkSchema: z.ZodObject<{
     model: z.ZodOptional<z.ZodString>;
     system_fingerprint: z.ZodNullable<z.ZodOptional<z.ZodString>>;
 }, "strip", z.ZodTypeAny, {
-    object: "chat.completion.chunk";
+    object: string;
     id: string;
     created: number;
     choices: {
@@ -695,7 +695,7 @@ declare const openaiChatChunkSchema: z.ZodObject<{
     model?: string | undefined;
     system_fingerprint?: string | null | undefined;
 }, {
-    object: "chat.completion.chunk";
+    object: string;
     id: string;
     created: number;
     choices: {
@@ -774,7 +774,7 @@ export declare const OpenAIChatResponseFormat: {
         handler: ({ response }: {
             response: Response;
         }) => Promise<AsyncIterable<import("../../index.js").Delta<{
-            object: "chat.completion.chunk";
+            object: string;
             id: string;
             created: number;
             choices: {

package/model-provider/openai/AbstractOpenAIChatModel.js

@@ -60,7 +60,7 @@ export class AbstractOpenAIChatModel extends AbstractModel {
                         temperature: this.settings.temperature,
                         top_p: this.settings.topP,
                         n: this.settings.numberOfGenerations,
-                        stop: this.settings.stopSequences,
+                        stop: stopSequences,
                         max_tokens: this.settings.maxGenerationTokens,
                         presence_penalty: this.settings.presencePenalty,
                         frequency_penalty: this.settings.frequencyPenalty,
@@ -119,7 +119,9 @@ export class AbstractOpenAIChatModel extends AbstractModel {
     }
     extractTextDelta(delta) {
         const chunk = delta;
-        if (chunk.object !== "chat.completion.chunk") {
+        if (chunk.object !== "chat.completion.chunk" &&
+            chunk.object !== "chat.completion" // for OpenAI-compatible models
+        ) {
             return undefined;
         }
         const chatChunk = chunk;
@@ -239,7 +241,7 @@ const openAIChatResponseSchema = z.object({
     }),
 });
 const openaiChatChunkSchema = z.object({
-    object: z.literal("chat.completion.chunk"),
+    object: z.string(), // generalized for openai compatible providers, z.literal("chat.completion.chunk")
     id: z.string(),
     choices: z.array(z.object({
         delta: z.object({

package/model-provider/openai/AbstractOpenAITextEmbeddingModel.cjs

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AbstractOpenAITextEmbeddingModel = void 0;
+const zod_1 = require("zod");
+const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
+const postToApi_js_1 = require("../../core/api/postToApi.cjs");
+const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
+const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
+const OpenAIApiConfiguration_js_1 = require("./OpenAIApiConfiguration.cjs");
+const OpenAIError_js_1 = require("./OpenAIError.cjs");
+/**
+ * Abstract text embedding model that calls an API that is compatible with the OpenAI embedding API.
+ *
+ * @see https://platform.openai.com/docs/api-reference/embeddings
+ */
+class AbstractOpenAITextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
+    constructor(settings) {
+        super({ settings });
+        Object.defineProperty(this, "isParallelizable", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: true
+        });
+    }
+    get maxValuesPerCall() {
+        return this.settings.maxValuesPerCall ?? 2048;
+    }
+    async callAPI(texts, callOptions) {
+        const api = this.settings.api ?? new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration();
+        const abortSignal = callOptions.run?.abortSignal;
+        return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
+            retry: api.retry,
+            throttle: api.throttle,
+            call: async () => (0, postToApi_js_1.postJsonToApi)({
+                url: api.assembleUrl("/embeddings"),
+                headers: api.headers({
+                    functionType: callOptions.functionType,
+                    functionId: callOptions.functionId,
+                    run: callOptions.run,
+                    callId: callOptions.callId,
+                }),
+                body: {
+                    model: this.modelName,
+                    input: texts,
+                    user: this.settings.isUserIdForwardingEnabled
+                        ? callOptions.run?.userId
+                        : undefined,
+                },
+                failedResponseHandler: OpenAIError_js_1.failedOpenAICallResponseHandler,
+                successfulResponseHandler: (0, postToApi_js_1.createJsonResponseHandler)((0, ZodSchema_js_1.zodSchema)(openAITextEmbeddingResponseSchema)),
+                abortSignal,
+            }),
+        });
+    }
+    async doEmbedValues(texts, callOptions) {
+        if (texts.length > this.maxValuesPerCall) {
+            throw new Error(`The OpenAI embedding API only supports ${this.maxValuesPerCall} texts per API call.`);
+        }
+        const rawResponse = await this.callAPI(texts, callOptions);
+        return {
+            rawResponse,
+            embeddings: rawResponse.data.map((data) => data.embedding),
+        };
+    }
+}
+exports.AbstractOpenAITextEmbeddingModel = AbstractOpenAITextEmbeddingModel;
+const openAITextEmbeddingResponseSchema = zod_1.z.object({
+    object: zod_1.z.literal("list"),
+    data: zod_1.z.array(zod_1.z.object({
+        object: zod_1.z.literal("embedding"),
+        embedding: zod_1.z.array(zod_1.z.number()),
+        index: zod_1.z.number(),
+    })),
+    model: zod_1.z.string(),
+    usage: zod_1.z
+        .object({
+        prompt_tokens: zod_1.z.number(),
+        total_tokens: zod_1.z.number(),
+    })
+        .optional(), // for openai-compatible models
+});

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

@@ -0,0 +1,91 @@
+import { z } from "zod";
+import { FunctionCallOptions } from "../../core/FunctionOptions.js";
+import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
+import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { EmbeddingModelSettings } from "../../model-function/embed/EmbeddingModel.js";
+export interface AbstractOpenAITextEmbeddingModelSettings extends EmbeddingModelSettings {
+    api?: ApiConfiguration;
+    model: string;
+    maxValuesPerCall?: number | undefined;
+    isUserIdForwardingEnabled?: boolean;
+}
+/**
+ * Abstract text embedding model that calls an API that is compatible with the OpenAI embedding API.
+ *
+ * @see https://platform.openai.com/docs/api-reference/embeddings
+ */
+export declare abstract class AbstractOpenAITextEmbeddingModel<SETTINGS extends AbstractOpenAITextEmbeddingModelSettings> extends AbstractModel<SETTINGS> {
+    constructor(settings: SETTINGS);
+    get maxValuesPerCall(): number;
+    readonly isParallelizable = true;
+    callAPI(texts: Array<string>, callOptions: FunctionCallOptions): Promise<OpenAITextEmbeddingResponse>;
+    doEmbedValues(texts: string[], callOptions: FunctionCallOptions): Promise<{
+        rawResponse: {
+            object: "list";
+            data: {
+                object: "embedding";
+                embedding: number[];
+                index: number;
+            }[];
+            model: string;
+            usage?: {
+                prompt_tokens: number;
+                total_tokens: number;
+            } | undefined;
+        };
+        embeddings: number[][];
+    }>;
+}
+declare const openAITextEmbeddingResponseSchema: z.ZodObject<{
+    object: z.ZodLiteral<"list">;
+    data: z.ZodArray<z.ZodObject<{
+        object: z.ZodLiteral<"embedding">;
+        embedding: z.ZodArray<z.ZodNumber, "many">;
+        index: z.ZodNumber;
+    }, "strip", z.ZodTypeAny, {
+        object: "embedding";
+        embedding: number[];
+        index: number;
+    }, {
+        object: "embedding";
+        embedding: number[];
+        index: number;
+    }>, "many">;
+    model: z.ZodString;
+    usage: z.ZodOptional<z.ZodObject<{
+        prompt_tokens: z.ZodNumber;
+        total_tokens: z.ZodNumber;
+    }, "strip", z.ZodTypeAny, {
+        prompt_tokens: number;
+        total_tokens: number;
+    }, {
+        prompt_tokens: number;
+        total_tokens: number;
+    }>>;
+}, "strip", z.ZodTypeAny, {
+    object: "list";
+    data: {
+        object: "embedding";
+        embedding: number[];
+        index: number;
+    }[];
+    model: string;
+    usage?: {
+        prompt_tokens: number;
+        total_tokens: number;
+    } | undefined;
+}, {
+    object: "list";
+    data: {
+        object: "embedding";
+        embedding: number[];
+        index: number;
+    }[];
+    model: string;
+    usage?: {
+        prompt_tokens: number;
+        total_tokens: number;
+    } | undefined;
+}>;
+export type OpenAITextEmbeddingResponse = z.infer<typeof openAITextEmbeddingResponseSchema>;
+export {};

package/model-provider/openai/AbstractOpenAITextEmbeddingModel.js

@@ -0,0 +1,78 @@
+import { z } from "zod";
+import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
+import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
+import { zodSchema } from "../../core/schema/ZodSchema.js";
+import { AbstractModel } from "../../model-function/AbstractModel.js";
+import { OpenAIApiConfiguration } from "./OpenAIApiConfiguration.js";
+import { failedOpenAICallResponseHandler } from "./OpenAIError.js";
+/**
+ * Abstract text embedding model that calls an API that is compatible with the OpenAI embedding API.
+ *
+ * @see https://platform.openai.com/docs/api-reference/embeddings
+ */
+export class AbstractOpenAITextEmbeddingModel extends AbstractModel {
+    constructor(settings) {
+        super({ settings });
+        Object.defineProperty(this, "isParallelizable", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: true
+        });
+    }
+    get maxValuesPerCall() {
+        return this.settings.maxValuesPerCall ?? 2048;
+    }
+    async callAPI(texts, callOptions) {
+        const api = this.settings.api ?? new OpenAIApiConfiguration();
+        const abortSignal = callOptions.run?.abortSignal;
+        return callWithRetryAndThrottle({
+            retry: api.retry,
+            throttle: api.throttle,
+            call: async () => postJsonToApi({
+                url: api.assembleUrl("/embeddings"),
+                headers: api.headers({
+                    functionType: callOptions.functionType,
+                    functionId: callOptions.functionId,
+                    run: callOptions.run,
+                    callId: callOptions.callId,
+                }),
+                body: {
+                    model: this.modelName,
+                    input: texts,
+                    user: this.settings.isUserIdForwardingEnabled
+                        ? callOptions.run?.userId
+                        : undefined,
+                },
+                failedResponseHandler: failedOpenAICallResponseHandler,
+                successfulResponseHandler: createJsonResponseHandler(zodSchema(openAITextEmbeddingResponseSchema)),
+                abortSignal,
+            }),
+        });
+    }
+    async doEmbedValues(texts, callOptions) {
+        if (texts.length > this.maxValuesPerCall) {
+            throw new Error(`The OpenAI embedding API only supports ${this.maxValuesPerCall} texts per API call.`);
+        }
+        const rawResponse = await this.callAPI(texts, callOptions);
+        return {
+            rawResponse,
+            embeddings: rawResponse.data.map((data) => data.embedding),
+        };
+    }
+}
+const openAITextEmbeddingResponseSchema = z.object({
+    object: z.literal("list"),
+    data: z.array(z.object({
+        object: z.literal("embedding"),
+        embedding: z.array(z.number()),
+        index: z.number(),
+    })),
+    model: z.string(),
+    usage: z
+        .object({
+        prompt_tokens: z.number(),
+        total_tokens: z.number(),
+    })
+        .optional(), // for openai-compatible models
+});

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

@@ -170,7 +170,7 @@ OpenAIChatSettings> {
     }>;
     doStreamStructure(schema: Schema<unknown> & JsonSchemaProducer, prompt: Parameters<PROMPT_TEMPLATE["format"]>[0], // first argument of the function
     options: FunctionCallOptions): Promise<AsyncIterable<import("../../index.js").Delta<{
-        object: "chat.completion.chunk";
+        object: string;
         id: string;
         created: number;
         choices: {

package/model-provider/openai/OpenAIChatModel.cjs

@@ -229,21 +229,12 @@ class OpenAIChatModel extends AbstractOpenAIChatModel_js_1.AbstractOpenAIChatMod
                 template: promptTemplate,
             });
     }
-    /**
-     * Returns this model with a text prompt template.
-     */
     withTextPrompt() {
         return this.withPromptTemplate((0, OpenAIChatPromptTemplate_js_1.text)());
     }
-    /**
-     * Returns this model with an instruction prompt template.
-     */
     withInstructionPrompt() {
         return this.withPromptTemplate((0, OpenAIChatPromptTemplate_js_1.instruction)());
     }
-    /**
-     * Returns this model with a chat prompt template.
-     */
     withChatPrompt() {
         return this.withPromptTemplate((0, OpenAIChatPromptTemplate_js_1.chat)());
     }

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

@@ -1,7 +1,7 @@
 import { FlexibleStructureFromTextPromptTemplate, StructureFromTextPromptTemplate } from "../../model-function/generate-structure/StructureFromTextPromptTemplate.js";
 import { StructureFromTextStreamingModel } from "../../model-function/generate-structure/StructureFromTextStreamingModel.js";
 import { PromptTemplateFullTextModel } from "../../model-function/generate-text/PromptTemplateFullTextModel.js";
-import { TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
+import { TextStreamingBaseModel, TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
 import { ToolCallGenerationModel } from "../../tool/generate-tool-call/ToolCallGenerationModel.js";
 import { ToolCallsGenerationModel } from "../../tool/generate-tool-calls/ToolCallsGenerationModel.js";
@@ -124,7 +124,7 @@ export interface OpenAIChatSettings extends AbstractOpenAIChatSettings {
  *   ),
  * ]);
  */
-export declare class OpenAIChatModel extends AbstractOpenAIChatModel<OpenAIChatSettings> implements TextStreamingModel<OpenAIChatPrompt, OpenAIChatSettings>, ToolCallGenerationModel<OpenAIChatPrompt, OpenAIChatSettings>, ToolCallsGenerationModel<OpenAIChatPrompt, OpenAIChatSettings> {
+export declare class OpenAIChatModel extends AbstractOpenAIChatModel<OpenAIChatSettings> implements TextStreamingBaseModel<OpenAIChatPrompt, OpenAIChatSettings>, ToolCallGenerationModel<OpenAIChatPrompt, OpenAIChatSettings>, ToolCallsGenerationModel<OpenAIChatPrompt, OpenAIChatSettings> {
     constructor(settings: OpenAIChatSettings);
     readonly provider: "openai";
     get modelName(): OpenAIChatModelType;
@@ -141,17 +141,8 @@ export declare class OpenAIChatModel extends AbstractOpenAIChatModel<OpenAIChatS
         fnDescription?: string;
     }): OpenAIChatFunctionCallStructureGenerationModel<TextGenerationPromptTemplate<OpenAIChatPrompt, OpenAIChatPrompt>>;
     asStructureGenerationModel<INPUT_PROMPT, OpenAIChatPrompt>(promptTemplate: StructureFromTextPromptTemplate<INPUT_PROMPT, OpenAIChatPrompt> | FlexibleStructureFromTextPromptTemplate<INPUT_PROMPT, unknown>): StructureFromTextStreamingModel<INPUT_PROMPT, unknown, TextStreamingModel<unknown, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>> | StructureFromTextStreamingModel<INPUT_PROMPT, OpenAIChatPrompt, TextStreamingModel<OpenAIChatPrompt, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>>;
-    /**
-     * Returns this model with a text prompt template.
-     */
     withTextPrompt(): PromptTemplateFullTextModel<string, OpenAIChatPrompt, OpenAIChatSettings, this>;
-    /**
-     * Returns this model with an instruction prompt template.
-     */
     withInstructionPrompt(): PromptTemplateFullTextModel<import("../../index.js").InstructionPrompt, OpenAIChatPrompt, OpenAIChatSettings, this>;
-    /**
-     * Returns this model with a chat prompt template.
-     */
     withChatPrompt(): PromptTemplateFullTextModel<import("../../index.js").ChatPrompt, OpenAIChatPrompt, OpenAIChatSettings, this>;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, OpenAIChatPrompt>): PromptTemplateFullTextModel<INPUT_PROMPT, OpenAIChatPrompt, OpenAIChatSettings, this>;
     withJsonOutput(): this;

package/model-provider/openai/OpenAIChatModel.js

@@ -223,21 +223,12 @@ export class OpenAIChatModel extends AbstractOpenAIChatModel {
                 template: promptTemplate,
             });
     }
-    /**
-     * Returns this model with a text prompt template.
-     */
     withTextPrompt() {
         return this.withPromptTemplate(text());
     }
-    /**
-     * Returns this model with an instruction prompt template.
-     */
     withInstructionPrompt() {
         return this.withPromptTemplate(instruction());
     }
-    /**
-     * Returns this model with a chat prompt template.
-     */
     withChatPrompt() {
         return this.withPromptTemplate(chat());
     }

package/model-provider/openai/OpenAICompletionModel.cjs

@@ -99,15 +99,12 @@ class OpenAICompletionModel extends AbstractOpenAICompletionModel_js_1.AbstractO
         ];
         return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
-    /**
-     * Returns this model with an instruction prompt template.
-     */
+    withTextPrompt() {
+        return this.withPromptTemplate((0, TextPromptTemplate_js_1.text)());
+    }
     withInstructionPrompt() {
         return this.withPromptTemplate((0, TextPromptTemplate_js_1.instruction)());
     }
-    /**
-     * Returns this model with a chat prompt template.
-     */
     withChatPrompt(options) {
         return this.withPromptTemplate((0, TextPromptTemplate_js_1.chat)(options));
     }

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

@@ -1,5 +1,5 @@
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
-import { TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
+import { TextStreamingBaseModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
 import { AbstractOpenAICompletionModel, AbstractOpenAICompletionModelSettings, OpenAICompletionResponse } from "./AbstractOpenAICompletionModel.js";
 import { TikTokenTokenizer } from "./TikTokenTokenizer.js";
@@ -46,7 +46,7 @@ export interface OpenAICompletionModelSettings extends AbstractOpenAICompletionM
  *   "Write a short story about a robot learning to love:\n\n"
  * );
  */
-export declare class OpenAICompletionModel extends AbstractOpenAICompletionModel<OpenAICompletionModelSettings> implements TextStreamingModel<string, OpenAICompletionModelSettings> {
+export declare class OpenAICompletionModel extends AbstractOpenAICompletionModel<OpenAICompletionModelSettings> implements TextStreamingBaseModel<string, OpenAICompletionModelSettings> {
     constructor(settings: OpenAICompletionModelSettings);
     readonly provider: "openai";
     get modelName(): "gpt-3.5-turbo-instruct";
@@ -54,13 +54,8 @@ export declare class OpenAICompletionModel extends AbstractOpenAICompletionModel
     readonly tokenizer: TikTokenTokenizer;
     countPromptTokens(input: string): Promise<number>;
     get settingsForEvent(): Partial<OpenAICompletionModelSettings>;
-    /**
-     * Returns this model with an instruction prompt template.
-     */
+    withTextPrompt(): PromptTemplateTextStreamingModel<string, string, OpenAICompletionModelSettings, this>;
     withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").InstructionPrompt, string, OpenAICompletionModelSettings, this>;
-    /**
-     * Returns this model with a chat prompt template.
-     */
     withChatPrompt(options?: {
         user?: string;
         assistant?: string;