modelfusion 0.102.0 → 0.103.0

package/model-provider/ollama/OllamaCompletionModel.js

@@ -6,6 +6,7 @@ import { ZodSchema } from "../../core/schema/ZodSchema.js";
 import { safeParseJSON } from "../../core/schema/parseJSON.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";
 import { TextGenerationToolCallModel, } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
 import { TextGenerationToolCallsOrGenerateTextModel, } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
 import { AsyncQueue } from "../../util/AsyncQueue.js";
@@ -87,8 +88,7 @@ export class OllamaCompletionModel extends AbstractModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
+            ...textGenerationModelProperties,
             "contextWindowSize",
             "temperature",
             "mirostat",
@@ -118,7 +118,12 @@ export class OllamaCompletionModel extends AbstractModel {
         });
         return {
             response,
-            texts: [response.response],
+            textGenerationResults: [
+                {
+                    text: response.response,
+                    finishReason: "unknown",
+                },
+            ],
         };
     }
     doStreamText(prompt, options) {

package/model-provider/openai/OpenAICompletionModel.cjs

@@ -8,6 +8,7 @@ const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const PromptTemplateTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptTemplateTextStreamingModel.cjs");
+const TextGenerationModel_js_1 = require("../../model-function/generate-text/TextGenerationModel.cjs");
 const TextPromptTemplate_js_1 = require("../../model-function/generate-text/prompt-template/TextPromptTemplate.cjs");
 const countTokens_js_1 = require("../../model-function/tokenize-text/countTokens.cjs");
 const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
@@ -228,9 +229,7 @@ class OpenAICompletionModel extends AbstractModel_js_1.AbstractModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
-            "numberOfGenerations",
+            ...TextGenerationModel_js_1.textGenerationModelProperties,
             "suffix",
             "temperature",
             "topP",
@@ -251,7 +250,12 @@ class OpenAICompletionModel extends AbstractModel_js_1.AbstractModel {
         });
         return {
             response,
-            texts: response.choices.map((choice) => choice.text),
+            textGenerationResults: response.choices.map((choice) => {
+                return {
+                    finishReason: this.translateFinishReason(choice.finish_reason),
+                    text: choice.text,
+                };
+            }),
             usage: {
                 promptTokens: response.usage.prompt_tokens,
                 completionTokens: response.usage.completion_tokens,
@@ -259,6 +263,18 @@ class OpenAICompletionModel extends AbstractModel_js_1.AbstractModel {
             },
         };
     }
