@xsai/stream-text 0.4.0-beta.2 → 0.4.0-beta.4

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+import { WithUnknown } from '@xsai/shared';
 import { CompletionToolCall, CompletionToolResult, FinishReason, Usage, ChatOptions, CompletionStep, Message } from '@xsai/shared-chat';
 
 type StreamTextEvent = (CompletionToolCall & {
@@ -51,8 +52,9 @@ interface StreamTextResult {
     messages: Promise<Message[]>;
     steps: Promise<CompletionStep[]>;
     textStream: ReadableStream<string>;
+    totalUsage: Promise<undefined | Usage>;
     usage: Promise<undefined | Usage>;
 }
-declare const streamText: (options: StreamTextOptions) => Promise<StreamTextResult>;
+declare const streamText: (options: WithUnknown<StreamTextOptions>) => StreamTextResult;
 
 export { type StreamTextEvent, type StreamTextOptions, type StreamTextResult, streamText };

package/dist/index.js

@@ -1,15 +1,6 @@
+import { trampoline, objCamelToSnake } from '@xsai/shared';
 import { chat, executeTool, determineStepType } from '@xsai/shared-chat';
 
-const strCamelToSnake = (str) => str.replace(/[A-Z]/g, (s) => `_${s.toLowerCase()}`);
-const objCamelToSnake = (obj) => Object.fromEntries(Object.entries(obj).map(([k, v]) => [strCamelToSnake(k), v]));
-
-const trampoline = async (fn) => {
-  let result = await fn();
-  while (result instanceof Function)
-    result = await result();
-  return result;
-};
-
 class DelayedPromise {
   get promise() {
     if (this._promise == null) {
@@ -82,14 +73,16 @@ const transformChunk = () => {
   });
 };
 
-const streamText = async (options) => {
+const streamText = (options) => {
   const steps = [];
   const messages = structuredClone(options.messages);
   const maxSteps = options.maxSteps ?? 1;
   let usage;
+  let totalUsage;
   const resultSteps = new DelayedPromise();
   const resultMessages = new DelayedPromise();
   const resultUsage = new DelayedPromise();
+  const resultTotalUsage = new DelayedPromise();
   let eventCtrl;
   let textCtrl;
   const eventStream = new ReadableStream({ start: (controller) => eventCtrl = controller });
@@ -102,16 +95,21 @@ const streamText = async (options) => {
     steps.push(step);
     void options.onStepFinish?.(step);
   };
-  const startStream = async () => chat({
-    ...options,
-    maxSteps: void 0,
-    messages,
-    stream: true,
-    streamOptions: options.streamOptions != null ? objCamelToSnake(options.streamOptions) : void 0
-  }).then((res) => res.body);
-  const handleStream = async (stream2) => {
+  const doStream = async () => {
+    const { body: stream } = await chat({
+      ...options,
+      maxSteps: void 0,
+      messages,
+      stream: true,
+      streamOptions: options.streamOptions != null ? objCamelToSnake(options.streamOptions) : void 0
+    });
     const pushUsage = (u) => {
       usage = u;
+      totalUsage = totalUsage ? {
+        completion_tokens: totalUsage.completion_tokens + u.completion_tokens,
+        prompt_tokens: totalUsage.prompt_tokens + u.prompt_tokens,
+        total_tokens: totalUsage.total_tokens + u.total_tokens
+      } : { ...u };
     };
     let text = "";
     const pushText = (content) => {
@@ -122,7 +120,7 @@ const streamText = async (options) => {
     const toolCalls = [];
     const toolResults = [];
     let finishReason = "other";
-    await stream2.pipeThrough(transformChunk()).pipeTo(new WritableStream({
+    await stream.pipeThrough(transformChunk()).pipeTo(new WritableStream({
       abort: (reason) => {
         eventCtrl?.error(reason);
         textCtrl?.error(reason);
@@ -166,6 +164,8 @@ const streamText = async (options) => {
     messages.push({ content: text, role: "assistant", tool_calls });
     if (tool_calls.length !== 0) {
       for (const toolCall of tool_calls) {
+        if (toolCall == null)
+          continue;
         const { completionToolCall, completionToolResult, message } = await executeTool({
           abortSignal: options.abortSignal,
           messages,
@@ -194,12 +194,11 @@ const streamText = async (options) => {
       usage
     });
     if (toolCalls.length !== 0 && steps.length < maxSteps)
-      return async () => handleStream(await startStream());
+      return async () => doStream();
   };
-  const stream = await startStream();
   void (async () => {
     try {
-      await trampoline(async () => handleStream(stream));
+      await trampoline(async () => doStream());
       eventCtrl?.close();
       textCtrl?.close();
     } catch (err) {
@@ -208,10 +207,12 @@ const streamText = async (options) => {
       resultSteps.reject(err);
       resultMessages.reject(err);
       resultUsage.reject(err);
+      resultTotalUsage.reject(err);
     } finally {
       resultSteps.resolve(steps);
       resultMessages.resolve(messages);
       resultUsage.resolve(usage);
+      resultTotalUsage.resolve(totalUsage);
       void options.onFinish?.(steps.at(-1));
     }
   })();
@@ -220,6 +221,7 @@ const streamText = async (options) => {
     messages: resultMessages.promise,
     steps: resultSteps.promise,
     textStream,
+    totalUsage: resultTotalUsage.promise,
     usage: resultUsage.promise
   };
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xsai/stream-text",
   "type": "module",
-  "version": "0.4.0-beta.2",
+  "version": "0.4.0-beta.4",
   "description": "extra-small AI SDK.",
   "author": "Moeru AI",
   "license": "MIT",
@@ -29,12 +29,12 @@
     "dist"
   ],
   "dependencies": {
-    "@xsai/shared-chat": "~0.4.0-beta.2"
+    "@xsai/shared": "~0.4.0-beta.4",
+    "@xsai/shared-chat": "~0.4.0-beta.4"
   },
   "devDependencies": {
     "valibot": "^1.0.0",
-    "@xsai/shared": "~0.4.0-beta.2",
-    "@xsai/tool": "~0.4.0-beta.2"
+    "@xsai/tool": "~0.4.0-beta.4"
   },
   "scripts": {
     "build": "pkgroll",