@xsai/generate-text 0.1.2 → 0.1.3

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ChatOptions, Tool, FinishReason, AssistantMessageResponse, Usage, Message, CompletionToolCall, CompletionToolResult } from '@xsai/shared-chat';
+import { ChatOptions, Tool, FinishReason, AssistantMessageResponse, Usage, Message, CompletionToolCall, CompletionToolResult, StepType } from '@xsai/shared-chat';
 
 interface GenerateTextOptions extends ChatOptions {
     /** @default 1 */
@@ -34,7 +34,7 @@ interface GenerateTextResult {
 }
 interface GenerateTextStepResult {
     finishReason: FinishReason;
-    stepType: 'continue' | 'initial' | 'tool-result';
+    stepType: StepType;
     text?: string;
     toolCalls: CompletionToolCall[];
     toolResults: CompletionToolResult[];

package/dist/index.js

@@ -1,5 +1,5 @@
 // src/index.ts
-import { chat, wrapToolResult } from "@xsai/shared-chat";
+import { chat, determineStepType, executeTool } from "@xsai/shared-chat";
 var rawGenerateText = async (options) => chat({
   ...options,
   maxSteps: void 0,
@@ -12,9 +12,15 @@ var rawGenerateText = async (options) => chat({
   const toolCalls = [];
   const toolResults = [];
   const { finish_reason: finishReason, message } = choices[0];
+  const msgToolCalls = message?.tool_calls ?? [];
+  const stepType = determineStepType({
+    finishReason,
+    maxSteps: options.maxSteps ?? 1,
+    stepsLength: steps.length,
+    toolCallsLength: msgToolCalls.length
+  });
   messages.push({ ...message, content: message.content });
-  const stepType = steps.length === 0 ? "initial" : steps.at(-1)?.finishReason === "tool-calls" ? "tool-result" : "continue";
-  if (message.content !== void 0 && message.content.length > 0 || !message.tool_calls || steps.length >= (options.maxSteps ?? 1)) {
+  if (finishReason === "stop" || stepType === "done") {
     const step2 = {
       finishReason,
       stepType,
@@ -36,35 +42,20 @@ var rawGenerateText = async (options) => chat({
       usage
     };
   }
-  for (const {
-    function: { arguments: toolArgs, name: toolName },
-    id: toolCallId,
-    type: toolCallType
-  } of message.tool_calls) {
-    const tool = options.tools?.find((tool2) => tool2.function.name === toolName);
-    if (!tool) {
-      const availableTools = options.tools?.map((tool2) => tool2.function.name);
-      const availableToolsErrorMsg = availableTools === void 0 ? "No tools are available." : `Available tools: ${availableTools.join(", ")}.`;
-      throw new Error(`Model tried to call unavailable tool '${toolName}. ${availableToolsErrorMsg}.`);
-    }
-    const parsedArgs = JSON.parse(toolArgs);
-    const result = wrapToolResult(await tool.execute(parsedArgs, { abortSignal: options.abortSignal, messages, toolCallId }));
-    toolCalls.push({
-      args: toolArgs,
-      toolCallId,
-      toolCallType,
-      toolName
-    });
-    toolResults.push({
-      args: parsedArgs,
-      result,
-      toolCallId,
-      toolName
+  for (const toolCall of msgToolCalls) {
+    const { parsedArgs, result, toolName } = await executeTool({
+      abortSignal: options.abortSignal,
+      messages,
+      toolCall,
+      tools: options.tools
     });
+    const toolInfo = { toolCallId: toolCall.id, toolName };
+    toolCalls.push({ ...toolInfo, args: toolCall.function.arguments, toolCallType: toolCall.type });
+    toolResults.push({ ...toolInfo, args: parsedArgs, result });
     messages.push({
       content: result,
       role: "tool",
-      tool_call_id: toolCallId
+      tool_call_id: toolCall.id
     });
   }
   const step = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xsai/generate-text",
   "type": "module",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "extra-small AI SDK for Browser, Node.js, Deno, Bun or Edge Runtime.",
   "author": "Moeru AI",
   "license": "MIT",