@xsai/generate-text 0.0.9 → 0.0.11

package/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 藍+85CD
+Copyright (c) 2024 Moeru AI
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/index.d.ts

@@ -1,46 +1,6 @@
-import { CommonRequestOptions } from '@xsai/shared';
+import { ChatCompletionOptions, FinishReason } from '@xsai/shared-chat-completion';
 
-type FinishReason = 'content_filter' | 'error' | 'length' | 'other' | 'stop' | 'tool-calls' | ({} & string);
-
-type Message = AssistantMessage | SystemMessage | ToolMessage | UserMessage;
-interface CommonMessage<T extends string> {
-    content: 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 GenerateTextOptions extends ChatCompletionOptions {
 }
 interface GenerateTextResponseUsage {
     completion_tokens: number;
@@ -49,9 +9,9 @@ interface GenerateTextResponseUsage {
 }
 interface GenerateTextResult {
     finishReason: FinishReason;
-    text: string;
+    text?: string;
     usage: GenerateTextResponseUsage;
 }
 declare const generateText: (options: GenerateTextOptions) => Promise<GenerateTextResult>;
 
-export { type AssistantMessage, type CommonMessage, type FinishReason, type GenerateTextOptions, type GenerateTextResponseUsage, type GenerateTextResult, type Message, type SystemMessage, type TextGenerationModel, type ToolChoice, type ToolMessage, type UserMessage, generateText as default, generateText };
+export { type GenerateTextOptions, type GenerateTextResponseUsage, type GenerateTextResult, generateText as default, generateText };

package/dist/index.js

@@ -1,24 +1,8 @@
-import { requestUrl, clean, objCamelToSnake } from '@xsai/shared';
+import { chatCompletion } from '@xsai/shared-chat-completion';
 
-const generateText = async (options) => await fetch(requestUrl(options.path ?? "chat/completions", options.base), {
-  body: JSON.stringify(clean({
-    ...objCamelToSnake(options),
-    abortSignal: void 0,
-    base: void 0,
-    headers: void 0,
-    path: void 0,
-    stream: false,
-    tools: options.tools?.map((tool) => ({
-      function: tool.function,
-      type: "function"
-    }))
-  })),
-  headers: {
-    "Content-Type": "application/json",
-    ...options.headers
-  },
-  method: "POST",
-  signal: options.abortSignal
+const generateText = async (options) => await chatCompletion({
+  ...options,
+  stream: false
 }).then(async (res) => {
   if (!res.ok) {
     const error = await res.text();
@@ -28,33 +12,32 @@ const generateText = async (options) => await fetch(requestUrl(options.path ?? "
   }
 }).then(async ({ choices, usage }) => {
   const { finish_reason, message } = 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
-      ]
-    });
-  } else {
+  if (!!message.content || !message.tool_calls) {
     return {
       finishReason: finish_reason,
       text: message.content,
       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);
+  }
+  return await generateText({
+    ...options,
+    messages: [
+      ...options.messages,
+      { ...message, content: message.content },
+      ...toolMessages
+    ]
+  });
 });
 
 export { generateText as default, generateText };

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@xsai/generate-text",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "type": "module",
-  "author": "藍+85CD",
+  "author": "Moeru AI",
   "license": "MIT",
-  "homepage": "https://github.com/moeru-ai/xsai",
+  "homepage": "https://xsai.js.org",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/moeru-ai/xsai.git",
@@ -23,7 +23,7 @@
     "dist"
   ],
   "dependencies": {
-    "@xsai/shared": "^0.0.9"
+    "@xsai/shared-chat-completion": ""
   },
   "scripts": {
     "build": "pkgroll",