@xsai/generate-text 0.0.8 → 0.0.9

package/dist/index.d.ts

@@ -42,19 +42,6 @@ interface GenerateTextOptions extends CommonRequestOptions<'chat/completions'> {
     model: TextGenerationModel;
     toolChoice?: ToolChoice;
 }
-interface GenerateTextResponse {
-    choices: {
-        finish_reason: FinishReason;
-        index: number;
-        message: AssistantMessage;
-    }[];
-    created: number;
-    id: string;
-    model: string;
-    object: 'chat.completion';
-    system_fingerprint: string;
-    usage: GenerateTextResponseUsage;
-}
 interface GenerateTextResponseUsage {
     completion_tokens: number;
     prompt_tokens: number;
@@ -62,11 +49,9 @@ interface GenerateTextResponseUsage {
 }
 interface GenerateTextResult {
     finishReason: FinishReason;
-    request: Request;
-    response: Response;
     text: string;
     usage: GenerateTextResponseUsage;
 }
 declare const generateText: (options: GenerateTextOptions) => Promise<GenerateTextResult>;
 
-export { type GenerateTextOptions, type GenerateTextResponse, type GenerateTextResponseUsage, type GenerateTextResult, generateText as default, generateText };
+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 };

package/dist/index.js

@@ -1,29 +1,33 @@
 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({
-      ...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.abortSingal
-  });
-  const response = await fetch(request);
-  const json = await response.json();
-  const { finish_reason, message } = json.choices[0];
+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
+}).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.tool_calls) {
     const toolMessages = [];
     for (const toolCall of message.tool_calls) {
@@ -44,14 +48,13 @@ const generateText = async (options) => {
         ...toolMessages
       ]
     });
+  } else {
+    return {
+      finishReason: finish_reason,
+      text: message.content,
+      usage
+    };
   }
-  return {
-    finishReason: finish_reason,
-    request,
-    response,
-    text: message.content,
-    usage: json.usage
-  };
-};
+});
 
 export { generateText as default, generateText };

package/package.json

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