modelfusion 0.119.1 → 0.121.0

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

@@ -0,0 +1,45 @@
+import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
+import { TextGenerationPromptTemplateProvider } from "../../model-function/generate-text/prompt-template/PromptTemplateProvider.js";
+import { OllamaCompletionPrompt } from "./OllamaCompletionModel.js";
+export declare function asOllamaCompletionPromptTemplate<SOURCE_PROMPT>(promptTemplate: TextGenerationPromptTemplate<SOURCE_PROMPT, string>): TextGenerationPromptTemplate<SOURCE_PROMPT, OllamaCompletionPrompt>;
+export declare function asOllamaCompletionTextPromptTemplateProvider(promptTemplateProvider: TextGenerationPromptTemplateProvider<string>): TextGenerationPromptTemplateProvider<OllamaCompletionPrompt>;
+export declare const Text: TextGenerationPromptTemplateProvider<OllamaCompletionPrompt>;
+/**
+ * Formats text, instruction or chat prompts as a Mistral instruct prompt.
+ *
+ * Note that Mistral does not support system prompts. We emulate them.
+ *
+ * Text prompt:
+ * ```
+ * <s>[INST] { instruction } [/INST]
+ * ```
+ *
+ * Instruction prompt when system prompt is set:
+ * ```
+ * <s>[INST] ${ system prompt } [/INST] </s>[INST] ${instruction} [/INST] ${ response prefix }
+ * ```
+ *
+ * Instruction prompt template when there is no system prompt:
+ * ```
+ * <s>[INST] ${ instruction } [/INST] ${ response prefix }
+ * ```
+ *
+ * Chat prompt when system prompt is set:
+ * ```
+ * <s>[INST] ${ system prompt } [/INST] </s> [INST] ${ user msg 1 } [/INST] ${ model response 1 } [INST] ${ user msg 2 } [/INST] ${ model response 2 } [INST] ${ user msg 3 } [/INST]
+ * ```
+ *
+ * Chat prompt when there is no system prompt:
+ * ```
+ * <s>[INST] ${ user msg 1 } [/INST] ${ model response 1 } </s>[INST] ${ user msg 2 } [/INST] ${ model response 2 } [INST] ${ user msg 3 } [/INST]
+ * ```
+ *
+ * @see https://docs.mistral.ai/models/#chat-template
+ */
+export declare const Mistral: TextGenerationPromptTemplateProvider<OllamaCompletionPrompt>;
+export declare const ChatML: TextGenerationPromptTemplateProvider<OllamaCompletionPrompt>;
+export declare const Llama2: TextGenerationPromptTemplateProvider<OllamaCompletionPrompt>;
+export declare const NeuralChat: TextGenerationPromptTemplateProvider<OllamaCompletionPrompt>;
+export declare const Alpaca: TextGenerationPromptTemplateProvider<OllamaCompletionPrompt>;
+export declare const Synthia: TextGenerationPromptTemplateProvider<OllamaCompletionPrompt>;
+export declare const Vicuna: TextGenerationPromptTemplateProvider<OllamaCompletionPrompt>;

package/model-provider/ollama/OllamaCompletionPrompt.js

@@ -0,0 +1,63 @@
+import * as alpacaPrompt from "../../model-function/generate-text/prompt-template/AlpacaPromptTemplate.js";
+import * as chatMlPrompt from "../../model-function/generate-text/prompt-template/ChatMLPromptTemplate.js";
+import * as llama2Prompt from "../../model-function/generate-text/prompt-template/Llama2PromptTemplate.js";
+import * as mistralPrompt from "../../model-function/generate-text/prompt-template/MistralInstructPromptTemplate.js";
+import * as neuralChatPrompt from "../../model-function/generate-text/prompt-template/NeuralChatPromptTemplate.js";
+import * as synthiaPrompt from "../../model-function/generate-text/prompt-template/SynthiaPromptTemplate.js";
+import * as textPrompt from "../../model-function/generate-text/prompt-template/TextPromptTemplate.js";
+import * as vicunaPrompt from "../../model-function/generate-text/prompt-template/VicunaPromptTemplate.js";
+export function asOllamaCompletionPromptTemplate(promptTemplate) {
+    return {
+        format: (prompt) => ({
+            prompt: promptTemplate.format(prompt),
+        }),
+        stopSequences: promptTemplate.stopSequences,
+    };
+}
+export function asOllamaCompletionTextPromptTemplateProvider(promptTemplateProvider) {
+    return {
+        text: () => asOllamaCompletionPromptTemplate(promptTemplateProvider.text()),
+        instruction: () => asOllamaCompletionPromptTemplate(promptTemplateProvider.instruction()),
+        chat: () => asOllamaCompletionPromptTemplate(promptTemplateProvider.chat()),
+    };
+}
+export const Text = asOllamaCompletionTextPromptTemplateProvider(textPrompt);
+/**
+ * Formats text, instruction or chat prompts as a Mistral instruct prompt.
+ *
+ * Note that Mistral does not support system prompts. We emulate them.
+ *
+ * Text prompt:
+ * ```
+ * <s>[INST] { instruction } [/INST]
+ * ```
+ *
+ * Instruction prompt when system prompt is set:
+ * ```
+ * <s>[INST] ${ system prompt } [/INST] </s>[INST] ${instruction} [/INST] ${ response prefix }
+ * ```
+ *
+ * Instruction prompt template when there is no system prompt:
+ * ```
+ * <s>[INST] ${ instruction } [/INST] ${ response prefix }
+ * ```
+ *
+ * Chat prompt when system prompt is set:
+ * ```
+ * <s>[INST] ${ system prompt } [/INST] </s> [INST] ${ user msg 1 } [/INST] ${ model response 1 } [INST] ${ user msg 2 } [/INST] ${ model response 2 } [INST] ${ user msg 3 } [/INST]
+ * ```
+ *
+ * Chat prompt when there is no system prompt:
+ * ```
+ * <s>[INST] ${ user msg 1 } [/INST] ${ model response 1 } </s>[INST] ${ user msg 2 } [/INST] ${ model response 2 } [INST] ${ user msg 3 } [/INST]
+ * ```
+ *
+ * @see https://docs.mistral.ai/models/#chat-template
+ */
+export const Mistral = asOllamaCompletionTextPromptTemplateProvider(mistralPrompt);
+export const ChatML = asOllamaCompletionTextPromptTemplateProvider(chatMlPrompt);
+export const Llama2 = asOllamaCompletionTextPromptTemplateProvider(llama2Prompt);
+export const NeuralChat = asOllamaCompletionTextPromptTemplateProvider(neuralChatPrompt);
+export const Alpaca = asOllamaCompletionTextPromptTemplateProvider(alpacaPrompt);
+export const Synthia = asOllamaCompletionTextPromptTemplateProvider(synthiaPrompt);
+export const Vicuna = asOllamaCompletionTextPromptTemplateProvider(vicunaPrompt);

