huxy-llm-api 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "huxy-llm-api",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "一个简洁、易用的用于简化 Ollama 和 OpenAI API 调用的 Node.js 库。",
   "type": "module",
   "module": "./src/index.js",

package/src/index.js

@@ -1,162 +1,167 @@
-import {Ollama as B} from 'ollama';
-import H from 'openai';
+import {Ollama as H} from 'ollama';
+import j from 'openai';
 import {fetch as K, Agent as M} from 'undici';
 var U = 300 * 60 * 1e3,
-  E = (t, r) => K(t, {...r, dispatcher: new M({headersTimeout: U})}),
-  w = E;
+  E = (t, a) => K(t, {...a, dispatcher: new M({headersTimeout: U})}),
+  R = E;
 var T = {
     config: {apiKey: process.env.LLM_API_KEY || 'ah.yiru@gmail.com', baseURL: process.env.LLM_API_BASEURL || 'http://127.0.0.1:11434/v1', timeout: process.env.LLM_API_TIMEOUT || 108e5, maxRetries: 3},
     params: {model: 'qwen3-vl:latest', temperature: 1, max_tokens: 4096, top_p: 0.95},
     options: {top_k: 20, repeat_penalty: 1.05, thinking: !0},
   },
   A = T;
-var q = {
+var b = {
     config: {apiKey: process.env.OLLM_API_KEY || 'ah.yiru@gmail.com', host: process.env.OLLM_API_HOST || 'http://127.0.0.1:11434'},
     params: {model: 'qwen3-vl:latest', keep_alive: -1},
     options: {temperature: 1, num_ctx: 4096, top_k: 20, top_p: 0.95, repeat_penalty: 1.05},
   },
-  I = q;
-var F = ['response.reasoning_text.delta', 'response.reasoning_summary_text.delta'],
-  C = async (t, r, o) => {
-    if (r) {
-      let s = '',
-        n = '';
-      for await (let e of t) {
-        let {type: a, delta: c} = e;
-        (F.includes(a) && (n += c), a === 'response.output_text.delta' && (s += c), o?.({content: s, reasoning: n}, e));
+  I = b;
+var q = ['response.reasoning_text.delta', 'response.reasoning_summary_text.delta'],
+  P = async (t, a, s) => {
+    if (a) {
+      let r = '',
+        e = '';
+      for await (let n of t) {
+        let {type: o, delta: i} = n;
+        (q.includes(o) && (e += i), o === 'response.output_text.delta' && (r += i), s?.({content: r, reasoning: e}, n));
       }
-      return {content: s, reasoning: n};
+      return {content: r, reasoning: e};
     }
-    return (o?.(t), {reasoning: (t.output?.[0]?.content ?? t.output?.[0]?.summary)?.[0]?.text, content: t.output_text});
+    return (s?.(t), {reasoning: (t.output?.[0]?.content ?? t.output?.[0]?.summary)?.[0]?.text, content: t.output_text});
   },
-  P = async (t, r, o) => {
-    if (r) {
-      let e = '',
-        a = '';
-      for await (let c of t) {
-        let {delta: p} = c.choices?.[0] ?? {},
-          {reasoning: u, content: m} = p ?? {};
-        (u && (a += u), m && (e += m), o?.({content: e, reasoning: a}, c));
+  C = async (t, a, s) => {
+    if (a) {
+      let n = '',
+        o = '';
+      for await (let i of t) {
+        let {delta: p} = i.choices?.[0] ?? {},
+          {reasoning: l, content: u} = p ?? {};
+        (l && (o += l), u && (n += u), s?.({content: n, reasoning: o}, i));
       }
-      return {content: e, reasoning: a};
+      return {content: n, reasoning: o};
     }
-    o?.(t);
-    let {message: i} = t.choices?.[0] ?? {},
-      {content: s, reasoning: n} = i;
-    return {content: s, reasoning: n};
+    s?.(t);
+    let {message: c} = t.choices?.[0] ?? {},
+      {content: r, reasoning: e} = c;
+    return {content: r, reasoning: e};
   };
-var Y = ['response.reasoning_text.delta', 'response.reasoning_summary_text.delta'],
-  k = async (t, r, o) => {
-    if (r) {
-      let s = '',
-        n = '';
-      for await (let e of t) {
-        let {type: a, delta: c} = e;
-        (Y.includes(a) && (n += c), a === 'response.output_text.delta' && (s += c), o?.({content: s, reasoning: n}, e));
+var S = ['response.reasoning_text.delta', 'response.reasoning_summary_text.delta'],
+  k = async (t, a, s) => {
+    if (a) {
+      let r = '',
+        e = '';
+      for await (let n of t) {
+        let {type: o, delta: i} = n;
+        (S.includes(o) && (e += i), o === 'response.output_text.delta' && (r += i), s?.({content: r, reasoning: e}, n));
       }
-      return {content: s, reasoning: n};
+      return {content: r, reasoning: e};
     }
-    return (o?.(t), {reasoning: (t.output?.[0]?.content ?? t.output?.[0]?.summary)?.[0]?.text, content: t.output_text});
+    return (s?.(t), {reasoning: (t.output?.[0]?.content ?? t.output?.[0]?.summary)?.[0]?.text, content: t.output_text});
   },
-  v = async (t, r, o) => {
-    if (r) {
-      let n = '',
-        e = '';
-      for await (let a of t) {
-        let c = a.reasoning ?? a.thinking,
-          p = a.content ?? a.response;
-        (c && (e += c), p && (n += p), o?.({content: n, reasoning: e}, a));
+  v = async (t, a, s) => {
+    if (a) {
+      let e = '',
+        n = '';
+      for await (let o of t) {
+        let i = o.reasoning ?? o.thinking,
+          p = o.content ?? o.response;
+        (i && (n += i), p && (e += p), s?.({content: e, reasoning: n}, o));
       }
-      return {content: n, reasoning: e};
+      return {content: e, reasoning: n};
     }
-    o?.(t);
-    let i = t.reasoning ?? t.thinking;
-    return {content: t.content ?? t.response, reasoning: i};
+    s?.(t);
+    let c = t.reasoning ?? t.thinking;
+    return {content: t.content ?? t.response, reasoning: c};
   },
-  O = async (t, r, o) => {
-    if (r) {
-      let e = '',
-        a = '';
-      for await (let c of t) {
-        let {message: p} = c,
-          u = p.reasoning ?? p.thinking,
-          m = p.content ?? p.response;
-        (u && (a += u), m && (e += m), o?.({content: e, reasoning: a}, c));
+  O = async (t, a, s) => {
+    if (a) {
+      let n = '',
+        o = '';
+      for await (let i of t) {
+        let {message: p} = i,
+          l = p.reasoning ?? p.thinking,
+          u = p.content ?? p.response;
+        (l && (o += l), u && (n += u), s?.({content: n, reasoning: o}, i));
       }
-      return {content: e, reasoning: a};
+      return {content: n, reasoning: o};
     }
-    let {message: i} = t;
-    o?.(t);
-    let s = i.reasoning ?? i.thinking;
-    return {content: i.content ?? i.response, reasoning: s};
+    let {message: c} = t;
+    s?.(t);
+    let r = c.reasoning ?? c.thinking;
+    return {content: c.content ?? c.response, reasoning: r};
   };
-var x = (t, r = {}, o = 'chat') => {
-    if (!t) throw Error('\u8BF7\u4F20\u5165\u4F60\u7684 prompt !');
-    if (o === 'chat') {
-      let s = Array.isArray(t) ? t : [{role: 'user', content: t}],
-        {system: n, ...e} = r;
-      return (n && (s = [{role: 'system', content: n}, ...s]), {messages: s, ...e});
-    }
-    if (o === 'responses') {
-      let {instructions: s, system: n, ...e} = r;
-      return (s || (e.instructions = n), {input: t, ...e});
-    }
-    return {prompt: Array.isArray(t) ? t.slice(-1)[0]?.content : t, ...r};
-  },
-  y = ({options: t, extra_body: r, ...o}, i = {}, s) => {
-    let n = {...i.params, ...o},
-      e = {...i.options, ...t};
-    return (s === 'openai' ? (n.extra_body = {...e, ...r}) : (n.options = e), n);
+var B = (t, a = {}, s = 'chat') => {
+  if (!t) throw Error('\u8BF7\u4F20\u5165\u4F60\u7684 prompt !');
+  if (s === 'chat') {
+    let r = Array.isArray(t) ? t : [{role: 'user', content: t}],
+      {system: e, ...n} = a;
+    return (e && (r = [{role: 'system', content: e}, ...r]), {messages: r, ...n});
+  }
+  if (s === 'responses') {
+    let {instructions: r, system: e, ...n} = a;
+    return (r || (n.instructions = e), {input: t, ...n});
+  }
+  return {prompt: Array.isArray(t) ? t.slice(-1)[0]?.content : t, ...a};
+};
+var w =
+  (t = {}, a) =>
+  (s, c, r) => {
+    let {options: e, ...n} = B(s, c, r),
+      o = {...t.params, ...n},
+      i = {...t.options, ...e};
+    return (a === 'openai' ? (o.extra_body = i) : (o.options = i), o);
   };
 var L = {
-  openai: (t = {}, r = {}) => {
-    let {config: o, params: i, options: s} = A,
-      {host: n, baseURL: e, ...a} = t,
-      c = new H({fetch: w, ...o, ...a, baseURL: n || e}),
-      {options: p, extra_body: u, ...m} = r,
-      h = {...i, ...m, options: {...s, ...p, ...u}};
+  openai: (t = {}, a = {}) => {
+    let {config: s, params: c, options: r} = A,
+      {host: e, baseURL: n, ...o} = t,
+      i = new j({fetch: R, ...s, ...o, baseURL: e || n}),
+      {options: p, extra_body: l, ...u} = a,
+      h = {params: {...c, ...u}, options: {...r, ...l, ...p}},
+      x = w(h, 'openai');
     return {
-      chat: async (f, l = {}, g) => {
-        let d = P,
-          _ = x(f, l, 'chat'),
-          R = await c.chat.completions.create(y(_, h, 'openai'));
-        return d(R, _.stream, g);
+      chat: async (m, f = {}, g) => {
+        let y = x(m, f, 'chat'),
+          _ = C,
+          d = await i.chat.completions.create(y);
+        return _(d, y.stream, g);
       },
-      responses: async (f, l = {}, g) => {
-        let d = C,
-          _ = x(f, l, 'responses'),
-          R = await c.responses.create(y(_, h, 'openai'));
-        return d(R, _.stream, g);
+      responses: async (m, f = {}, g) => {
+        let y = x(m, f, 'responses'),
+          _ = P,
+          d = await i.responses.create(y);
+        return _(d, y.stream, g);
       },
     };
   },
-  ollama: (t = {}, r = {}) => {
-    let {config: o, params: i, options: s} = I,
-      n = new B({fetch: w, ...o, ...t}),
-      {options: e, extra_body: a, ...c} = r,
-      p = {...i, ...c, options: {...s, ...e, ...a}};
+  ollama: (t = {}, a = {}) => {
+    let {config: s, params: c, options: r} = I,
+      e = new H({fetch: R, ...s, ...t}),
+      {options: n, extra_body: o, ...i} = a,
+      p = {params: {...c, ...i}, options: {...r, ...o, ...n}},
+      l = w(p, 'ollama');
     return {
-      chat: async (u, m = {}, h) => {
-        let f = O,
-          l = x(u, m, 'chat'),
-          g = await n.chat(y(l, p, 'ollama'));
-        return f(g, l.stream, h);
+      chat: async (u, h = {}, x) => {
+        let m = l(u, h, 'chat'),
+          f = O,
+          g = await e.chat(m);
+        return f(g, m.stream, x);
       },
-      generate: async (u, m = {}, h) => {
-        let f = v,
-          l = x(u, m, 'generate'),
-          g = await n.generate(y(l, p, 'ollama'));
-        return f(g, l.stream, h);
+      generate: async (u, h = {}, x) => {
+        let m = l(u, h, 'generate'),
+          f = v,
+          g = await e.generate(m);
+        return f(g, m.stream, x);
       },
-      responses: async (u, m = {}, h) => {
-        let f = k,
-          l = x(u, m, 'responses'),
-          g = await n.responses(y(l, p, 'ollama'));
-        return f(g, l.stream, h);
+      responses: async (u, h = {}, x) => {
+        let m = l(u, h, 'responses'),
+          f = k,
+          g = await e.responses(m);
+        return f(g, m.stream, x);
       },
     };
   },
 };
-var j = (t = 'ollama', r, o) => (L[t] ?? L.ollama)(r, o),
-  et = j;
-export {et as default, j as startApi};
+var z = (t = 'ollama', a, s) => (L[t] ?? L.ollama)(a, s),
+  ot = z;
+export {ot as default, z as startApi};