modelfusion 0.116.1 → 0.118.0

package/model-provider/openai/AbstractOpenAIChatModel.js

@@ -87,14 +87,14 @@ export class AbstractOpenAIChatModel extends AbstractModel {
             schema: 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) {
@@ -130,7 +130,7 @@ export class AbstractOpenAIChatModel extends 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: OpenAIChatResponseFormat.json,
             toolChoice: {
                 type: "function",
@@ -147,20 +147,20 @@ export class AbstractOpenAIChatModel extends 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: 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: OpenAIChatResponseFormat.json,
             toolChoice: "auto",
             tools: tools.map((tool) => ({
@@ -172,16 +172,16 @@ export class AbstractOpenAIChatModel extends 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: parseJSON({ text: toolCall.function.arguments }),
             })) ?? null,
-            usage: this.extractUsage(response),
+            usage: this.extractUsage(rawResponse),
         };
     }
     extractUsage(response) {

package/model-provider/openai/AbstractOpenAICompletionModel.cjs

@@ -79,19 +79,19 @@ class AbstractOpenAICompletionModel extends AbstractModel_js_1.AbstractModel {
             schema: (0, ZodSchema_js_1.zodSchema)(OpenAICompletionResponseSchema),
         }));
     }
-    processTextGenerationResponse(response) {
+    processTextGenerationResponse(rawResponse) {
         return {
-            response,
-            textGenerationResults: response.choices.map((choice) => {
+            rawResponse,
+            textGenerationResults: rawResponse.choices.map((choice) => {
                 return {
                     finishReason: this.translateFinishReason(choice.finish_reason),
                     text: choice.text,
                 };
             }),
             usage: {
-                promptTokens: response.usage.prompt_tokens,
-                completionTokens: response.usage.completion_tokens,
-                totalTokens: response.usage.total_tokens,
+                promptTokens: rawResponse.usage.prompt_tokens,
+                completionTokens: rawResponse.usage.completion_tokens,
+                totalTokens: rawResponse.usage.total_tokens,
             },
         };
     }

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

@@ -31,7 +31,7 @@ export declare abstract class AbstractOpenAICompletionModel<SETTINGS extends Abs
         responseFormat: OpenAITextResponseFormatType<RESULT>;
     }): Promise<RESULT>;
     doGenerateTexts(prompt: string, options: FunctionCallOptions): Promise<{
-        response: {
+        rawResponse: {
             object: "text_completion";
             model: string;
             usage: {
@@ -60,7 +60,7 @@ export declare abstract class AbstractOpenAICompletionModel<SETTINGS extends Abs
         };
     }>;
     restoreGeneratedTexts(rawResponse: unknown): {
-        response: {
+        rawResponse: {
             object: "text_completion";
             model: string;
             usage: {

package/model-provider/openai/AbstractOpenAICompletionModel.js

@@ -76,19 +76,19 @@ export class AbstractOpenAICompletionModel extends AbstractModel {
             schema: zodSchema(OpenAICompletionResponseSchema),
         }));
     }
-    processTextGenerationResponse(response) {
+    processTextGenerationResponse(rawResponse) {
         return {
-            response,
-            textGenerationResults: response.choices.map((choice) => {
+            rawResponse,
+            textGenerationResults: rawResponse.choices.map((choice) => {
                 return {
                     finishReason: this.translateFinishReason(choice.finish_reason),
                     text: choice.text,
                 };
             }),
             usage: {
-                promptTokens: response.usage.prompt_tokens,
-                completionTokens: response.usage.completion_tokens,
-                totalTokens: response.usage.total_tokens,
+                promptTokens: rawResponse.usage.prompt_tokens,
+                completionTokens: rawResponse.usage.completion_tokens,
+                totalTokens: rawResponse.usage.total_tokens,
             },
         };
     }

package/model-provider/openai/OpenAIImageGenerationModel.cjs

@@ -127,12 +127,12 @@ class OpenAIImageGenerationModel 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, {
             responseFormat: exports.OpenAIImageGenerationResponseFormat.base64Json,
         });
         return {
-            response,
-            base64Images: response.data.map((item) => item.b64_json),
+            rawResponse,
+            base64Images: rawResponse.data.map((item) => item.b64_json),
         };
     }
     withPromptTemplate(promptTemplate) {

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

@@ -52,7 +52,7 @@ export declare class OpenAIImageGenerationModel extends AbstractModel<OpenAIImag
     }): Promise<RESULT>;
     get settingsForEvent(): Partial<OpenAIImageGenerationSettings>;
     doGenerateImages(prompt: string, options: FunctionCallOptions): Promise<{
-        response: {
+        rawResponse: {
             data: {
                 b64_json: string;
             }[];

package/model-provider/openai/OpenAIImageGenerationModel.js

@@ -123,12 +123,12 @@ export class OpenAIImageGenerationModel 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, {
             responseFormat: OpenAIImageGenerationResponseFormat.base64Json,
         });
         return {
-            response,
-            base64Images: response.data.map((item) => item.b64_json),
+            rawResponse,
+            base64Images: rawResponse.data.map((item) => item.b64_json),
         };
     }
     withPromptTemplate(promptTemplate) {

package/model-provider/openai/OpenAITextEmbeddingModel.cjs

@@ -125,10 +125,10 @@ class OpenAITextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
         if (texts.length > this.maxValuesPerCall) {
             throw new Error(`The OpenAI embedding API only supports ${this.maxValuesPerCall} texts per API call.`);
         }
-        const response = await this.callAPI(texts, callOptions);
+        const rawResponse = await this.callAPI(texts, callOptions);
         return {
-            response,
-            embeddings: response.data.map((data) => data.embedding),
+            rawResponse,
+            embeddings: rawResponse.data.map((data) => data.embedding),
         };
     }
     withSettings(additionalSettings) {

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

@@ -50,7 +50,7 @@ export declare class OpenAITextEmbeddingModel extends AbstractModel<OpenAITextEm
     callAPI(texts: Array<string>, callOptions: FunctionCallOptions): Promise<OpenAITextEmbeddingResponse>;
     get settingsForEvent(): Partial<OpenAITextEmbeddingModelSettings>;
     doEmbedValues(texts: string[], callOptions: FunctionCallOptions): Promise<{
-        response: {
+        rawResponse: {
             object: "list";
             model: string;
             usage: {

package/model-provider/openai/OpenAITextEmbeddingModel.js

@@ -120,10 +120,10 @@ export class OpenAITextEmbeddingModel extends AbstractModel {
         if (texts.length > this.maxValuesPerCall) {
             throw new Error(`The OpenAI embedding API only supports ${this.maxValuesPerCall} texts per API call.`);
         }
-        const response = await this.callAPI(texts, callOptions);
+        const rawResponse = await this.callAPI(texts, callOptions);
         return {
-            response,
-            embeddings: response.data.map((data) => data.embedding),
+            rawResponse,
+            embeddings: rawResponse.data.map((data) => data.embedding),
         };
     }
     withSettings(additionalSettings) {

package/model-provider/openai/OpenAITranscriptionModel.cjs

@@ -55,12 +55,12 @@ class OpenAITranscriptionModel extends AbstractModel_js_1.AbstractModel {
         return this.settings.model;
     }
     async doTranscribe(data, options) {
-        const response = await this.callAPI(data, options, {
+        const rawResponse = await this.callAPI(data, options, {
             responseFormat: exports.OpenAITranscriptionResponseFormat.verboseJson,
         });
         return {
-            response,
-            transcription: response.text,
+            rawResponse,
+            transcription: rawResponse.text,
         };
     }
     async callAPI(data, callOptions, options) {

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

@@ -66,7 +66,7 @@ export declare class OpenAITranscriptionModel extends AbstractModel<OpenAITransc
     readonly provider: "openai";
     get modelName(): "whisper-1";
     doTranscribe(data: OpenAITranscriptionInput, options: FunctionCallOptions): Promise<{
-        response: {
+        rawResponse: {
             text: string;
             duration: number;
             task: "transcribe";

package/model-provider/openai/OpenAITranscriptionModel.js

@@ -51,12 +51,12 @@ export class OpenAITranscriptionModel extends AbstractModel {
         return this.settings.model;
     }
     async doTranscribe(data, options) {
-        const response = await this.callAPI(data, options, {
+        const rawResponse = await this.callAPI(data, options, {
             responseFormat: OpenAITranscriptionResponseFormat.verboseJson,
         });
         return {
-            response,
-            transcription: response.text,
+            rawResponse,
+            transcription: rawResponse.text,
         };
     }
     async callAPI(data, callOptions, options) {

package/model-provider/stability/StabilityImageGenerationModel.cjs

@@ -94,10 +94,10 @@ class StabilityImageGenerationModel extends AbstractModel_js_1.AbstractModel {
         };
     }
     async doGenerateImages(prompt, callOptions) {
-        const response = await this.callAPI(prompt, callOptions);
+        const rawResponse = await this.callAPI(prompt, callOptions);
         return {
-            response,
-            base64Images: response.artifacts.map((artifact) => artifact.base64),
+            rawResponse,
+            base64Images: rawResponse.artifacts.map((artifact) => artifact.base64),
         };
     }
     withTextPrompt() {

package/model-provider/stability/StabilityImageGenerationModel.d.ts

@@ -67,7 +67,7 @@ export declare class StabilityImageGenerationModel extends AbstractModel<Stabili
     callAPI(input: StabilityImageGenerationPrompt, callOptions: FunctionCallOptions): Promise<StabilityImageGenerationResponse>;
     get settingsForEvent(): Partial<StabilityImageGenerationSettings>;
     doGenerateImages(prompt: StabilityImageGenerationPrompt, callOptions: FunctionCallOptions): Promise<{
-        response: {
+        rawResponse: {
             artifacts: {
                 base64: string;
                 finishReason: "ERROR" | "SUCCESS" | "CONTENT_FILTERED";

package/model-provider/stability/StabilityImageGenerationModel.js

@@ -91,10 +91,10 @@ export class StabilityImageGenerationModel extends AbstractModel {
         };
     }
     async doGenerateImages(prompt, callOptions) {
-        const response = await this.callAPI(prompt, callOptions);
+        const rawResponse = await this.callAPI(prompt, callOptions);
         return {
-            response,
-            base64Images: response.artifacts.map((artifact) => artifact.base64),
+            rawResponse,
+            base64Images: rawResponse.artifacts.map((artifact) => artifact.base64),
         };
     }
     withTextPrompt() {

package/model-provider/whispercpp/WhisperCppTranscriptionModel.cjs

@@ -26,10 +26,10 @@ class WhisperCppTranscriptionModel extends AbstractModel_js_1.AbstractModel {
         });
     }
     async doTranscribe(data, options) {
-        const response = await this.callAPI(data, options);
+        const rawResponse = await this.callAPI(data, options);
         return {
-            response,
-            transcription: response.text,
+            rawResponse,
+            transcription: rawResponse.text,
         };
     }
     async callAPI(data, callOptions) {

package/model-provider/whispercpp/WhisperCppTranscriptionModel.d.ts

@@ -16,7 +16,7 @@ export declare class WhisperCppTranscriptionModel extends AbstractModel<WhisperC
     readonly provider: "whispercpp";
     readonly modelName: null;
     doTranscribe(data: WhisperCppTranscriptionInput, options: FunctionCallOptions): Promise<{
-        response: {
+        rawResponse: {
             text: string;
         };
         transcription: string;

package/model-provider/whispercpp/WhisperCppTranscriptionModel.js

@@ -23,10 +23,10 @@ export class WhisperCppTranscriptionModel extends AbstractModel {
         });
     }
     async doTranscribe(data, options) {
-        const response = await this.callAPI(data, options);
+        const rawResponse = await this.callAPI(data, options);
         return {
-            response,
-            transcription: response.text,
+            rawResponse,
+            transcription: rawResponse.text,
         };
     }
     async callAPI(data, callOptions) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modelfusion",
   "description": "The TypeScript library for building AI applications.",
-  "version": "0.116.1",
+  "version": "0.118.0",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [

package/tool/generate-tool-call/TextGenerationToolCallModel.cjs

@@ -30,13 +30,13 @@ class TextGenerationToolCallModel {
         return this.model.settingsForEvent;
     }
     async doGenerateToolCall(tool, prompt, options) {
-        const { response, text, metadata } = await (0, generateText_js_1.generateText)(this.model, this.format.createPrompt(prompt, tool), {
+        const { rawResponse, text, metadata } = await (0, generateText_js_1.generateText)(this.model, this.format.createPrompt(prompt, tool), {
             ...options,
             fullResponse: true,
         });
         try {
             return {
-                response,
+                rawResponse,
                 toolCall: this.format.extractToolCall(text, tool),
                 usage: metadata?.usage,
             };

package/tool/generate-tool-call/TextGenerationToolCallModel.d.ts

@@ -20,7 +20,7 @@ export declare class TextGenerationToolCallModel<SOURCE_PROMPT, TARGET_PROMPT, M
     get settings(): TextGenerationModelSettings;
     get settingsForEvent(): Partial<MODEL["settings"]>;
     doGenerateToolCall(tool: ToolDefinition<string, unknown>, prompt: SOURCE_PROMPT, options?: FunctionOptions): Promise<{
-        response: unknown;
+        rawResponse: unknown;
         toolCall: {
             id: string;
             args: unknown;

package/tool/generate-tool-call/TextGenerationToolCallModel.js

@@ -27,13 +27,13 @@ export class TextGenerationToolCallModel {
         return this.model.settingsForEvent;
     }
     async doGenerateToolCall(tool, prompt, options) {
-        const { response, text, metadata } = await generateText(this.model, this.format.createPrompt(prompt, tool), {
+        const { rawResponse, text, metadata } = await generateText(this.model, this.format.createPrompt(prompt, tool), {
             ...options,
             fullResponse: true,
         });
         try {
             return {
-                response,
+                rawResponse,
                 toolCall: this.format.extractToolCall(text, tool),
                 usage: metadata?.usage,
             };

package/tool/generate-tool-call/ToolCallGenerationEvent.d.ts

@@ -4,7 +4,7 @@ export interface ToolCallGenerationStartedEvent extends BaseModelCallStartedEven
 }
 export type ToolCallGenerationFinishedEventResult = {
     status: "success";
-    response: unknown;
+    rawResponse: unknown;
     value: unknown;
     usage?: {
         promptTokens: number;

package/tool/generate-tool-call/ToolCallGenerationModel.d.ts

@@ -5,7 +5,7 @@ export interface ToolCallGenerationModelSettings extends ModelSettings {
 }
 export interface ToolCallGenerationModel<PROMPT, SETTINGS extends ToolCallGenerationModelSettings = ToolCallGenerationModelSettings> extends Model<SETTINGS> {
     doGenerateToolCall(tool: ToolDefinition<string, unknown>, prompt: PROMPT, options?: FunctionOptions): PromiseLike<{
-        response: unknown;
+        rawResponse: unknown;
         toolCall: {
             id: string;
             args: unknown;

package/tool/generate-tool-call/generateToolCall.cjs

@@ -33,7 +33,7 @@ async function generateToolCall(model, tool, prompt, options) {
                     });
                 }
                 return {
-                    response: result.response,
+                    rawResponse: result.rawResponse,
                     extractedValue: {
                         id: toolCall.id,
                         name: tool.name,
@@ -57,7 +57,7 @@ async function generateToolCall(model, tool, prompt, options) {
     return options?.fullResponse
         ? {
             toolCall: fullResponse.value,
-            response: fullResponse.response,
+            response: fullResponse.rawResponse,
             metadata: fullResponse.metadata,
         }
         : fullResponse.value;

package/tool/generate-tool-call/generateToolCall.js

@@ -30,7 +30,7 @@ export async function generateToolCall(model, tool, prompt, options) {
                     });
                 }
                 return {
-                    response: result.response,
+                    rawResponse: result.rawResponse,
                     extractedValue: {
                         id: toolCall.id,
                         name: tool.name,
@@ -54,7 +54,7 @@ export async function generateToolCall(model, tool, prompt, options) {
     return options?.fullResponse
         ? {
             toolCall: fullResponse.value,
-            response: fullResponse.response,
+            response: fullResponse.rawResponse,
             metadata: fullResponse.metadata,
         }
         : fullResponse.value;

package/tool/generate-tool-calls/TextGenerationToolCallsModel.cjs

@@ -30,14 +30,14 @@ class TextGenerationToolCallsModel {
         return this.model.settingsForEvent;
     }
     async doGenerateToolCalls(tools, prompt, options) {
-        const { response, text: generatedText, metadata, } = await (0, generateText_js_1.generateText)(this.model, this.template.createPrompt(prompt, tools), {
+        const { rawResponse, text: generatedText, metadata, } = await (0, generateText_js_1.generateText)(this.model, this.template.createPrompt(prompt, tools), {
             ...options,
             fullResponse: true,
         });
         try {
             const { text, toolCalls } = this.template.extractToolCallsAndText(generatedText);
             return {
-                response,
+                rawResponse,
                 text,
                 toolCalls,
                 usage: metadata?.usage,

package/tool/generate-tool-calls/TextGenerationToolCallsModel.d.ts

@@ -14,7 +14,7 @@ export declare class TextGenerationToolCallsModel<SOURCE_PROMPT, TARGET_PROMPT,
     get settings(): ToolCallsGenerationModelSettings;
     get settingsForEvent(): Partial<MODEL["settings"]>;
     doGenerateToolCalls(tools: Array<ToolDefinition<string, unknown>>, prompt: SOURCE_PROMPT, options?: FunctionOptions): Promise<{
-        response: unknown;
+        rawResponse: unknown;
         text: string | null;
         toolCalls: {
             id: string;

package/tool/generate-tool-calls/TextGenerationToolCallsModel.js

@@ -27,14 +27,14 @@ export class TextGenerationToolCallsModel {
         return this.model.settingsForEvent;
     }
     async doGenerateToolCalls(tools, prompt, options) {
-        const { response, text: generatedText, metadata, } = await generateText(this.model, this.template.createPrompt(prompt, tools), {
+        const { rawResponse, text: generatedText, metadata, } = await generateText(this.model, this.template.createPrompt(prompt, tools), {
             ...options,
             fullResponse: true,
         });
         try {
             const { text, toolCalls } = this.template.extractToolCallsAndText(generatedText);
             return {
-                response,
+                rawResponse,
                 text,
                 toolCalls,
                 usage: metadata?.usage,

package/tool/generate-tool-calls/ToolCallsGenerationEvent.d.ts

@@ -4,7 +4,7 @@ export interface ToolCallsGenerationStartedEvent extends BaseModelCallStartedEve
 }
 export type ToolCallsGenerationFinishedEventResult = {
     status: "success";
-    response: unknown;
+    rawResponse: unknown;
     value: unknown;
     usage?: {
         promptTokens: number;

package/tool/generate-tool-calls/ToolCallsGenerationModel.d.ts

@@ -5,7 +5,7 @@ export interface ToolCallsGenerationModelSettings extends ModelSettings {
 }
 export interface ToolCallsGenerationModel<PROMPT, SETTINGS extends ToolCallsGenerationModelSettings> extends Model<SETTINGS> {
     doGenerateToolCalls(tools: Array<ToolDefinition<string, unknown>>, prompt: PROMPT, options?: FunctionOptions): PromiseLike<{
-        response: unknown;
+        rawResponse: unknown;
         text: string | null;
         toolCalls: Array<{
             id: string;

package/tool/generate-tool-calls/generateToolCalls.cjs

@@ -20,7 +20,7 @@ async function generateToolCalls(model, tools, prompt, options) {
             // no tool calls:
             if (rawToolCalls == null) {
                 return {
-                    response: result.response,
+                    rawResponse: result.rawResponse,
                     extractedValue: { text, toolCalls: null },
                     usage: result.usage,
                 };
@@ -49,7 +49,7 @@ async function generateToolCalls(model, tools, prompt, options) {
                 };
             });
             return {
-                response: result.response,
+                rawResponse: result.rawResponse,
                 extractedValue: {
                     text,
                     toolCalls: toolCalls,

package/tool/generate-tool-calls/generateToolCalls.d.ts

@@ -27,7 +27,7 @@ export declare function generateToolCalls<TOOLS extends ToolDefinition<any, any>
         text: string | null;
         toolCalls: Array<ToOutputValue<TOOLS>>;
     };
-    response: unknown;
+    rawResponse: unknown;
     metadata: ModelCallMetadata;
 }>;
 export {};

package/tool/generate-tool-calls/generateToolCalls.js

@@ -17,7 +17,7 @@ export async function generateToolCalls(model, tools, prompt, options) {
             // no tool calls:
             if (rawToolCalls == null) {
                 return {
-                    response: result.response,
+                    rawResponse: result.rawResponse,
                     extractedValue: { text, toolCalls: null },
                     usage: result.usage,
                 };
@@ -46,7 +46,7 @@ export async function generateToolCalls(model, tools, prompt, options) {
                 };
             });
             return {
-                response: result.response,
+                rawResponse: result.rawResponse,
                 extractedValue: {
                     text,
                     toolCalls: toolCalls,