modelfusion 0.113.0 → 0.114.1

package/model-function/generate-text/PromptTemplateTextGenerationModel.cjs

@@ -44,6 +44,9 @@ class PromptTemplateTextGenerationModel {
         const mappedPrompt = this.promptTemplate.format(prompt);
         return this.model.doGenerateTexts(mappedPrompt, options);
     }
+    restoreGeneratedTexts(rawResponse) {
+        return this.model.restoreGeneratedTexts(rawResponse);
+    }
     get settingsForEvent() {
         return this.model.settingsForEvent;
     }

package/model-function/generate-text/PromptTemplateTextGenerationModel.d.ts

@@ -1,4 +1,4 @@
-import { FunctionOptions } from "../../core/FunctionOptions.js";
+import { FunctionCallOptions } from "../../core/FunctionOptions.js";
 import { TextGenerationToolCallModel, ToolCallPromptTemplate } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
 import { TextGenerationToolCallsModel } from "../../tool/generate-tool-calls/TextGenerationToolCallsModel.js";
 import { ToolCallsPromptTemplate } from "../../tool/generate-tool-calls/ToolCallsPromptTemplate.js";
@@ -18,7 +18,7 @@ export declare class PromptTemplateTextGenerationModel<PROMPT, MODEL_PROMPT, SET
     get tokenizer(): MODEL["tokenizer"];
     get contextWindowSize(): MODEL["contextWindowSize"];
     get countPromptTokens(): MODEL["countPromptTokens"] extends undefined ? undefined : (prompt: PROMPT) => PromiseLike<number>;
-    doGenerateTexts(prompt: PROMPT, options?: FunctionOptions): PromiseLike<{
+    doGenerateTexts(prompt: PROMPT, options?: FunctionCallOptions): PromiseLike<{
         response: unknown;
         textGenerationResults: import("./TextGenerationResult.js").TextGenerationResult[];
         usage?: {
@@ -27,6 +27,15 @@ export declare class PromptTemplateTextGenerationModel<PROMPT, MODEL_PROMPT, SET
             totalTokens: number;
         } | undefined;
     }>;
+    restoreGeneratedTexts(rawResponse: unknown): {
+        response: unknown;
+        textGenerationResults: import("./TextGenerationResult.js").TextGenerationResult[];
+        usage?: {
+            promptTokens: number;
+            completionTokens: number;
+            totalTokens: number;
+        } | undefined;
+    };
     get settingsForEvent(): Partial<SETTINGS>;
     asToolCallGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallPromptTemplate<INPUT_PROMPT, PROMPT>): TextGenerationToolCallModel<INPUT_PROMPT, PROMPT, this>;
     asToolCallsOrTextGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallsPromptTemplate<INPUT_PROMPT, PROMPT>): TextGenerationToolCallsModel<INPUT_PROMPT, PROMPT, this>;

package/model-function/generate-text/PromptTemplateTextGenerationModel.js

@@ -41,6 +41,9 @@ export class PromptTemplateTextGenerationModel {
         const mappedPrompt = this.promptTemplate.format(prompt);
         return this.model.doGenerateTexts(mappedPrompt, options);
     }
+    restoreGeneratedTexts(rawResponse) {
+        return this.model.restoreGeneratedTexts(rawResponse);
+    }
     get settingsForEvent() {
         return this.model.settingsForEvent;
     }

package/model-function/generate-text/PromptTemplateTextStreamingModel.d.ts

@@ -1,4 +1,4 @@
-import { FunctionOptions } from "../../core/FunctionOptions.js";
+import { FunctionCallOptions } from "../../core/FunctionOptions.js";
 import { StructureFromTextPromptTemplate } from "../generate-structure/StructureFromTextPromptTemplate.js";
 import { StructureFromTextStreamingModel } from "../generate-structure/StructureFromTextStreamingModel.js";
 import { PromptTemplateTextGenerationModel } from "./PromptTemplateTextGenerationModel.js";
