@xsai/generate-text 0.0.27 → 0.0.29

package/dist/index.d.ts

@@ -1,8 +1,9 @@
-import { ChatOptions, FinishReason, AssistantMessageResponse } from '@xsai/shared-chat';
+import { ChatOptions, FinishReason, AssistantMessageResponse, Usage } from '@xsai/shared-chat';
 
 interface GenerateTextOptions extends ChatOptions {
     /** @default 1 */
     maxSteps?: number;
+    onStepFinish?: (step: StepResult) => Promise<void> | void;
     /** @internal */
     steps?: StepResult[];
     /** if you want to enable stream, use `@xsai/stream-{text,object}` */
@@ -19,12 +20,21 @@ interface GenerateTextResponse {
     model: string;
     object: 'chat.completion';
     system_fingerprint: string;
-    usage: GenerateTextResponseUsage;
+    usage: Usage;
 }
-interface GenerateTextResponseUsage {
-    completion_tokens: number;
-    prompt_tokens: number;
-    total_tokens: number;
+interface GenerateTextResult {
+    finishReason: FinishReason;
+    steps: StepResult[];
+    text?: string;
+    toolCalls: ToolCall[];
+    toolResults: ToolResult[];
+    usage: Usage;
+}
+interface StepResult {
+    text?: string;
+    toolCalls: ToolCall[];
+    toolResults: ToolResult[];
+    usage: Usage;
 }
 interface ToolCall {
     args: string;
@@ -38,20 +48,6 @@ interface ToolResult {
     toolCallId: string;
     toolName: string;
 }
-interface GenerateTextResult {
-    finishReason: FinishReason;
-    steps: StepResult[];
-    text?: string;
-    toolCalls: ToolCall[];
-    toolResults: ToolResult[];
-    usage: GenerateTextResponseUsage;
-}
-interface StepResult {
-    text?: string;
-    toolCalls: ToolCall[];
-    toolResults: ToolResult[];
-    usage: GenerateTextResponseUsage;
-}
 declare const generateText: (options: GenerateTextOptions) => Promise<GenerateTextResult>;
 
-export { type GenerateTextOptions, type GenerateTextResponse, type GenerateTextResponseUsage, type GenerateTextResult, type StepResult, type ToolCall, type ToolResult, generateText as default, generateText };
+export { type GenerateTextOptions, type GenerateTextResponse, type GenerateTextResult, type StepResult, type ToolCall, type ToolResult, generateText as default, generateText };

package/dist/index.js

@@ -2,9 +2,9 @@ import { chat } from '@xsai/shared-chat';
 
 const rawGenerateText = async (options) => await chat({
   ...options,
-  maxSteps: void 0,
+  maxSteps: undefined,
   messages: options.messages,
-  steps: void 0,
+  steps: undefined,
   stream: false
 }).then((res) => res.json()).then(async ({ choices, usage }) => {
   const messages = options.messages;
@@ -13,17 +13,19 @@ const rawGenerateText = async (options) => await chat({
   const toolResults = [];
   const { finish_reason: finishReason, message } = choices[0];
   if (message.content || !message.tool_calls || steps.length >= (options.maxSteps ?? 1)) {
-    const step = {
+    const step2 = {
       text: message.content,
       toolCalls,
       toolResults,
       usage
     };
-    steps.push(step);
+    steps.push(step2);
+    if (options.onStepFinish)
+      await options.onStepFinish(step2);
     return {
       finishReason,
       steps,
-      ...step
+      ...step2
     };
   }
   messages.push({ ...message, content: message.content });
@@ -53,12 +55,15 @@ const rawGenerateText = async (options) => await chat({
       tool_call_id: toolCallId
     });
   }
-  steps.push({
+  const step = {
     text: message.content,
     toolCalls,
     toolResults,
     usage
-  });
+  };
+  steps.push(step);
+  if (options.onStepFinish)
+    await options.onStepFinish(step);
   return async () => await rawGenerateText({
     ...options,
     messages,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xsai/generate-text",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "type": "module",
   "author": "Moeru AI",
   "license": "MIT",