@xsai/stream-text 0.0.9 → 0.0.10

package/dist/index.d.ts

@@ -1,12 +1,24 @@
-import { GenerateTextOptions } from '@xsai/generate-text';
+import { GenerateTextOptions, FinishReason, GenerateTextResponseUsage } from '@xsai/generate-text';
 
+interface StreamTextOptions extends GenerateTextOptions {
+    streamOptions?: {
+        /**
+         * Return usage.
+         * @default `undefined`
+         * @remarks Ollama doesn't support this, see {@link https://github.com/ollama/ollama/issues/5200}
+         */
+        usage?: boolean;
+    };
+}
 interface StreamTextResult {
+    finishReason?: FinishReason;
     textStream: ReadableStream<string>;
+    usage?: GenerateTextResponseUsage;
 }
 /**
  * @experimental
  * WIP, currently only returns `textStream`, does not support function calling (tools).
  */
-declare const streamText: (options: GenerateTextOptions) => Promise<StreamTextResult>;
+declare const streamText: (options: StreamTextOptions) => Promise<StreamTextResult>;
 
-export { type StreamTextResult, streamText as default, streamText };
+export { type StreamTextOptions, type StreamTextResult, streamText as default, streamText };

package/dist/index.js

@@ -20,25 +20,28 @@ const streamText = async (options) => await fetch(requestUrl(options.path ?? "ch
   method: "POST",
   signal: options.abortSignal
 }).then((res) => {
+  let finishReason;
+  let usage;
   const decoder = new TextDecoder();
   const transformStream = new TransformStream({
     transform: (chunk, controller) => {
-      const text = decoder.decode(chunk);
-      for (const line of text.split("\n")) {
-        if (line.includes("[DONE]")) {
-          controller.terminate();
-          return;
-        }
-        try {
+      for (const line of decoder.decode(chunk).split("\n")) {
+        if (line.startsWith("data: ") && line !== "data: [DONE]") {
           const data = JSON.parse(line.slice(6));
           controller.enqueue(data.choices[0].delta.content);
-        } catch {
+          if (data.choices[0].finish_reason) {
+            finishReason = data.choices[0].finish_reason;
+          }
+          if (data.usage)
+            usage = data.usage;
+        } else if (line === "data: [DONE]") {
+          controller.terminate();
         }
       }
     }
   });
   const textStream = res.body.pipeThrough(transformStream);
-  return { textStream };
+  return { finishReason, textStream, usage };
 });
 
 export { streamText as default, streamText };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xsai/stream-text",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "type": "module",
   "author": "藍+85CD",
   "license": "MIT",
@@ -23,8 +23,8 @@
     "dist"
   ],
   "dependencies": {
-    "@xsai/generate-text": "^0.0.9",
-    "@xsai/shared": "^0.0.9"
+    "@xsai/generate-text": "^0.0.10",
+    "@xsai/shared": "^0.0.10"
   },
   "scripts": {
     "build": "pkgroll",