@xsai/generate-text 0.5.0-beta.3 → 0.5.0-beta.4

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { WithUnknown } from '@xsai/shared';
-import { ChatOptions, CompletionStep, PrepareStep, StopCondition, Message, FinishReason, AssistantMessage, ChatCompletionUsage, CompletionToolCall, CompletionToolResult, Usage } from '@xsai/shared-chat';
+import { ChatOptions, CompletionStep, PrepareStep, StopCondition, Message, Usage, FinishReason, AssistantMessage, ChatCompletionUsage, CompletionToolCall, CompletionToolResult } from '@xsai/shared-chat';
 
 interface GenerateTextOptions extends ChatOptions {
     onStepFinish?: (step: CompletionStep<true>) => Promise<unknown> | unknown;
@@ -10,6 +10,8 @@ interface GenerateTextOptions extends ChatOptions {
     stopWhen?: StopCondition<Message>;
     /** if you want to enable stream, use `@xsai/stream-{text,object}` */
     stream?: never;
+    /** @internal */
+    totalUsage?: Usage;
 }
 interface GenerateTextResponse {
     choices: {
@@ -33,6 +35,7 @@ interface GenerateTextResult {
     text?: string;
     toolCalls: CompletionToolCall[];
     toolResults: CompletionToolResult[];
+    totalUsage: Usage;
     usage: Usage;
 }
 declare const generateText: (options: WithUnknown<GenerateTextOptions>) => Promise<GenerateTextResult>;

package/dist/index.js

@@ -1,5 +1,5 @@
 import { trampoline, responseJSON, InvalidResponseError } from '@xsai/shared';
-import { resolvePrepareStep, chat, normalizeChatCompletionUsage, stepCountAtLeast, executeTool, shouldStop } from '@xsai/shared-chat';
+import { resolvePrepareStep, chat, normalizeChatCompletionUsage, computeTotalUsage, stepCountAtLeast, executeTool, shouldStop } from '@xsai/shared-chat';
 
 const rawGenerateText = async (options) => {
   const messages = options.steps == null ? structuredClone(options.messages) : options.messages;
@@ -14,16 +14,16 @@ const rawGenerateText = async (options) => {
   });
   return chat({
     ...options,
-    maxSteps: void 0,
     messages: stepOptions.input,
     model: stepOptions.model,
     steps: void 0,
-    stopWhen: void 0,
     stream: false,
-    toolChoice: stepOptions.toolChoice
+    toolChoice: stepOptions.toolChoice,
+    totalUsage: void 0
   }).then(responseJSON).then(async (res) => {
     const { choices } = res;
     const usage = normalizeChatCompletionUsage(res.usage);
+    const totalUsage = computeTotalUsage(options.totalUsage, usage);
     if (!choices?.length) {
       const responseBody = JSON.stringify(res);
       throw new InvalidResponseError(`No choices returned, response body: ${responseBody}`, {
@@ -81,13 +81,15 @@ const rawGenerateText = async (options) => {
         text: step.text,
         toolCalls: step.toolCalls,
         toolResults: step.toolResults,
+        totalUsage,
         usage: step.usage
       };
     } else {
       return async () => rawGenerateText({
         ...options,
         messages,
-        steps
+        steps,
+        totalUsage
       });
     }
   });

package/package.json

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