huxy-llm-api 1.0.6 → 1.0.7

package/package.json

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

package/src/index.js

@@ -1,172 +1,175 @@
-import {Ollama as H} from 'ollama';
-import j from 'openai';
-import {fetch as E, Agent as U} from 'undici';
-var v = 300 * 60 * 1e3,
-  K = (t, a) => E(t, {...a, dispatcher: new U({headersTimeout: v})}),
-  d = K;
-var M = {
-    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: {temperature: 1, max_tokens: 4096, top_p: 0.95},
-    options: {top_k: 20, repeat_penalty: 1.05},
-  },
-  L = M;
-var T = {
-    config: {apiKey: process.env.OLLM_API_KEY || 'ah.yiru@gmail.com', host: process.env.OLLM_API_HOST || 'http://127.0.0.1:11434'},
-    params: {},
-    options: {temperature: 1, num_ctx: 4096, top_k: 20, top_p: 0.95, repeat_penalty: 1.05},
-  },
-  P = T;
-var b = ['response.reasoning_text.delta', 'response.reasoning_summary_text.delta'],
-  A = async (t, a, r) => {
-    if (a) {
+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 = '',
         n = '';
       for await (let e of t) {
-        let {type: s, delta: i} = e;
-        (b.includes(s) && (n += i), s === 'response.output_text.delta' && (o += i), r?.({content: o, reasoning: n}, e));
+        let {type: c, delta: i} = e;
+        (T.includes(c) && (n += i), c === 'response.output_text.delta' && (o += i), s?.({content: o, reasoning: n}, e));
       }
       return {content: o, reasoning: n};
     }
-    return (r?.(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});
   },
