@xsai/generate-text 0.0.26 → 0.0.28

package/dist/index.d.ts

@@ -1,8 +1,11 @@
-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}` */
     stream?: never;
 }
@@ -17,23 +20,34 @@ 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 ToolCall {
+    args: string;
+    toolCallId: string;
+    toolCallType: 'function';
+    toolName: string;
+}
+interface ToolResult {
+    args: Record<string, unknown>;
+    result: string;
+    toolCallId: string;
+    toolName: string;
 }
 interface GenerateTextResult {
     finishReason: FinishReason;
     steps: StepResult[];
     text?: string;
-    usage: GenerateTextResponseUsage;
+    toolCalls: ToolCall[];
+    toolResults: ToolResult[];
+    usage: Usage;
 }
 interface StepResult {
     text?: string;
-    usage: GenerateTextResponseUsage;
+    toolCalls: ToolCall[];
+    toolResults: ToolResult[];
+    usage: Usage;
 }
 declare const generateText: (options: GenerateTextOptions) => Promise<GenerateTextResult>;
 
-export { type GenerateTextOptions, type GenerateTextResponse, type GenerateTextResponseUsage, type GenerateTextResult, type StepResult, 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

@@ -1,60 +1,80 @@
 import { chat } from '@xsai/shared-chat';
 
-const generateText = async (options) => {
-  let currentStep = 0;
-  let finishReason = "error";
-  let text;
-  let usage = {
-    completion_tokens: 0,
-    prompt_tokens: 0,
-    total_tokens: 0
-  };
-  const steps = [];
+const rawGenerateText = async (options) => await chat({
+  ...options,
+  maxSteps: void 0,
+  messages: options.messages,
+  steps: void 0,
+  stream: false
+}).then((res) => res.json()).then(async ({ choices, usage }) => {
   const messages = options.messages;
-  while (currentStep < (options.maxSteps ?? 1)) {
-    currentStep += 1;
-    const data = await chat({
-      ...options,
-      maxSteps: void 0,
-      messages,
-      stream: false
-    }).then((res) => res.json());
-    const { finish_reason, message } = data.choices[0];
-    finishReason = finish_reason;
-    text = message.content;
-    usage = data.usage;
-    steps.push({
+  const steps = options.steps ?? [];
+  const toolCalls = [];
+  const toolResults = [];
+  const { finish_reason: finishReason, message } = choices[0];
+  if (message.content || !message.tool_calls || steps.length >= (options.maxSteps ?? 1)) {
+    const step2 = {
       text: message.content,
-      // type: 'initial',
+      toolCalls,
+      toolResults,
       usage
+    };
+    steps.push(step2);
+    if (options.onStepFinish)
+      await options.onStepFinish(step2);
+    return {
+      finishReason,
+      steps,
+      ...step2
+    };
+  }
+  messages.push({ ...message, content: message.content });
+  for (const {
+    function: { arguments: toolArgs, name: toolName },
+    id: toolCallId,
+    type: toolCallType
+  } of message.tool_calls) {
+    const tool = options.tools.find((tool2) => tool2.function.name === toolName);
+    const parsedArgs = JSON.parse(toolArgs);
+    const result = await tool.execute(parsedArgs);
+    toolCalls.push({
+      args: toolArgs,
+      toolCallId,
+      toolCallType,
+      toolName
+    });
+    toolResults.push({
+      args: parsedArgs,
+      result,
+      toolCallId,
+      toolName
+    });
+    messages.push({
+      content: result,
+      role: "tool",
+      tool_call_id: toolCallId
     });
-    messages.push({ ...message, content: message.content });
-    if (message.tool_calls) {
-      for (const toolCall of message.tool_calls ?? []) {
-        const tool = options.tools.find((tool2) => tool2.function.name === toolCall.function.name);
-        const toolResult = await tool.execute(JSON.parse(toolCall.function.arguments));
-        const toolMessage = {
-          content: toolResult,
-          role: "tool",
-          tool_call_id: toolCall.id
-        };
-        messages.push(toolMessage);
-      }
-    } else {
-      return {
-        finishReason: finish_reason,
-        steps,
-        text: message.content,
-        usage
-      };
-    }
   }
-  return {
-    finishReason,
-    steps,
-    text,
+  const step = {
+    text: message.content,
+    toolCalls,
+    toolResults,
     usage
   };
+  steps.push(step);
+  if (options.onStepFinish)
+    await options.onStepFinish(step);
+  return async () => await rawGenerateText({
+    ...options,
+    messages,
+    steps
+  });
+});
+const generateText = async (options) => {
+  let result = await rawGenerateText(options);
+  while (result instanceof Function)
+    result = await result();
+  return result;
 };
 
 export { generateText as default, generateText };

package/package.json

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