@xsai/stream-text 0.1.2 → 0.2.0-beta.1

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ToolCall, FinishReason, Usage, ChatOptions, Tool, Message, CompletionToolCall, CompletionToolResult, AssistantMessage } from '@xsai/shared-chat';
+import { ToolCall, FinishReason, Usage, ChatOptions, Tool, Message, StepType, CompletionToolCall, CompletionToolResult, AssistantMessage } from '@xsai/shared-chat';
 
 interface StreamTextChunkResult {
     choices: {
@@ -66,7 +66,9 @@ interface StreamTextResult {
 }
 interface StreamTextStep {
     choices: StreamTextChoice[];
+    finishReason: FinishReason;
     messages: Message[];
+    stepType: StepType;
     toolCalls: CompletionToolCall[];
     toolResults: CompletionToolResult[];
     usage?: Usage;

package/dist/index.js

@@ -9,7 +9,7 @@ var XSAIError = class extends Error {
 };
 
 // src/index.ts
-import { chat, wrapToolResult } from "@xsai/shared-chat";
+import { chat, determineStepType, executeTool } from "@xsai/shared-chat";
 
 // src/helper.ts
 var CHUNK_HEADER_PREFIX = "data:";
@@ -54,7 +54,9 @@ var streamText = async (options) => {
   const stepOne = async (options2) => {
     const step = {
       choices: [],
+      finishReason: "error",
       messages: structuredClone(options2.messages),
+      stepType: "initial",
       toolCalls: [],
       toolResults: []
     };
@@ -65,12 +67,6 @@ var streamText = async (options) => {
       if (state.endedToolCallIDs.has(id)) {
         return;
       }
-      const toolCall = step.choices[state.index].message.tool_calls[id];
-      try {
-        toolCall.function.parsed_arguments = JSON.parse(toolCall.function.arguments);
-      } catch (error) {
-        state.toolCallErrors[id] = error;
-      }
       state.endedToolCallIDs.add(id);
       state.currentToolID = null;
     };
@@ -122,6 +118,7 @@ var streamText = async (options) => {
             }
           };
           if (finish_reason !== void 0) {
+            step.finishReason = finish_reason;
             choiceSnapshot.finish_reason = finish_reason;
             if (finish_reason === "length") {
               throw new XSAIError("length exceeded");
@@ -195,34 +192,37 @@ var streamText = async (options) => {
         if (state.toolCallResults[id]) {
           return;
         }
-        const tool = options2.tools?.find((tool2) => tool2.function.name === toolCall.function.name);
-        if (tool) {
-          try {
-            const ret = wrapToolResult(await tool.execute(toolCall.function.parsed_arguments, {
-              abortSignal: options2.abortSignal,
-              messages: options2.messages,
-              toolCallId: id
-            }));
-            state.toolCallResults[id] = ret;
-            step.messages.push({
-              content: ret,
-              role: "tool",
-              tool_call_id: id
-            });
-            step.toolResults.push({
-              args: toolCall.function.parsed_arguments,
-              result: ret,
-              toolCallId: id,
-              toolName: toolCall.function.name
-            });
-          } catch (error) {
-            state.toolCallErrors[id] = error;
-          }
-        } else {
-          state.toolCallErrors[id] = new XSAIError(`tool ${toolCall.function.name} not found`);
+        try {
+          const { parsedArgs, result, toolName } = await executeTool({
+            abortSignal: options2.abortSignal,
+            messages: options2.messages,
+            toolCall,
+            tools: options2.tools
+          });
+          toolCall.function.parsed_arguments = parsedArgs;
+          state.toolCallResults[id] = result;
+          step.messages.push({
+            content: result,
+            role: "tool",
+            tool_call_id: id
+          });
+          step.toolResults.push({
+            args: parsedArgs,
+            result,
+            toolCallId: id,
+            toolName
+          });
+        } catch (error) {
+          state.toolCallErrors[id] = error;
         }
       }));
     }));
+    step.stepType = determineStepType({
+      finishReason: step.finishReason,
+      maxSteps,
+      stepsLength: steps.length,
+      toolCallsLength: step.toolCalls.length
+    });
     steps.push(step);
     stepCtrl.enqueue(step);
     options2.onStepFinish?.(step);
@@ -232,9 +232,9 @@ var streamText = async (options) => {
     return async () => stepOne({ ...options2, messages: step.messages });
   };
   const invokeFunctionCalls = async () => {
-    for (let i = 1, ret = await stepOne(options); typeof ret === "function" && i < maxSteps; ret = await ret(), i += 1) {
-      ;
-    }
+    let ret = await stepOne(options);
+    while (typeof ret === "function" && steps.length < maxSteps)
+      ret = await ret();
     options.onFinish?.(steps);
     chunkCtrl.close();
     stepCtrl.close();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xsai/stream-text",
   "type": "module",
-  "version": "0.1.2",
+  "version": "0.2.0-beta.1",
   "description": "extra-small AI SDK for Browser, Node.js, Deno, Bun or Edge Runtime.",
   "author": "Moeru AI",
   "license": "MIT",
@@ -34,7 +34,7 @@
   "devDependencies": {
     "@xsai/shared": "",
     "@xsai/tool": "",
-    "valibot": "^1.0.0-rc.3"
+    "valibot": "^1.0.0"
   },
   "scripts": {
     "build": "tsup",