huxy-llm-api 1.0.2 → 1.0.3

package/package.json

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

package/src/index.js

@@ -17,124 +17,124 @@ var q = {
   },
   I = q;
 var F = ['response.reasoning_text.delta', 'response.reasoning_summary_text.delta'],
-  C = async (t, r, o) => {
+  C = async (t, r, e) => {
     if (r) {
-      let s = '',
+      let o = '',
         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));
+      for await (let s of t) {
+        let {type: a, delta: i} = s;
+        (F.includes(a) && (n += i), a === 'response.output_text.delta' && (o += i), e?.({content: o, reasoning: n}, s));
       }
-      return {content: s, reasoning: n};
+      return {content: o, reasoning: n};
     }
-    return (o?.(t), {reasoning: (t.output?.[0]?.content ?? t.output?.[0]?.summary)?.[0]?.text, content: t.output_text});
+    return (e?.(t), {reasoning: (t.output?.[0]?.content ?? t.output?.[0]?.summary)?.[0]?.text, content: t.output_text});
   },
-  P = async (t, r, o) => {
+  P = async (t, r, e) => {
     if (r) {
-      let e = '',
+      let s = '',
         a = '';
-      for await (let c of t) {
-        let {delta: p} = c.choices?.[0] ?? {},
+      for await (let i of t) {
+        let {delta: p} = i.choices?.[0] ?? {},
           {reasoning: u, content: m} = p ?? {};
-        (u && (a += u), m && (e += m), o?.({content: e, reasoning: a}, c));
+        (u && (a += u), m && (s += m), e?.({content: s, reasoning: a}, i));
       }
-      return {content: e, reasoning: a};
+      return {content: s, reasoning: a};
     }
-    o?.(t);
-    let {message: i} = t.choices?.[0] ?? {},
-      {content: s, reasoning: n} = i;
-    return {content: s, reasoning: n};
+    e?.(t);
+    let {message: c} = t.choices?.[0] ?? {},
+      {content: o, reasoning: n} = c;
+    return {content: o, reasoning: n};
   };
 var Y = ['response.reasoning_text.delta', 'response.reasoning_summary_text.delta'],
-  k = async (t, r, o) => {
+  k = async (t, r, e) => {
     if (r) {
-      let s = '',
+      let o = '',
         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));
+      for await (let s of t) {
+        let {type: a, delta: i} = s;
+        (Y.includes(a) && (n += i), a === 'response.output_text.delta' && (o += i), e?.({content: o, reasoning: n}, s));
       }
-      return {content: s, reasoning: n};
+      return {content: o, reasoning: n};
     }
-    return (o?.(t), {reasoning: (t.output?.[0]?.content ?? t.output?.[0]?.summary)?.[0]?.text, content: t.output_text});
+    return (e?.(t), {reasoning: (t.output?.[0]?.content ?? t.output?.[0]?.summary)?.[0]?.text, content: t.output_text});
   },
-  v = async (t, r, o) => {
+  v = async (t, r, e) => {
     if (r) {
       let n = '',
-        e = '';
+        s = '';
       for await (let a of t) {
-        let c = a.reasoning ?? a.thinking,
+        let i = a.reasoning ?? a.thinking,
           p = a.content ?? a.response;
-        (c && (e += c), p && (n += p), o?.({content: n, reasoning: e}, a));
+        (i && (s += i), p && (n += p), e?.({content: n, reasoning: s}, a));
       }
-      return {content: n, reasoning: e};
+      return {content: n, reasoning: s};
     }
-    o?.(t);
-    let i = t.reasoning ?? t.thinking;
-    return {content: t.content ?? t.response, reasoning: i};
+    e?.(t);
+    let c = t.reasoning ?? t.thinking;
+    return {content: t.content ?? t.response, reasoning: c};
   },
-  O = async (t, r, o) => {
+  O = async (t, r, e) => {
     if (r) {
-      let e = '',
+      let s = '',
         a = '';
-      for await (let c of t) {
-        let {message: p} = c,
+      for await (let i of t) {
+        let {message: p} = i,
           u = p.reasoning ?? p.thinking,
           m = p.content ?? p.response;
-        (u && (a += u), m && (e += m), o?.({content: e, reasoning: a}, c));
+        (u && (a += u), m && (s += m), e?.({content: s, reasoning: a}, i));
       }
-      return {content: e, reasoning: a};
+      return {content: s, reasoning: a};
     }
-    let {message: i} = t;
-    o?.(t);
-    let s = i.reasoning ?? i.thinking;
-    return {content: i.content ?? i.response, reasoning: s};
+    let {message: c} = t;
+    e?.(t);
+    let o = c.reasoning ?? c.thinking;
+    return {content: c.content ?? c.response, reasoning: o};
   };
-var x = (t, r = {}, o = 'chat') => {
+var x = (t, r = {}, e = '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 (e === 'chat') {
+      let o = Array.isArray(t) ? t : [{role: 'user', content: t}],
+        {system: n, ...s} = r;
+      return (n && (o = [{role: 'system', content: n}, ...o]), {messages: o, ...s});
     }
-    if (o === 'responses') {
-      let {instructions: s, system: n, ...e} = r;
-      return (s || (e.instructions = n), {input: t, ...e});
+    if (e === 'responses') {
+      let {instructions: o, system: n, ...s} = r;
+      return (o || (s.instructions = n), {input: t, ...s});
     }
     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);
+  y = ({options: t, ...r}, e = {}, c) => {
+    let o = {...e.params, ...r},
+      n = {...e.options, ...t};
+    return (c === 'openai' ? (o.extra_body = n) : (o.options = n), 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}),
+    let {config: e, params: c, options: o} = A,
+      {host: n, baseURL: s, ...a} = t,
+      i = new H({fetch: w, ...e, ...a, baseURL: n || s}),
       {options: p, extra_body: u, ...m} = r,
-      h = {...i, ...m, options: {...s, ...p, ...u}};
+      h = {params: {...c, ...m}, options: {...o, ...u, ...p}};
     return {
       chat: async (f, l = {}, g) => {
         let d = P,
           _ = x(f, l, 'chat'),
-          R = await c.chat.completions.create(y(_, h, 'openai'));
+          R = await i.chat.completions.create(y(_, h, 'openai'));
         return d(R, _.stream, g);
       },
       responses: async (f, l = {}, g) => {
         let d = C,
           _ = x(f, l, 'responses'),
-          R = await c.responses.create(y(_, h, 'openai'));
+          R = await i.responses.create(y(_, h, 'openai'));
         return d(R, _.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}};
+    let {config: e, params: c, options: o} = I,
+      n = new B({fetch: w, ...e, ...t}),
+      {options: s, extra_body: a, ...i} = r,
+      p = {params: {...c, ...i}, options: {...o, ...a, ...s}};
     return {
       chat: async (u, m = {}, h) => {
         let f = O,
@@ -157,6 +157,6 @@ var L = {
     };
   },
 };
-var j = (t = 'ollama', r, o) => (L[t] ?? L.ollama)(r, o),
+var j = (t = 'ollama', r, e) => (L[t] ?? L.ollama)(r, e),
   et = j;
 export {et as default, j as startApi};