huxy-llm-api 1.1.1 → 1.1.2

package/README.md

@@ -32,7 +32,6 @@ import startApi from 'huxy-llm-api';
 const ollamaApi = startApi('ollama', {
   apiKey: 'your-api-key',
   host: 'http://localhost:11434',
-  // undici dispatcher
   dispatcher: {
     headersTimeout: 10 * 60 * 1000,
   },
@@ -84,9 +83,45 @@ const response = await openaiApi.chat('你是谁', {
 console.log('对话结果:', response);
 ```
 
+#### 图片处理函数
+
+- `saveImage(base64String, outputDir = './images', name)`: 保存 base64 图片到本地。
+- `imageToBase64(imagePath, includeMimeType = false)`: 将本地图片转为 base64 字符串。
+
+使用：
+
+```
+// imageToBase64
+const image = await ollamaApi.imageToBase64('./example.png');
+const result = await ollamaApi.generate('你好', {
+  model: 'qwen3-vl',
+  stream: false,
+  image,
+  options: {
+    temperature: 0.15,
+    top_p: 0.9,
+  },
+}, (message) => {
+  console.log('实时响应:', message);
+});
+
+// saveImage
+const result = await ollamaApi.generate('你好', {
+  model: 'qwen3-vl',
+  stream: false,
+  options: {
+    temperature: 0.15,
+    top_p: 0.9,
+  },
+}, (message) => {
+  console.log('实时响应:', message);
+});
+saveImage(result.image);
+```
+
 ## API 文档
 
-### `startApi(apiType, userConfig, userOption)`
+### `startApi(apiType, userConfig)`
 
 初始化 LLM API 客户端。
 
@@ -114,13 +149,11 @@ console.log('对话结果:', response);
 - `prompt`: 字符串或消息数组 - 输入提示
 - `configs`: 对象 - 模型参数配置
   - `model`: 模型名称
-  - `system`: 系统提示词
   - `stream`: 是否流式响应（默认: false）
-  - `think`: 是否开启思考模式（需模型支持）（Boolean 或 'high | medium | low'。默认: false）
-  - `options`: 其他模型参数（OpenAI 可使用 `extra_body`）[详细参数配置 parameter](https://docs.ollama.com/modelfile#parameter)
+  - `system`: 系统提示（聊天模式）
+  - `options`: 其他模型参数（OpenAI 可使用 `extra_body`）
      - `temperature`: 生成温度（0-1）
      - `top_p`: 核采样概率
-     - ...
 - `callback`: 函数 - 流式响应回调
 
 ## 配置

package/package.json

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

package/src/index.js

@@ -1,171 +1,218 @@
-import {Ollama as $} from 'ollama';
-import q from 'openai';
-import {fetch as v, Agent as b} from 'undici';
-var E = 300 * 60 * 1e3,
-  k = t => (i, o) => v(i, {...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: {}},
-  h = M;
-var B = ['temperature', 'seed', 'stop', 'top_p'],
-  F = t => {
-    let {max_tokens: i, options: o = {}, ...r} = t,
-      {num_ctx: s, ...n} = o;
+var B = Object.defineProperty;
+var U = (t, o) => {
+  for (var e in o) B(t, e, {get: o[e], enumerable: !0});
+};
+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,
+  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: {}},
+  w = N;
+var S = {config: {apiKey: process.env.LLM_API_KEY || 'llm_key', baseURL: process.env.LLM_API_BASEURL}, params: {}, options: {}},
+  _ = S;
+var Y = ['temperature', 'seed', 'stop', 'top_p'],
+  H = t => {
+    let {max_tokens: o, options: e = {}, ...s} = t,
+      {num_ctx: a, ...n} = e;
     return (
-      (r.max_tokens = i ?? s),
-      Object.keys(n).map(e => {
-        B.includes(e) ? (r[e] = n[e]) : (r.extra_body || (r.extra_body = {}), (r.extra_body[e] = n[e]));
+      (s.max_tokens = o ?? a),
+      Object.keys(n).map(r => {
+        Y.includes(r) ? (s[r] = n[r]) : (s.extra_body || (s.extra_body = {}), (s.extra_body[r] = n[r]));
       }),
-      r
+      s
     );
   },
-  S = (t, i = {}, o = 'chat') => {
+  V = (t, o = {}, e = 'chat') => {
     if (!t) throw Error('\u8BF7\u4F20\u5165\u4F60\u7684 prompt !');
-    if (!i.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} = i;
-      return (n && (s = [{role: 'system', content: n}, ...s]), {messages: s, ...e});
+    if (!o.model) throw Error('\u8BF7\u914D\u7F6E\u8981\u4F7F\u7528\u7684\u5927\u6A21\u578B model !');
+    if (e === 'chat') {
+      let a = Array.isArray(t) ? t : [{role: 'user', content: t}],
+        {system: n, ...r} = o;
+      return (n && (a = [{role: 'system', content: n}, ...a]), {messages: a, ...r});
     }
-    if (o === 'responses') {
-      let {instructions: s, system: n, ...e} = i;
-      return (s || (e.instructions = n), {input: t, ...e});
+    if (e === 'responses') {
+      let {instructions: a, system: n, ...r} = o;
+      return (a || (r.instructions = n), {input: t, ...r});
     }
-    return {prompt: Array.isArray(t) ? t.slice(-1)[0]?.content : t, ...i};
+    return {prompt: Array.isArray(t) ? t.slice(-1)[0]?.content : t, ...o};
   };
-var x =
-  ({params: t, options: i} = {}, o) =>
-  (r, s = {}, n) => {
-    let {options: e, extra_body: a, ...c} = s,
-      p = S(r, {...t, ...c}, n);
-    return ((p.options = {...i, ...a, ...e}), o === 'openai' ? F(p) : 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);
   };
-var Y = ['response.reasoning_text.delta', 'response.reasoning_summary_text.delta'],
-  d = async (t, i, o) => {
-    if (i) {
-      let s = '',
+var W = ['response.reasoning_text.delta', 'response.reasoning_summary_text.delta'],
+  A = async (t, o, e) => {
+    if (o) {
+      let a = '',
         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 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));
       }
-      return {content: s, reasoning: n};
+      return {content: a, 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});
   },
-  y = async (t, i, o) => {
-    if (i) {
-      let e = '',
-        a = '';
+  b = async (t, o, e) => {
+    if (o) {
+      let r = '',
+        i = '';
       for await (let c of t) {
         let {delta: p} = c.choices?.[0] ?? {},
-          {reasoning: u, content: f} = p ?? {};
-        (u && (a += u), f && (e += f), o?.({content: e, reasoning: a}, c));
+          {reasoning: m, content: f} = p ?? {};
+        (m && (i += m), f && (r += f), e?.({content: r, reasoning: i}, c));
       }
-      return {content: e, reasoning: a};
+      return {content: r, reasoning: i};
     }
-    o?.(t);
-    let {message: r} = t.choices?.[0] ?? {},
-      {content: s, reasoning: n} = r;
-    return {content: s, reasoning: n};
+    e?.(t);
+    let {message: s} = t.choices?.[0] ?? {},
+      {content: a, reasoning: n} = s;
+    return {content: a, reasoning: n};
   };
-var z = ['response.reasoning_text.delta', 'response.reasoning_summary_text.delta'],
-  _ = async (t, i, o) => {
-    if (i) {
-      let s = '',
+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 e of t) {
-        let {type: a, delta: c} = e;
-        (z.includes(a) && (n += c), a === 'response.output_text.delta' && (s += c), o?.({content: s, reasoning: n}, e));
+      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));
       }
-      return {content: s, reasoning: n};
+      return {content: a, 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});
   },
-  R = async (t, i, o) => {
-    if (i) {
+  G = async (t, o, e) => {
+    if (o) {
       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));
+        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));
       }
-      return {content: n, reasoning: e};
+      return {content: n, reasoning: r};
     }
-    o?.(t);
-    let r = t.reasoning ?? t.thinking;
-    return {content: t.content ?? t.response, reasoning: r};
+    e?.(t);
+    let s = t.reasoning ?? t.thinking;
+    return {content: t.content ?? t.response, reasoning: s};
+  },
+  J = async (t, o, e) => {
+    for await (let s of t) e?.(s);
   },
-  A = async (t, i, o) => {
-    if (i) {
-      let e = '',
-        a = '';
+  u = async (t, o, e) => {
+    if (o) {
+      let r = '',
+        i = '';
       for await (let c of t) {
         let {message: p} = c,
-          u = p.reasoning ?? p.thinking,
+          m = p.reasoning ?? p.thinking,
           f = p.content ?? p.response;
-        (u && (a += u), f && (e += f), o?.({content: e, reasoning: a}, c));
+        (m && (i += m), f && (r += f), e?.({content: r, reasoning: i}, c));
       }
-      return {content: e, reasoning: a};
+      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};
+  },
+  Q = u;
+import C from 'node:fs/promises';
+var g = {'.jpg': 'image/jpeg', '.jpeg': 'image/jpeg', '.png': 'image/png', '.gif': 'image/gif', '.webp': 'image/webp', '.bmp': 'image/bmp', '.svg': 'image/svg+xml', '.tiff': 'image/tiff'},
+  h = '.png',
+  X = t => Object.fromEntries(Object.entries(t).map(([o, e]) => [e, o])),
+  I = X(g);
+var Z = t => {
+    let o = /^data:(image\/[a-z]+);base64,(.+)$/i,
+      e = t.match(o);
+    return e ? {ext: I[e[1]] ?? h, data: e[2]} : {ext: h, data: t};
+  },
+  tt = async (t, o = './images', e) => {
+    try {
+      await C.mkdir(o, {recursive: !0});
+      let {ext: s, data: a} = Z(t),
+        n = `${o}/image_${e || Date.now()}${s}`;
+      return (await C.writeFile(n, Buffer.from(a, 'base64')), n);
+    } catch (s) {
+      throw (console.error('\u4FDD\u5B58\u56FE\u7247\u5931\u8D25:', s.message), s);
     }
-    let {message: r} = t;
-    o?.(t);
-    let s = r.reasoning ?? r.thinking;
-    return {content: r.content ?? r.response, reasoning: s};
+  },
+  L = tt;
+import {readFile as et} from 'fs/promises';
+import {extname as nt} from 'path';
+var ot = async (t, o = !1) => {
+    try {
+      let e = nt(t).toLowerCase();
+      if (!g[e]) throw new Error(`\u4E0D\u652F\u6301\u7684\u56FE\u7247\u683C\u5F0F: ${e}`);
+      let s = await et(t, 'base64');
+      return o ? `data:${g[e]};base64,${s}` : s;
+    } catch (e) {
+      throw e.code === 'ENOENT' ? new Error(`\u6587\u4EF6\u4E0D\u5B58\u5728: ${t}`) : e;
+    }
+  },
+  O = ot;
+var st = t => (t?.startsWith('x/') ? 'image' : 'generate'),
+  E = {
+    openai: (t, o) => ({
+      chat: async (e, s = {}, a) => {
+        let n = o(e, s, 'chat'),
+          r = b,
+          i = await t.chat.completions.create(n);
+        return r(i, n.stream, a);
+      },
+      responses: async (e, s = {}, a) => {
+        let n = o(e, s, 'responses'),
+          r = A,
+          i = await t.responses.create(n);
+        return r(i, n.stream, a);
+      },
+    }),
+    ollama: (t, o) => ({
+      chat: async (e, s = {}, a) => {
+        let n = o(e, s, 'chat'),
+          r = u,
+          i = await t.chat(n);
+        return r(i, n.stream, a);
+      },
+      generate: async (e, s = {}, a) => {
+        let n = o(e, s, 'generate'),
+          r = d[st(n.model)],
+          i = await t.generate(n);
+        return r(i, n.stream, a);
+      },
+      responses: async (e, s = {}, a) => {
+        let n = o(e, s, 'responses'),
+          r = x,
+          i = await t.responses(n);
+        return r(i, n.stream, a);
+      },
+      saveImage: L,
+      imageToBase64: O,
+    }),
   };
-var w = {
-  openai: (t, i) => ({
-    chat: async (o, r = {}, s) => {
-      let n = i(o, r, 'chat'),
-        e = y,
-        a = await t.chat.completions.create(n);
-      return e(a, n.stream, s);
-    },
-    responses: async (o, r = {}, s) => {
-      let n = i(o, r, 'responses'),
-        e = d,
-        a = await t.responses.create(n);
-      return e(a, n.stream, s);
-    },
-  }),
-  ollama: (t, i) => ({
-    chat: async (o, r = {}, s) => {
-      let n = i(o, r, 'chat'),
-        e = A,
-        a = await t.chat(n);
-      return e(a, n.stream, s);
-    },
-    generate: async (o, r = {}, s) => {
-      let n = i(o, r, 'generate'),
-        e = R,
-        a = await t.generate(n);
-      return e(a, n.stream, s);
-    },
-    responses: async (o, r = {}, s) => {
-      let n = i(o, r, 'responses'),
-        e = _,
-        a = await t.responses(n);
-      return e(a, n.stream, s);
-    },
-  }),
-};
-var D = {
-    ollama: {hostKey: 'host', envConfig: g, API: ({apiKey: t, headers: i, ...o}) => new $({headers: {Authorization: t ? `Bearer ${t}` : void 0, ...i}, ...o})},
-    openai: {hostKey: 'baseURL', envConfig: h, API: t => new q(t)},
+var it = {
+    ollama: {hostKey: 'host', envConfig: w, API: ({apiKey: t, headers: o, ...e}) => new rt({headers: {Authorization: t ? `Bearer ${t}` : void 0, ...o}, ...e})},
+    openai: {hostKey: 'baseURL', envConfig: _, API: t => new at(t)},
   },
-  G = (t = 'ollama', i = {}, o = {}) => {
+  ct = (t = 'ollama', o = {}, e = {}) => {
     t = ['ollama', 'openai'].includes(t) ? t : 'ollama';
-    let {hostKey: r, envConfig: s, API: n} = D[t],
-      {config: e, params: a, options: c} = s,
-      {baseURL: p, host: u, dispatcher: f, ...m} = {...e, ...i};
-    if (((m[r] = u || p), !m[r])) throw Error('\u8BF7\u914D\u7F6E\u5927\u6A21\u578B API \u5730\u5740 host/baseURL !');
-    let I = n({fetch: l(f), ...m}),
-      {options: P, extra_body: C, ...L} = o,
-      O = {params: {...a, ...L}, options: {...c, ...C, ...P}},
-      K = x(O, t);
-    return w[t](I, K);
+    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 !');
+    let P = n({fetch: y(f), ...l}),
+      {options: v, extra_body: K, ...$} = e,
+      j = {params: {...i, ...$}, options: {...c, ...K, ...v}},
+      k = R(j, t);
+    return E[t](P, k);
   },
-  rt = G;
-export {rt as default, G as startApi};
+  jt = ct;
+export {jt as default, ct as startApi};