npm - modelfusion - Versions diffs - 0.97.0 → 0.99.0 - Mend

modelfusion 0.97.0 → 0.99.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (105) hide show

package/tool/generate-tool-call/generateToolCall.d.ts CHANGED Viewed

@@ -4,12 +4,12 @@ import { ToolCall } from "../ToolCall.js";
 import { ToolDefinition } from "../ToolDefinition.js";
 import { ToolCallGenerationModel, ToolCallGenerationModelSettings } from "./ToolCallGenerationModel.js";
 export declare function generateToolCall<PARAMETERS, PROMPT, NAME extends string, SETTINGS extends ToolCallGenerationModelSettings>(model: ToolCallGenerationModel<PROMPT, SETTINGS>, tool: ToolDefinition<NAME, PARAMETERS>, prompt: PROMPT | ((tool: ToolDefinition<NAME, PARAMETERS>) => PROMPT), options?: FunctionOptions & {
-    returnType?: "structure";
+    fullResponse?: false;
 }): Promise<ToolCall<NAME, PARAMETERS>>;
 export declare function generateToolCall<PARAMETERS, PROMPT, NAME extends string, SETTINGS extends ToolCallGenerationModelSettings>(model: ToolCallGenerationModel<PROMPT, SETTINGS>, tool: ToolDefinition<NAME, PARAMETERS>, prompt: PROMPT | ((tool: ToolDefinition<NAME, PARAMETERS>) => PROMPT), options: FunctionOptions & {
-    returnType: "full";
+    fullResponse: true;
 }): Promise<{
-    value: ToolCall<NAME, PARAMETERS>;
+    toolCall: ToolCall<NAME, PARAMETERS>;
     response: unknown;
     metadata: ModelCallMetadata;
 }>;

package/tool/generate-tool-call/generateToolCall.js CHANGED Viewed

@@ -51,5 +51,11 @@ export async function generateToolCall(model, tool, prompt, options) {
             }
         },
     });
-    return options?.returnType === "full" ? fullResponse : fullResponse.value;
+    return options?.fullResponse
+        ? {
+            toolCall: fullResponse.value,
+            response: fullResponse.response,
+            metadata: fullResponse.metadata,
+        }
+        : fullResponse.value;
 }

package/tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.cjs CHANGED Viewed

