modelfusion 0.106.0 → 0.107.0

package/model-provider/llamacpp/index.cjs

@@ -33,5 +33,5 @@ var LlamaCppError_js_1 = require("./LlamaCppError.cjs");
 Object.defineProperty(exports, "LlamaCppError", { enumerable: true, get: function () { return LlamaCppError_js_1.LlamaCppError; } });
 exports.llamacpp = __importStar(require("./LlamaCppFacade.cjs"));
 __exportStar(require("./LlamaCppTextEmbeddingModel.cjs"), exports);
-__exportStar(require("./LlamaCppTextGenerationModel.cjs"), exports);
+__exportStar(require("./LlamaCppCompletionModel.cjs"), exports);
 __exportStar(require("./LlamaCppTokenizer.cjs"), exports);

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/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/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/package.json

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

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

@@ -19,3 +19,4 @@ __exportStar(require("./ToolCallGenerationEvent.cjs"), exports);
 __exportStar(require("./ToolCallGenerationModel.cjs"), exports);
 __exportStar(require("./ToolCallParseError.cjs"), exports);
 __exportStar(require("./generateToolCall.cjs"), exports);
+__exportStar(require("./jsonToolCallPrompt.cjs"), exports);

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

@@ -3,3 +3,4 @@ export * from "./ToolCallGenerationEvent.js";
 export * from "./ToolCallGenerationModel.js";
 export * from "./ToolCallParseError.js";
 export * from "./generateToolCall.js";
+export * from "./jsonToolCallPrompt.js";

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

@@ -3,3 +3,4 @@ export * from "./ToolCallGenerationEvent.js";
 export * from "./ToolCallGenerationModel.js";
 export * from "./ToolCallParseError.js";
 export * from "./generateToolCall.js";
+export * from "./jsonToolCallPrompt.js";

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

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.jsonToolCallPrompt = void 0;
+const nanoid_1 = require("nanoid");
+const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
+exports.jsonToolCallPrompt = {
+    text() {
+        return {
+            createPrompt(instruction, tool) {
+                return {
+                    system: [
+                        `You are calling a function "${tool.name}".`,
+                        tool.description != null
+                            ? `  Function description: ${tool.description}`
+                            : null,
+                        `  Function parameters JSON schema: ${JSON.stringify(tool.parameters.getJsonSchema())}`,
+                        ``,
+                        `You MUST answer with a JSON object matches the above schema for the arguments.`,
+                    ]
+                        .filter(Boolean)
+                        .join("\n"),
+                    instruction,
+                };
+            },
+            extractToolCall(response) {
+                return { id: (0, nanoid_1.nanoid)(), args: (0, parseJSON_js_1.parseJSON)({ text: response }) };
+            },
+        };
+    },
+};

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

@@ -0,0 +1,5 @@
+import { InstructionPrompt } from "../../model-function/generate-text/prompt-template/InstructionPrompt.js";
+import { ToolCallPromptTemplate } from "./TextGenerationToolCallModel.js";
+export declare const jsonToolCallPrompt: {
+    text(): ToolCallPromptTemplate<string, InstructionPrompt>;
+};

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

@@ -0,0 +1,27 @@
+import { nanoid } from "nanoid";
+import { parseJSON } from "../../core/schema/parseJSON.js";
+export const jsonToolCallPrompt = {
+    text() {
+        return {
+            createPrompt(instruction, tool) {
+                return {
+                    system: [
+                        `You are calling a function "${tool.name}".`,
+                        tool.description != null
+                            ? `  Function description: ${tool.description}`
+                            : null,
+                        `  Function parameters JSON schema: ${JSON.stringify(tool.parameters.getJsonSchema())}`,
+                        ``,
+                        `You MUST answer with a JSON object matches the above schema for the arguments.`,
+                    ]
+                        .filter(Boolean)
+                        .join("\n"),
+                    instruction,
+                };
+            },
+            extractToolCall(response) {
+                return { id: nanoid(), args: parseJSON({ text: response }) };
+            },
+        };
+    },
+};