@xsai/generate-text 0.0.28 → 0.0.30

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ChatOptions, FinishReason, AssistantMessageResponse, Usage } from '@xsai/shared-chat';
+import { ChatOptions, FinishReason, AssistantMessageResponse, Usage, Message } from '@xsai/shared-chat';
 
 interface GenerateTextOptions extends ChatOptions {
     /** @default 1 */
@@ -22,20 +22,9 @@ interface GenerateTextResponse {
     system_fingerprint: string;
     usage: Usage;
 }
-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;
+    messages: Message[];
     steps: StepResult[];
     text?: string;
     toolCalls: ToolCall[];
@@ -43,11 +32,25 @@ interface GenerateTextResult {
     usage: Usage;
 }
 interface StepResult {
+    finishReason: FinishReason;
+    stepType: 'continue' | 'initial' | 'tool-result';
     text?: string;
     toolCalls: ToolCall[];
     toolResults: ToolResult[];
     usage: Usage;
 }
+interface ToolCall {
+    args: string;
+    toolCallId: string;
+    toolCallType: 'function';
+    toolName: string;
+}
+interface ToolResult {
+    args: Record<string, unknown>;
+    result: string;
+    toolCallId: string;
+    toolName: string;
+}
 declare const generateText: (options: GenerateTextOptions) => Promise<GenerateTextResult>;
 
 export { type GenerateTextOptions, type GenerateTextResponse, type GenerateTextResult, type StepResult, type ToolCall, type ToolResult, generateText as default, generateText };

package/dist/index.js

@@ -1,19 +1,23 @@
 import { chat } from '@xsai/shared-chat';
 
-const rawGenerateText = async (options) => await chat({
+const rawGenerateText = async (options) => 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 }) => {
+}).then(async (res) => res.json()).then(async ({ choices, usage }) => {
   const messages = options.messages;
   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)) {
+  messages.push({ ...message, content: message.content });
+  const stepType = steps.length === 0 ? "initial" : steps.at(-1)?.finishReason === "tool-calls" ? "tool-result" : "continue";
+  if (message.content !== undefined || !message.tool_calls || steps.length >= (options.maxSteps ?? 1)) {
     const step2 = {
+      finishReason,
+      stepType,
       text: message.content,
       toolCalls,
       toolResults,
@@ -24,11 +28,14 @@ const rawGenerateText = async (options) => await chat({
       await options.onStepFinish(step2);
     return {
       finishReason,
+      messages,
       steps,
-      ...step2
+      text: message.content,
+      toolCalls,
+      toolResults,
+      usage
     };
   }
-  messages.push({ ...message, content: message.content });
   for (const {
     function: { arguments: toolArgs, name: toolName },
     id: toolCallId,
@@ -36,7 +43,7 @@ const rawGenerateText = async (options) => await chat({
   } 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);
+    const result = await tool.execute(parsedArgs, { abortSignal: options.abortSignal, messages, toolCallId });
     toolCalls.push({
       args: toolArgs,
       toolCallId,
@@ -56,6 +63,8 @@ const rawGenerateText = async (options) => await chat({
     });
   }
   const step = {
+    finishReason,
+    stepType,
     text: message.content,
     toolCalls,
     toolResults,
@@ -64,7 +73,7 @@ const rawGenerateText = async (options) => await chat({
   steps.push(step);
   if (options.onStepFinish)
     await options.onStepFinish(step);
-  return async () => await rawGenerateText({
+  return async () => rawGenerateText({
     ...options,
     messages,
     steps
@@ -72,7 +81,7 @@ const rawGenerateText = async (options) => await chat({
 });
 const generateText = async (options) => {
   let result = await rawGenerateText(options);
-  while (result instanceof Function)
+  while (typeof result === "function")
     result = await result();
   return result;
 };

package/package.json

@@ -1,31 +1,31 @@
 {
   "name": "@xsai/generate-text",
-  "version": "0.0.28",
   "type": "module",
+  "version": "0.0.30",
+  "description": "extra-small AI SDK for Browser, Node.js, Deno, Bun or Edge Runtime.",
   "author": "Moeru AI",
   "license": "MIT",
   "homepage": "https://xsai.js.org",
-  "description": "extra-small AI SDK for Browser, Node.js, Deno, Bun or Edge Runtime.",
-  "keywords": [
-    "xsai",
-    "openai",
-    "ai"
-  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/moeru-ai/xsai.git",
     "directory": "packages/generate-text"
   },
   "bugs": "https://github.com/moeru-ai/xsai/issues",
+  "keywords": [
+    "xsai",
+    "openai",
+    "ai"
+  ],
   "sideEffects": false,
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     }
   },
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "files": [
     "dist"
   ],