@xsai/generate-text 0.0.19 → 0.0.20

package/dist/index.d.ts

@@ -1,6 +1,10 @@
 import { ChatCompletionOptions, FinishReason } from '@xsai/shared-chat-completion';
 
 interface GenerateTextOptions extends ChatCompletionOptions {
+    /** @default 1 */
+    maxSteps?: number;
+    /** if you want to enable stream, use `@xsai/stream-text` */
+    stream?: never;
 }
 interface GenerateTextResponseUsage {
     completion_tokens: number;
@@ -9,9 +13,14 @@ interface GenerateTextResponseUsage {
 }
 interface GenerateTextResult {
     finishReason: FinishReason;
+    steps: StepResult[];
+    text?: string;
+    usage: GenerateTextResponseUsage;
+}
+interface StepResult {
     text?: string;
     usage: GenerateTextResponseUsage;
 }
 declare const generateText: (options: GenerateTextOptions) => Promise<GenerateTextResult>;
 
-export { type GenerateTextOptions, type GenerateTextResponseUsage, type GenerateTextResult, generateText as default, generateText };
+export { type GenerateTextOptions, type GenerateTextResponseUsage, type GenerateTextResult, type StepResult, generateText as default, generateText };

package/dist/index.js

@@ -1,43 +1,65 @@
 import { chatCompletion } from '@xsai/shared-chat-completion';
 
-const generateText = async (options) => await chatCompletion({
-  ...options,
-  stream: false
-}).then(async (res) => {
-  if (!res.ok) {
-    const error = await res.text();
-    throw new Error(`Error(${res.status}): ${error}`);
-  } else {
-    return res.json();
-  }
-}).then(async ({ choices, usage }) => {
-  const { finish_reason, message } = choices[0];
-  if (!!message.content || !message.tool_calls) {
-    return {
-      finishReason: finish_reason,
+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 messages = options.messages;
+  while (currentStep < (options.maxSteps ?? 1)) {
+    currentStep += 1;
+    const res = await chatCompletion({
+      ...options,
+      maxSteps: void 0,
+      messages,
+      stream: false
+    });
+    if (!res.ok) {
+      const error = await res.text();
+      throw new Error(`Error(${res.status}): ${error}`);
+    }
+    const data = await res.json();
+    const { finish_reason, message } = data.choices[0];
+    finishReason = finish_reason;
+    text = message.content;
+    usage = data.usage;
+    steps.push({
       text: message.content,
+      // type: 'initial',
       usage
-    };
-  }
-  const toolMessages = [];
-  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
-    };
-    toolMessages.push(toolMessage);
+    });
+    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 await generateText({
-    ...options,
-    messages: [
-      ...options.messages,
-      { ...message, content: message.content },
-      ...toolMessages
-    ]
-  });
-});
+  return {
+    finishReason,
+    steps,
+    text,
+    usage
+  };
+};
 
 export { generateText as default, generateText };

package/package.json

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