huxy-llm-api 1.1.2 → 1.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "huxy-llm-api",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "一个简洁、易用的用于简化 Ollama 和 OpenAI API 调用的 Node.js 库。",
   "type": "module",
   "module": "./src/index.js",
@@ -35,8 +35,8 @@
   },
   "dependencies": {
     "ollama": "^0.6.3",
-    "openai": "^6.24.0",
-    "undici": "^7.22.0"
+    "openai": "^6.42.0",
+    "undici": "^8.4.1"
   },
   "engines": {
     "node": ">=20.0.0"

package/src/index.js

@@ -5,7 +5,7 @@ var U = (t, o) => {
 import {Ollama as rt} from 'ollama';
 import at from 'openai';
 import {fetch as F, Agent as M} from 'undici';
-var T = 1.5 * 60 * 60 * 1e3,
+var T = 3600 * 1e3,
   z = t => (o, e) => F(o, {...e, dispatcher: new M({headersTimeout: T, ...t})}),
   y = z;
 var N = {config: {apiKey: process.env.OLLM_API_KEY || 'ollm_key', host: process.env.OLLM_API_HOST}, params: {}, options: {}},
@@ -41,68 +41,71 @@ var Y = ['temperature', 'seed', 'stop', 'top_p'],
 var R =
   ({params: t, options: o} = {}, e) =>
   (s, a = {}, n) => {
-    let {options: r, extra_body: i, ...c} = a,
-      p = V(s, {...t, ...c}, n);
-    return ((p.options = {...o, ...i, ...r}), e === 'openai' ? H(p) : p);
+    let {options: r, extra_body: i, ...p} = a,
+      c = V(s, {...t, ...p}, n);
+    return ((c.options = {...o, ...i, ...r}), e === 'openai' ? H(c) : c);
   };
 var W = ['response.reasoning_text.delta', 'response.reasoning_summary_text.delta'],
   A = async (t, o, e) => {
     if (o) {
-      let a = '',
-        n = '';
-      for await (let r of t) {
-        let {type: i, delta: c} = r;
-        (W.includes(i) && (n += c), i === 'response.output_text.delta' && (a += c), e?.({content: a, reasoning: n}, r));
+      let r = '',
+        i = '';
+      for await (let p of t) {
+        let {type: c, delta: m} = p;
+        (W.includes(c) && (i += m), c === 'response.output_text.delta' && (r += m), e?.({content: r, reasoning: i}, p));
       }
-      return {content: a, reasoning: n};
+      return {content: r, reasoning: i};
     }
-    return (e?.(t), {reasoning: (t.output?.[0]?.content ?? t.output?.[0]?.summary)?.[0]?.text, content: t.output_text});
+    let a = (t.output?.[0]?.content ?? t.output?.[0]?.summary)?.[0]?.text,
+      n = t.output_text;
+    return (e?.({content: n, reasoning: a}, t), {content: n, reasoning: a});
   },
   b = async (t, o, e) => {
     if (o) {
       let r = '',
         i = '';
-      for await (let c of t) {
-        let {delta: p} = c.choices?.[0] ?? {},
-          {reasoning: m, content: f} = p ?? {};
-        (m && (i += m), f && (r += f), e?.({content: r, reasoning: i}, c));
+      for await (let p of t) {
+        let {delta: c} = p.choices?.[0] ?? {},
+          {reasoning: m, content: f} = c ?? {};
+        (m && (i += m), f && (r += f), e?.({content: r, reasoning: i}, p));
       }
       return {content: r, reasoning: i};
     }
-    e?.(t);
     let {message: s} = t.choices?.[0] ?? {},
       {content: a, reasoning: n} = s;
-    return {content: a, reasoning: n};
+    return (e?.({content: a, reasoning: n}, t), {content: a, reasoning: n});
   };
 var d = {};
 U(d, {chat: () => u, default: () => Q, generate: () => G, image: () => J, responses: () => x});
 var D = ['response.reasoning_text.delta', 'response.reasoning_summary_text.delta'],
   x = async (t, o, e) => {
     if (o) {
-      let a = '',
-        n = '';
-      for await (let r of t) {
-        let {type: i, delta: c} = r;
-        (D.includes(i) && (n += c), i === 'response.output_text.delta' && (a += c), e?.({content: a, reasoning: n}, r));
+      let r = '',
+        i = '';
+      for await (let p of t) {
+        let {type: c, delta: m} = p;
+        (D.includes(c) && (i += m), c === 'response.output_text.delta' && (r += m), e?.({content: r, reasoning: i}, p));
       }
-      return {content: a, reasoning: n};
+      return {content: r, reasoning: i};
     }
-    return (e?.(t), {reasoning: (t.output?.[0]?.content ?? t.output?.[0]?.summary)?.[0]?.text, content: t.output_text});
+    let a = (t.output?.[0]?.content ?? t.output?.[0]?.summary)?.[0]?.text,
+      n = t.output_text;
+    return (e?.({content: n, reasoning: a}, t), {content: n, reasoning: a});
   },
   G = async (t, o, e) => {
     if (o) {
       let n = '',
         r = '';
       for await (let i of t) {
-        let c = i.reasoning ?? i.thinking,
-          p = i.content ?? i.response;
-        (c && (r += c), p && (n += p), e?.({content: n, reasoning: r}, i));
+        let p = i.reasoning ?? i.thinking,
+          c = i.content ?? i.response;
+        (p && (r += p), c && (n += c), e?.({content: n, reasoning: r}, i));
       }
       return {content: n, reasoning: r};
     }
-    e?.(t);
-    let s = t.reasoning ?? t.thinking;
-    return {content: t.content ?? t.response, reasoning: s};
+    let s = t.reasoning ?? t.thinking,
+      a = t.content ?? t.response;
+    return (e?.({content: a, reasoning: s}, t), {content: a, reasoning: s});
   },
   J = async (t, o, e) => {
     for await (let s of t) e?.(s);
@@ -111,18 +114,18 @@ var D = ['response.reasoning_text.delta', 'response.reasoning_summary_text.delta
     if (o) {
       let r = '',
         i = '';
-      for await (let c of t) {
-        let {message: p} = c,
-          m = p.reasoning ?? p.thinking,
-          f = p.content ?? p.response;
-        (m && (i += m), f && (r += f), e?.({content: r, reasoning: i}, c));
+      for await (let p of t) {
+        let {message: c} = p,
+          m = c.reasoning ?? c.thinking,
+          f = c.content ?? c.response;
+        (m && (i += m), f && (r += f), e?.({content: r, reasoning: i}, p));
       }
       return {content: r, reasoning: i};
     }
-    let {message: s} = t;
-    e?.(t);
-    let a = s.reasoning ?? s.thinking;
-    return {content: s.content ?? s.response, reasoning: a};
+    let {message: s} = t,
+      a = s.reasoning ?? s.thinking,
+      n = s.content ?? s.response;
+    return (e?.({content: n, reasoning: a}, t), {content: n, reasoning: a});
   },
   Q = u;
 import C from 'node:fs/promises';
@@ -205,12 +208,12 @@ var it = {
   ct = (t = 'ollama', o = {}, e = {}) => {
     t = ['ollama', 'openai'].includes(t) ? t : 'ollama';
     let {hostKey: s, envConfig: a, API: n} = it[t],
-      {config: r, params: i, options: c} = a,
-      {baseURL: p, host: m, dispatcher: f, ...l} = {...r, ...o};
-    if (((l[s] = m || p), !l[s])) throw Error('\u8BF7\u914D\u7F6E\u5927\u6A21\u578B API \u5730\u5740 host/baseURL !');
+      {config: r, params: i, options: p} = a,
+      {baseURL: c, host: m, dispatcher: f, ...l} = {...r, ...o};
+    if (((l[s] = m || c), !l[s])) throw Error('\u8BF7\u914D\u7F6E\u5927\u6A21\u578B API \u5730\u5740 host/baseURL !');
     let P = n({fetch: y(f), ...l}),
       {options: v, extra_body: K, ...$} = e,
-      j = {params: {...i, ...$}, options: {...c, ...K, ...v}},
+      j = {params: {...i, ...$}, options: {...p, ...K, ...v}},
       k = R(j, t);
     return E[t](P, k);
   },