@xsai/generate-text 0.1.0-beta.5 → 0.1.0-beta.6

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ChatOptions, Tool, FinishReason, AssistantMessageResponse, Usage, Message } from '@xsai/shared-chat';
+import { ChatOptions, Tool, FinishReason, AssistantMessageResponse, Usage, Message, CompletionToolCall, CompletionToolResult } from '@xsai/shared-chat';
 
 interface GenerateTextOptions extends ChatOptions {
     /** @default 1 */
@@ -28,30 +28,18 @@ interface GenerateTextResult {
     messages: Message[];
     steps: GenerateTextStepResult[];
     text?: string;
-    toolCalls: GenerateTextToolCall[];
-    toolResults: GenerateTextToolResult[];
+    toolCalls: CompletionToolCall[];
+    toolResults: CompletionToolResult[];
     usage: Usage;
 }
 interface GenerateTextStepResult {
     finishReason: FinishReason;
     stepType: 'continue' | 'initial' | 'tool-result';
     text?: string;
-    toolCalls: GenerateTextToolCall[];
-    toolResults: GenerateTextToolResult[];
+    toolCalls: CompletionToolCall[];
+    toolResults: CompletionToolResult[];
     usage: Usage;
 }
-interface GenerateTextToolCall {
-    args: string;
-    toolCallId: string;
-    toolCallType: 'function';
-    toolName: string;
-}
-interface GenerateTextToolResult {
-    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 GenerateTextStepResult, type GenerateTextToolCall, type GenerateTextToolResult, generateText };
+export { type GenerateTextOptions, type GenerateTextResponse, type GenerateTextResult, type GenerateTextStepResult, generateText };

package/dist/index.js

@@ -1,10 +1,10 @@
-import { chat } from '@xsai/shared-chat';
-
-const rawGenerateText = async (options) => chat({
+// src/index.ts
+import { chat } from "@xsai/shared-chat";
+var rawGenerateText = async (options) => chat({
   ...options,
-  maxSteps: undefined,
+  maxSteps: void 0,
   messages: options.messages,
-  steps: undefined,
+  steps: void 0,
   stream: false
 }).then(async (res) => res.json()).then(async ({ choices, usage }) => {
   const messages = structuredClone(options.messages);
@@ -14,7 +14,7 @@ const rawGenerateText = async (options) => chat({
   const { finish_reason: finishReason, message } = choices[0];
   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.content.length > 0 || !message.tool_calls || steps.length >= (options.maxSteps ?? 1)) {
+  if (message.content !== void 0 && message.content.length > 0 || !message.tool_calls || steps.length >= (options.maxSteps ?? 1)) {
     const step2 = {
       finishReason,
       stepType,
@@ -41,7 +41,12 @@ const rawGenerateText = async (options) => chat({
     id: toolCallId,
     type: toolCallType
   } of message.tool_calls) {
-    const tool = options.tools.find((tool2) => tool2.function.name === toolName);
+    const tool = options.tools?.find((tool2) => tool2.function.name === toolName);
+    if (!tool) {
+      const availableTools = options.tools?.map((tool2) => tool2.function.name);
+      const availableToolsErrorMsg = availableTools === void 0 ? "No tools are available." : `Available tools: ${availableTools.join(", ")}.`;
+      throw new Error(`Model tried to call unavailable tool '${toolName}. ${availableToolsErrorMsg}.`);
+    }
     const parsedArgs = JSON.parse(toolArgs);
     const result = await tool.execute(parsedArgs, { abortSignal: options.abortSignal, messages, toolCallId });
     toolCalls.push({
@@ -79,11 +84,12 @@ const rawGenerateText = async (options) => chat({
     steps
   });
 });
-const generateText = async (options) => {
+var generateText = async (options) => {
   let result = await rawGenerateText(options);
   while (typeof result === "function")
     result = await result();
   return result;
 };
-
-export { generateText };
+export {
+  generateText
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xsai/generate-text",
   "type": "module",
-  "version": "0.1.0-beta.5",
+  "version": "0.1.0-beta.6",
   "description": "extra-small AI SDK for Browser, Node.js, Deno, Bun or Edge Runtime.",
   "author": "Moeru AI",
   "license": "MIT",
@@ -22,10 +22,9 @@
     ".": {
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "files": [
     "dist"
   ],
@@ -33,12 +32,14 @@
     "@xsai/shared-chat": ""
   },
   "devDependencies": {
-    "@xsai/providers": ""
+    "@xsai/tool": "",
+    "valibot": "^1.0.0-rc.1"
   },
   "scripts": {
-    "build": "pkgroll",
-    "build:watch": "pkgroll --watch",
+    "build": "tsup",
     "test": "vitest run",
     "test:watch": "vitest"
-  }
+  },
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts"
 }