modelfusion 0.116.1 → 0.118.0

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: {

package/model-provider/mistral/MistralTextEmbeddingModel.js

@@ -76,10 +76,10 @@ export class MistralTextEmbeddingModel extends 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/ollama/OllamaChatModel.cjs

@@ -129,12 +129,12 @@ class OllamaChatModel extends AbstractModel_js_1.AbstractModel {
             schema: (0, ZodSchema_js_1.zodSchema)(ollamaChatResponseSchema),
         }));
     }
-    processTextGenerationResponse(response) {
+    processTextGenerationResponse(rawResponse) {
         return {
-            response,
+            rawResponse,
             textGenerationResults: [
                 {
-                    text: response.message.content,
+                    text: rawResponse.message.content,
                     finishReason: "unknown",
                 },
             ],

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

@@ -39,7 +39,7 @@ export declare class OllamaChatModel extends AbstractModel<OllamaChatModelSettin
     }): Promise<RESPONSE>;
     get settingsForEvent(): Partial<OllamaChatModelSettings>;
     doGenerateTexts(prompt: OllamaChatPrompt, options: FunctionCallOptions): Promise<{
-        response: {
+        rawResponse: {
             model: string;
             message: {
                 role: string;
@@ -60,7 +60,7 @@ export declare class OllamaChatModel extends AbstractModel<OllamaChatModelSettin
         }[];
     }>;
     restoreGeneratedTexts(rawResponse: unknown): {
-        response: {
+        rawResponse: {
             model: string;
             message: {
                 role: string;

package/model-provider/ollama/OllamaChatModel.js

@@ -126,12 +126,12 @@ export class OllamaChatModel extends AbstractModel {
             schema: zodSchema(ollamaChatResponseSchema),
         }));
     }
-    processTextGenerationResponse(response) {
+    processTextGenerationResponse(rawResponse) {
         return {
-            response,
+            rawResponse,
             textGenerationResults: [
                 {
-                    text: response.message.content,
+                    text: rawResponse.message.content,
                     finishReason: "unknown",
                 },
             ],

package/model-provider/ollama/OllamaCompletionModel.cjs

@@ -130,12 +130,12 @@ class OllamaCompletionModel extends AbstractModel_js_1.AbstractModel {
             schema: (0, ZodSchema_js_1.zodSchema)(ollamaCompletionResponseSchema),
         }));
     }
-    processTextGenerationResponse(response) {
+    processTextGenerationResponse(rawResponse) {
         return {
-            response,
+            rawResponse,
             textGenerationResults: [
                 {
-                    text: response.response,
+                    text: rawResponse.response,
                     finishReason: "unknown",
                 },
             ],

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

@@ -52,10 +52,10 @@ export declare class OllamaCompletionModel<CONTEXT_WINDOW_SIZE extends number |
     }): Promise<RESPONSE>;
     get settingsForEvent(): Partial<OllamaCompletionModelSettings<CONTEXT_WINDOW_SIZE>>;
     doGenerateTexts(prompt: OllamaCompletionPrompt, options: FunctionCallOptions): Promise<{
-        response: {
-            response: string;
+        rawResponse: {
             model: string;
             done: true;
+            response: string;
             created_at: string;
             total_duration: number;
             prompt_eval_count: number;
@@ -71,10 +71,10 @@ export declare class OllamaCompletionModel<CONTEXT_WINDOW_SIZE extends number |
         }[];
     }>;
     restoreGeneratedTexts(rawResponse: unknown): {
-        response: {
-            response: string;
+        rawResponse: {
             model: string;
             done: true;
+            response: string;
             created_at: string;
             total_duration: number;
             prompt_eval_count: number;
@@ -89,11 +89,11 @@ export declare class OllamaCompletionModel<CONTEXT_WINDOW_SIZE extends number |
             finishReason: "unknown";
         }[];
     };
-    processTextGenerationResponse(response: OllamaCompletionResponse): {
-        response: {
-            response: string;
+    processTextGenerationResponse(rawResponse: OllamaCompletionResponse): {
+        rawResponse: {
             model: string;
             done: true;
+            response: string;
             created_at: string;
             total_duration: number;
             prompt_eval_count: number;
@@ -109,9 +109,9 @@ export declare class OllamaCompletionModel<CONTEXT_WINDOW_SIZE extends number |
         }[];
     };
     doStreamText(prompt: OllamaCompletionPrompt, options: FunctionCallOptions): Promise<AsyncIterable<import("../../index.js").Delta<{
-        response: string;
         model: string;
         done: false;
+        response: string;
         created_at: string;
     } | {
         model: string;
@@ -151,9 +151,9 @@ declare const ollamaCompletionResponseSchema: z.ZodObject<{
     eval_duration: z.ZodNumber;
     context: z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>;
 }, "strip", z.ZodTypeAny, {
-    response: string;
     model: string;
     done: true;
+    response: string;
     created_at: string;
     total_duration: number;
     prompt_eval_count: number;
@@ -163,9 +163,9 @@ declare const ollamaCompletionResponseSchema: z.ZodObject<{
     prompt_eval_duration?: number | undefined;
     context?: number[] | undefined;
 }, {
-    response: string;
     model: string;
     done: true;
+    response: string;
     created_at: string;
     total_duration: number;
     prompt_eval_count: number;
@@ -182,14 +182,14 @@ declare const ollamaCompletionStreamChunkSchema: z.ZodDiscriminatedUnion<"done",
     created_at: z.ZodString;
     response: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    response: string;
     model: string;
     done: false;
+    response: string;
     created_at: string;
 }, {
-    response: string;
     model: string;
     done: false;
+    response: string;
     created_at: string;
 }>, z.ZodObject<{
     done: z.ZodLiteral<true>;
@@ -247,9 +247,9 @@ export declare const OllamaCompletionResponseFormat: {
             requestBodyValues: unknown;
             response: Response;
         }) => Promise<{
-            response: string;
             model: string;
             done: true;
+            response: string;
             created_at: string;
             total_duration: number;
             prompt_eval_count: number;
@@ -269,9 +269,9 @@ export declare const OllamaCompletionResponseFormat: {
         handler: ({ response }: {
             response: Response;
         }) => Promise<AsyncIterable<import("../../index.js").Delta<{
-            response: string;
             model: string;
             done: false;
+            response: string;
             created_at: string;
         } | {
             model: string;

package/model-provider/ollama/OllamaCompletionModel.js

@@ -127,12 +127,12 @@ export class OllamaCompletionModel extends AbstractModel {
             schema: zodSchema(ollamaCompletionResponseSchema),
         }));
     }
-    processTextGenerationResponse(response) {
+    processTextGenerationResponse(rawResponse) {
         return {
-            response,
+            rawResponse,
             textGenerationResults: [
                 {
-                    text: response.response,
+                    text: rawResponse.response,
                     finishReason: "unknown",
                 },
             ],

package/model-provider/ollama/OllamaTextEmbeddingModel.cjs

@@ -66,10 +66,10 @@ class OllamaTextEmbeddingModel 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/ollama/OllamaTextEmbeddingModel.d.ts

@@ -19,7 +19,7 @@ export declare class OllamaTextEmbeddingModel extends AbstractModel<OllamaTextEm
     callAPI(texts: Array<string>, callOptions: FunctionCallOptions): Promise<OllamaTextEmbeddingResponse>;
     get settingsForEvent(): Partial<OllamaTextEmbeddingModelSettings>;
     doEmbedValues(texts: string[], options: FunctionCallOptions): Promise<{
-        response: {
+        rawResponse: {
             embedding: number[];
         };
         embeddings: number[][];

package/model-provider/ollama/OllamaTextEmbeddingModel.js

@@ -63,10 +63,10 @@ export class OllamaTextEmbeddingModel 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/openai/AbstractOpenAIChatModel.cjs

@@ -90,14 +90,14 @@ class AbstractOpenAIChatModel extends AbstractModel_js_1.AbstractModel {
             schema: (0, ZodSchema_js_1.zodSchema)(openAIChatResponseSchema),
         }));
     }
-    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),
             })),
-            usage: this.extractUsage(response),
+            usage: this.extractUsage(rawResponse),
         };
     }
     translateFinishReason(finishReason) {
@@ -133,7 +133,7 @@ class AbstractOpenAIChatModel extends AbstractModel_js_1.AbstractModel {
         return firstChoice.delta.content ?? undefined;
     }
     async doGenerateToolCall(tool, prompt, options) {
-        const response = await this.callAPI(prompt, options, {
+        const rawResponse = await this.callAPI(prompt, options, {
             responseFormat: exports.OpenAIChatResponseFormat.json,
             toolChoice: {
                 type: "function",
@@ -150,20 +150,20 @@ class AbstractOpenAIChatModel extends AbstractModel_js_1.AbstractModel {
                 },
             ],
         });
-        const toolCalls = response.choices[0]?.message.tool_calls;
+        const toolCalls = rawResponse.choices[0]?.message.tool_calls;
         return {
-            response,
+            rawResponse,
             toolCall: toolCalls == null || toolCalls.length === 0
                 ? null
                 : {
                     id: toolCalls[0].id,
                     args: (0, parseJSON_js_1.parseJSON)({ text: toolCalls[0].function.arguments }),
                 },
-            usage: this.extractUsage(response),
+            usage: this.extractUsage(rawResponse),
         };
     }
     async doGenerateToolCalls(tools, prompt, options) {
-        const response = await this.callAPI(prompt, options, {
+        const rawResponse = await this.callAPI(prompt, options, {
             responseFormat: exports.OpenAIChatResponseFormat.json,
             toolChoice: "auto",
             tools: tools.map((tool) => ({
@@ -175,16 +175,16 @@ class AbstractOpenAIChatModel extends AbstractModel_js_1.AbstractModel {
                 },
             })),
         });
-        const message = response.choices[0]?.message;
+        const message = rawResponse.choices[0]?.message;
         return {
-            response,
+            rawResponse,
             text: message.content ?? null,
             toolCalls: message.tool_calls?.map((toolCall) => ({
                 id: toolCall.id,
                 name: toolCall.function.name,
                 args: (0, parseJSON_js_1.parseJSON)({ text: toolCall.function.arguments }),
             })) ?? null,
-            usage: this.extractUsage(response),
+            usage: this.extractUsage(rawResponse),
         };
     }
     extractUsage(response) {

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

@@ -90,7 +90,7 @@ export declare abstract class AbstractOpenAIChatModel<SETTINGS extends AbstractO
         toolChoice?: AbstractOpenAIChatSettings["toolChoice"];
     }): Promise<RESULT>;
     doGenerateTexts(prompt: OpenAIChatPrompt, options: FunctionCallOptions): Promise<{
-        response: {
+        rawResponse: {
             object: "chat.completion";
             model: string;
             usage: {
@@ -134,7 +134,7 @@ export declare abstract class AbstractOpenAIChatModel<SETTINGS extends AbstractO
         };
     }>;
     restoreGeneratedTexts(rawResponse: unknown): {
-        response: {
+        rawResponse: {
             object: "chat.completion";
             model: string;
             usage: {
@@ -177,8 +177,8 @@ export declare abstract class AbstractOpenAIChatModel<SETTINGS extends AbstractO
             totalTokens: number;
         };
     };
-    processTextGenerationResponse(response: OpenAIChatResponse): {
-        response: {
+    processTextGenerationResponse(rawResponse: OpenAIChatResponse): {
+        rawResponse: {
             object: "chat.completion";
             model: string;
             usage: {
@@ -251,7 +251,7 @@ export declare abstract class AbstractOpenAIChatModel<SETTINGS extends AbstractO
     }>>>;
     extractTextDelta(delta: unknown): string | undefined;
     doGenerateToolCall(tool: ToolDefinition<string, unknown>, prompt: OpenAIChatPrompt, options: FunctionCallOptions): Promise<{
-        response: {
+        rawResponse: {
             object: "chat.completion";
             model: string;
             usage: {
@@ -295,7 +295,7 @@ export declare abstract class AbstractOpenAIChatModel<SETTINGS extends AbstractO
         };
     }>;
     doGenerateToolCalls(tools: Array<ToolDefinition<string, unknown>>, prompt: OpenAIChatPrompt, options: FunctionCallOptions): Promise<{
-        response: {
+        rawResponse: {
             object: "chat.completion";
             model: string;
             usage: {