xsai 0.0.3 → 0.0.5

package/dist/index.d.ts

@@ -2,13 +2,14 @@ type GenerationModel = 'gemma2' | 'llama3.1' | 'llama3.2' | 'llama3.2-vision' |
 type EmbedModel = 'all-minilm' | 'mxbai-embed-large' | 'nomic-embed-text' | ({} & string);
 
 interface CommonRequestOptions {
-    /**
-     * @default `http://localhost:11434/v1`
-     */
+    /** @default `http://localhost:11434/v1` */
     base?: string;
+    /** @default `undefined` */
+    headers?: Headers | Record<string, string>;
 }
 
 interface EmbedOptions extends CommonRequestOptions {
+    [key: string]: unknown;
     input: string | string[];
     model: EmbedModel;
     /** @default `embeddings` */
@@ -22,7 +23,7 @@ interface EmbedResult {
     embedding: number[];
     request: Request;
     response: Response;
-    usage?: EmbedResponseUsage;
+    usage: EmbedResponseUsage;
 }
 declare const embed: (options: EmbedOptions) => Promise<{
     embedding: number[];
@@ -31,22 +32,31 @@ declare const embed: (options: EmbedOptions) => Promise<{
     usage: EmbedResponseUsage;
 }>;
 
+type FinishReason = 'content_filter' | 'error' | 'length' | 'other' | 'stop' | 'tool-calls' | ({} & string);
+
 interface Message {
     content: string;
     role: 'assistant' | 'system' | 'user' | ({} & string);
 }
 
 interface GenerateTextOptions extends CommonRequestOptions {
-    messages?: Message[];
+    [key: string]: unknown;
+    messages: Message[];
     model: GenerationModel;
-    /** @default `completions` */
-    path?: 'completions' | ({} & string);
-    prompt: string;
+    /** @default `chat/completions` */
+    path?: 'chat/completions' | ({} & string);
+}
+interface GenerateTextResponseUsage {
+    completion_tokens: number;
+    prompt_tokens: number;
+    total_tokens: number;
 }
 interface GenerateTextResult {
+    finishReason: FinishReason;
     request: Request;
     response: Response;
     text: string;
+    usage: GenerateTextResponseUsage;
 }
 declare const generateText: (options: GenerateTextOptions) => Promise<GenerateTextResult>;
 

package/dist/index.js

@@ -7,8 +7,13 @@ const embed = async (options) => {
     body: JSON.stringify(clean({
       ...options,
       base: void 0,
+      headers: void 0,
       path: void 0
     })),
+    headers: {
+      "Content-Type": "application/json",
+      ...options.headers
+    },
     method: "POST"
   });
   const response = await fetch(request);
@@ -22,21 +27,28 @@ const embed = async (options) => {
 };
 
 const generateText = async (options) => {
-  const request = new Request(new URL(options.path ?? "completions", options.base ?? base), {
+  const request = new Request(new URL(options.path ?? "chat/completions", options.base ?? base), {
     body: JSON.stringify(clean({
-      stream: false,
       ...options,
       base: void 0,
-      path: void 0
+      headers: void 0,
+      path: void 0,
+      stream: false
     })),
+    headers: {
+      "Content-Type": "application/json",
+      ...options.headers
+    },
     method: "POST"
   });
   const response = await fetch(request);
   const json = await response.json();
   return {
+    finishReason: json.choices[0].finish_reason,
     request,
     response,
-    text: json.choices[0].text
+    text: json.choices[0].message.content,
+    usage: json.usage
   };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xsai",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "type": "module",
   "author": "藍+85CD",
   "license": "MIT",