+    translateFinishReason(finishReason) {
+        switch (finishReason) {
+            case "stop":
+                return "stop";
+            case "length":
+                return "length";
+            case "content_filter":
+                return "content-filter";
+            default:
+                return "unknown";
+        }
+    }
     doStreamText(prompt, options) {
         return this.callAPI(prompt, {
             ...options,

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

@@ -7,6 +7,7 @@ import { Delta } from "../../model-function/Delta.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { TextGenerationModelSettings, TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
+import { TextGenerationFinishReason } from "../../model-function/generate-text/TextGenerationResult.js";
 import { TikTokenTokenizer } from "./TikTokenTokenizer.js";
 /**
  * @see https://platform.openai.com/docs/models/
@@ -162,13 +163,17 @@ export declare class OpenAICompletionModel extends AbstractModel<OpenAICompletio
             }[];
             system_fingerprint?: string | undefined;
         };
-        texts: string[];
+        textGenerationResults: {
+            finishReason: TextGenerationFinishReason;
+            text: string;
+        }[];
         usage: {
             promptTokens: number;
             completionTokens: number;
             totalTokens: number;
         };
     }>;
+    private translateFinishReason;
     doStreamText(prompt: string, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
     /**
      * Returns this model with an instruction prompt template.

package/model-provider/openai/OpenAICompletionModel.js

@@ -5,6 +5,7 @@ import { ZodSchema } from "../../core/schema/ZodSchema.js";
 import { parseJSON } from "../../core/schema/parseJSON.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";
 import { chat, instruction, } from "../../model-function/generate-text/prompt-template/TextPromptTemplate.js";
 import { countTokens } from "../../model-function/tokenize-text/countTokens.js";
 import { AsyncQueue } from "../../util/AsyncQueue.js";
@@ -222,9 +223,7 @@ export class OpenAICompletionModel extends AbstractModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
-            "numberOfGenerations",
+            ...textGenerationModelProperties,
             "suffix",
             "temperature",
             "topP",
@@ -245,7 +244,12 @@ export class OpenAICompletionModel extends AbstractModel {
         });
         return {
             response,
-            texts: response.choices.map((choice) => choice.text),
+            textGenerationResults: response.choices.map((choice) => {
+                return {
+                    finishReason: this.translateFinishReason(choice.finish_reason),
+                    text: choice.text,
+                };
+            }),
             usage: {
                 promptTokens: response.usage.prompt_tokens,
                 completionTokens: response.usage.completion_tokens,
@@ -253,6 +257,18 @@ export class OpenAICompletionModel extends AbstractModel {
             },
         };
     }
+    translateFinishReason(finishReason) {
+        switch (finishReason) {
+            case "stop":
+                return "stop";
+            case "length":
+                return "length";
+            case "content_filter":
+                return "content-filter";
+            default:
+                return "unknown";
+        }
+    }
     doStreamText(prompt, options) {
         return this.callAPI(prompt, {
             ...options,

package/model-provider/openai/chat/AbstractOpenAIChatModel.cjs

@@ -80,10 +80,28 @@ class AbstractOpenAIChatModel extends AbstractModel_js_1.AbstractModel {
         });
         return {
             response,
-            texts: response.choices.map((choice) => choice.message.content ?? ""),
+            textGenerationResults: response.choices.map((choice) => ({
+                text: choice.message.content ?? "",
+                finishReason: this.translateFinishReason(choice.finish_reason),
+            })),
             usage: this.extractUsage(response),
         };
     }
+    translateFinishReason(finishReason) {
+        switch (finishReason) {
+            case "stop":
+                return "stop";
+            case "length":
+                return "length";
+            case "content_filter":
+                return "content-filter";
+            case "function_call":
+            case "tool_calls":
+                return "tool-calls";
+            default:
+                return "unknown";
+        }
+    }
     doStreamText(prompt, options) {
         return this.callAPI(prompt, {
             ...options,

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

@@ -5,6 +5,7 @@ import { ResponseHandler } from "../../../core/api/postToApi.js";
 import { AbstractModel } from "../../../model-function/AbstractModel.js";
 import { Delta } from "../../../model-function/Delta.js";
 import { TextGenerationModelSettings } from "../../../model-function/generate-text/TextGenerationModel.js";
+import { TextGenerationFinishReason } from "../../../model-function/generate-text/TextGenerationResult.js";
 import { ToolDefinition } from "../../../tool/ToolDefinition.js";
 import { OpenAIChatMessage } from "./OpenAIChatMessage.js";
 export interface AbstractOpenAIChatCallSettings {
@@ -126,13 +127,17 @@ export declare abstract class AbstractOpenAIChatModel<SETTINGS extends AbstractO
             }[];
             system_fingerprint?: string | null | undefined;
         };
-        texts: string[];
+        textGenerationResults: {
+            text: string;
+            finishReason: TextGenerationFinishReason;
+        }[];
         usage: {
             promptTokens: number;
             completionTokens: number;
             totalTokens: number;
         };
     }>;
+    private translateFinishReason;
     doStreamText(prompt: OpenAIChatPrompt, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
     doGenerateToolCall(tool: ToolDefinition<string, unknown>, prompt: OpenAIChatPrompt, options?: FunctionOptions): Promise<{
         response: {

package/model-provider/openai/chat/AbstractOpenAIChatModel.js

@@ -77,10 +77,28 @@ export class AbstractOpenAIChatModel extends AbstractModel {
         });
         return {
             response,
-            texts: response.choices.map((choice) => choice.message.content ?? ""),
+            textGenerationResults: response.choices.map((choice) => ({
+                text: choice.message.content ?? "",
+                finishReason: this.translateFinishReason(choice.finish_reason),
+            })),
             usage: this.extractUsage(response),
         };
     }
+    translateFinishReason(finishReason) {
+        switch (finishReason) {
+            case "stop":
+                return "stop";
+            case "length":
+                return "length";
+            case "content_filter":
+                return "content-filter";
+            case "function_call":
+            case "tool_calls":
+                return "tool-calls";
+            default:
+                return "unknown";
+        }
+    }
     doStreamText(prompt, options) {
         return this.callAPI(prompt, {
             ...options,

package/model-provider/openai/chat/OpenAIChatModel.cjs

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAIChatModel = exports.calculateOpenAIChatCostInMillicents = exports.isOpenAIChatModel = exports.getOpenAIChatModelInformation = exports.OPENAI_CHAT_MODELS = void 0;
 const StructureFromTextStreamingModel_js_1 = require("../../../model-function/generate-structure/StructureFromTextStreamingModel.cjs");
 const PromptTemplateTextStreamingModel_js_1 = require("../../../model-function/generate-text/PromptTemplateTextStreamingModel.cjs");
+const TextGenerationModel_js_1 = require("../../../model-function/generate-text/TextGenerationModel.cjs");
 const TikTokenTokenizer_js_1 = require("../TikTokenTokenizer.cjs");
 const AbstractOpenAIChatModel_js_1 = require("./AbstractOpenAIChatModel.cjs");
 const OpenAIChatFunctionCallStructureGenerationModel_js_1 = require("./OpenAIChatFunctionCallStructureGenerationModel.cjs");
@@ -196,9 +197,7 @@ class OpenAIChatModel extends AbstractOpenAIChatModel_js_1.AbstractOpenAIChatMod
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
-            "numberOfGenerations",
+            ...TextGenerationModel_js_1.textGenerationModelProperties,
             "functions",
             "functionCall",
             "temperature",

package/model-provider/openai/chat/OpenAIChatModel.js

@@ -1,5 +1,6 @@
 import { StructureFromTextStreamingModel } from "../../../model-function/generate-structure/StructureFromTextStreamingModel.js";
 import { PromptTemplateTextStreamingModel } from "../../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
+import { textGenerationModelProperties, } from "../../../model-function/generate-text/TextGenerationModel.js";
 import { TikTokenTokenizer } from "../TikTokenTokenizer.js";
 import { AbstractOpenAIChatModel, } from "./AbstractOpenAIChatModel.js";
 import { OpenAIChatFunctionCallStructureGenerationModel } from "./OpenAIChatFunctionCallStructureGenerationModel.js";
@@ -190,9 +191,7 @@ export class OpenAIChatModel extends AbstractOpenAIChatModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "maxGenerationTokens",
-            "stopSequences",
-            "numberOfGenerations",
+            ...textGenerationModelProperties,
             "functions",
             "functionCall",
             "temperature",

package/model-provider/openai-compatible/OpenAICompatibleChatModel.cjs

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAICompatibleChatModel = void 0;
 const StructureFromTextStreamingModel_js_1 = require("../../model-function/generate-structure/StructureFromTextStreamingModel.cjs");
 const PromptTemplateTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptTemplateTextStreamingModel.cjs");
+const TextGenerationModel_js_1 = require("../../model-function/generate-text/TextGenerationModel.cjs");
 const AbstractOpenAIChatModel_js_1 = require("../openai/chat/AbstractOpenAIChatModel.cjs");
 const OpenAIChatPromptTemplate_js_1 = require("../openai/chat/OpenAIChatPromptTemplate.cjs");
 /**
@@ -43,9 +44,7 @@ class OpenAICompatibleChatModel extends AbstractOpenAIChatModel_js_1.AbstractOpe
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "stopSequences",
-            "maxGenerationTokens",
-            "numberOfGenerations",
+            ...TextGenerationModel_js_1.textGenerationModelProperties,
             "functions",
             "functionCall",
             "temperature",

package/model-provider/openai-compatible/OpenAICompatibleChatModel.js

@@ -1,5 +1,6 @@
 import { StructureFromTextStreamingModel } from "../../model-function/generate-structure/StructureFromTextStreamingModel.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
+import { textGenerationModelProperties, } from "../../model-function/generate-text/TextGenerationModel.js";
 import { AbstractOpenAIChatModel, } from "../openai/chat/AbstractOpenAIChatModel.js";
 import { chat, instruction, text, } from "../openai/chat/OpenAIChatPromptTemplate.js";
 /**
@@ -40,9 +41,7 @@ export class OpenAICompatibleChatModel extends AbstractOpenAIChatModel {
     }
     get settingsForEvent() {
         const eventSettingProperties = [
-            "stopSequences",
-            "maxGenerationTokens",
-            "numberOfGenerations",
+            ...textGenerationModelProperties,
             "functions",
             "functionCall",
             "temperature",

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

@@ -69,9 +69,9 @@ export declare class StabilityImageGenerationModel extends AbstractModel<Stabili
     doGenerateImages(prompt: StabilityImageGenerationPrompt, options?: FunctionOptions): Promise<{
         response: {
             artifacts: {
+                finishReason: "ERROR" | "SUCCESS" | "CONTENT_FILTERED";
                 base64: string;
                 seed: number;
-                finishReason: "SUCCESS" | "ERROR" | "CONTENT_FILTERED";
             }[];
         };
         base64Images: string[];
@@ -86,25 +86,25 @@ declare const stabilityImageGenerationResponseSchema: z.ZodObject<{
         seed: z.ZodNumber;
         finishReason: z.ZodEnum<["SUCCESS", "ERROR", "CONTENT_FILTERED"]>;
     }, "strip", z.ZodTypeAny, {
+        finishReason: "ERROR" | "SUCCESS" | "CONTENT_FILTERED";
         base64: string;
         seed: number;
-        finishReason: "SUCCESS" | "ERROR" | "CONTENT_FILTERED";
     }, {
+        finishReason: "ERROR" | "SUCCESS" | "CONTENT_FILTERED";
         base64: string;
         seed: number;
-        finishReason: "SUCCESS" | "ERROR" | "CONTENT_FILTERED";
     }>, "many">;
 }, "strip", z.ZodTypeAny, {
     artifacts: {
+        finishReason: "ERROR" | "SUCCESS" | "CONTENT_FILTERED";
         base64: string;
         seed: number;
-        finishReason: "SUCCESS" | "ERROR" | "CONTENT_FILTERED";
     }[];
 }, {
     artifacts: {
+        finishReason: "ERROR" | "SUCCESS" | "CONTENT_FILTERED";
         base64: string;
         seed: number;
-        finishReason: "SUCCESS" | "ERROR" | "CONTENT_FILTERED";
     }[];
 }>;
 export type StabilityImageGenerationResponse = z.infer<typeof stabilityImageGenerationResponseSchema>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modelfusion",
   "description": "The TypeScript library for building multi-modal AI applications.",
-  "version": "0.102.0",
+  "version": "0.103.0",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [
@@ -89,7 +89,7 @@
     "@vitest/coverage-v8": "^1.1.0",
     "@vitest/ui": "1.1.0",
     "eslint": "^8.45.0",
-    "eslint-config-prettier": "9.0.0",
+    "eslint-config-prettier": "9.1.0",
     "fastify": "^4.0.0",
     "msw": "2.0.10"
   }