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

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { WithUnknown } from '@xsai/shared';
-import { ChatOptions, CompletionStep, PrepareStep, StopCondition, FinishReason, AssistantMessage, Usage, Message, CompletionToolCall, CompletionToolResult } 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;
@@ -7,9 +7,11 @@ interface GenerateTextOptions extends ChatOptions {
     /** @internal */
     steps?: CompletionStep<true>[];
     /** @default `stepCountAtLeast(1)` */
-    stopWhen?: StopCondition;
+    stopWhen?: StopCondition<Message>;
     /** if you want to enable stream, use `@xsai/stream-{text,object}` */
     stream?: never;
+    /** @internal */
+    totalUsage?: Usage;
 }
 interface GenerateTextResponse {
     choices: {
@@ -23,7 +25,7 @@ interface GenerateTextResponse {
     model: string;
     object: 'chat.completion';
     system_fingerprint: string;
-    usage: Usage;
+    usage: ChatCompletionUsage;
 }
 interface GenerateTextResult {
     finishReason: FinishReason;
@@ -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,11 +1,11 @@
 import { trampoline, responseJSON, InvalidResponseError } from '@xsai/shared';
-import { resolveStepOptions, chat, stepCountAtLeast, executeTool, shouldStop, determineStepType } 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;
   const steps = options.steps ?? [];
-  const stepOptions = await resolveStepOptions({
-    messages,
+  const stepOptions = await resolvePrepareStep({
+    input: messages,
     model: options.model,
     prepareStep: options.prepareStep,
     stepNumber: steps.length,
@@ -14,15 +14,16 @@ const rawGenerateText = async (options) => {
   });
   return chat({
     ...options,
-    maxSteps: void 0,
-    messages: stepOptions.messages,
+    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, usage } = 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}`, {
@@ -45,13 +46,17 @@ const rawGenerateText = async (options) => {
           tools: options.tools
         }))
       );
-      for (const { completionToolCall, completionToolResult, message: message2 } of results) {
+      for (const { completionToolCall, completionToolResult, result } of results) {
         toolCalls.push(completionToolCall);
         toolResults.push(completionToolResult);
-        messages.push(message2);
+        messages.push({
+          content: result,
+          role: "tool",
+          tool_call_id: completionToolCall.toolCallId
+        });
       }
     }
-    const stopStep = {
+    const step = {
       finishReason,
       text: Array.isArray(message.content) ? message.content.filter((m) => m.type === "text").map((m) => m.text).join("\n") : message.content,
       toolCalls,
@@ -59,20 +64,11 @@ const rawGenerateText = async (options) => {
       usage
     };
     const stop = shouldStop(stopWhen, {
-      messages,
-      step: stopStep,
-      steps: [...steps, stopStep]
+      input: messages,
+      step,
+      steps: [...steps, step]
     });
     const willContinue = toolCalls.length > 0 && !stop;
-    const step = {
-      ...stopStep,
-      stepType: determineStepType({
-        finishReason,
-        stepsLength: steps.length,
-        toolCallsLength: toolCalls.length,
-        willContinue
-      })
-    };
     steps.push(step);
     if (options.onStepFinish)
       await options.onStepFinish(step);
@@ -85,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.2",
+  "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.2",
-    "@xsai/shared-chat": "~0.5.0-beta.2"
+    "@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.2"
+    "@xsai/tool": "0.5.0-beta.4"
   },
   "scripts": {
     "build": "pkgroll",