-  I = async (t, a, r) => {
-    if (a) {
+  L = async (t, r, s) => {
+    if (r) {
       let e = '',
-        s = '';
+        c = '';
       for await (let i of t) {
         let {delta: p} = i.choices?.[0] ?? {},
           {reasoning: f, content: u} = p ?? {};
-        (f && (s += f), u && (e += u), r?.({content: e, reasoning: s}, i));
+        (f && (c += f), u && (e += u), s?.({content: e, reasoning: c}, i));
       }
-      return {content: e, reasoning: s};
+      return {content: e, reasoning: c};
     }
-    r?.(t);
-    let {message: c} = t.choices?.[0] ?? {},
-      {content: o, reasoning: n} = c;
+    s?.(t);
+    let {message: a} = t.choices?.[0] ?? {},
+      {content: o, reasoning: n} = a;
     return {content: o, reasoning: n};
   };
 var S = ['response.reasoning_text.delta', 'response.reasoning_summary_text.delta'],
-  C = async (t, a, r) => {
-    if (a) {
+  I = async (t, r, s) => {
+    if (r) {
       let o = '',
         n = '';
       for await (let e of t) {
-        let {type: s, delta: i} = e;
-        (S.includes(s) && (n += i), s === 'response.output_text.delta' && (o += i), r?.({content: o, reasoning: n}, e));
+        let {type: c, delta: i} = e;
+        (S.includes(c) && (n += i), c === 'response.output_text.delta' && (o += i), s?.({content: o, reasoning: n}, e));
       }
       return {content: o, reasoning: n};
     }
-    return (r?.(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});
   },
-  O = async (t, a, r) => {
-    if (a) {
+  O = async (t, r, s) => {
+    if (r) {
       let n = '',
         e = '';
-      for await (let s of t) {
-        let i = s.reasoning ?? s.thinking,
-          p = s.content ?? s.response;
-        (i && (e += i), p && (n += p), r?.({content: n, reasoning: e}, s));
+      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));
       }
       return {content: n, reasoning: e};
     }
-    r?.(t);
-    let c = t.reasoning ?? t.thinking;
-    return {content: t.content ?? t.response, reasoning: c};
+    s?.(t);
+    let a = t.reasoning ?? t.thinking;
+    return {content: t.content ?? t.response, reasoning: a};
   },
-  k = async (t, a, r) => {
-    if (a) {
+  b = async (t, r, s) => {
+    if (r) {
       let e = '',
-        s = '';
+        c = '';
       for await (let i of t) {
         let {message: p} = i,
           f = p.reasoning ?? p.thinking,
           u = p.content ?? p.response;
-        (f && (s += f), u && (e += u), r?.({content: e, reasoning: s}, i));
+        (f && (c += f), u && (e += u), s?.({content: e, reasoning: c}, i));
       }
-      return {content: e, reasoning: s};
+      return {content: e, reasoning: c};
     }
-    let {message: c} = t;
-    r?.(t);
-    let o = c.reasoning ?? c.thinking;
-    return {content: c.content ?? c.response, reasoning: o};
+    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 {prompt: Array.isArray(t) ? t.slice(-1)[0]?.content : t, ...r};
   };
-var B = (t, a = {}, r = 'chat') => {
-  if (!t) throw Error('\u8BF7\u4F20\u5165\u4F60\u7684 prompt !');
-  if (!a.model) throw Error('\u8BF7\u914D\u7F6E\u8981\u4F7F\u7528\u7684\u5927\u6A21\u578B model !');
-  if (r === 'chat') {
-    let o = Array.isArray(t) ? t : [{role: 'user', content: t}],
-      {system: n, ...e} = a;
-    return (n && (o = [{role: 'system', content: n}, ...o]), {messages: o, ...e});
-  }
-  if (r === 'responses') {
-    let {instructions: o, system: n, ...e} = a;
-    return (o || (e.instructions = n), {input: t, ...e});
-  }
-  return {prompt: Array.isArray(t) ? t.slice(-1)[0]?.content : t, ...a};
-};
 var R =
-  ({params: t, options: a} = {}, r) =>
-  (c, o = {}, n) => {
-    let {options: e, ...s} = o,
-      i = B(c, {...t, ...s}, n),
-      p = {...a, ...e};
-    return (r === 'openai' ? (i.extra_body = p) : (i.options = p), i);
+  ({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);
   };
-var w = {
-  openai: (t = {}, a = {}) => {
-    let {config: r, params: c, options: o} = L,
+var P = {
+  openai: (t = {}, r = {}) => {
+    let {config: s, params: a, options: o} = w,
       {host: n, ...e} = t,
-      s = new j({fetch: d, ...r, ...e, baseURL: n}),
-      {options: i, extra_body: p, ...f} = a,
-      u = {params: {...c, ...f}, options: {...o, ...p, ...i}},
-      x = R(u, 'openai');
+      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 = {}, h) => {
-        let l = x(g, m, 'chat'),
-          y = I,
-          _ = await s.chat.completions.create(l);
-        return y(_, l.stream, h);
+      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 = {}, h) => {
-        let l = x(g, m, 'responses'),
-          y = A,
-          _ = await s.responses.create(l);
-        return y(_, l.stream, h);
+      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 = {}, a = {}) => {
-    let {config: r, params: c, options: o} = P,
-      n = new H({fetch: d, ...r, ...t}),
-      {options: e, extra_body: s, ...i} = a,
-      p = {params: {...c, ...i}, options: {...o, ...s, ...e}},
+  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, x = {}, g) => {
-        let m = f(u, x, 'chat'),
-          h = k,
+      chat: async (u, h = {}, g) => {
+        let m = f(u, h, 'chat'),
+          x = b,
           l = await n.chat(m);
-        return h(l, m.stream, g);
+        return x(l, m.stream, g);
       },
-      generate: async (u, x = {}, g) => {
-        let m = f(u, x, 'generate'),
-          h = O,
+      generate: async (u, h = {}, g) => {
+        let m = f(u, h, 'generate'),
+          x = O,
           l = await n.generate(m);
-        return h(l, m.stream, g);
+        return x(l, m.stream, g);
       },
-      responses: async (u, x = {}, g) => {
-        let m = f(u, x, 'responses'),
-          h = C,
+      responses: async (u, h = {}, g) => {
+        let m = f(u, h, 'responses'),
+          x = I,
           l = await n.responses(m);
-        return h(l, m.stream, g);
+        return x(l, m.stream, g);
       },
     };
   },
 };
-var q = (t = 'ollama', a = {}, r = {}) => {
-    let {baseURL: c, host: o, ...n} = a;
-    if (((n.host = o || c), !n.host)) throw Error('\u8BF7\u914D\u7F6E\u5927\u6A21\u578B API \u5730\u5740 host/baseURL !');
-    return (w[t] ?? w.ollama)(n, r);
+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);
   },
-  et = q;
-export {et as default, q as startApi};
+  st = D;
+export {st as default, D as startApi};