@@ -9,7 +9,7 @@ export declare class PromptTemplateTextStreamingModel<PROMPT, MODEL_PROMPT, SETT
         model: MODEL;
         promptTemplate: TextGenerationPromptTemplate<PROMPT, MODEL_PROMPT>;
     });
-    doStreamText(prompt: PROMPT, options?: FunctionOptions): PromiseLike<AsyncIterable<import("../Delta.js").Delta<unknown>>>;
+    doStreamText(prompt: PROMPT, options?: FunctionCallOptions): PromiseLike<AsyncIterable<import("../Delta.js").Delta<unknown>>>;
     extractTextDelta(delta: unknown): string | undefined;
     asStructureGenerationModel<INPUT_PROMPT>(promptTemplate: StructureFromTextPromptTemplate<INPUT_PROMPT, PROMPT>): StructureFromTextStreamingModel<INPUT_PROMPT, PROMPT, this>;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, PROMPT>): PromptTemplateTextStreamingModel<INPUT_PROMPT, PROMPT, SETTINGS, this>;

package/model-function/generate-text/TextGenerationModel.d.ts

@@ -1,4 +1,4 @@
-import { FunctionOptions } from "../../core/FunctionOptions.js";
+import { FunctionCallOptions } from "../../core/FunctionOptions.js";
 import { Delta } from "../Delta.js";
 import { Model, ModelSettings } from "../Model.js";
 import { BasicTokenizer, FullTokenizer } from "../tokenize-text/Tokenizer.js";
@@ -62,7 +62,7 @@ export interface TextGenerationModel<PROMPT, SETTINGS extends TextGenerationMode
      * Optional. Implement if you have a tokenizer and want to count the number of tokens in a prompt.
      */
     readonly countPromptTokens: ((prompt: PROMPT) => PromiseLike<number>) | undefined;