package/model-provider/ollama/OllamaFacade.cjs

@@ -1,6 +1,29 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TextEmbedder = exports.ChatTextGenerator = exports.CompletionTextGenerator = exports.Api = void 0;
+exports.prompt = exports.TextEmbedder = exports.ChatTextGenerator = exports.CompletionTextGenerator = exports.Api = void 0;
 const OllamaApiConfiguration_js_1 = require("./OllamaApiConfiguration.cjs");
 const OllamaChatModel_js_1 = require("./OllamaChatModel.cjs");
 const OllamaCompletionModel_js_1 = require("./OllamaCompletionModel.cjs");
@@ -25,3 +48,4 @@ function TextEmbedder(settings) {
     return new OllamaTextEmbeddingModel_js_1.OllamaTextEmbeddingModel(settings);
 }
 exports.TextEmbedder = TextEmbedder;
+exports.prompt = __importStar(require("./OllamaCompletionPrompt.cjs"));

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

@@ -12,3 +12,4 @@ export declare function CompletionTextGenerator<CONTEXT_WINDOW_SIZE extends numb
 export declare function ChatTextGenerator(settings: OllamaChatModelSettings): OllamaChatModel;
 export declare function TextEmbedder(settings: OllamaTextEmbeddingModelSettings): OllamaTextEmbeddingModel;
 export { OllamaChatMessage as ChatMessage, OllamaChatPrompt as ChatPrompt, } from "./OllamaChatModel.js";
+export * as prompt from "./OllamaCompletionPrompt.js";

package/model-provider/ollama/OllamaFacade.js

@@ -18,3 +18,4 @@ export function ChatTextGenerator(settings) {
 export function TextEmbedder(settings) {
     return new OllamaTextEmbeddingModel(settings);
 }
+export * as prompt from "./OllamaCompletionPrompt.js";

package/package.json

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

package/tool/Tool.d.ts

@@ -1,4 +1,4 @@
-import { FunctionOptions } from "../core/FunctionOptions.js";
+import { FunctionCallOptions, FunctionOptions } from "../core/FunctionOptions.js";
 import { JsonSchemaProducer } from "../core/schema/JsonSchemaProducer.js";
 import { Schema } from "../core/schema/Schema.js";
 import { ToolDefinition } from "./ToolDefinition.js";
@@ -28,7 +28,7 @@ export declare class Tool<NAME extends string, PARAMETERS, RESULT> implements To
     /**
      * The actual execution function of the tool.
      */
-    readonly execute: (args: PARAMETERS, options?: FunctionOptions) => PromiseLike<RESULT>;
+    readonly execute: (args: PARAMETERS, options: FunctionCallOptions) => PromiseLike<RESULT>;
     constructor({ name, description, parameters, returnType, execute, }: {
         name: NAME;
         description: string;

package/tool/execute-tool/executeTool.cjs

@@ -32,7 +32,7 @@ async function doExecuteTool(tool, args, options) {
     const metadata = {
         functionType: "execute-tool",
         callId: `call-${(0, nanoid_1.nanoid)()}`,
-        parentCallId: options?.parentCallId,
+        parentCallId: options?.callId,
         runId: run?.runId,
         sessionId: run?.sessionId,
         userId: run?.userId,
@@ -47,11 +47,12 @@ async function doExecuteTool(tool, args, options) {
         startTimestamp: durationMeasurement.startDate,
     });
     const result = await (0, runSafe_js_1.runSafe)(() => tool.execute(args, {
+        functionType: metadata.functionType,
+        callId: metadata.callId,
         functionId: options?.functionId,
         logging: options?.logging,
         observers: options?.observers,
         run,
-        parentCallId: metadata.callId,
     }));
     const finishMetadata = {
         ...metadata,

package/tool/execute-tool/executeTool.js

@@ -28,7 +28,7 @@ async function doExecuteTool(tool, args, options) {
     const metadata = {
         functionType: "execute-tool",
         callId: `call-${createId()}`,
-        parentCallId: options?.parentCallId,
+        parentCallId: options?.callId,
         runId: run?.runId,
         sessionId: run?.sessionId,
         userId: run?.userId,
@@ -43,11 +43,12 @@ async function doExecuteTool(tool, args, options) {
         startTimestamp: durationMeasurement.startDate,
     });
     const result = await runSafe(() => tool.execute(args, {
+        functionType: metadata.functionType,
+        callId: metadata.callId,
         functionId: options?.functionId,
         logging: options?.logging,
         observers: options?.observers,
         run,
-        parentCallId: metadata.callId,
     }));
     const finishMetadata = {
         ...metadata,