@xsai/stream-text 0.4.0-beta.1 → 0.4.0-beta.10

package/README.md

@@ -0,0 +1 @@
+https://xsai.js.org/docs/packages/stream/text

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,10 @@ 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 };
+export { streamText };
+export type { StreamTextEvent, StreamTextOptions, StreamTextResult };

package/dist/index.js

@@ -1,48 +1,6 @@
+import { DelayedPromise, 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) {
-      this._promise = new Promise((resolve, reject) => {
-        if (this.status.type === "resolved") {
-          resolve(this.status.value);
-        } else if (this.status.type === "rejected") {
-          reject(this.status.error);
-        }
-        this._resolve = resolve;
-        this._reject = reject;
-      });
-    }
-    return this._promise;
-  }
-  _promise;
-  _reject;
-  _resolve;
-  status = { type: "pending" };
-  reject(error) {
-    this.status = { error, type: "rejected" };
-    if (this._promise) {
-      this._reject?.(error);
-    }
-  }
-  resolve(value) {
-    this.status = { type: "resolved", value };
-    if (this._promise) {
-      this._resolve?.(value);
-    }
-  }
-}
-
 const parseChunk = (text) => {
   if (!text || !text.startsWith("data:"))
     return [void 0, false];
@@ -82,14 +40,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,9 +62,21 @@ const streamText = async (options) => {
     steps.push(step);
     void options.onStepFinish?.(step);
   };
-  const startStream = async () => {
+  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) => {
@@ -115,58 +87,58 @@ const streamText = async (options) => {
     const toolCalls = [];
     const toolResults = [];
     let finishReason = "other";
-    await chat({
-      ...options,
-      maxSteps: void 0,
-      messages,
-      stream: true,
-      streamOptions: options.streamOptions != null ? objCamelToSnake(options.streamOptions) : void 0
-    }).then(
-      async (res) => res.body.pipeThrough(transformChunk()).pipeTo(new WritableStream({
-        abort: (reason) => {
-          eventCtrl?.error(reason);
-          textCtrl?.error(reason);
-        },
-        close: () => {
-        },
-        // eslint-disable-next-line sonarjs/cognitive-complexity
-        write: (chunk) => {
-          if (chunk.usage)
-            pushUsage(chunk.usage);
-          if (chunk.choices == null || chunk.choices.length === 0)
-            return;
-          const choice = chunk.choices[0];
-          if (choice.delta.reasoning_content != null)
-            pushEvent({ text: choice.delta.reasoning_content, type: "reasoning-delta" });
-          if (choice.finish_reason != null)
-            finishReason = choice.finish_reason;
-          if (choice.delta.tool_calls?.length === 0 || choice.delta.tool_calls == null) {
-            if (choice.delta.content != null) {
-              pushEvent({ text: choice.delta.content, type: "text-delta" });
-              pushText(choice.delta.content);
-            } else if (choice.delta.refusal != null) {
-              pushEvent({ error: choice.delta.refusal, type: "error" });
-            } else if (choice.finish_reason != null) {
-              pushEvent({ finishReason: choice.finish_reason, type: "finish", usage });
-            }
-          } else {
-            for (const toolCall of choice.delta.tool_calls) {
-              const { index } = toolCall;
-              if (!tool_calls.at(index)) {
-                tool_calls[index] = toolCall;
-                pushEvent({ toolCallId: toolCall.id, toolName: toolCall.function.name, type: "tool-call-streaming-start" });
-              } else {
-                tool_calls[index].function.arguments += toolCall.function.arguments;
-                pushEvent({ argsTextDelta: toolCall.function.arguments, toolCallId: toolCall.id, toolName: toolCall.function.name, type: "tool-call-delta" });
-              }
+    await stream.pipeThrough(transformChunk()).pipeTo(new WritableStream({
+      abort: (reason) => {
+        eventCtrl?.error(reason);
+        textCtrl?.error(reason);
+      },
+      close: () => {
+      },
+      // eslint-disable-next-line sonarjs/cognitive-complexity
+      write: (chunk) => {
+        if (chunk.usage)
+          pushUsage(chunk.usage);
+        if (chunk.choices == null || chunk.choices.length === 0)
+          return;
+        const choice = chunk.choices[0];
+        if (choice.delta.reasoning_content != null)
+          pushEvent({ text: choice.delta.reasoning_content, type: "reasoning-delta" });
+        if (choice.finish_reason != null)
+          finishReason = choice.finish_reason;
+        if (choice.delta.tool_calls?.length === 0 || choice.delta.tool_calls == null) {
+          if (choice.delta.content != null) {
+            pushEvent({ text: choice.delta.content, type: "text-delta" });
+            pushText(choice.delta.content);
+          } else if (choice.delta.refusal != null) {
+            pushEvent({ error: choice.delta.refusal, type: "error" });
+          } else if (choice.finish_reason != null) {
+            pushEvent({ finishReason: choice.finish_reason, type: "finish", usage });
+          }
+        } else {
+          for (const toolCall of choice.delta.tool_calls) {
+            const { index } = toolCall;
+            if (!tool_calls.at(index)) {
+              tool_calls[index] = {
+                ...toolCall,
+                function: {
+                  ...toolCall.function,
+                  arguments: toolCall.function.arguments ?? ""
+                }
+              };
+              pushEvent({ toolCallId: toolCall.id, toolName: toolCall.function.name, type: "tool-call-streaming-start" });
+            } else {
+              tool_calls[index].function.arguments += toolCall.function.arguments;
+              pushEvent({ argsTextDelta: toolCall.function.arguments, toolCallId: toolCall.id, toolName: toolCall.function.name ?? tool_calls[index].function.name, type: "tool-call-delta" });
             }
           }
         }
-      }))
-    );
+      }
+    }));
     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,
@@ -195,29 +167,34 @@ const streamText = async (options) => {
       usage
     });
     if (toolCalls.length !== 0 && steps.length < maxSteps)
-      return async () => startStream();
+      return async () => doStream();
   };
-  try {
-    await trampoline(async () => startStream());
-    eventCtrl?.close();
-    textCtrl?.close();
-  } catch (err) {
-    eventCtrl?.error(err);
-    textCtrl?.error(err);
-    resultSteps.reject(err);
-    resultMessages.reject(err);
-    resultUsage.reject(err);
-  } finally {
-    resultSteps.resolve(steps);
-    resultMessages.resolve(messages);
-    resultUsage.resolve(usage);
-    void options.onFinish?.(steps.at(-1));
-  }
+  void (async () => {
+    try {
+      await trampoline(async () => doStream());
+      eventCtrl?.close();
+      textCtrl?.close();
+    } catch (err) {
+      eventCtrl?.error(err);
+      textCtrl?.error(err);
+      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));
+    }
+  })();
   return {
     fullStream: eventStream,
     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.1",
+  "version": "0.4.0-beta.10",
   "description": "extra-small AI SDK.",
   "author": "Moeru AI",
   "license": "MIT",
@@ -29,12 +29,12 @@
     "dist"
   ],
   "dependencies": {
-    "@xsai/shared-chat": "~0.4.0-beta.1"
+    "@xsai/shared": "~0.4.0-beta.10",
+    "@xsai/shared-chat": "~0.4.0-beta.10"
   },
   "devDependencies": {
     "valibot": "^1.0.0",
-    "@xsai/tool": "~0.4.0-beta.1",
-    "@xsai/shared": "~0.4.0-beta.1"
+    "@xsai/tool": "~0.4.0-beta.10"
   },
   "scripts": {
     "build": "pkgroll",