-    doGenerateTexts(prompt: PROMPT, options?: FunctionOptions): PromiseLike<{
+    doGenerateTexts(prompt: PROMPT, options?: FunctionCallOptions): PromiseLike<{
         response: unknown;
         textGenerationResults: TextGenerationResult[];
         usage?: {
@@ -71,6 +71,15 @@ export interface TextGenerationModel<PROMPT, SETTINGS extends TextGenerationMode
             totalTokens: number;
         };
     }>;
+    restoreGeneratedTexts(rawResponse: unknown): {
+        response: unknown;
+        textGenerationResults: TextGenerationResult[];
+        usage?: {
+            promptTokens: number;
+            completionTokens: number;
+            totalTokens: number;
+        };
+    };
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, PROMPT>): TextGenerationModel<INPUT_PROMPT, SETTINGS>;
     /**
      * Optional. When available, forces the model to return JSON as the text output.
@@ -78,7 +87,7 @@ export interface TextGenerationModel<PROMPT, SETTINGS extends TextGenerationMode
     withJsonOutput?(): this;
 }
 export interface TextStreamingModel<PROMPT, SETTINGS extends TextGenerationModelSettings = TextGenerationModelSettings> extends TextGenerationModel<PROMPT, SETTINGS> {
-    doStreamText(prompt: PROMPT, options?: FunctionOptions): PromiseLike<AsyncIterable<Delta<unknown>>>;
+    doStreamText(prompt: PROMPT, options?: FunctionCallOptions): PromiseLike<AsyncIterable<Delta<unknown>>>;
     extractTextDelta(delta: unknown): string | undefined;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, PROMPT>): TextStreamingModel<INPUT_PROMPT, SETTINGS>;
 }

package/model-function/generate-text/generateText.cjs

@@ -9,7 +9,48 @@ async function generateText(model, prompt, options) {
         model,
         options,
         generateResponse: async (options) => {
-            const result = await model.doGenerateTexts(prompt, options);
+            async function getGeneratedTexts() {
+                if (options?.cache == null) {
+                    return {
+                        ...(await model.doGenerateTexts(prompt, options)),
+                        cache: undefined,
+                    };
+                }
+                let cacheErrors = undefined;
+                const cacheKey = {
+                    functionType: "generate-text",
+                    functionId: options?.functionId,
+                    input: {
+                        model,
+                        settings: model.settingsForEvent, // TODO should include full model information
+                        prompt,
+                    },
+                };
+                try {
+                    const cachedRawResponse = await options.cache.lookupValue(cacheKey);
+                    if (cachedRawResponse != null) {
+                        return {
+                            ...model.restoreGeneratedTexts(cachedRawResponse),
+                            cache: { status: "hit" },
+                        };
+                    }
+                }
+                catch (err) {
+                    cacheErrors = [err];
+                }
+                const result = await model.doGenerateTexts(prompt, options);
+                try {
+                    await options.cache.storeValue(cacheKey, result.response);
+                }
+                catch (err) {
+                    cacheErrors = [...(cacheErrors ?? []), err];
+                }
+                return {
+                    ...result,
+                    cache: { status: "miss", errors: cacheErrors },
+                };
+            }
+            const result = await getGeneratedTexts();
             const shouldTrimWhitespace = model.settings.trimWhitespace ?? true;
             const textGenerationResults = shouldTrimWhitespace
                 ? result.textGenerationResults.map((textGeneration) => ({
@@ -17,6 +58,7 @@ async function generateText(model, prompt, options) {
                     finishReason: textGeneration.finishReason,
                 }))
                 : result.textGenerationResults;
+            // TODO add cache information
             return {
                 response: result.response,
                 extractedValue: textGenerationResults,

package/model-function/generate-text/generateText.js

@@ -6,7 +6,48 @@ export async function generateText(model, prompt, options) {
         model,
         options,
         generateResponse: async (options) => {
-            const result = await model.doGenerateTexts(prompt, options);
+            async function getGeneratedTexts() {
+                if (options?.cache == null) {
+                    return {
+                        ...(await model.doGenerateTexts(prompt, options)),
+                        cache: undefined,
+                    };
+                }
+                let cacheErrors = undefined;
+                const cacheKey = {
+                    functionType: "generate-text",
+                    functionId: options?.functionId,
+                    input: {
+                        model,
+                        settings: model.settingsForEvent, // TODO should include full model information
+                        prompt,
+                    },
+                };
+                try {
+                    const cachedRawResponse = await options.cache.lookupValue(cacheKey);
+                    if (cachedRawResponse != null) {
+                        return {
+                            ...model.restoreGeneratedTexts(cachedRawResponse),
+                            cache: { status: "hit" },
+                        };
+                    }
+                }
+                catch (err) {
+                    cacheErrors = [err];
+                }
+                const result = await model.doGenerateTexts(prompt, options);
+                try {
+                    await options.cache.storeValue(cacheKey, result.response);
+                }
+                catch (err) {
+                    cacheErrors = [...(cacheErrors ?? []), err];
+                }
+                return {
+                    ...result,
+                    cache: { status: "miss", errors: cacheErrors },
+                };
+            }
+            const result = await getGeneratedTexts();
             const shouldTrimWhitespace = model.settings.trimWhitespace ?? true;
             const textGenerationResults = shouldTrimWhitespace
                 ? result.textGenerationResults.map((textGeneration) => ({
@@ -14,6 +55,7 @@ export async function generateText(model, prompt, options) {
                     finishReason: textGeneration.finishReason,
                 }))
                 : result.textGenerationResults;
+            // TODO add cache information
             return {
                 response: result.response,
                 extractedValue: textGenerationResults,

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

@@ -1,9 +1,9 @@
-import { FunctionOptions } from "../../core/FunctionOptions.js";
+import { FunctionCallOptions } from "../../core/FunctionOptions.js";
 import { Model, ModelSettings } from "../Model.js";
 export interface TranscriptionModelSettings extends ModelSettings {
 }
 export interface TranscriptionModel<DATA, SETTINGS extends TranscriptionModelSettings = TranscriptionModelSettings> extends Model<SETTINGS> {
-    doTranscribe: (data: DATA, options?: FunctionOptions) => PromiseLike<{
+    doTranscribe: (data: DATA, options: FunctionCallOptions) => PromiseLike<{
         response: unknown;
         transcription: string;
     }>;

package/model-provider/anthropic/AnthropicTextGenerationModel.cjs

@@ -6,6 +6,7 @@ const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndTh
 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 validateTypes_js_1 = require("../../core/schema/validateTypes.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const PromptTemplateTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptTemplateTextStreamingModel.cjs");
 const TextGenerationModel_js_1 = require("../../model-function/generate-text/TextGenerationModel.cjs");
@@ -69,17 +70,22 @@ class AnthropicTextGenerationModel extends AbstractModel_js_1.AbstractModel {
     get modelName() {
         return this.settings.model;
     }
-    async callAPI(prompt, options) {
+    async callAPI(prompt, callOptions, options) {
         const api = this.settings.api ?? new AnthropicApiConfiguration_js_1.AnthropicApiConfiguration();
         const responseFormat = options.responseFormat;
-        const abortSignal = options.run?.abortSignal;
+        const abortSignal = callOptions.run?.abortSignal;
         const userId = this.settings.userId;
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
             retry: api.retry,
             throttle: api.throttle,
             call: async () => (0, postToApi_js_1.postJsonToApi)({
                 url: api.assembleUrl(`/complete`),
-                headers: api.headers,
+                headers: api.headers({
+                    functionType: callOptions.functionType,
+                    functionId: callOptions.functionId,
+                    run: callOptions.run,
+                    callId: callOptions.callId,
+                }),
                 body: {
                     model: this.settings.model,
                     prompt,
@@ -108,10 +114,17 @@ class AnthropicTextGenerationModel extends AbstractModel_js_1.AbstractModel {
         return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
     async doGenerateTexts(prompt, options) {
-        const response = await this.callAPI(prompt, {
-            ...options,
+        return this.processTextGenerationResponse(await this.callAPI(prompt, options, {
             responseFormat: exports.AnthropicTextGenerationResponseFormat.json,
-        });
+        }));
+    }
+    restoreGeneratedTexts(rawResponse) {
+        return this.processTextGenerationResponse((0, validateTypes_js_1.validateTypes)({
+            structure: rawResponse,
+            schema: (0, ZodSchema_js_1.zodSchema)(anthropicTextGenerationResponseSchema),
+        }));
+    }
+    processTextGenerationResponse(response) {
         return {
             response,
             textGenerationResults: [
@@ -133,8 +146,7 @@ class AnthropicTextGenerationModel extends AbstractModel_js_1.AbstractModel {
         }
     }
     doStreamText(prompt, options) {
-        return this.callAPI(prompt, {
-            ...options,
+        return this.callAPI(prompt, options, {
             responseFormat: exports.AnthropicTextGenerationResponseFormat.deltaIterable,
         });
     }

package/model-provider/anthropic/AnthropicTextGenerationModel.d.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { FunctionOptions } from "../../core/FunctionOptions.js";
+import { FunctionCallOptions } 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";
@@ -46,11 +46,11 @@ export declare class AnthropicTextGenerationModel extends AbstractModel<Anthropi
     readonly contextWindowSize: number;
     readonly tokenizer: undefined;
     readonly countPromptTokens: undefined;
-    callAPI<RESPONSE>(prompt: string, options: {
+    callAPI<RESPONSE>(prompt: string, callOptions: FunctionCallOptions, options: {
         responseFormat: AnthropicTextGenerationResponseFormatType<RESPONSE>;
-    } & FunctionOptions): Promise<RESPONSE>;
+    }): Promise<RESPONSE>;
     get settingsForEvent(): Partial<AnthropicTextGenerationModelSettings>;
-    doGenerateTexts(prompt: string, options?: FunctionOptions): Promise<{
+    doGenerateTexts(prompt: string, options: FunctionCallOptions): Promise<{
         response: {
             model: string;
             completion: string;
@@ -61,8 +61,30 @@ export declare class AnthropicTextGenerationModel extends AbstractModel<Anthropi
             finishReason: TextGenerationFinishReason;
         }[];
     }>;
+    restoreGeneratedTexts(rawResponse: unknown): {
+        response: {
+            model: string;
+            completion: string;
+            stop_reason: string;
+        };
+        textGenerationResults: {
+            text: string;
+            finishReason: TextGenerationFinishReason;
+        }[];
+    };
+    processTextGenerationResponse(response: AnthropicTextGenerationResponse): {
+        response: {
+            model: string;
+            completion: string;
+            stop_reason: string;
+        };
+        textGenerationResults: {
+            text: string;
+            finishReason: TextGenerationFinishReason;
+        }[];
+    };
     private translateFinishReason;
-    doStreamText(prompt: string, options?: FunctionOptions): Promise<AsyncIterable<Delta<{
+    doStreamText(prompt: string, options: FunctionCallOptions): Promise<AsyncIterable<Delta<{
         model: string;
         completion: string;
         stop_reason: string | null;

package/model-provider/anthropic/AnthropicTextGenerationModel.js

@@ -3,6 +3,7 @@ import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottl
 import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
 import { zodSchema } from "../../core/schema/ZodSchema.js";
 import { parseJSON } from "../../core/schema/parseJSON.js";
+import { validateTypes } from "../../core/schema/validateTypes.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { textGenerationModelProperties, } from "../../model-function/generate-text/TextGenerationModel.js";
@@ -66,17 +67,22 @@ export class AnthropicTextGenerationModel extends AbstractModel {
     get modelName() {
         return this.settings.model;
     }
-    async callAPI(prompt, options) {
+    async callAPI(prompt, callOptions, options) {
         const api = this.settings.api ?? new AnthropicApiConfiguration();
         const responseFormat = options.responseFormat;
-        const abortSignal = options.run?.abortSignal;
+        const abortSignal = callOptions.run?.abortSignal;
         const userId = this.settings.userId;
         return callWithRetryAndThrottle({
             retry: api.retry,
             throttle: api.throttle,
             call: async () => postJsonToApi({
                 url: api.assembleUrl(`/complete`),
-                headers: api.headers,
+                headers: api.headers({
+                    functionType: callOptions.functionType,
+                    functionId: callOptions.functionId,
+                    run: callOptions.run,
+                    callId: callOptions.callId,
+                }),
                 body: {
                     model: this.settings.model,
                     prompt,
@@ -105,10 +111,17 @@ export class AnthropicTextGenerationModel extends AbstractModel {
         return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
     async doGenerateTexts(prompt, options) {
-        const response = await this.callAPI(prompt, {
-            ...options,
+        return this.processTextGenerationResponse(await this.callAPI(prompt, options, {
             responseFormat: AnthropicTextGenerationResponseFormat.json,
-        });
+        }));
+    }
+    restoreGeneratedTexts(rawResponse) {
+        return this.processTextGenerationResponse(validateTypes({
+            structure: rawResponse,
+            schema: zodSchema(anthropicTextGenerationResponseSchema),
+        }));
+    }
+    processTextGenerationResponse(response) {
         return {
             response,
             textGenerationResults: [
@@ -130,8 +143,7 @@ export class AnthropicTextGenerationModel extends AbstractModel {
         }
     }
     doStreamText(prompt, options) {
-        return this.callAPI(prompt, {
-            ...options,
+        return this.callAPI(prompt, options, {
             responseFormat: AnthropicTextGenerationResponseFormat.deltaIterable,
         });
     }

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.cjs

@@ -28,15 +28,20 @@ class Automatic1111ImageGenerationModel extends AbstractModel_js_1.AbstractModel
     get modelName() {
         return this.settings.model;
     }
-    async callAPI(input, options) {
+    async callAPI(input, callOptions) {
         const api = this.settings.api ?? new Automatic1111ApiConfiguration_js_1.Automatic1111ApiConfiguration();
-        const abortSignal = options?.run?.abortSignal;
+        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(`/txt2img`),
-                headers: api.headers,
+                headers: api.headers({
+                    functionType: callOptions.functionType,
+                    functionId: callOptions.functionId,
+                    run: callOptions.run,
+                    callId: callOptions.callId,
+                }),
                 body: {
                     prompt: input.prompt,
                     negative_prompt: input.negativePrompt,

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

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { FunctionOptions } from "../../core/FunctionOptions.js";
+import { FunctionCallOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptTemplate } from "../../model-function/PromptTemplate.js";
@@ -37,9 +37,9 @@ export declare class Automatic1111ImageGenerationModel extends AbstractModel<Aut
     constructor(settings: Automatic1111ImageGenerationSettings);
     readonly provider: "Automatic1111";
     get modelName(): string;
-    callAPI(input: Automatic1111ImageGenerationPrompt, options?: FunctionOptions): Promise<Automatic1111ImageGenerationResponse>;
+    callAPI(input: Automatic1111ImageGenerationPrompt, callOptions: FunctionCallOptions): Promise<Automatic1111ImageGenerationResponse>;
     get settingsForEvent(): Partial<Automatic1111ImageGenerationSettings>;
-    doGenerateImages(prompt: Automatic1111ImageGenerationPrompt, options?: FunctionOptions): Promise<{
+    doGenerateImages(prompt: Automatic1111ImageGenerationPrompt, options: FunctionCallOptions): Promise<{
         response: {
             images: string[];
             parameters: {};

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.js

@@ -25,15 +25,20 @@ export class Automatic1111ImageGenerationModel extends AbstractModel {
     get modelName() {
         return this.settings.model;
     }
-    async callAPI(input, options) {
+    async callAPI(input, callOptions) {
         const api = this.settings.api ?? new Automatic1111ApiConfiguration();
-        const abortSignal = options?.run?.abortSignal;
+        const abortSignal = callOptions.run?.abortSignal;
         return callWithRetryAndThrottle({
             retry: api.retry,
             throttle: api.throttle,
             call: async () => postJsonToApi({
                 url: api.assembleUrl(`/txt2img`),
-                headers: api.headers,
+                headers: api.headers({
+                    functionType: callOptions.functionType,
+                    functionId: callOptions.functionId,
+                    run: callOptions.run,
+                    callId: callOptions.callId,
+                }),
                 body: {
                     prompt: input.prompt,
                     negative_prompt: input.negativePrompt,

package/model-provider/cohere/CohereTextEmbeddingModel.cjs

@@ -113,18 +113,23 @@ class CohereTextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
     async detokenize(tokens) {
         return this.tokenizer.detokenize(tokens);
     }
-    async callAPI(texts, options) {
+    async callAPI(texts, callOptions) {
         if (texts.length > this.maxValuesPerCall) {
             throw new Error(`The Cohere embedding API only supports ${this.maxValuesPerCall} texts per API call.`);
         }
         const api = this.settings.api ?? new CohereApiConfiguration_js_1.CohereApiConfiguration();
-        const abortSignal = options?.run?.abortSignal;
+        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(`/embed`),
-                headers: api.headers,
+                headers: api.headers({
+                    functionType: callOptions.functionType,
+                    functionId: callOptions.functionId,
+                    run: callOptions.run,
+                    callId: callOptions.callId,
+                }),
                 body: {
                     model: this.settings.model,
                     texts,

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

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { FunctionOptions } from "../../core/FunctionOptions.js";
+import { FunctionCallOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { EmbeddingModel, EmbeddingModelSettings } from "../../model-function/embed/EmbeddingModel.js";
@@ -70,9 +70,9 @@ export declare class CohereTextEmbeddingModel extends AbstractModel<CohereTextEm
         tokenTexts: string[];
     }>;
     detokenize(tokens: number[]): Promise<string>;
-    callAPI(texts: Array<string>, options?: FunctionOptions): Promise<CohereTextEmbeddingResponse>;
+    callAPI(texts: Array<string>, callOptions: FunctionCallOptions): Promise<CohereTextEmbeddingResponse>;
     get settingsForEvent(): Partial<CohereTextEmbeddingModelSettings>;
-    doEmbedValues(texts: string[], options?: FunctionOptions): Promise<{
+    doEmbedValues(texts: string[], options: FunctionCallOptions): Promise<{
         response: {
             embeddings: number[][];
             texts: string[];

package/model-provider/cohere/CohereTextEmbeddingModel.js

@@ -110,18 +110,23 @@ export class CohereTextEmbeddingModel extends AbstractModel {
     async detokenize(tokens) {
         return this.tokenizer.detokenize(tokens);
     }
-    async callAPI(texts, options) {
+    async callAPI(texts, callOptions) {
         if (texts.length > this.maxValuesPerCall) {
             throw new Error(`The Cohere embedding API only supports ${this.maxValuesPerCall} texts per API call.`);
         }
         const api = this.settings.api ?? new CohereApiConfiguration();
-        const abortSignal = options?.run?.abortSignal;
+        const abortSignal = callOptions.run?.abortSignal;
         return callWithRetryAndThrottle({
             retry: api.retry,
             throttle: api.throttle,
             call: async () => postJsonToApi({
                 url: api.assembleUrl(`/embed`),
-                headers: api.headers,
+                headers: api.headers({
+                    functionType: callOptions.functionType,
+                    functionId: callOptions.functionId,
+                    run: callOptions.run,
+                    callId: callOptions.callId,
+                }),
                 body: {
                     model: this.settings.model,
                     texts,

package/model-provider/cohere/CohereTextGenerationModel.cjs

@@ -5,6 +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 ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
+const validateTypes_js_1 = require("../../core/schema/validateTypes.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const PromptTemplateTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptTemplateTextStreamingModel.cjs");
 const TextGenerationModel_js_1 = require("../../model-function/generate-text/TextGenerationModel.cjs");
@@ -73,16 +74,21 @@ class CohereTextGenerationModel extends AbstractModel_js_1.AbstractModel {
     async countPromptTokens(input) {
         return (0, countTokens_js_1.countTokens)(this.tokenizer, input);
     }
-    async callAPI(prompt, options) {
+    async callAPI(prompt, callOptions, options) {
         const api = this.settings.api ?? new CohereApiConfiguration_js_1.CohereApiConfiguration();
         const responseFormat = options.responseFormat;
-        const abortSignal = options.run?.abortSignal;
+        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(`/generate`),
-                headers: api.headers,
+                headers: api.headers({
+                    functionType: callOptions.functionType,
+                    functionId: callOptions.functionId,
+                    run: callOptions.run,
+                    callId: callOptions.callId,
+                }),
                 body: {
                     stream: responseFormat.stream,
                     model: this.settings.model,
@@ -122,10 +128,17 @@ class CohereTextGenerationModel extends AbstractModel_js_1.AbstractModel {
         return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
     async doGenerateTexts(prompt, options) {
-        const response = await this.callAPI(prompt, {
-            ...options,
+        return this.processTextGenerationResponse(await this.callAPI(prompt, options, {
             responseFormat: exports.CohereTextGenerationResponseFormat.json,
-        });
+        }));
+    }
+    restoreGeneratedTexts(rawResponse) {
+        return this.processTextGenerationResponse((0, validateTypes_js_1.validateTypes)({
+            structure: rawResponse,
+            schema: (0, ZodSchema_js_1.zodSchema)(cohereTextGenerationResponseSchema),
+        }));
+    }
+    processTextGenerationResponse(response) {
         return {
             response,
             textGenerationResults: response.generations.map((generation) => ({
@@ -149,8 +162,7 @@ class CohereTextGenerationModel extends AbstractModel_js_1.AbstractModel {
         }
     }
     doStreamText(prompt, options) {
-        return this.callAPI(prompt, {
-            ...options,
+        return this.callAPI(prompt, options, {
             responseFormat: exports.CohereTextGenerationResponseFormat.deltaIterable,
         });
     }