huxy-llm-api 1.0.0-beta.0 → 1.0.1

package/README.md

@@ -32,6 +32,11 @@ import startApi from 'huxy-llm-api';
 const ollamaApi = startApi('ollama', {
   apiKey: 'your-api-key',
   host: 'http://localhost:11434',
+}, {
+  model: 'qwen3-vl:latest',
+  options: {
+    num_ctx: 4096,
+  },
 });
 
 // 初始化 OpenAI API
@@ -92,7 +97,7 @@ console.log('对话结果:', response);
 
 - `generate(prompt, configs, callback)`: 文本生成
 - `chat(prompt, configs, callback)`: 聊天对话
-- `responses(prompt, configs, callback)`: 结构化响应
+- <del>`responses(prompt, configs, callback)`: 结构化响应</del>
 
 ### OpenAI 方法
 
@@ -106,7 +111,7 @@ console.log('对话结果:', response);
   - `model`: 模型名称
   - `stream`: 是否流式响应（默认: false）
   - `system`: 系统提示（聊天模式）
-  - `options`: 其他模型参数
+  - `options`: 其他模型参数（OpenAI 可使用 `extra_body`）
      - `temperature`: 生成温度（0-1）
      - `top_p`: 核采样概率
 - `callback`: 函数 - 流式响应回调
@@ -161,25 +166,6 @@ console.log('对话结果:', response);
 }
 ```
 
-## 高级用法
-
-### 自定义 Fetch
-
-项目使用 Undici 实现高性能 HTTP 请求，并支持自定义超时：
-
-```javascript
-import customFetch from 'huxy-llm-api/customFetch';
-
-// 自定义请求
-const response = await customFetch('https://api.example.com', {
-  method: 'POST',
-  headers: {
-    'Content-Type': 'application/json',
-  },
-  body: JSON.stringify({prompt: 'Hello'}),
-});
-```
-
 ### 环境变量
 
 支持通过环境变量配置 API 密钥和地址：

package/example.js

@@ -12,11 +12,13 @@ const openaiApi = startApi('openai', {
   baseURL: 'http://192.168.0.111:11434/v1',
   // headers
   // fetch
+}, {
+  model: 'qwen3-vl',
 });
 
 const demo = async () => {
   const ollamaResult = await ollamaApi.generate('你好', {
-    model: 'devstral-small-2',
+    model: 'ministral3:14b-reasoning',
     stream: false,
     options: {
       temperature: 0.15,
@@ -38,6 +40,18 @@ const demo = async () => {
     console.log(mesg, resp);
   });
   console.log(openaiResult);
+
+  const responsesResult = await openaiApi.responses('你是谁', {
+    model: 'qwen3-vl',
+    temperature: 0.15,
+    stream: true,
+    options: {
+      top_k: 20,
+    },
+  }, (mesg, resp) => {
+    console.log(mesg, resp);
+  });
+  console.log(responsesResult);
 };
 
 demo();

package/package.json

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

package/src/index.js

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