@xsai/stream-text 0.0.9 → 0.0.11

package/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 藍+85CD
+Copyright (c) 2024 Moeru AI
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/index.d.ts

@@ -1,12 +1,45 @@
-import { GenerateTextOptions } from '@xsai/generate-text';
+import { ChatCompletionOptions, FinishReason } from '@xsai/shared-chat-completion';
 
+interface StreamTextOptions extends ChatCompletionOptions {
+    streamOptions?: {
+        /**
+         * Return usage.
+         * @default `undefined`
+         * @remarks Ollama doesn't support this, see {@link https://github.com/ollama/ollama/issues/5200}
+         */
+        usage?: boolean;
+    };
+}
+interface StreamTextResponseUsage {
+    completion_tokens: number;
+    prompt_tokens: number;
+    total_tokens: number;
+}
 interface StreamTextResult {
+    finishReason?: FinishReason;
     textStream: ReadableStream<string>;
+    usage?: StreamTextResponseUsage;
+}
+interface StreamTextResponse {
+    choices: {
+        delta: {
+            content: string;
+            role: 'assistant';
+        };
+        finish_reason?: FinishReason;
+        index: number;
+    }[];
+    created: number;
+    id: string;
+    model: string;
+    object: 'chat.completion.chunk';
+    system_fingerprint: string;
+    usage?: StreamTextResponseUsage;
 }
 /**
  * @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 StreamTextResponse, type StreamTextResponseUsage, type StreamTextResult, streamText as default, streamText };

package/dist/index.js

@@ -1,44 +1,33 @@
-import { requestUrl, clean, objCamelToSnake } from '@xsai/shared';
+import { chatCompletion } from '@xsai/shared-chat-completion';
 
-const streamText = async (options) => await fetch(requestUrl(options.path ?? "chat/completions", options.base), {
-  body: JSON.stringify(clean({
-    ...objCamelToSnake(options),
-    abortSignal: void 0,
-    base: void 0,
-    headers: void 0,
-    path: void 0,
-    stream: true,
-    tools: options.tools?.map((tool) => ({
-      function: tool.function,
-      type: "function"
-    }))
-  })),
-  headers: {
-    "Content-Type": "application/json",
-    ...options.headers
-  },
-  method: "POST",
-  signal: options.abortSignal
+const streamText = async (options) => await chatCompletion({
+  ...options,
+  stream: true
 }).then((res) => {
+  if (!res.body) {
+    return Promise.reject(res);
+  }
   const decoder = new TextDecoder();
-  const transformStream = new TransformStream({
+  let finishReason;
+  let usage;
+  const textStream = res.body.pipeThrough(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").filter((line2) => line2)) {
+        if (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 {
+          controller.terminate();
         }
       }
     }
-  });
-  const textStream = res.body.pipeThrough(transformStream);
-  return { textStream };
+  }));
+  return { finishReason, textStream, usage };
 });
 
 export { streamText as default, streamText };

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@xsai/stream-text",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "type": "module",
-  "author": "藍+85CD",
+  "author": "Moeru AI",
   "license": "MIT",
-  "homepage": "https://github.com/moeru-ai/xsai",
+  "homepage": "https://xsai.js.org",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/moeru-ai/xsai.git",
@@ -23,8 +23,7 @@
     "dist"
   ],
   "dependencies": {
-    "@xsai/generate-text": "^0.0.9",
-    "@xsai/shared": "^0.0.9"
+    "@xsai/shared-chat-completion": ""
   },
   "scripts": {
     "build": "pkgroll",