@@ -30,12 +30,12 @@ class TextGenerationToolCallsOrGenerateTextModel {
         return this.model.settingsForEvent;
     }
     async doGenerateToolCallsOrText(tools, prompt, options) {
-        const { response, value, metadata } = await (0, generateText_js_1.generateText)(this.model, this.template.createPrompt(prompt, tools), {
+        const { response, text: generatedText, metadata, } = await (0, generateText_js_1.generateText)(this.model, this.template.createPrompt(prompt, tools), {
             ...options,
-            returnType: "full",
+            fullResponse: true,
         });
         try {
-            const { text, toolCalls } = this.template.extractToolCallsAndText(value);
+            const { text, toolCalls } = this.template.extractToolCallsAndText(generatedText);
             return {
                 response,
                 text,
@@ -45,7 +45,7 @@ class TextGenerationToolCallsOrGenerateTextModel {
         }
         catch (error) {
             throw new ToolCallsOrTextParseError_js_1.ToolCallsOrTextParseError({
-                valueText: value,
+                valueText: generatedText,
                 cause: error,
             });
         }

package/tool/generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.js CHANGED Viewed

@@ -27,12 +27,12 @@ export class TextGenerationToolCallsOrGenerateTextModel {
         return this.model.settingsForEvent;
     }
     async doGenerateToolCallsOrText(tools, prompt, options) {
-        const { response, value, metadata } = await generateText(this.model, this.template.createPrompt(prompt, tools), {
+        const { response, text: generatedText, metadata, } = await generateText(this.model, this.template.createPrompt(prompt, tools), {
             ...options,
-            returnType: "full",
+            fullResponse: true,
         });
         try {
-            const { text, toolCalls } = this.template.extractToolCallsAndText(value);
+            const { text, toolCalls } = this.template.extractToolCallsAndText(generatedText);
             return {
                 response,
                 text,
@@ -42,7 +42,7 @@ export class TextGenerationToolCallsOrGenerateTextModel {
         }
         catch (error) {
             throw new ToolCallsOrTextParseError({
-                valueText: value,
+                valueText: generatedText,
                 cause: error,
             });
         }

package/tool/generate-tool-calls-or-text/generateToolCallsOrText.cjs CHANGED Viewed

@@ -58,6 +58,6 @@ async function generateToolCallsOrText(model, tools, prompt, options) {
             };
         },
     });
-    return options?.returnType === "full" ? fullResponse : fullResponse.value;
+    return options?.fullResponse ? fullResponse : fullResponse.value;
 }
 exports.generateToolCallsOrText = generateToolCallsOrText;

package/tool/generate-tool-calls-or-text/generateToolCallsOrText.d.ts CHANGED Viewed

@@ -15,13 +15,13 @@ type ToToolCallUnion<T> = {
 }[keyof T];
 type ToOutputValue<TOOL_CALLS extends ToolCallDefinitionArray<ToolDefinition<any, any>[]>> = ToToolCallUnion<ToToolCallDefinitionMap<TOOL_CALLS>>;
 export declare function generateToolCallsOrText<TOOLS extends Array<ToolDefinition<any, any>>, PROMPT>(model: ToolCallsOrTextGenerationModel<PROMPT, ToolCallsOrTextGenerationModelSettings>, tools: TOOLS, prompt: PROMPT | ((tools: TOOLS) => PROMPT), options?: FunctionOptions & {
-    returnType?: "structure";
+    fullResponse?: false;
 }): Promise<{
     text: string | null;
     toolCalls: Array<ToOutputValue<TOOLS>> | null;
 }>;
 export declare function generateToolCallsOrText<TOOLS extends ToolDefinition<any, any>[], PROMPT>(model: ToolCallsOrTextGenerationModel<PROMPT, ToolCallsOrTextGenerationModelSettings>, tools: TOOLS, prompt: PROMPT | ((tools: TOOLS) => PROMPT), options: FunctionOptions & {
-    returnType?: "full";
+    fullResponse?: boolean;
 }): Promise<{
     value: {
         text: string | null;

package/tool/generate-tool-calls-or-text/generateToolCallsOrText.js CHANGED Viewed

@@ -55,5 +55,5 @@ export async function generateToolCallsOrText(model, tools, prompt, options) {
             };
         },
     });
-    return options?.returnType === "full" ? fullResponse : fullResponse.value;
+    return options?.fullResponse ? fullResponse : fullResponse.value;
 }

package/tool/use-tools-or-generate-text/useToolsOrGenerateText.cjs CHANGED Viewed

@@ -15,7 +15,7 @@ async function useToolsOrGenerateText(model, tools, prompt, options) {
         input: expandedPrompt,
         functionType: "use-tools-or-generate-text",
         execute: async (options) => {
-            const modelResponse = await (0, generateToolCallsOrText_js_1.generateToolCallsOrText)(model, tools, expandedPrompt, { ...options, returnType: "structure" });
+            const modelResponse = await (0, generateToolCallsOrText_js_1.generateToolCallsOrText)(model, tools, expandedPrompt, { ...options, fullResponse: false });
             const { toolCalls, text } = modelResponse;
             // no tool calls:
             if (toolCalls == null) {

package/tool/use-tools-or-generate-text/useToolsOrGenerateText.js CHANGED Viewed

@@ -12,7 +12,7 @@ export async function useToolsOrGenerateText(model, tools, prompt, options) {
         input: expandedPrompt,
         functionType: "use-tools-or-generate-text",
         execute: async (options) => {
-            const modelResponse = await generateToolCallsOrText(model, tools, expandedPrompt, { ...options, returnType: "structure" });
+            const modelResponse = await generateToolCallsOrText(model, tools, expandedPrompt, { ...options, fullResponse: false });
             const { toolCalls, text } = modelResponse;
             // no tool calls:
             if (toolCalls == null) {