modelfusion 0.105.0 → 0.107.0

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

@@ -3,5 +3,5 @@ export * as LlamaCppBakLLaVA1Prompt from "./LlamaCppBakLLaVA1PromptTemplate.js";
 export { LlamaCppError, LlamaCppErrorData } from "./LlamaCppError.js";
 export * as llamacpp from "./LlamaCppFacade.js";
 export * from "./LlamaCppTextEmbeddingModel.js";
-export * from "./LlamaCppTextGenerationModel.js";
+export * from "./LlamaCppCompletionModel.js";
 export * from "./LlamaCppTokenizer.js";

package/model-provider/llamacpp/index.js

@@ -3,5 +3,5 @@ export * as LlamaCppBakLLaVA1Prompt from "./LlamaCppBakLLaVA1PromptTemplate.js";
 export { LlamaCppError } from "./LlamaCppError.js";
 export * as llamacpp from "./LlamaCppFacade.js";
 export * from "./LlamaCppTextEmbeddingModel.js";
-export * from "./LlamaCppTextGenerationModel.js";
+export * from "./LlamaCppCompletionModel.js";
 export * from "./LlamaCppTokenizer.js";

package/model-provider/mistral/MistralChatModel.cjs

@@ -10,8 +10,8 @@ const PromptTemplateTextStreamingModel_js_1 = require("../../model-function/gene
 const TextGenerationModel_js_1 = require("../../model-function/generate-text/TextGenerationModel.cjs");
 const createEventSourceResponseHandler_js_1 = require("../../util/streaming/createEventSourceResponseHandler.cjs");
 const MistralApiConfiguration_js_1 = require("./MistralApiConfiguration.cjs");
+const MistralChatPromptTemplate_js_1 = require("./MistralChatPromptTemplate.cjs");
 const MistralError_js_1 = require("./MistralError.cjs");
-const MistralPromptTemplate_js_1 = require("./MistralPromptTemplate.cjs");
 class MistralChatModel extends AbstractModel_js_1.AbstractModel {
     constructor(settings) {
         super({ settings });
@@ -118,19 +118,19 @@ class MistralChatModel extends AbstractModel_js_1.AbstractModel {
      * Returns this model with a text prompt template.
      */
     withTextPrompt() {
-        return this.withPromptTemplate((0, MistralPromptTemplate_js_1.text)());
+        return this.withPromptTemplate((0, MistralChatPromptTemplate_js_1.text)());
     }
     /**
      * Returns this model with an instruction prompt template.
      */
     withInstructionPrompt() {
-        return this.withPromptTemplate((0, MistralPromptTemplate_js_1.instruction)());
+        return this.withPromptTemplate((0, MistralChatPromptTemplate_js_1.instruction)());
     }
     /**
      * Returns this model with a chat prompt template.
      */
     withChatPrompt() {
-        return this.withPromptTemplate((0, MistralPromptTemplate_js_1.chat)());
+        return this.withPromptTemplate((0, MistralChatPromptTemplate_js_1.chat)());
     }
     withPromptTemplate(promptTemplate) {
         return new PromptTemplateTextStreamingModel_js_1.PromptTemplateTextStreamingModel({

package/model-provider/mistral/MistralChatModel.d.ts

@@ -64,8 +64,8 @@ export declare class MistralChatModel extends AbstractModel<MistralChatModelSett
             object: string;
             usage: {
                 prompt_tokens: number;
-                total_tokens: number;
                 completion_tokens: number;
+                total_tokens: number;
             };
             model: string;
             id: string;
@@ -154,19 +154,19 @@ declare const mistralChatResponseSchema: z.ZodObject<{
         total_tokens: z.ZodNumber;
     }, "strip", z.ZodTypeAny, {
         prompt_tokens: number;
-        total_tokens: number;
         completion_tokens: number;
+        total_tokens: number;
     }, {
         prompt_tokens: number;
-        total_tokens: number;
         completion_tokens: number;
+        total_tokens: number;
     }>;
 }, "strip", z.ZodTypeAny, {
     object: string;
     usage: {
         prompt_tokens: number;
-        total_tokens: number;
         completion_tokens: number;
+        total_tokens: number;
     };
     model: string;
     id: string;
@@ -183,8 +183,8 @@ declare const mistralChatResponseSchema: z.ZodObject<{
     object: string;
     usage: {
         prompt_tokens: number;
-        total_tokens: number;
         completion_tokens: number;
+        total_tokens: number;
     };
     model: string;
     id: string;
@@ -228,8 +228,8 @@ export declare const MistralChatResponseFormat: {
             object: string;
             usage: {
                 prompt_tokens: number;
-                total_tokens: number;
                 completion_tokens: number;
+                total_tokens: number;
             };
             model: string;
             id: string;

package/model-provider/mistral/MistralChatModel.js

@@ -7,8 +7,8 @@ import { PromptTemplateTextStreamingModel } from "../../model-function/generate-
 import { textGenerationModelProperties, } from "../../model-function/generate-text/TextGenerationModel.js";
 import { createEventSourceResponseHandler } from "../../util/streaming/createEventSourceResponseHandler.js";
 import { MistralApiConfiguration } from "./MistralApiConfiguration.js";
+import { chat, instruction, text } from "./MistralChatPromptTemplate.js";
 import { failedMistralCallResponseHandler } from "./MistralError.js";
-import { chat, instruction, text } from "./MistralPromptTemplate.js";
 export class MistralChatModel extends AbstractModel {
     constructor(settings) {
         super({ settings });

package/model-provider/mistral/MistralTextEmbeddingModel.d.ts

@@ -32,16 +32,16 @@ export declare class MistralTextEmbeddingModel extends AbstractModel<MistralText
     doEmbedValues(texts: string[], options?: FunctionOptions): Promise<{
         response: {
             object: string;
-            usage: {
-                prompt_tokens: number;
-                total_tokens: number;
-            };
-            model: string;
             data: {
                 object: string;
                 embedding: number[];
                 index: number;
             }[];
+            usage: {
+                prompt_tokens: number;
+                total_tokens: number;
+            };
+            model: string;
             id: string;
         };
         embeddings: number[][];
@@ -77,29 +77,29 @@ declare const MistralTextEmbeddingResponseSchema: z.ZodObject<{
     }>;
 }, "strip", z.ZodTypeAny, {
     object: string;
-    usage: {
-        prompt_tokens: number;
-        total_tokens: number;
-    };
-    model: string;
     data: {
         object: string;
         embedding: number[];
         index: number;
     }[];
-    id: string;
-}, {
-    object: string;
     usage: {
         prompt_tokens: number;
         total_tokens: number;
     };
     model: string;
+    id: string;
+}, {
+    object: string;
     data: {
         object: string;
         embedding: number[];
         index: number;
     }[];
+    usage: {
+        prompt_tokens: number;
+        total_tokens: number;
+    };
+    model: string;
     id: string;
 }>;
 export type MistralTextEmbeddingResponse = z.infer<typeof MistralTextEmbeddingResponseSchema>;

package/model-provider/mistral/index.cjs

@@ -26,9 +26,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MistralPrompt = exports.mistral = void 0;
+exports.mistral = exports.MistralChatPrompt = void 0;
 __exportStar(require("./MistralApiConfiguration.cjs"), exports);
+__exportStar(require("./MistralChatModel.cjs"), exports);
+exports.MistralChatPrompt = __importStar(require("./MistralChatPromptTemplate.cjs"));
 exports.mistral = __importStar(require("./MistralFacade.cjs"));
-exports.MistralPrompt = __importStar(require("./MistralPromptTemplate.cjs"));
 __exportStar(require("./MistralTextEmbeddingModel.cjs"), exports);
-__exportStar(require("./MistralChatModel.cjs"), exports);

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

@@ -1,6 +1,6 @@
 export * from "./MistralApiConfiguration.js";
+export * from "./MistralChatModel.js";
+export * as MistralChatPrompt from "./MistralChatPromptTemplate.js";
 export { MistralErrorData } from "./MistralError.js";
 export * as mistral from "./MistralFacade.js";
-export * as MistralPrompt from "./MistralPromptTemplate.js";
 export * from "./MistralTextEmbeddingModel.js";
-export * from "./MistralChatModel.js";

package/model-provider/mistral/index.js

@@ -1,5 +1,5 @@
 export * from "./MistralApiConfiguration.js";
+export * from "./MistralChatModel.js";
+export * as MistralChatPrompt from "./MistralChatPromptTemplate.js";
 export * as mistral from "./MistralFacade.js";
-export * as MistralPrompt from "./MistralPromptTemplate.js";
 export * from "./MistralTextEmbeddingModel.js";
-export * from "./MistralChatModel.js";

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

@@ -8,7 +8,8 @@ import { PromptTemplateTextStreamingModel } from "../../model-function/generate-
 import { TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
 import { TextGenerationToolCallModel, ToolCallPromptTemplate } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
-import { TextGenerationToolCallsOrGenerateTextModel, ToolCallsOrGenerateTextPromptTemplate } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
+import { TextGenerationToolCallsOrGenerateTextModel } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
+import { ToolCallsOrGenerateTextPromptTemplate } from "../../tool/generate-tool-calls-or-text/ToolCallsOrGenerateTextPromptTemplate.js";
 import { OllamaTextGenerationSettings } from "./OllamaTextGenerationSettings.js";
 export type OllamaChatMessage = {
     role: "system" | "user" | "assistant";
@@ -38,11 +39,11 @@ export declare class OllamaChatModel extends AbstractModel<OllamaChatModelSettin
     get settingsForEvent(): Partial<OllamaChatModelSettings>;
     doGenerateTexts(prompt: OllamaChatPrompt, options?: FunctionOptions): Promise<{
         response: {
-            model: string;
             message: {
                 role: string;
                 content: string;
             };
+            model: string;
             done: true;
             created_at: string;
             total_duration: number;
@@ -58,11 +59,11 @@ export declare class OllamaChatModel extends AbstractModel<OllamaChatModelSettin
         }[];
     }>;
     doStreamText(prompt: OllamaChatPrompt, options?: FunctionOptions): Promise<AsyncIterable<import("../../index.js").Delta<{
-        model: string;
         message: {
             role: string;
             content: string;
         };
+        model: string;
         done: false;
         created_at: string;
     } | {
@@ -115,11 +116,11 @@ declare const ollamaChatResponseSchema: z.ZodObject<{
     eval_count: z.ZodNumber;
     eval_duration: z.ZodNumber;
 }, "strip", z.ZodTypeAny, {
-    model: string;
     message: {
         role: string;
         content: string;
     };
+    model: string;
     done: true;
     created_at: string;
     total_duration: number;
@@ -129,11 +130,11 @@ declare const ollamaChatResponseSchema: z.ZodObject<{
     load_duration?: number | undefined;
     prompt_eval_duration?: number | undefined;
 }, {
-    model: string;
     message: {
         role: string;
         content: string;
     };
+    model: string;
     done: true;
     created_at: string;
     total_duration: number;
@@ -145,11 +146,11 @@ declare const ollamaChatResponseSchema: z.ZodObject<{
 }>;
 export type OllamaChatResponse = z.infer<typeof ollamaChatResponseSchema>;
 declare const ollamaChatStreamChunkSchema: ZodSchema<{
-    model: string;
     message: {
         role: string;
         content: string;
     };
+    model: string;
     done: false;
     created_at: string;
 } | {
@@ -179,11 +180,11 @@ export declare const OllamaChatResponseFormat: {
             requestBodyValues: unknown;
             response: Response;
         }) => Promise<{
-            model: string;
             message: {
                 role: string;
                 content: string;
             };
+            model: string;
             done: true;
             created_at: string;
             total_duration: number;
@@ -203,11 +204,11 @@ export declare const OllamaChatResponseFormat: {
         handler: ({ response }: {
             response: Response;
         }) => Promise<AsyncIterable<import("../../index.js").Delta<{
-            model: string;
             message: {
                 role: string;
                 content: string;
             };
+            model: string;
             done: false;
             created_at: string;
         } | {

package/model-provider/ollama/OllamaChatModel.js

@@ -8,7 +8,7 @@ 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";
 import { TextGenerationToolCallModel, } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
-import { TextGenerationToolCallsOrGenerateTextModel, } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
+import { TextGenerationToolCallsOrGenerateTextModel } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
 import { createJsonStreamResponseHandler } from "../../util/streaming/createJsonStreamResponseHandler.js";
 import { OllamaApiConfiguration } from "./OllamaApiConfiguration.js";
 import { chat, instruction, text } from "./OllamaChatPromptTemplate.js";

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

@@ -8,7 +8,8 @@ import { PromptTemplateTextStreamingModel } from "../../model-function/generate-
 import { TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
 import { TextGenerationToolCallModel, ToolCallPromptTemplate } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
-import { TextGenerationToolCallsOrGenerateTextModel, ToolCallsOrGenerateTextPromptTemplate } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
+import { TextGenerationToolCallsOrGenerateTextModel } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
+import { ToolCallsOrGenerateTextPromptTemplate } from "../../tool/generate-tool-calls-or-text/ToolCallsOrGenerateTextPromptTemplate.js";
 import { OllamaTextGenerationSettings } from "./OllamaTextGenerationSettings.js";
 export interface OllamaCompletionPrompt {
     /**

package/model-provider/ollama/OllamaCompletionModel.js

@@ -8,7 +8,7 @@ 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";
 import { TextGenerationToolCallModel, } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
-import { TextGenerationToolCallsOrGenerateTextModel, } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
+import { TextGenerationToolCallsOrGenerateTextModel } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
 import { createJsonStreamResponseHandler } from "../../util/streaming/createJsonStreamResponseHandler.js";
 import { OllamaApiConfiguration } from "./OllamaApiConfiguration.js";
 import { failedOllamaCallResponseHandler } from "./OllamaError.js";

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

@@ -132,13 +132,7 @@ describe("streamStructure", () => {
             raw: true,
         })
             .withTextPromptTemplate(TextPrompt.instruction())
-            .asStructureGenerationModel((0, jsonStructurePrompt_js_1.jsonStructurePrompt)((instruction, schema) => ({
-            system: "JSON schema: \n" +
-                JSON.stringify(schema.getJsonSchema()) +
-                "\n\n" +
-                "Respond only using JSON that matches the above schema.",
-            instruction,
-        }))), (0, ZodSchema_js_1.zodSchema)(zod_1.z.object({ name: zod_1.z.string() })), "generate a name");
+            .asStructureGenerationModel(jsonStructurePrompt_js_1.jsonStructurePrompt.text()), (0, ZodSchema_js_1.zodSchema)(zod_1.z.object({ name: zod_1.z.string() })), "generate a name");
         // note: space moved to last chunk bc of trimming
         expect(await (0, arrayFromAsync_js_1.arrayFromAsync)(stream)).toStrictEqual([
             { isComplete: false, value: {} },

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

@@ -107,13 +107,7 @@ describe("streamStructure", () => {
             raw: true,
         })
             .withTextPromptTemplate(TextPrompt.instruction())
-            .asStructureGenerationModel(jsonStructurePrompt((instruction, schema) => ({
-            system: "JSON schema: \n" +
-                JSON.stringify(schema.getJsonSchema()) +
-                "\n\n" +
-                "Respond only using JSON that matches the above schema.",
-            instruction,
-        }))), zodSchema(z.object({ name: z.string() })), "generate a name");
+            .asStructureGenerationModel(jsonStructurePrompt.text()), zodSchema(z.object({ name: z.string() })), "generate a name");
         // note: space moved to last chunk bc of trimming
         expect(await arrayFromAsync(stream)).toStrictEqual([
             { isComplete: false, value: {} },

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

@@ -97,8 +97,8 @@ export declare abstract class AbstractOpenAIChatModel<SETTINGS extends AbstractO
             object: "chat.completion";
             usage: {
                 prompt_tokens: number;
-                total_tokens: number;
                 completion_tokens: number;
+                total_tokens: number;
             };
             model: string;
             id: string;
@@ -172,8 +172,8 @@ export declare abstract class AbstractOpenAIChatModel<SETTINGS extends AbstractO
             object: "chat.completion";
             usage: {
                 prompt_tokens: number;
-                total_tokens: number;
                 completion_tokens: number;
+                total_tokens: number;
             };
             model: string;
             id: string;
@@ -216,8 +216,8 @@ export declare abstract class AbstractOpenAIChatModel<SETTINGS extends AbstractO
             object: "chat.completion";
             usage: {
                 prompt_tokens: number;
-                total_tokens: number;
                 completion_tokens: number;
+                total_tokens: number;
             };
             model: string;
             id: string;
@@ -392,19 +392,19 @@ declare const openAIChatResponseSchema: z.ZodObject<{
         total_tokens: z.ZodNumber;
     }, "strip", z.ZodTypeAny, {
         prompt_tokens: number;
-        total_tokens: number;
         completion_tokens: number;
+        total_tokens: number;
     }, {
         prompt_tokens: number;
-        total_tokens: number;
         completion_tokens: number;
+        total_tokens: number;
     }>;
 }, "strip", z.ZodTypeAny, {
     object: "chat.completion";
     usage: {
         prompt_tokens: number;
-        total_tokens: number;
         completion_tokens: number;
+        total_tokens: number;
     };
     model: string;
     id: string;
@@ -435,8 +435,8 @@ declare const openAIChatResponseSchema: z.ZodObject<{
     object: "chat.completion";
     usage: {
         prompt_tokens: number;
-        total_tokens: number;
         completion_tokens: number;
+        total_tokens: number;
     };
     model: string;
     id: string;
@@ -683,8 +683,8 @@ export declare const OpenAIChatResponseFormat: {
             object: "chat.completion";
             usage: {
                 prompt_tokens: number;
-                total_tokens: number;
                 completion_tokens: number;
+                total_tokens: number;
             };
             model: string;
             id: string;

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

@@ -47,8 +47,8 @@ OpenAIChatSettings> {
             object: "chat.completion";
             usage: {
                 prompt_tokens: number;
-                total_tokens: number;
                 completion_tokens: number;
+                total_tokens: number;
             };
             model: string;
             id: string;

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

@@ -148,8 +148,8 @@ export declare class OpenAICompletionModel extends AbstractModel<OpenAICompletio
             object: "text_completion";
             usage: {
                 prompt_tokens: number;
-                total_tokens: number;
                 completion_tokens: number;
+                total_tokens: number;
             };
             model: string;
             id: string;
@@ -228,19 +228,19 @@ declare const OpenAICompletionResponseSchema: z.ZodObject<{
         total_tokens: z.ZodNumber;
     }, "strip", z.ZodTypeAny, {
         prompt_tokens: number;
-        total_tokens: number;
         completion_tokens: number;
+        total_tokens: number;
     }, {
         prompt_tokens: number;
-        total_tokens: number;
         completion_tokens: number;
+        total_tokens: number;
     }>;
 }, "strip", z.ZodTypeAny, {
     object: "text_completion";
     usage: {
         prompt_tokens: number;
-        total_tokens: number;
         completion_tokens: number;
+        total_tokens: number;
     };
     model: string;
     id: string;
@@ -256,8 +256,8 @@ declare const OpenAICompletionResponseSchema: z.ZodObject<{
     object: "text_completion";
     usage: {
         prompt_tokens: number;
-        total_tokens: number;
         completion_tokens: number;
+        total_tokens: number;
     };
     model: string;
     id: string;
@@ -285,8 +285,8 @@ export declare const OpenAITextResponseFormat: {
             object: "text_completion";
             usage: {
                 prompt_tokens: number;
-                total_tokens: number;
                 completion_tokens: number;
+                total_tokens: number;
             };
             model: string;
             id: string;

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

@@ -52,16 +52,16 @@ export declare class OpenAITextEmbeddingModel extends AbstractModel<OpenAITextEm
     doEmbedValues(texts: string[], options?: FunctionOptions): Promise<{
         response: {
             object: "list";
-            usage: {
-                prompt_tokens: number;
-                total_tokens: number;
-            };
-            model: string;
             data: {
                 object: "embedding";
                 embedding: number[];
                 index: number;
             }[];
+            usage: {
+                prompt_tokens: number;
+                total_tokens: number;
+            };
+            model: string;
         };
         embeddings: number[][];
     }>;
@@ -95,28 +95,28 @@ declare const openAITextEmbeddingResponseSchema: z.ZodObject<{
     }>;
 }, "strip", z.ZodTypeAny, {
     object: "list";
-    usage: {
-        prompt_tokens: number;
-        total_tokens: number;
-    };
-    model: string;
     data: {
         object: "embedding";
         embedding: number[];
         index: number;
     }[];
-}, {
-    object: "list";
     usage: {
         prompt_tokens: number;
         total_tokens: number;
     };
     model: string;
+}, {
+    object: "list";
     data: {
         object: "embedding";
         embedding: number[];
         index: number;
     }[];
+    usage: {
+        prompt_tokens: number;
+        total_tokens: number;
+    };
+    model: string;
 }>;
 export type OpenAITextEmbeddingResponse = z.infer<typeof openAITextEmbeddingResponseSchema>;
 export {};

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

@@ -64,6 +64,9 @@ export declare class OpenAITranscriptionModel extends AbstractModel<OpenAITransc
     doTranscribe(data: OpenAITranscriptionInput, options?: FunctionOptions): Promise<{
         response: {
             text: string;
+            task: "transcribe";
+            language: string;
+            duration: number;
             segments: {
                 text: string;
                 id: number;
@@ -77,9 +80,6 @@ export declare class OpenAITranscriptionModel extends AbstractModel<OpenAITransc
                 no_speech_prob: number;
                 transient?: boolean | undefined;
             }[];
-            task: "transcribe";
-            language: string;
-            duration: number;
         };
         transcription: string;
     }>;
@@ -141,6 +141,9 @@ declare const openAITranscriptionVerboseJsonSchema: z.ZodObject<{
     text: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     text: string;
+    task: "transcribe";
+    language: string;
+    duration: number;
     segments: {
         text: string;
         id: number;
@@ -154,11 +157,11 @@ declare const openAITranscriptionVerboseJsonSchema: z.ZodObject<{
         no_speech_prob: number;
         transient?: boolean | undefined;
     }[];
+}, {
+    text: string;
     task: "transcribe";
     language: string;
     duration: number;
-}, {
-    text: string;
     segments: {
         text: string;
         id: number;
@@ -172,9 +175,6 @@ declare const openAITranscriptionVerboseJsonSchema: z.ZodObject<{
         no_speech_prob: number;
         transient?: boolean | undefined;
     }[];
-    task: "transcribe";
-    language: string;
-    duration: number;
 }>;
 export type OpenAITranscriptionVerboseJsonResponse = z.infer<typeof openAITranscriptionVerboseJsonSchema>;
 export type OpenAITranscriptionResponseFormatType<T> = {
@@ -192,6 +192,9 @@ export declare const OpenAITranscriptionResponseFormat: {
         type: "verbose_json";
         handler: ResponseHandler<{
             text: string;
+            task: "transcribe";
+            language: string;
+            duration: number;
             segments: {
                 text: string;
                 id: number;
@@ -205,9 +208,6 @@ export declare const OpenAITranscriptionResponseFormat: {
                 no_speech_prob: number;
                 transient?: boolean | undefined;
             }[];
-            task: "transcribe";
-            language: string;
-            duration: number;
         }>;
     };
     text: {

package/model-provider/openai/index.cjs

@@ -34,7 +34,6 @@ __exportStar(require("./OpenAIChatMessage.cjs"), exports);
 __exportStar(require("./OpenAIChatModel.cjs"), exports);
 exports.OpenAIChatPrompt = __importStar(require("./OpenAIChatPromptTemplate.cjs"));
 __exportStar(require("./OpenAICompletionModel.cjs"), exports);
-__exportStar(require("./OpenAICostCalculator.cjs"), exports);
 exports.openai = __importStar(require("./OpenAIFacade.cjs"));
 __exportStar(require("./OpenAIImageGenerationModel.cjs"), exports);
 __exportStar(require("./OpenAISpeechModel.cjs"), exports);

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

@@ -5,7 +5,6 @@ export * from "./OpenAIChatMessage.js";
 export * from "./OpenAIChatModel.js";
 export * as OpenAIChatPrompt from "./OpenAIChatPromptTemplate.js";
 export * from "./OpenAICompletionModel.js";
-export * from "./OpenAICostCalculator.js";
 export { OpenAIErrorData } from "./OpenAIError.js";
 export * as openai from "./OpenAIFacade.js";
 export * from "./OpenAIImageGenerationModel.js";

package/model-provider/openai/index.js

@@ -5,7 +5,6 @@ export * from "./OpenAIChatMessage.js";
 export * from "./OpenAIChatModel.js";
 export * as OpenAIChatPrompt from "./OpenAIChatPromptTemplate.js";
 export * from "./OpenAICompletionModel.js";
-export * from "./OpenAICostCalculator.js";
 export * as openai from "./OpenAIFacade.js";
 export * from "./OpenAIImageGenerationModel.js";
 export * from "./OpenAISpeechModel.js";