huxy-llm-api 1.0.7 → 1.0.9

package/README.md

@@ -32,6 +32,9 @@ import startApi from 'huxy-llm-api';
 const ollamaApi = startApi('ollama', {
   apiKey: 'your-api-key',
   host: 'http://localhost:11434',
+  dispatcher: {
+    headersTimeout: 10 * 60 * 1000,
+  },
 }, {
   model: 'qwen3-vl:latest',
   options: {
@@ -89,7 +92,8 @@ console.log('对话结果:', response);
 **参数:**
 
 - `apiType`: `'ollama'` 或 `'openai'` - 指定要使用的 API 类型
-- `userConfig`: 对象 - 自定义配置，会覆盖默认配置
+- `userConfig`: 对象 - 自定义 API 接口配置，如 apiKey、baseURL、fetch 等
+- `userOption`: 对象 - 通用模型参数配置
 
 **返回:** API 客户端实例，包含以下方法：
 
@@ -126,8 +130,8 @@ console.log('对话结果:', response);
 
 ```javascript
 {
-  apiKey: process.env.OLLM_API_KEY || 'huxy@zys',
-  host: process.env.OLLM_API_HOST || 'http://192.168.0.111:11434',
+  apiKey: process.env.OLLM_API_KEY || '1234',
+  host: process.env.OLLM_API_HOST || 'http://localhost:11434',
   params: {
     model: 'qwen3-vl:latest',
     keep_alive: -1,
@@ -146,8 +150,8 @@ console.log('对话结果:', response);
 
 ```javascript
 {
-  apiKey: process.env.LLM_API_KEY || 'huxy@zys',
-  baseURL: process.env.LLM_API_BASEURL || 'http://192.168.0.111:11434/v1',
+  apiKey: process.env.LLM_API_KEY || '1234',
+  baseURL: process.env.LLM_API_BASEURL || 'http://localhost:11434/v1',
   timeout: 3 * 60 * 60 * 1000,
   maxRetries: 3,
   params: {

package/example.js

@@ -1,14 +1,14 @@
 import startApi from './index.js';
 
 const ollamaApi = startApi('ollama', {
-  apiKey: '123',
+  apiKey: '1234',
   host: 'http://192.168.0.111:11434',
   // headers
   // fetch
 });
 
 const openaiApi = startApi('openai', {
-  apiKey: '123',
+  apiKey: '1234',
   baseURL: 'http://192.168.0.111:11434/v1',
   // headers
   // fetch

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "huxy-llm-api",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "一个简洁、易用的用于简化 Ollama 和 OpenAI API 调用的 Node.js 库。",
   "type": "module",
   "module": "./src/index.js",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "ollama": "^0.6.3",
-    "openai": "^6.15.0",
+    "openai": "^6.16.0",
     "undici": "^7.18.2"
   },
   "engines": {

package/src/index.js

@@ -1,175 +1,168 @@
-import {Ollama as q} from 'ollama';
-import z from 'openai';
-import {fetch as E, Agent as K} from 'undici';
-var U = 300 * 60 * 1e3,
-  k = (t, r) => E(t, {...r, dispatcher: new K({headersTimeout: U})}),
-  _ = k;
-var v = {config: {apiKey: process.env.LLM_API_KEY || 'llm_key', baseURL: process.env.LLM_API_BASEURL}, params: {}, options: {}},
-  w = v;
-var M = {config: {apiKey: process.env.OLLM_API_KEY || 'ollm_key', host: process.env.OLLM_API_HOST}, params: {}, options: {}},
-  A = M;
-var T = ['response.reasoning_text.delta', 'response.reasoning_summary_text.delta'],
-  C = async (t, r, s) => {
-    if (r) {
-      let o = '',
+import {Ollama as z} from 'ollama';
+import D from 'openai';
+import {fetch as v, Agent as b} from 'undici';
+var E = 300 * 60 * 1e3,
+  k = t => (c, o) => v(c, {...o, dispatcher: new b({headersTimeout: E, ...t})}),
+  l = k;
+var U = {config: {apiKey: process.env.OLLM_API_KEY || 'ollm_key', host: process.env.OLLM_API_HOST}, params: {}, options: {}},
+  g = U;
+var M = {config: {apiKey: process.env.LLM_API_KEY || 'llm_key', baseURL: process.env.LLM_API_BASEURL}, params: {}, options: {}},
+  x = M;
+var F = ['temperature', 'seed', 'stop', 'top_p'],
+  S = t => {
+    let {max_tokens: c, options: o = {}, ...r} = t,
+      {num_ctx: s, ...n} = o;
+    return (
+      (r.max_tokens = c ?? s),
+      Object.keys(n).map(e => {
+        F.includes(e) ? (r[e] = n[e]) : (r.extra_body || (r.extra_body = {}), (r.extra_body[e] = n[e]));
+      }),
+      r
+    );
+  },
+  Y = (t, c = {}, o = 'chat') => {
+    if (!t) throw Error('\u8BF7\u4F20\u5165\u4F60\u7684 prompt !');
+    if (!c.model) throw Error('\u8BF7\u914D\u7F6E\u8981\u4F7F\u7528\u7684\u5927\u6A21\u578B model !');
+    if (o === 'chat') {
+      let s = Array.isArray(t) ? t : [{role: 'user', content: t}],
+        {system: n, ...e} = c;
+      return (n && (s = [{role: 'system', content: n}, ...s]), {messages: s, ...e});
+    }
+    if (o === 'responses') {
+      let {instructions: s, system: n, ...e} = c;
+      return (s || (e.instructions = n), {input: t, ...e});
+    }
+    return {prompt: Array.isArray(t) ? t.slice(-1)[0]?.content : t, ...c};
+  };
+var h =
+  ({params: t, options: c} = {}, o) =>
+  (r, s = {}, n) => {
+    let {options: e, extra_body: a, ...i} = s,
+      p = Y(r, {...t, ...i}, n);
+    return ((p.options = {...c, ...a, ...e}), o === 'openai' ? S(p) : p);
+  };
+var j = ['response.reasoning_text.delta', 'response.reasoning_summary_text.delta'],
+  y = async (t, c, o) => {
+    if (c) {
+      let s = '',
         n = '';
       for await (let e of t) {
-        let {type: c, delta: i} = e;
-        (T.includes(c) && (n += i), c === 'response.output_text.delta' && (o += i), s?.({content: o, reasoning: n}, e));
+        let {type: a, delta: i} = e;
+        (j.includes(a) && (n += i), a === 'response.output_text.delta' && (s += i), o?.({content: s, reasoning: n}, e));
       }
-      return {content: o, reasoning: n};
+      return {content: s, reasoning: n};
     }
-    return (s?.(t), {reasoning: (t.output?.[0]?.content ?? t.output?.[0]?.summary)?.[0]?.text, content: t.output_text});
+    return (o?.(t), {reasoning: (t.output?.[0]?.content ?? t.output?.[0]?.summary)?.[0]?.text, content: t.output_text});
   },
-  L = async (t, r, s) => {
-    if (r) {
+  d = async (t, c, o) => {
+    if (c) {
       let e = '',
-        c = '';
+        a = '';
       for await (let i of t) {
         let {delta: p} = i.choices?.[0] ?? {},
-          {reasoning: f, content: u} = p ?? {};
-        (f && (c += f), u && (e += u), s?.({content: e, reasoning: c}, i));
+          {reasoning: u, content: f} = p ?? {};
+        (u && (a += u), f && (e += f), o?.({content: e, reasoning: a}, i));
       }
-      return {content: e, reasoning: c};
+      return {content: e, reasoning: a};
     }
-    s?.(t);
-    let {message: a} = t.choices?.[0] ?? {},
-      {content: o, reasoning: n} = a;
-    return {content: o, reasoning: n};
+    o?.(t);
+    let {message: r} = t.choices?.[0] ?? {},
+      {content: s, reasoning: n} = r;
+    return {content: s, reasoning: n};
   };
-var S = ['response.reasoning_text.delta', 'response.reasoning_summary_text.delta'],
-  I = async (t, r, s) => {
-    if (r) {
-      let o = '',
+var H = ['response.reasoning_text.delta', 'response.reasoning_summary_text.delta'],
+  _ = async (t, c, o) => {
+    if (c) {
+      let s = '',
         n = '';
       for await (let e of t) {
-        let {type: c, delta: i} = e;
-        (S.includes(c) && (n += i), c === 'response.output_text.delta' && (o += i), s?.({content: o, reasoning: n}, e));
+        let {type: a, delta: i} = e;
+        (H.includes(a) && (n += i), a === 'response.output_text.delta' && (s += i), o?.({content: s, reasoning: n}, e));
       }
-      return {content: o, reasoning: n};
+      return {content: s, reasoning: n};
     }
-    return (s?.(t), {reasoning: (t.output?.[0]?.content ?? t.output?.[0]?.summary)?.[0]?.text, content: t.output_text});
+    return (o?.(t), {reasoning: (t.output?.[0]?.content ?? t.output?.[0]?.summary)?.[0]?.text, content: t.output_text});
   },
-  O = async (t, r, s) => {
-    if (r) {
+  R = async (t, c, o) => {
+    if (c) {
       let n = '',
         e = '';
-      for await (let c of t) {
-        let i = c.reasoning ?? c.thinking,
-          p = c.content ?? c.response;
-        (i && (e += i), p && (n += p), s?.({content: n, reasoning: e}, c));
+      for await (let a of t) {
+        let i = a.reasoning ?? a.thinking,
+          p = a.content ?? a.response;
+        (i && (e += i), p && (n += p), o?.({content: n, reasoning: e}, a));
       }
       return {content: n, reasoning: e};
     }
-    s?.(t);
-    let a = t.reasoning ?? t.thinking;
-    return {content: t.content ?? t.response, reasoning: a};
+    o?.(t);
+    let r = t.reasoning ?? t.thinking;
+    return {content: t.content ?? t.response, reasoning: r};
   },
-  b = async (t, r, s) => {
-    if (r) {
+  A = async (t, c, o) => {
+    if (c) {
       let e = '',
-        c = '';
+        a = '';
       for await (let i of t) {
         let {message: p} = i,
-          f = p.reasoning ?? p.thinking,
-          u = p.content ?? p.response;
-        (f && (c += f), u && (e += u), s?.({content: e, reasoning: c}, i));
+          u = p.reasoning ?? p.thinking,
+          f = p.content ?? p.response;
+        (u && (a += u), f && (e += f), o?.({content: e, reasoning: a}, i));
       }
-      return {content: e, reasoning: c};
-    }
-    let {message: a} = t;
-    s?.(t);
-    let o = a.reasoning ?? a.thinking;
-    return {content: a.content ?? a.response, reasoning: o};
-  };
-var j = ['temperature', 'seed', 'stop', 'top_p'],
-  B = t => {
-    let {max_tokens: r, options: s = {}, ...a} = t,
-      {num_ctx: o, ...n} = s;
-    return (
-      (a.max_tokens = r ?? o),
-      Object.keys(n).map(e => {
-        j.includes(e) ? (a[e] = n[e]) : (a.extra_body || (a.extra_body = {}), (a.extra_body[e] = n[e]));
-      }),
-      a
-    );
-  },
-  H = (t, r = {}, s = 'chat') => {
-    if (!t) throw Error('\u8BF7\u4F20\u5165\u4F60\u7684 prompt !');
-    if (!r.model) throw Error('\u8BF7\u914D\u7F6E\u8981\u4F7F\u7528\u7684\u5927\u6A21\u578B model !');
-    if (s === 'chat') {
-      let o = Array.isArray(t) ? t : [{role: 'user', content: t}],
-        {system: n, ...e} = r;
-      return (n && (o = [{role: 'system', content: n}, ...o]), {messages: o, ...e});
-    }
-    if (s === 'responses') {
-      let {instructions: o, system: n, ...e} = r;
-      return (o || (e.instructions = n), {input: t, ...e});
+      return {content: e, reasoning: a};
     }
-    return {prompt: Array.isArray(t) ? t.slice(-1)[0]?.content : t, ...r};
-  };
-var R =
-  ({params: t, options: r} = {}, s) =>
-  (a, o = {}, n) => {
-    let {options: e, extra_body: c, ...i} = o,
-      p = H(a, {...t, ...i}, n);
-    return ((p.options = {...r, ...c, ...e}), s === 'openai' ? B(p) : p);
+    let {message: r} = t;
+    o?.(t);
+    let s = r.reasoning ?? r.thinking;
+    return {content: r.content ?? r.response, reasoning: s};
   };
-var P = {
-  openai: (t = {}, r = {}) => {
-    let {config: s, params: a, options: o} = w,
-      {host: n, ...e} = t,
-      c = new z({fetch: _, ...s, ...e, baseURL: n}),
-      {options: i, extra_body: p, ...f} = r,
-      u = {params: {...a, ...f}, options: {...o, ...p, ...i}},
-      h = R(u, 'openai');
-    return {
-      chat: async (g, m = {}, x) => {
-        let l = h(g, m, 'chat'),
-          y = L,
-          d = await c.chat.completions.create(l);
-        return y(d, l.stream, x);
-      },
-      responses: async (g, m = {}, x) => {
-        let l = h(g, m, 'responses'),
-          y = C,
-          d = await c.responses.create(l);
-        return y(d, l.stream, x);
-      },
-    };
-  },
-  ollama: (t = {}, r = {}) => {
-    let {config: s, params: a, options: o} = A,
-      n = new q({fetch: _, ...s, ...t}),
-      {options: e, extra_body: c, ...i} = r,
-      p = {params: {...a, ...i}, options: {...o, ...c, ...e}},
-      f = R(p, 'ollama');
-    return {
-      chat: async (u, h = {}, g) => {
-        let m = f(u, h, 'chat'),
-          x = b,
-          l = await n.chat(m);
-        return x(l, m.stream, g);
-      },
-      generate: async (u, h = {}, g) => {
-        let m = f(u, h, 'generate'),
-          x = O,
-          l = await n.generate(m);
-        return x(l, m.stream, g);
-      },
-      responses: async (u, h = {}, g) => {
-        let m = f(u, h, 'responses'),
-          x = I,
-          l = await n.responses(m);
-        return x(l, m.stream, g);
-      },
-    };
-  },
+var w = {
+  openai: (t, c) => ({
+    chat: async (o, r = {}, s) => {
+      let n = c(o, r, 'chat'),
+        e = d,
+        a = await t.chat.completions.create(n);
+      return e(a, n.stream, s);
+    },
+    responses: async (o, r = {}, s) => {
+      let n = c(o, r, 'responses'),
+        e = y,
+        a = await t.responses.create(n);
+      return e(a, n.stream, s);
+    },
+  }),
+  ollama: (t, c) => ({
+    chat: async (o, r = {}, s) => {
+      let n = c(o, r, 'chat'),
+        e = A,
+        a = await t.chat(n);
+      return e(a, n.stream, s);
+    },
+    generate: async (o, r = {}, s) => {
+      let n = c(o, r, 'generate'),
+        e = R,
+        a = await t.generate(n);
+      return e(a, n.stream, s);
+    },
+    responses: async (o, r = {}, s) => {
+      let n = c(o, r, 'responses'),
+        e = _,
+        a = await t.responses(n);
+      return e(a, n.stream, s);
+    },
+  }),
 };
-var D = (t = 'ollama', r = {}, s = {}) => {
-    let {baseURL: a, host: o, ...n} = r;
-    if (((n.host = o || a), !n.host)) throw Error('\u8BF7\u914D\u7F6E\u5927\u6A21\u578B API \u5730\u5740 host/baseURL !');
-    return (P[t] ?? P.ollama)(n, s);
+var G = {ollama: {hostKey: 'host', envConfig: g, API: z}, openai: {hostKey: 'baseURL', envConfig: x, API: D}},
+  J = (t = 'ollama', c = {}, o = {}) => {
+    t = ['ollama', 'openai'].includes(t) ? t : 'ollama';
+    let {hostKey: r, envConfig: s, API: n} = G[t],
+      {config: e, params: a, options: i} = s,
+      {baseURL: p, host: u, dispatcher: f, ...m} = {...e, ...c};
+    if (((m[r] = u || p), !m[r])) throw Error('\u8BF7\u914D\u7F6E\u5927\u6A21\u578B API \u5730\u5740 host/baseURL !');
+    let I = new n({fetch: l(f), ...m}),
+      {options: P, extra_body: C, ...L} = o,
+      O = {params: {...a, ...L}, options: {...i, ...C, ...P}},
+      K = h(O, t);
+    return w[t](I, K);
   },
-  st = D;
-export {st as default, D as startApi};
+  rt = J;
+export {rt as default, J as startApi};