modelfusion 0.111.0 → 0.112.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v0.112.0 - 2024-01-02
+
+### Changed
+
+- **breaking change**: renamed `useToolsOrGenerateText` to `useTools`
+- **breaking change**: renamed `generateToolCallsOrText` to `generateToolCalls`
+
+### Removed
+
+- Restriction on tool names. OpenAI tool calls do not have such a restriction.
+
 ## v0.111.0 - 2024-01-01
 
 Reworked API configuration support.

package/README.md

@@ -328,67 +328,7 @@ Providers: [OpenAI](https://modelfusion.dev/integration/model-provider/openai),
 
 Tools are functions that can be executed by an AI model. They are useful for building chatbots and agents.
 
-Predefined tools: [Math.js](https://modelfusion.dev/guide/tools/predefined-tools/mathjs), [SerpAPI](https://modelfusion.dev/guide/tools/predefined-tools/serpapi), [Google Custom Search](https://modelfusion.dev/guide/tools/predefined-tools/google-custom-search)
-
-#### [Creating Tools](https://modelfusion.dev/guide/tools/create-tools)
-
-A tool is comprised of an async execute function, a name, a description, and a schema for the input parameters.
-
-```ts
-const calculator = new Tool({
-  name: "calculator",
-  description: "Execute a calculation",
-
-  parameters: zodSchema(
-    z.object({
-      a: z.number().describe("The first number."),
-      b: z.number().describe("The second number."),
-      operator: z
-        .enum(["+", "-", "*", "/"])
-        .describe("The operator (+, -, *, /)."),
-    })
-  ),
-
-  execute: async ({ a, b, operator }) => {
-    switch (operator) {
-      case "+":
-        return a + b;
-      case "-":
-        return a - b;
-      case "*":
-        return a * b;
-      case "/":
-        return a / b;
-      default:
-        throw new Error(`Unknown operator: ${operator}`);
-    }
-  },
-});
-```
-
-#### [generateToolCall](https://modelfusion.dev/guide/tools/generate-tool-call)
-
-With `generateToolCall`, you can generate a tool call for a specific tool with a language model that supports tools calls (e.g. OpenAI Chat). This function does not execute the tools.
-
-```ts
-const { id, name, args } = await generateToolCall(
-  openai.ChatTextGenerator({ model: "gpt-3.5-turbo" }),
-  calculator,
-  [openai.ChatMessage.user("What's fourteen times twelve?")]
-);
-```
-
-#### [generateToolCallsOrText](https://modelfusion.dev/guide/tools/generate-tool-calls-or-text)
-
-With `generateToolCallsOrText`, you can ask a language model to generate several tool calls as well as text. The model will choose which tools (if any) should be called with which arguments. Both the text and the tool calls are optional. This function does not execute the tools.
-
-```ts
-const { text, toolCalls } = await generateToolCallsOrText(
-  openai.ChatTextGenerator({ model: "gpt-3.5-turbo" }),
-  [toolA, toolB, toolC],
-  [openai.ChatMessage.user(query)]
-);
-```
+Predefined tools: [Math.js](https://modelfusion.dev/guide/tools/predefined-tools/mathjs), [MediaWiki Search](https://modelfusion.dev/guide/tools/predefined-tools/mediawiki-search), [SerpAPI](https://modelfusion.dev/guide/tools/predefined-tools/serpapi), [Google Custom Search](https://modelfusion.dev/guide/tools/predefined-tools/google-custom-search)
 
 #### [executeTool](https://modelfusion.dev/guide/tools/execute-tool)
 
@@ -420,21 +360,57 @@ console.log(`Ok:`, ok);
 console.log(`Result or Error:`, result);
 ```
 
-#### [useToolsOrGenerateText](https://modelfusion.dev/guide/tools/use-tools-or-generate-text)
+#### [useTools](https://modelfusion.dev/guide/tools/use-tools-or-generate-text)
 
-With `useToolsOrGenerateText`, you can ask a language model to generate several tool calls as well as text. The model will choose which tools (if any) should be called with which arguments. Both the text and the tool calls are optional. This function executes the tools.
+With `useTools`, you can ask a language model to generate several tool calls as well as text. The model will choose which tools (if any) should be called with which arguments. Both the text and the tool calls are optional. This function executes the tools.
 
 ```ts
-const { text, toolResults } = await useToolsOrGenerateText(
+const { text, toolResults } = await useTools(
   openai.ChatTextGenerator({ model: "gpt-3.5-turbo" }),
   [calculator /* ... */],
   [openai.ChatMessage.user("What's fourteen times twelve?")]
 );
 ```
 
+#### [Creating Tools](https://modelfusion.dev/guide/tools/create-tools)
+
+A tool is comprised of an async execute function, a name, a description, and a schema for the input parameters.
+
+```ts
+const calculator = new Tool({
+  name: "calculator",
+  description: "Execute a calculation",
+
+  parameters: zodSchema(
+    z.object({
+      a: z.number().describe("The first number."),
+      b: z.number().describe("The second number."),
+      operator: z
+        .enum(["+", "-", "*", "/"])
+        .describe("The operator (+, -, *, /)."),
+    })
+  ),
+
+  execute: async ({ a, b, operator }) => {
+    switch (operator) {
+      case "+":
+        return a + b;
+      case "-":
+        return a - b;
+      case "*":
+        return a * b;
+      case "/":
+        return a / b;
+      default:
+        throw new Error(`Unknown operator: ${operator}`);
+    }
+  },
+});
+```
+
 #### [Agent Loop](https://modelfusion.dev/guide/tools/agent-loop)
 
-You can use `useToolsOrGenerateText` to implement an agent loop that responds to user messages and executes tools. [Learn more](https://modelfusion.dev/guide/tools/agent-loop).
+You can use `useTools` to implement an agent loop that responds to user messages and executes tools. [Learn more](https://modelfusion.dev/guide/tools/agent-loop).
 
 ### [Vector Indices](https://modelfusion.dev/guide/vector-index)
 

package/core/FunctionEvent.d.ts

@@ -1,11 +1,11 @@
-import { ExtensionFunctionStartedEvent, ExtensionFunctionFinishedEvent } from "./ExtensionFunctionEvent.js";
 import { ModelCallFinishedEvent, ModelCallStartedEvent } from "../model-function/ModelCallEvent.js";
 import { RetrieveFinishedEvent, RetrieveStartedEvent } from "../retriever/RetrieveEvent.js";
 import { ExecuteToolFinishedEvent, ExecuteToolStartedEvent } from "../tool/execute-tool/ExecuteToolEvent.js";
 import { UseToolFinishedEvent, UseToolStartedEvent } from "../tool/use-tool/UseToolEvent.js";
-import { UseToolsOrGenerateTextFinishedEvent, UseToolsOrGenerateTextStartedEvent } from "../tool/use-tools-or-generate-text/UseToolsOrGenerateTextEvent.js";
+import { useToolsFinishedEvent, useToolsStartedEvent } from "../tool/use-tools/UseToolsEvent.js";
 import { UpsertIntoVectorIndexFinishedEvent, UpsertIntoVectorIndexStartedEvent } from "../vector-index/UpsertIntoVectorIndexEvent.js";
 import { ExecuteFunctionFinishedEvent, ExecuteFunctionStartedEvent } from "./ExecuteFunctionEvent.js";
+import { ExtensionFunctionFinishedEvent, ExtensionFunctionStartedEvent } from "./ExtensionFunctionEvent.js";
 export interface BaseFunctionEvent {
     /**
      * Unique identifier for the function call.
@@ -82,4 +82,4 @@ export interface BaseFunctionFinishedEvent extends BaseFunctionEvent {
      */
     result: BaseFunctionFinishedEventResult;
 }
-export type FunctionEvent = ExecuteFunctionStartedEvent | ExecuteFunctionFinishedEvent | ExecuteToolStartedEvent | ExecuteToolFinishedEvent | ExtensionFunctionStartedEvent | ExtensionFunctionFinishedEvent | ModelCallStartedEvent | ModelCallFinishedEvent | RetrieveStartedEvent | RetrieveFinishedEvent | UpsertIntoVectorIndexStartedEvent | UpsertIntoVectorIndexFinishedEvent | UseToolStartedEvent | UseToolFinishedEvent | UseToolsOrGenerateTextStartedEvent | UseToolsOrGenerateTextFinishedEvent;
+export type FunctionEvent = ExecuteFunctionStartedEvent | ExecuteFunctionFinishedEvent | ExecuteToolStartedEvent | ExecuteToolFinishedEvent | ExtensionFunctionStartedEvent | ExtensionFunctionFinishedEvent | ModelCallStartedEvent | ModelCallFinishedEvent | RetrieveStartedEvent | RetrieveFinishedEvent | UpsertIntoVectorIndexStartedEvent | UpsertIntoVectorIndexFinishedEvent | UseToolStartedEvent | UseToolFinishedEvent | useToolsStartedEvent | useToolsFinishedEvent;

package/model-function/ModelCallEvent.d.ts

@@ -1,6 +1,6 @@
 import { BaseFunctionFinishedEvent, BaseFunctionStartedEvent } from "../core/FunctionEvent.js";
 import { ToolCallGenerationFinishedEvent, ToolCallGenerationStartedEvent } from "../tool/generate-tool-call/ToolCallGenerationEvent.js";
-import { ToolCallsOrTextGenerationFinishedEvent, ToolCallsOrTextGenerationStartedEvent } from "../tool/generate-tool-calls-or-text/ToolCallsOrTextGenerationEvent.js";
+import { ToolCallsGenerationFinishedEvent, ToolCallsGenerationStartedEvent } from "../tool/generate-tool-calls/ToolCallsGenerationEvent.js";
 import { ModelInformation } from "./ModelInformation.js";
 import { EmbeddingFinishedEvent, EmbeddingStartedEvent } from "./embed/EmbeddingEvent.js";
 import { ImageGenerationFinishedEvent, ImageGenerationStartedEvent } from "./generate-image/ImageGenerationEvent.js";
@@ -49,5 +49,5 @@ export interface BaseModelCallFinishedEvent extends BaseFunctionFinishedEvent {
      */
     result: BaseModelCallFinishedEventResult;
 }
-export type ModelCallStartedEvent = EmbeddingStartedEvent | ImageGenerationStartedEvent | SpeechGenerationStartedEvent | SpeechStreamingStartedEvent | StructureGenerationStartedEvent | StructureStreamingStartedEvent | TextGenerationStartedEvent | TextStreamingStartedEvent | ToolCallGenerationStartedEvent | ToolCallsOrTextGenerationStartedEvent | TranscriptionStartedEvent;
-export type ModelCallFinishedEvent = EmbeddingFinishedEvent | ImageGenerationFinishedEvent | SpeechGenerationFinishedEvent | SpeechStreamingFinishedEvent | StructureGenerationFinishedEvent | StructureStreamingFinishedEvent | TextGenerationFinishedEvent | TextStreamingFinishedEvent | ToolCallGenerationFinishedEvent | ToolCallsOrTextGenerationFinishedEvent | TranscriptionFinishedEvent;
+export type ModelCallStartedEvent = EmbeddingStartedEvent | ImageGenerationStartedEvent | SpeechGenerationStartedEvent | SpeechStreamingStartedEvent | StructureGenerationStartedEvent | StructureStreamingStartedEvent | TextGenerationStartedEvent | TextStreamingStartedEvent | ToolCallGenerationStartedEvent | ToolCallsGenerationStartedEvent | TranscriptionStartedEvent;
+export type ModelCallFinishedEvent = EmbeddingFinishedEvent | ImageGenerationFinishedEvent | SpeechGenerationFinishedEvent | SpeechStreamingFinishedEvent | StructureGenerationFinishedEvent | StructureStreamingFinishedEvent | TextGenerationFinishedEvent | TextStreamingFinishedEvent | ToolCallGenerationFinishedEvent | ToolCallsGenerationFinishedEvent | TranscriptionFinishedEvent;

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

@@ -10,9 +10,9 @@ class PromptTemplateFullTextModel extends PromptTemplateTextStreamingModel_js_1.
         const mappedPrompt = this.promptTemplate.format(prompt);
         return this.model.doGenerateToolCall(tool, mappedPrompt, options);
     }
-    doGenerateToolCallsOrText(tools, prompt, options) {
+    doGenerateToolCalls(tools, prompt, options) {
         const mappedPrompt = this.promptTemplate.format(prompt);
-        return this.model.doGenerateToolCallsOrText(tools, mappedPrompt, options);
+        return this.model.doGenerateToolCalls(tools, mappedPrompt, options);
     }
     withPromptTemplate(promptTemplate) {
         return new PromptTemplateFullTextModel({

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

@@ -1,11 +1,11 @@
 import { FunctionOptions } from "../../core/FunctionOptions.js";
 import { ToolDefinition } from "../../tool/ToolDefinition.js";
 import { ToolCallGenerationModel } from "../../tool/generate-tool-call/ToolCallGenerationModel.js";
-import { ToolCallsOrTextGenerationModel } from "../../tool/generate-tool-calls-or-text/ToolCallsOrTextGenerationModel.js";
+import { ToolCallsGenerationModel } from "../../tool/generate-tool-calls/ToolCallsGenerationModel.js";
 import { PromptTemplateTextStreamingModel } from "./PromptTemplateTextStreamingModel.js";
 import { TextGenerationModelSettings, TextStreamingModel } from "./TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "./TextGenerationPromptTemplate.js";
-export declare class PromptTemplateFullTextModel<PROMPT, MODEL_PROMPT, SETTINGS extends TextGenerationModelSettings, MODEL extends TextStreamingModel<MODEL_PROMPT, SETTINGS> & ToolCallGenerationModel<MODEL_PROMPT, SETTINGS> & ToolCallsOrTextGenerationModel<MODEL_PROMPT, SETTINGS>> extends PromptTemplateTextStreamingModel<PROMPT, MODEL_PROMPT, SETTINGS, MODEL> implements TextStreamingModel<PROMPT, SETTINGS>, ToolCallGenerationModel<PROMPT, SETTINGS>, ToolCallsOrTextGenerationModel<PROMPT, SETTINGS> {
+export declare class PromptTemplateFullTextModel<PROMPT, MODEL_PROMPT, SETTINGS extends TextGenerationModelSettings, MODEL extends TextStreamingModel<MODEL_PROMPT, SETTINGS> & ToolCallGenerationModel<MODEL_PROMPT, SETTINGS> & ToolCallsGenerationModel<MODEL_PROMPT, SETTINGS>> extends PromptTemplateTextStreamingModel<PROMPT, MODEL_PROMPT, SETTINGS, MODEL> implements TextStreamingModel<PROMPT, SETTINGS>, ToolCallGenerationModel<PROMPT, SETTINGS>, ToolCallsGenerationModel<PROMPT, SETTINGS> {
     constructor(options: {
         model: MODEL;
         promptTemplate: TextGenerationPromptTemplate<PROMPT, MODEL_PROMPT>;
@@ -22,7 +22,7 @@ export declare class PromptTemplateFullTextModel<PROMPT, MODEL_PROMPT, SETTINGS
             totalTokens: number;
         } | undefined;
     }>;
-    doGenerateToolCallsOrText(tools: ToolDefinition<string, unknown>[], prompt: PROMPT, options?: FunctionOptions | undefined): PromiseLike<{
+    doGenerateToolCalls(tools: ToolDefinition<string, unknown>[], prompt: PROMPT, options?: FunctionOptions | undefined): PromiseLike<{
         response: unknown;
         text: string | null;
         toolCalls: {

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

@@ -7,9 +7,9 @@ export class PromptTemplateFullTextModel extends PromptTemplateTextStreamingMode
         const mappedPrompt = this.promptTemplate.format(prompt);
         return this.model.doGenerateToolCall(tool, mappedPrompt, options);
     }
-    doGenerateToolCallsOrText(tools, prompt, options) {
+    doGenerateToolCalls(tools, prompt, options) {
         const mappedPrompt = this.promptTemplate.format(prompt);
-        return this.model.doGenerateToolCallsOrText(tools, mappedPrompt, options);
+        return this.model.doGenerateToolCalls(tools, mappedPrompt, options);
     }
     withPromptTemplate(promptTemplate) {
         return new PromptTemplateFullTextModel({

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PromptTemplateTextGenerationModel = void 0;
 const TextGenerationToolCallModel_js_1 = require("../../tool/generate-tool-call/TextGenerationToolCallModel.cjs");
-const TextGenerationToolCallsOrGenerateTextModel_js_1 = require("../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.cjs");
+const TextGenerationToolCallsModel_js_1 = require("../../tool/generate-tool-calls/TextGenerationToolCallsModel.cjs");
 const StructureFromTextGenerationModel_js_1 = require("../generate-structure/StructureFromTextGenerationModel.cjs");
 class PromptTemplateTextGenerationModel {
     constructor({ model, promptTemplate, }) {
@@ -54,7 +54,7 @@ class PromptTemplateTextGenerationModel {
         });
     }
     asToolCallsOrTextGenerationModel(promptTemplate) {
-        return new TextGenerationToolCallsOrGenerateTextModel_js_1.TextGenerationToolCallsOrGenerateTextModel({
+        return new TextGenerationToolCallsModel_js_1.TextGenerationToolCallsModel({
             model: this,
             template: promptTemplate,
         });

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

@@ -1,7 +1,7 @@
 import { FunctionOptions } from "../../core/FunctionOptions.js";
 import { TextGenerationToolCallModel, ToolCallPromptTemplate } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
-import { TextGenerationToolCallsOrGenerateTextModel } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
-import { ToolCallsOrGenerateTextPromptTemplate } from "../../tool/generate-tool-calls-or-text/ToolCallsOrGenerateTextPromptTemplate.js";
+import { TextGenerationToolCallsModel } from "../../tool/generate-tool-calls/TextGenerationToolCallsModel.js";
+import { ToolCallsPromptTemplate } from "../../tool/generate-tool-calls/ToolCallsPromptTemplate.js";
 import { StructureFromTextGenerationModel } from "../generate-structure/StructureFromTextGenerationModel.js";
 import { StructureFromTextPromptTemplate } from "../generate-structure/StructureFromTextPromptTemplate.js";
 import { TextGenerationModel, TextGenerationModelSettings } from "./TextGenerationModel.js";
@@ -29,7 +29,7 @@ export declare class PromptTemplateTextGenerationModel<PROMPT, MODEL_PROMPT, SET
     }>;
     get settingsForEvent(): Partial<SETTINGS>;
     asToolCallGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallPromptTemplate<INPUT_PROMPT, PROMPT>): TextGenerationToolCallModel<INPUT_PROMPT, PROMPT, this>;
-    asToolCallsOrTextGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallsOrGenerateTextPromptTemplate<INPUT_PROMPT, PROMPT>): TextGenerationToolCallsOrGenerateTextModel<INPUT_PROMPT, PROMPT, this>;
+    asToolCallsOrTextGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallsPromptTemplate<INPUT_PROMPT, PROMPT>): TextGenerationToolCallsModel<INPUT_PROMPT, PROMPT, this>;
     asStructureGenerationModel<INPUT_PROMPT>(promptTemplate: StructureFromTextPromptTemplate<INPUT_PROMPT, PROMPT>): StructureFromTextGenerationModel<INPUT_PROMPT, PROMPT, this>;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, PROMPT>): PromptTemplateTextGenerationModel<INPUT_PROMPT, PROMPT, SETTINGS, this>;
     withSettings(additionalSettings: Partial<SETTINGS>): this;

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

@@ -1,5 +1,5 @@
 import { TextGenerationToolCallModel, } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
-import { TextGenerationToolCallsOrGenerateTextModel } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
+import { TextGenerationToolCallsModel } from "../../tool/generate-tool-calls/TextGenerationToolCallsModel.js";
 import { StructureFromTextGenerationModel } from "../generate-structure/StructureFromTextGenerationModel.js";
 export class PromptTemplateTextGenerationModel {
     constructor({ model, promptTemplate, }) {
@@ -51,7 +51,7 @@ export class PromptTemplateTextGenerationModel {
         });
     }
     asToolCallsOrTextGenerationModel(promptTemplate) {
-        return new TextGenerationToolCallsOrGenerateTextModel({
+        return new TextGenerationToolCallsModel({
             model: this,
             template: promptTemplate,
         });

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

@@ -61,12 +61,12 @@ export declare class MistralChatModel extends AbstractModel<MistralChatModelSett
     doGenerateTexts(prompt: MistralChatPrompt, options?: FunctionOptions): Promise<{
         response: {
             object: string;
+            model: string;
             usage: {
                 prompt_tokens: number;
                 completion_tokens: number;
                 total_tokens: number;
             };
-            model: string;
             id: string;
             created: number;
             choices: {
@@ -162,12 +162,12 @@ declare const mistralChatResponseSchema: z.ZodObject<{
     }>;
 }, "strip", z.ZodTypeAny, {
     object: string;
+    model: string;
     usage: {
         prompt_tokens: number;
         completion_tokens: number;
         total_tokens: number;
     };
-    model: string;
     id: string;
     created: number;
     choices: {
@@ -180,12 +180,12 @@ declare const mistralChatResponseSchema: z.ZodObject<{
     }[];
 }, {
     object: string;
+    model: string;
     usage: {
         prompt_tokens: number;
         completion_tokens: number;
         total_tokens: number;
     };
-    model: string;
     id: string;
     created: number;
     choices: {
@@ -271,12 +271,12 @@ export declare const MistralChatResponseFormat: {
         stream: boolean;
         handler: ResponseHandler<{
             object: string;
+            model: string;
             usage: {
                 prompt_tokens: number;
                 completion_tokens: number;
                 total_tokens: number;
             };
-            model: string;
             id: string;
             created: number;
             choices: {

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

@@ -37,11 +37,11 @@ export declare class MistralTextEmbeddingModel extends AbstractModel<MistralText
                 embedding: number[];
                 index: number;
             }[];
+            model: string;
             usage: {
                 prompt_tokens: number;
                 total_tokens: number;
             };
-            model: string;
             id: string;
         };
         embeddings: number[][];
@@ -82,11 +82,11 @@ declare const MistralTextEmbeddingResponseSchema: z.ZodObject<{
         embedding: number[];
         index: number;
     }[];
+    model: string;
     usage: {
         prompt_tokens: number;
         total_tokens: number;
     };
-    model: string;
     id: string;
 }, {
     object: string;
@@ -95,11 +95,11 @@ declare const MistralTextEmbeddingResponseSchema: z.ZodObject<{
         embedding: number[];
         index: number;
     }[];
+    model: string;
     usage: {
         prompt_tokens: number;
         total_tokens: number;
     };
-    model: string;
     id: string;
 }>;
 export type MistralTextEmbeddingResponse = z.infer<typeof MistralTextEmbeddingResponseSchema>;

package/model-provider/ollama/OllamaChatModel.cjs

@@ -11,7 +11,7 @@ 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 TextGenerationToolCallModel_js_1 = require("../../tool/generate-tool-call/TextGenerationToolCallModel.cjs");
-const TextGenerationToolCallsOrGenerateTextModel_js_1 = require("../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.cjs");
+const TextGenerationToolCallsModel_js_1 = require("../../tool/generate-tool-calls/TextGenerationToolCallsModel.cjs");
 const createJsonStreamResponseHandler_js_1 = require("../../util/streaming/createJsonStreamResponseHandler.cjs");
 const OllamaApiConfiguration_js_1 = require("./OllamaApiConfiguration.cjs");
 const OllamaChatPromptTemplate_js_1 = require("./OllamaChatPromptTemplate.cjs");
@@ -143,7 +143,7 @@ class OllamaChatModel extends AbstractModel_js_1.AbstractModel {
         });
     }
     asToolCallsOrTextGenerationModel(promptTemplate) {
-        return new TextGenerationToolCallsOrGenerateTextModel_js_1.TextGenerationToolCallsOrGenerateTextModel({
+        return new TextGenerationToolCallsModel_js_1.TextGenerationToolCallsModel({
             model: this,
             template: promptTemplate,
         });

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

@@ -7,8 +7,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 } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
-import { ToolCallsOrGenerateTextPromptTemplate } from "../../tool/generate-tool-calls-or-text/ToolCallsOrGenerateTextPromptTemplate.js";
+import { TextGenerationToolCallsModel } from "../../tool/generate-tool-calls/TextGenerationToolCallsModel.js";
+import { ToolCallsPromptTemplate } from "../../tool/generate-tool-calls/ToolCallsPromptTemplate.js";
 import { OllamaTextGenerationSettings } from "./OllamaTextGenerationSettings.js";
 export type OllamaChatMessage = {
     role: "system" | "user" | "assistant";
@@ -78,7 +78,7 @@ export declare class OllamaChatModel extends AbstractModel<OllamaChatModelSettin
     }>>>;
     extractTextDelta(delta: unknown): string | undefined;
     asToolCallGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallPromptTemplate<INPUT_PROMPT, OllamaChatPrompt>): TextGenerationToolCallModel<INPUT_PROMPT, OllamaChatPrompt, this>;
-    asToolCallsOrTextGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallsOrGenerateTextPromptTemplate<INPUT_PROMPT, OllamaChatPrompt>): TextGenerationToolCallsOrGenerateTextModel<INPUT_PROMPT, OllamaChatPrompt, this>;
+    asToolCallsOrTextGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallsPromptTemplate<INPUT_PROMPT, OllamaChatPrompt>): TextGenerationToolCallsModel<INPUT_PROMPT, OllamaChatPrompt, this>;
     /**
      * Returns this model with a text prompt template.
      */

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 { TextGenerationToolCallsModel } from "../../tool/generate-tool-calls/TextGenerationToolCallsModel.js";
 import { createJsonStreamResponseHandler } from "../../util/streaming/createJsonStreamResponseHandler.js";
 import { OllamaApiConfiguration } from "./OllamaApiConfiguration.js";
 import { chat, instruction, text } from "./OllamaChatPromptTemplate.js";
@@ -140,7 +140,7 @@ export class OllamaChatModel extends AbstractModel {
         });
     }
     asToolCallsOrTextGenerationModel(promptTemplate) {
-        return new TextGenerationToolCallsOrGenerateTextModel({
+        return new TextGenerationToolCallsModel({
             model: this,
             template: promptTemplate,
         });

package/model-provider/ollama/OllamaCompletionModel.cjs

@@ -11,7 +11,7 @@ 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 TextGenerationToolCallModel_js_1 = require("../../tool/generate-tool-call/TextGenerationToolCallModel.cjs");
-const TextGenerationToolCallsOrGenerateTextModel_js_1 = require("../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.cjs");
+const TextGenerationToolCallsModel_js_1 = require("../../tool/generate-tool-calls/TextGenerationToolCallsModel.cjs");
 const createJsonStreamResponseHandler_js_1 = require("../../util/streaming/createJsonStreamResponseHandler.cjs");
 const OllamaApiConfiguration_js_1 = require("./OllamaApiConfiguration.cjs");
 const OllamaError_js_1 = require("./OllamaError.cjs");
@@ -145,7 +145,7 @@ class OllamaCompletionModel extends AbstractModel_js_1.AbstractModel {
         });
     }
     asToolCallsOrTextGenerationModel(promptTemplate) {
-        return new TextGenerationToolCallsOrGenerateTextModel_js_1.TextGenerationToolCallsOrGenerateTextModel({
+        return new TextGenerationToolCallsModel_js_1.TextGenerationToolCallsModel({
             model: this,
             template: promptTemplate,
         });

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

@@ -7,8 +7,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 } from "../../tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js";
-import { ToolCallsOrGenerateTextPromptTemplate } from "../../tool/generate-tool-calls-or-text/ToolCallsOrGenerateTextPromptTemplate.js";
+import { TextGenerationToolCallsModel } from "../../tool/generate-tool-calls/TextGenerationToolCallsModel.js";
+import { ToolCallsPromptTemplate } from "../../tool/generate-tool-calls/ToolCallsPromptTemplate.js";
 import { OllamaTextGenerationSettings } from "./OllamaTextGenerationSettings.js";
 export interface OllamaCompletionPrompt {
     /**
@@ -91,7 +91,7 @@ export declare class OllamaCompletionModel<CONTEXT_WINDOW_SIZE extends number |
     }>>>;
     extractTextDelta(delta: unknown): string | undefined;
     asToolCallGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallPromptTemplate<INPUT_PROMPT, OllamaCompletionPrompt>): TextGenerationToolCallModel<INPUT_PROMPT, OllamaCompletionPrompt, this>;
-    asToolCallsOrTextGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallsOrGenerateTextPromptTemplate<INPUT_PROMPT, OllamaCompletionPrompt>): TextGenerationToolCallsOrGenerateTextModel<INPUT_PROMPT, OllamaCompletionPrompt, this>;
+    asToolCallsOrTextGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallsPromptTemplate<INPUT_PROMPT, OllamaCompletionPrompt>): TextGenerationToolCallsModel<INPUT_PROMPT, OllamaCompletionPrompt, this>;
     withTextPrompt(): PromptTemplateTextStreamingModel<string, OllamaCompletionPrompt, OllamaCompletionModelSettings<CONTEXT_WINDOW_SIZE>, this>;
     /**
      * Maps the prompt for a text version of the Ollama completion prompt template (without image support).

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 { TextGenerationToolCallsModel } from "../../tool/generate-tool-calls/TextGenerationToolCallsModel.js";
 import { createJsonStreamResponseHandler } from "../../util/streaming/createJsonStreamResponseHandler.js";
 import { OllamaApiConfiguration } from "./OllamaApiConfiguration.js";
 import { failedOllamaCallResponseHandler } from "./OllamaError.js";
@@ -142,7 +142,7 @@ export class OllamaCompletionModel extends AbstractModel {
         });
     }
     asToolCallsOrTextGenerationModel(promptTemplate) {
-        return new TextGenerationToolCallsOrGenerateTextModel({
+        return new TextGenerationToolCallsModel({
             model: this,
             template: promptTemplate,
         });

package/model-provider/openai/AbstractOpenAIChatModel.cjs

@@ -151,7 +151,7 @@ class AbstractOpenAIChatModel extends AbstractModel_js_1.AbstractModel {
             usage: this.extractUsage(response),
         };
     }
-    async doGenerateToolCallsOrText(tools, prompt, options) {
+    async doGenerateToolCalls(tools, prompt, options) {
         const response = await this.callAPI(prompt, {
             ...options,
             responseFormat: exports.OpenAIChatResponseFormat.json,

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

@@ -93,12 +93,12 @@ export declare abstract class AbstractOpenAIChatModel<SETTINGS extends AbstractO
     doGenerateTexts(prompt: OpenAIChatPrompt, options?: FunctionOptions): Promise<{
         response: {
             object: "chat.completion";
+            model: string;
             usage: {
                 prompt_tokens: number;
                 completion_tokens: number;
                 total_tokens: number;
             };
-            model: string;
             id: string;
             created: number;
             choices: {
@@ -166,12 +166,12 @@ export declare abstract class AbstractOpenAIChatModel<SETTINGS extends AbstractO
     doGenerateToolCall(tool: ToolDefinition<string, unknown>, prompt: OpenAIChatPrompt, options?: FunctionOptions): Promise<{
         response: {
             object: "chat.completion";
+            model: string;
             usage: {
                 prompt_tokens: number;
                 completion_tokens: number;
                 total_tokens: number;
             };
-            model: string;
             id: string;
             created: number;
             choices: {
@@ -207,15 +207,15 @@ export declare abstract class AbstractOpenAIChatModel<SETTINGS extends AbstractO
             totalTokens: number;
         };
     }>;
-    doGenerateToolCallsOrText(tools: Array<ToolDefinition<string, unknown>>, prompt: OpenAIChatPrompt, options?: FunctionOptions): Promise<{
+    doGenerateToolCalls(tools: Array<ToolDefinition<string, unknown>>, prompt: OpenAIChatPrompt, options?: FunctionOptions): Promise<{
         response: {
             object: "chat.completion";
+            model: string;
             usage: {
                 prompt_tokens: number;
                 completion_tokens: number;
                 total_tokens: number;
             };
-            model: string;
             id: string;
             created: number;
             choices: {
@@ -397,12 +397,12 @@ declare const openAIChatResponseSchema: z.ZodObject<{
     }>;
 }, "strip", z.ZodTypeAny, {
     object: "chat.completion";
+    model: string;
     usage: {
         prompt_tokens: number;
         completion_tokens: number;
         total_tokens: number;
     };
-    model: string;
     id: string;
     created: number;
     choices: {
@@ -429,12 +429,12 @@ declare const openAIChatResponseSchema: z.ZodObject<{
     system_fingerprint?: string | null | undefined;
 }, {
     object: "chat.completion";
+    model: string;
     usage: {
         prompt_tokens: number;
         completion_tokens: number;
         total_tokens: number;
     };
-    model: string;
     id: string;
     created: number;
     choices: {
@@ -647,12 +647,12 @@ export declare const OpenAIChatResponseFormat: {
         stream: boolean;
         handler: ResponseHandler<{
             object: "chat.completion";
+            model: string;
             usage: {
                 prompt_tokens: number;
                 completion_tokens: number;
                 total_tokens: number;
             };
-            model: string;
             id: string;
             created: number;
             choices: {

package/model-provider/openai/AbstractOpenAIChatModel.js

@@ -148,7 +148,7 @@ export class AbstractOpenAIChatModel extends AbstractModel {
             usage: this.extractUsage(response),
         };
     }
-    async doGenerateToolCallsOrText(tools, prompt, options) {
+    async doGenerateToolCalls(tools, prompt, options) {
         const response = await this.callAPI(prompt, {
             ...options,
             responseFormat: OpenAIChatResponseFormat.json,