@xsai/generate-text 0.0.6 → 0.0.8

package/dist/index.d.ts

@@ -2,23 +2,51 @@ import { CommonRequestOptions } from '@xsai/shared';
 
 type FinishReason = 'content_filter' | 'error' | 'length' | 'other' | 'stop' | 'tool-calls' | ({} & string);
 
-interface Message {
+type Message = AssistantMessage | SystemMessage | ToolMessage | UserMessage;
+interface CommonMessage<T extends string> {
     content: string;
-    role: 'assistant' | 'system' | 'user' | ({} & string);
+    name?: string;
+    role: T;
+}
+interface SystemMessage extends CommonMessage<'system'> {
+}
+interface UserMessage extends CommonMessage<'user'> {
+}
+interface AssistantMessage extends CommonMessage<'assistant'> {
+    refusal?: string;
+    tool_calls?: {
+        function: {
+            arguments: string;
+            name: string;
+        };
+        id: string;
+        type: 'function';
+    }[];
+}
+interface ToolMessage extends Omit<CommonMessage<'tool'>, 'name'> {
+    tool_call_id: string;
 }
 
 type TextGenerationModel = 'gemma2' | 'llama3.1' | 'llama3.2' | 'llama3.2-vision' | 'mistral-nemo' | 'mistral-small' | 'nemotron' | 'qwen2.5' | 'qwen2.5-coder' | ({} & string);
 
+type ToolChoice = 'auto' | 'none' | 'required' | {
+    function: {
+        name: string;
+    };
+    type: 'function';
+};
+
 interface GenerateTextOptions extends CommonRequestOptions<'chat/completions'> {
     [key: string]: unknown;
     messages: Message[];
     model: TextGenerationModel;
+    toolChoice?: ToolChoice;
 }
 interface GenerateTextResponse {
     choices: {
         finish_reason: FinishReason;
         index: number;
-        message: Message;
+        message: AssistantMessage;
     }[];
     created: number;
     id: string;

package/dist/index.js

@@ -1,27 +1,55 @@
-import { requestUrl, clean } from '@xsai/shared';
+import { requestUrl, clean, objCamelToSnake } from '@xsai/shared';
 
 const generateText = async (options) => {
   const request = new Request(requestUrl(options.path ?? "chat/completions", options.base), {
     body: JSON.stringify(clean({
-      ...options,
+      ...objCamelToSnake(options),
+      abortSignal: void 0,
       base: void 0,
       headers: void 0,
       path: void 0,
-      stream: false
+      stream: false,
+      tools: options.tools?.map((tool) => ({
+        function: tool.function,
+        type: "function"
+      }))
     })),
     headers: {
       "Content-Type": "application/json",
       ...options.headers
     },
-    method: "POST"
+    method: "POST",
+    signal: options.abortSingal
   });
   const response = await fetch(request);
   const json = await response.json();
+  const { finish_reason, message } = json.choices[0];
+  if (message.tool_calls) {
+    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);
+    }
+    return await generateText({
+      ...options,
+      messages: [
+        ...options.messages,
+        message,
+        ...toolMessages
+      ]
+    });
+  }
   return {
-    finishReason: json.choices[0].finish_reason,
+    finishReason: finish_reason,
     request,
     response,
-    text: json.choices[0].message.content,
+    text: message.content,
     usage: json.usage
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xsai/generate-text",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "type": "module",
   "author": "藍+85CD",
   "license": "MIT",
@@ -23,7 +23,7 @@
     "dist"
   ],
   "dependencies": {
-    "@xsai/shared": "^0.0.6"
+    "@xsai/shared": "^0.0.8"
   },
   "scripts": {
     "build": "pkgroll",