modelfusion 0.92.0 → 0.93.0

package/model-provider/ollama/OllamaTextGenerationModel.js

@@ -1,9 +1,11 @@
 import { z } from "zod";
+import { ApiCallError } from "../../core/api/ApiCallError.js";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
-import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
+import { postJsonToApi } from "../../core/api/postToApi.js";
 import { ZodSchema } from "../../core/schema/ZodSchema.js";
+import { safeParseJSON } from "../../core/schema/parseJSON.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { PromptFormatTextStreamingModel } from "../../model-function/generate-text/PromptFormatTextStreamingModel.js";
+import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { TextGenerationToolCallModel, } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
 import { TextGenerationToolCallsOrGenerateTextModel, } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
 import { AsyncQueue } from "../../util/AsyncQueue.js";
@@ -93,27 +95,27 @@ export class OllamaTextGenerationModel extends AbstractModel {
             responseFormat: OllamaTextGenerationResponseFormat.deltaIterable,
         });
     }
-    asToolCallGenerationModel(promptFormat) {
+    asToolCallGenerationModel(promptTemplate) {
         return new TextGenerationToolCallModel({
             model: this,
-            format: promptFormat,
+            format: promptTemplate,
         });
     }
-    asToolCallsOrTextGenerationModel(promptFormat) {
+    asToolCallsOrTextGenerationModel(promptTemplate) {
         return new TextGenerationToolCallsOrGenerateTextModel({
             model: this,
-            format: promptFormat,
+            template: promptTemplate,
         });
     }
-    withPromptFormat(promptFormat) {
-        return new PromptFormatTextStreamingModel({
+    withPromptTemplate(promptTemplate) {
+        return new PromptTemplateTextStreamingModel({
             model: this.withSettings({
                 stopSequences: [
                     ...(this.settings.stopSequences ?? []),
-                    ...promptFormat.stopSequences,
+                    ...promptTemplate.stopSequences,
                 ],
             }),
-            promptFormat,
+            promptTemplate,
         });
     }
     withSettings(additionalSettings) {
@@ -234,7 +236,42 @@ export const OllamaTextGenerationResponseFormat = {
      */
     json: {
         stream: false,
-        handler: createJsonResponseHandler(ollamaTextGenerationResponseSchema),
+        handler: (async ({ response, url, requestBodyValues }) => {
+            const responseBody = await response.text();
+            const parsedResult = safeParseJSON({
+                text: responseBody,
+                schema: new ZodSchema(z.union([
+                    ollamaTextGenerationResponseSchema,
+                    z.object({
+                        done: z.literal(false),
+                        model: z.string(),
+                        created_at: z.string(),
+                        response: z.string(),
+                    }),
+                ])),
+            });
+            if (!parsedResult.success) {
+                throw new ApiCallError({
+                    message: "Invalid JSON response",
+                    cause: parsedResult.error,
+                    statusCode: response.status,
+                    responseBody,
+                    url,
+                    requestBodyValues,
+                });
+            }
+            if (parsedResult.data.done === false) {
+                throw new ApiCallError({
+                    message: "Incomplete Ollama response received",
+                    statusCode: response.status,
+                    responseBody,
+                    url,
+                    requestBodyValues,
+                    isRetryable: true,
+                });
+            }
+            return parsedResult.data;
+        }),
     },
     /**
      * Returns an async iterable over the full deltas (all choices, including full current state at time of event)

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

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const assert_1 = require("assert");
+const msw_1 = require("msw");
+const node_1 = require("msw/node");
+const ApiCallError_js_1 = require("../../core/api/ApiCallError.cjs");
+const retryNever_js_1 = require("../../core/api/retryNever.cjs");
+const generateText_js_1 = require("../../model-function/generate-text/generateText.cjs");
+const OllamaApiConfiguration_js_1 = require("./OllamaApiConfiguration.cjs");
+const OllamaTextGenerationModel_js_1 = require("./OllamaTextGenerationModel.cjs");
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+let responseBodyJson = {};
+const server = (0, node_1.setupServer)(msw_1.http.post("http://127.0.0.1:11434/api/generate", () => msw_1.HttpResponse.json(responseBodyJson)));
+beforeAll(() => server.listen());
+beforeEach(() => {
+    responseBodyJson = {};
+});
+afterEach(() => server.resetHandlers());
+afterAll(() => server.close());
+describe("generateText", () => {
+    it("should return the generated text", async () => {
+        responseBodyJson = {
+            model: "test-model",
+            created_at: "2023-08-04T19:22:45.499127Z",
+            response: "test response",
+            context: [1, 2, 3],
+            done: true,
+            total_duration: 5589157167,
+            load_duration: 3013701500,
+            sample_count: 114,
+            sample_duration: 81442000,
+            prompt_eval_count: 46,
+            prompt_eval_duration: 1160282000,
+            eval_count: 113,
+            eval_duration: 1325948000,
+        };
+        const result = await (0, generateText_js_1.generateText)(new OllamaTextGenerationModel_js_1.OllamaTextGenerationModel({
+            model: "test-model",
+        }), "test prompt");
+        expect(result).toEqual("test response");
+    });
+    it("should throw retryable ApiCallError when Ollama is overloaded", async () => {
+        responseBodyJson = {
+            model: "",
+            created_at: "0001-01-01T00:00:00Z",
+            response: "",
+            done: false,
+        };
+        try {
+            await (0, generateText_js_1.generateText)(new OllamaTextGenerationModel_js_1.OllamaTextGenerationModel({
+                api: new OllamaApiConfiguration_js_1.OllamaApiConfiguration({
+                    retry: (0, retryNever_js_1.retryNever)(),
+                }),
+                model: "test-model",
+            }), "test prompt");
+            (0, assert_1.fail)("Should have thrown ApiCallError");
+        }
+        catch (expectedError) {
+            expect(expectedError).toBeInstanceOf(ApiCallError_js_1.ApiCallError);
+            expect(expectedError.isRetryable).toBe(true);
+        }
+    });
+});

package/model-provider/ollama/OllamaTextGenerationModel.test.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,61 @@
+import { fail } from "assert";
+import { HttpResponse, http } from "msw";
+import { setupServer } from "msw/node";
+import { ApiCallError } from "../../core/api/ApiCallError.js";
+import { retryNever } from "../../core/api/retryNever.js";
+import { generateText } from "../../model-function/generate-text/generateText.js";
+import { OllamaApiConfiguration } from "./OllamaApiConfiguration.js";
+import { OllamaTextGenerationModel } from "./OllamaTextGenerationModel.js";
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+let responseBodyJson = {};
+const server = setupServer(http.post("http://127.0.0.1:11434/api/generate", () => HttpResponse.json(responseBodyJson)));
+beforeAll(() => server.listen());
+beforeEach(() => {
+    responseBodyJson = {};
+});
+afterEach(() => server.resetHandlers());
+afterAll(() => server.close());
+describe("generateText", () => {
+    it("should return the generated text", async () => {
+        responseBodyJson = {
+            model: "test-model",
+            created_at: "2023-08-04T19:22:45.499127Z",
+            response: "test response",
+            context: [1, 2, 3],
+            done: true,
+            total_duration: 5589157167,
+            load_duration: 3013701500,
+            sample_count: 114,
+            sample_duration: 81442000,
+            prompt_eval_count: 46,
+            prompt_eval_duration: 1160282000,
+            eval_count: 113,
+            eval_duration: 1325948000,
+        };
+        const result = await generateText(new OllamaTextGenerationModel({
+            model: "test-model",
+        }), "test prompt");
+        expect(result).toEqual("test response");
+    });
+    it("should throw retryable ApiCallError when Ollama is overloaded", async () => {
+        responseBodyJson = {
+            model: "",
+            created_at: "0001-01-01T00:00:00Z",
+            response: "",
+            done: false,
+        };
+        try {
+            await generateText(new OllamaTextGenerationModel({
+                api: new OllamaApiConfiguration({
+                    retry: retryNever(),
+                }),
+                model: "test-model",
+            }), "test prompt");
+            fail("Should have thrown ApiCallError");
+        }
+        catch (expectedError) {
+            expect(expectedError).toBeInstanceOf(ApiCallError);
+            expect(expectedError.isRetryable).toBe(true);
+        }
+    });
+});

package/model-provider/ollama/index.cjs

@@ -26,10 +26,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ollama = exports.OllamaError = void 0;
+exports.ollama = void 0;
 __exportStar(require("./OllamaApiConfiguration.cjs"), exports);
-var OllamaError_js_1 = require("./OllamaError.cjs");
-Object.defineProperty(exports, "OllamaError", { enumerable: true, get: function () { return OllamaError_js_1.OllamaError; } });
 exports.ollama = __importStar(require("./OllamaFacade.cjs"));
 __exportStar(require("./OllamaTextEmbeddingModel.cjs"), exports);
 __exportStar(require("./OllamaTextGenerationModel.cjs"), exports);

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

@@ -1,5 +1,5 @@
 export * from "./OllamaApiConfiguration.js";
-export { OllamaError } from "./OllamaError.js";
+export { OllamaErrorData } from "./OllamaError.js";
 export * as ollama from "./OllamaFacade.js";
 export * from "./OllamaTextEmbeddingModel.js";
 export * from "./OllamaTextGenerationModel.js";

package/model-provider/ollama/index.js

@@ -1,5 +1,4 @@
 export * from "./OllamaApiConfiguration.js";
-export { OllamaError } from "./OllamaError.js";
 export * as ollama from "./OllamaFacade.js";
 export * from "./OllamaTextEmbeddingModel.js";
 export * from "./OllamaTextGenerationModel.js";

package/model-provider/openai/OpenAICompletionModel.cjs

@@ -7,8 +7,8 @@ const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
-const PromptFormatTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptFormatTextStreamingModel.cjs");
-const TextPromptFormat_js_1 = require("../../model-function/generate-text/prompt-format/TextPromptFormat.cjs");
+const PromptTemplateTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptTemplateTextStreamingModel.cjs");
+const TextPromptTemplate_js_1 = require("../../model-function/generate-text/prompt-template/TextPromptTemplate.cjs");
 const countTokens_js_1 = require("../../model-function/tokenize-text/countTokens.cjs");
 const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
 const parseEventSourceStream_js_1 = require("../../util/streaming/parseEventSourceStream.cjs");
@@ -239,26 +239,26 @@ class OpenAICompletionModel extends AbstractModel_js_1.AbstractModel {
         });
     }
     /**
-     * Returns this model with an instruction prompt format.
+     * Returns this model with an instruction prompt template.
      */
     withInstructionPrompt() {
-        return this.withPromptFormat((0, TextPromptFormat_js_1.instruction)());
+        return this.withPromptTemplate((0, TextPromptTemplate_js_1.instruction)());
     }
     /**
-     * Returns this model with a chat prompt format.
+     * Returns this model with a chat prompt template.
      */
     withChatPrompt(options) {
-        return this.withPromptFormat((0, TextPromptFormat_js_1.chat)(options));
+        return this.withPromptTemplate((0, TextPromptTemplate_js_1.chat)(options));
     }
-    withPromptFormat(promptFormat) {
-        return new PromptFormatTextStreamingModel_js_1.PromptFormatTextStreamingModel({
+    withPromptTemplate(promptTemplate) {
+        return new PromptTemplateTextStreamingModel_js_1.PromptTemplateTextStreamingModel({
             model: this.withSettings({
                 stopSequences: [
                     ...(this.settings.stopSequences ?? []),
-                    ...promptFormat.stopSequences,
+                    ...promptTemplate.stopSequences,
                 ],
             }),
-            promptFormat,
+            promptTemplate,
         });
     }
     withSettings(additionalSettings) {

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

@@ -4,9 +4,9 @@ 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 { PromptFormatTextStreamingModel } from "../../model-function/generate-text/PromptFormatTextStreamingModel.js";
+import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { TextGenerationModelSettings, TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
-import { TextGenerationPromptFormat } from "../../model-function/generate-text/TextGenerationPromptFormat.js";
+import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
 import { TikTokenTokenizer } from "./TikTokenTokenizer.js";
 /**
  * @see https://platform.openai.com/docs/models/
@@ -174,17 +174,17 @@ export declare class OpenAICompletionModel extends AbstractModel<OpenAICompletio
     }>;
     doStreamText(prompt: string, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
     /**
-     * Returns this model with an instruction prompt format.
+     * Returns this model with an instruction prompt template.
      */
-    withInstructionPrompt(): PromptFormatTextStreamingModel<import("../../index.js").TextInstructionPrompt, string, OpenAICompletionModelSettings, this>;
+    withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").TextInstructionPrompt, string, OpenAICompletionModelSettings, this>;
     /**
-     * Returns this model with a chat prompt format.
+     * Returns this model with a chat prompt template.
      */
     withChatPrompt(options?: {
         user?: string;
         assistant?: string;
-    }): PromptFormatTextStreamingModel<import("../../index.js").TextChatPrompt, string, OpenAICompletionModelSettings, this>;
-    withPromptFormat<INPUT_PROMPT>(promptFormat: TextGenerationPromptFormat<INPUT_PROMPT, string>): PromptFormatTextStreamingModel<INPUT_PROMPT, string, OpenAICompletionModelSettings, this>;
+    }): PromptTemplateTextStreamingModel<import("../../index.js").TextChatPrompt, string, OpenAICompletionModelSettings, this>;
+    withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, string>): PromptTemplateTextStreamingModel<INPUT_PROMPT, string, OpenAICompletionModelSettings, this>;
     withSettings(additionalSettings: Partial<OpenAICompletionModelSettings>): this;
 }
 declare const OpenAICompletionResponseSchema: z.ZodObject<{

package/model-provider/openai/OpenAICompletionModel.js

@@ -4,8 +4,8 @@ import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postTo
 import { ZodSchema } from "../../core/schema/ZodSchema.js";
 import { parseJSON } from "../../core/schema/parseJSON.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { PromptFormatTextStreamingModel } from "../../model-function/generate-text/PromptFormatTextStreamingModel.js";
-import { chat, instruction, } from "../../model-function/generate-text/prompt-format/TextPromptFormat.js";
+import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
+import { chat, instruction, } from "../../model-function/generate-text/prompt-template/TextPromptTemplate.js";
 import { countTokens } from "../../model-function/tokenize-text/countTokens.js";
 import { AsyncQueue } from "../../util/AsyncQueue.js";
 import { parseEventSourceStream } from "../../util/streaming/parseEventSourceStream.js";
@@ -233,26 +233,26 @@ export class OpenAICompletionModel extends AbstractModel {
         });
     }
     /**
-     * Returns this model with an instruction prompt format.
+     * Returns this model with an instruction prompt template.
      */
     withInstructionPrompt() {
-        return this.withPromptFormat(instruction());
+        return this.withPromptTemplate(instruction());
     }
     /**
-     * Returns this model with a chat prompt format.
+     * Returns this model with a chat prompt template.
      */
     withChatPrompt(options) {
-        return this.withPromptFormat(chat(options));
+        return this.withPromptTemplate(chat(options));
     }
-    withPromptFormat(promptFormat) {
-        return new PromptFormatTextStreamingModel({
+    withPromptTemplate(promptTemplate) {
+        return new PromptTemplateTextStreamingModel({
             model: this.withSettings({
                 stopSequences: [
                     ...(this.settings.stopSequences ?? []),
-                    ...promptFormat.stopSequences,
+                    ...promptTemplate.stopSequences,
                 ],
             }),
-            promptFormat,
+            promptTemplate,
         });
     }
     withSettings(additionalSettings) {

package/model-provider/openai/OpenAIError.cjs

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.failedOpenAICallResponseHandler = exports.OpenAIError = exports.openAIErrorDataSchema = void 0;
+exports.failedOpenAICallResponseHandler = void 0;
 const zod_1 = require("zod");
 const ApiCallError_js_1 = require("../../core/api/ApiCallError.cjs");
 const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
-exports.openAIErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
+const openAIErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
     error: zod_1.z.object({
         message: zod_1.z.string(),
         type: zod_1.z.string(),
@@ -13,50 +13,34 @@ exports.openAIErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
         code: zod_1.z.string().nullable(),
     }),
 }));
-class OpenAIError extends ApiCallError_js_1.ApiCallError {
-    constructor({ data, statusCode, url, requestBodyValues, message, }) {
-        super({
-            message,
-            statusCode,
-            requestBodyValues,
-            url,
-            isRetryable: (statusCode === 429 &&
-                // insufficient_quota is also reported as a 429, but it's not retryable:
-                data?.error.type !== "insufficient_quota") ||
-                statusCode >= 500,
-        });
-        Object.defineProperty(this, "data", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.data = data;
-    }
-}
-exports.OpenAIError = OpenAIError;
 const failedOpenAICallResponseHandler = async ({ response, url, requestBodyValues }) => {
     const responseBody = await response.text();
     // resilient parsing in case the response is not JSON or does not match the schema:
     try {
         const parsedError = (0, parseJSON_js_1.parseJSON)({
             text: responseBody,
-            schema: exports.openAIErrorDataSchema,
+            schema: openAIErrorDataSchema,
         });
-        return new OpenAIError({
+        return new ApiCallError_js_1.ApiCallError({
+            message: parsedError.error.message,
             url,
             requestBodyValues,
             statusCode: response.status,
-            message: parsedError.error.message,
+            responseBody,
             data: parsedError,
+            isRetryable: (response.status === 429 &&
+                // insufficient_quota is also reported as a 429, but it's not retryable:
+                parsedError?.error.type !== "insufficient_quota") ||
+                response.status >= 500,
         });
     }
     catch (parseError) {
-        return new OpenAIError({
+        return new ApiCallError_js_1.ApiCallError({
+            message: responseBody.trim() !== "" ? responseBody : response.statusText,
             url,
             requestBodyValues,
             statusCode: response.status,
-            message: responseBody.trim() !== "" ? responseBody : response.statusText,
+            responseBody,
         });
     }
 };

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

@@ -1,7 +1,7 @@
 import { ApiCallError } from "../../core/api/ApiCallError.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
 import { ZodSchema } from "../../core/schema/ZodSchema.js";
-export declare const openAIErrorDataSchema: ZodSchema<{
+declare const openAIErrorDataSchema: ZodSchema<{
     error: {
         message: string;
         code: string | null;
@@ -10,14 +10,5 @@ export declare const openAIErrorDataSchema: ZodSchema<{
     };
 }>;
 export type OpenAIErrorData = (typeof openAIErrorDataSchema)["_type"];
-export declare class OpenAIError extends ApiCallError {
-    readonly data?: OpenAIErrorData;
-    constructor({ data, statusCode, url, requestBodyValues, message, }: {
-        message: string;
-        statusCode: number;
-        url: string;
-        requestBodyValues: unknown;
-        data?: OpenAIErrorData;
-    });
-}
 export declare const failedOpenAICallResponseHandler: ResponseHandler<ApiCallError>;
+export {};

package/model-provider/openai/OpenAIError.js

@@ -2,7 +2,7 @@ import { z } from "zod";
 import { ApiCallError } from "../../core/api/ApiCallError.js";
 import { ZodSchema } from "../../core/schema/ZodSchema.js";
 import { parseJSON } from "../../core/schema/parseJSON.js";
-export const openAIErrorDataSchema = new ZodSchema(z.object({
+const openAIErrorDataSchema = new ZodSchema(z.object({
     error: z.object({
         message: z.string(),
         type: z.string(),
@@ -10,27 +10,6 @@ export const openAIErrorDataSchema = new ZodSchema(z.object({
         code: z.string().nullable(),
     }),
 }));
-export class OpenAIError extends ApiCallError {
-    constructor({ data, statusCode, url, requestBodyValues, message, }) {
-        super({
-            message,
-            statusCode,
-            requestBodyValues,
-            url,
-            isRetryable: (statusCode === 429 &&
-                // insufficient_quota is also reported as a 429, but it's not retryable:
-                data?.error.type !== "insufficient_quota") ||
-                statusCode >= 500,
-        });
-        Object.defineProperty(this, "data", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.data = data;
-    }
-}
 export const failedOpenAICallResponseHandler = async ({ response, url, requestBodyValues }) => {
     const responseBody = await response.text();
     // resilient parsing in case the response is not JSON or does not match the schema:
@@ -39,20 +18,26 @@ export const failedOpenAICallResponseHandler = async ({ response, url, requestBo
             text: responseBody,
             schema: openAIErrorDataSchema,
         });
-        return new OpenAIError({
+        return new ApiCallError({
+            message: parsedError.error.message,
             url,
             requestBodyValues,
             statusCode: response.status,
-            message: parsedError.error.message,
+            responseBody,
             data: parsedError,
+            isRetryable: (response.status === 429 &&
+                // insufficient_quota is also reported as a 429, but it's not retryable:
+                parsedError?.error.type !== "insufficient_quota") ||
+                response.status >= 500,
         });
     }
     catch (parseError) {
-        return new OpenAIError({
+        return new ApiCallError({
+            message: responseBody.trim() !== "" ? responseBody : response.statusText,
             url,
             requestBodyValues,
             statusCode: response.status,
-            message: responseBody.trim() !== "" ? responseBody : response.statusText,
+            responseBody,
         });
     }
 };

package/model-provider/openai/OpenAIImageGenerationModel.cjs

@@ -5,7 +5,7 @@ const zod_1 = require("zod");
 const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
-const PromptFormatImageGenerationModel_js_1 = require("../../model-function/generate-image/PromptFormatImageGenerationModel.cjs");
+const PromptTemplateImageGenerationModel_js_1 = require("../../model-function/generate-image/PromptTemplateImageGenerationModel.cjs");
 const OpenAIApiConfiguration_js_1 = require("./OpenAIApiConfiguration.cjs");
 const OpenAIError_js_1 = require("./OpenAIError.cjs");
 exports.OPENAI_IMAGE_MODELS = {
@@ -122,10 +122,10 @@ class OpenAIImageGenerationModel extends AbstractModel_js_1.AbstractModel {
             base64Image: response.data[0].b64_json,
         };
     }
-    withPromptFormat(promptFormat) {
-        return new PromptFormatImageGenerationModel_js_1.PromptFormatImageGenerationModel({
+    withPromptTemplate(promptTemplate) {
+        return new PromptTemplateImageGenerationModel_js_1.PromptTemplateImageGenerationModel({
             model: this,
-            promptFormat,
+            promptTemplate,
         });
     }
     withSettings(additionalSettings) {

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

@@ -3,9 +3,9 @@ import { FunctionOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { PromptFormat } from "../../model-function/PromptFormat.js";
+import { PromptTemplate } from "../../model-function/PromptTemplate.js";
 import { ImageGenerationModel, ImageGenerationModelSettings } from "../../model-function/generate-image/ImageGenerationModel.js";
-import { PromptFormatImageGenerationModel } from "../../model-function/generate-image/PromptFormatImageGenerationModel.js";
+import { PromptTemplateImageGenerationModel } from "../../model-function/generate-image/PromptTemplateImageGenerationModel.js";
 export declare const OPENAI_IMAGE_MODELS: {
     "dall-e-2": {
         getCost(settings: OpenAIImageGenerationSettings): 2000 | 1800 | 1600 | null;
@@ -61,7 +61,7 @@ export declare class OpenAIImageGenerationModel extends AbstractModel<OpenAIImag
         };
         base64Image: string;
     }>;
-    withPromptFormat<INPUT_PROMPT>(promptFormat: PromptFormat<INPUT_PROMPT, string>): PromptFormatImageGenerationModel<INPUT_PROMPT, string, OpenAIImageGenerationSettings, this>;
+    withPromptTemplate<INPUT_PROMPT>(promptTemplate: PromptTemplate<INPUT_PROMPT, string>): PromptTemplateImageGenerationModel<INPUT_PROMPT, string, OpenAIImageGenerationSettings, this>;
     withSettings(additionalSettings: Partial<OpenAIImageGenerationSettings>): this;
 }
 export type OpenAIImageGenerationResponseFormatType<T> = {

package/model-provider/openai/OpenAIImageGenerationModel.js

@@ -2,7 +2,7 @@ import { z } from "zod";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { PromptFormatImageGenerationModel } from "../../model-function/generate-image/PromptFormatImageGenerationModel.js";
+import { PromptTemplateImageGenerationModel } from "../../model-function/generate-image/PromptTemplateImageGenerationModel.js";
 import { OpenAIApiConfiguration } from "./OpenAIApiConfiguration.js";
 import { failedOpenAICallResponseHandler } from "./OpenAIError.js";
 export const OPENAI_IMAGE_MODELS = {
@@ -118,10 +118,10 @@ export class OpenAIImageGenerationModel extends AbstractModel {
             base64Image: response.data[0].b64_json,
         };
     }
-    withPromptFormat(promptFormat) {
-        return new PromptFormatImageGenerationModel({
+    withPromptTemplate(promptTemplate) {
+        return new PromptTemplateImageGenerationModel({
             model: this,
-            promptFormat,
+            promptTemplate,
         });
     }
     withSettings(additionalSettings) {