@mokuyoaxis/dsh-iris 0.1.4 → 0.2.1

package/lib/adapters.js

@@ -3,14 +3,18 @@
  * Iris 媒体生成后端 —— 多协议适配器。
  * - dashscope：阿里云百炼（图像/视频异步任务 + qwen-tts 同步）
  * - openai-images：OpenAI Images 兼容协议（generations）
+ * - openai-chat-images：网关 Chat Completions 生图扩展（非流式）
+ * - openai-responses-images：Responses image_generation 工具及网关图片消息（同步）
  * 所有函数只收显式 key；错误统一 throw Error(人话)。
  */
 import fs from 'node:fs';
 import path from 'node:path';
 import { Readable } from 'node:stream';
 import { pipeline } from 'node:stream/promises';
-import { dashscopeApiBase } from './provider-protocol.js';
+import { dashscopeApiBase, isDashScopeBaseUrl } from './provider-protocol.js';
 import { chmodPrivateFile, ensurePrivateDir, privateSibling } from './private-storage.js';
+import { isFreeQuotaExhausted, retryAfterDelay } from './provider-health.js';
+import { ProviderContractError } from './provider-contract.js';
 
 /**
  * 网络调用超时档位（2026-09-03 健康检查）：挂死的连接绝不能冻住盯守 tick——
@@ -31,7 +35,10 @@ function timeoutSignal(ms, external) {
 }
 
 function authHeaders(key) {
-  return { Authorization: `Bearer ${key}`, 'Content-Type': 'application/json' };
+  return {
+    ...(typeof key === 'string' && key.trim() ? { Authorization: `Bearer ${key}` } : {}),
+    'Content-Type': 'application/json'
+  };
 }
 
 async function readJson(res) {
@@ -50,26 +57,31 @@ async function readJson(res) {
  * message 保持人话（向后兼容 String(err.message)）。
  */
 export class ProviderError extends Error {
-  constructor({ category, status, message, rootCause }) {
+  constructor({ category, status, message, rootCause, providerCode, retryAfterMs }) {
     super(message);
     this.name = 'ProviderError';
     this.category = category;
     this.status = status;
     this.rootCause = rootCause;
+    this.providerCode = providerCode;
+    this.retryAfterMs = retryAfterMs;
   }
 }
 
-function classifyHttpError(status, body, fallback) {
-  const msg = (body && (body.message || (body.output && body.output.message))) || (body && body.code) || `HTTP ${status}`;
-  const code = String((body && body.code) || '');
+function classifyHttpError(status, body, fallback, headers) {
+  const msg = body?.message || body?.output?.message || body?.error?.message || body?.code || `HTTP ${status}`;
+  const code = String(body?.code || body?.error?.code || '');
   let category = 'unknown';
   let text;
-  if (status === 401 || status === 403) {
+  if (isFreeQuotaExhausted({ status, code, message: msg })) {
+    category = 'quota';
+    text = `免费额度耗尽：${msg}`;
+  } else if (status === 401 || status === 403) {
     category = 'auth';
     text = `鉴权失败：${msg}`;
   } else if (status === 429) {
-    category = /quota|insufficient|balance|limit|额度/i.test(msg + ' ' + code) ? 'quota' : 'rate_limit';
-    text = `限流或额度不足：${msg}`;
+    category = code === 'BudgetLimitExceeded' ? 'quota' : 'rate_limit';
+    text = `${category === 'quota' ? '预算额度耗尽' : '请求限流'}：${msg}`;
   } else if (/InvalidParameter|NotFound\.Model|unsupported/i.test(code)) {
     category = 'invalid_parameter';
     text = `模型或参数不受支持：${msg}`;
@@ -79,7 +91,8 @@ function classifyHttpError(status, body, fallback) {
   } else {
     text = `${fallback}：${msg}`;
   }
-  return new ProviderError({ category, status, message: text, rootCause: msg });
+  return new ProviderError({ category, status, message: text, rootCause: msg, providerCode: code,
+    ...(status === 429 ? { retryAfterMs: retryAfterDelay(headers?.get('retry-after')) } : {}) });
 }
 
 /** 包装 fetch 层的网络异常（无 HTTP 状态） */
@@ -93,8 +106,8 @@ export function networkError(err) {
   return e;
 }
 
-function providerError(status, body, fallback) {
-  return classifyHttpError(status, body, fallback);
+function providerError(status, body, fallback, headers) {
+  return classifyHttpError(status, body, fallback, headers);
 }
 
 /* ---------------- DashScope：图像（旧异步 / 新版多模态） ---------------- */
@@ -126,7 +139,7 @@ export async function generateImageMultimodal({ key, baseUrl, model, prompt, siz
     })
   });
   const body = await readJson(res);
-  if (!res.ok) throw providerError(res.status, body, '生成失败');
+  if (!res.ok) throw providerError(res.status, body, '生成失败', res.headers);
   const urls = [];
   for (const choice of (body && body.output && body.output.choices) || []) {
     for (const item of (choice && choice.message && choice.message.content) || []) {
@@ -154,7 +167,7 @@ export async function submitImage({ key, baseUrl, model, prompt, size, n = 1, ti
     body: JSON.stringify({ model, input: { prompt }, parameters: { ...(size ? { size } : {}), n: Number(n) || 1 } })
   });
   const body = await readJson(res);
-  if (!res.ok) throw providerError(res.status, body, '提交失败');
+  if (!res.ok) throw providerError(res.status, body, '提交失败', res.headers);
   const taskId = body && body.output && body.output.task_id;
   if (!taskId) throw new Error('提交成功但未返回 task_id');
   return taskId;
@@ -196,7 +209,7 @@ export async function submitVideo({ key, baseUrl, model, prompt, imgDataUrl, siz
     body: JSON.stringify({ model, input, parameters })
   });
   const body = await readJson(res);
-  if (!res.ok) throw providerError(res.status, body, '提交失败');
+  if (!res.ok) throw providerError(res.status, body, '提交失败', res.headers);
   const taskId = body && body.output && body.output.task_id;
   if (!taskId) throw new Error('提交成功但未返回 task_id');
   return taskId;
@@ -215,7 +228,7 @@ export async function uploadTempFile({ key, baseUrl, model, filePath, timeoutMs
   u.searchParams.set('model', model);
   const pres = await fetch(u, { headers: authHeaders(key), signal: timeoutSignal(timeoutMs, signal) });
   const pbody = await readJson(pres);
-  if (!pres.ok || !pbody || !pbody.data) throw providerError(pres.status, pbody, '获取上传凭证失败');
+  if (!pres.ok || !pbody || !pbody.data) throw providerError(pres.status, pbody, '获取上传凭证失败', pres.headers);
   const pol = pbody.data;
   const name = path.basename(filePath);
   const keyPath = `${pol.upload_dir}/${Date.now()}-${name}`;
@@ -243,7 +256,7 @@ export async function pollTask({ key, baseUrl, remoteTaskId, timeoutMs = T_POLL,
     signal: timeoutSignal(timeoutMs, signal)
   });
   const body = await readJson(res);
-  if (!res.ok) throw providerError(res.status, body, '查询任务失败');
+  if (!res.ok) throw providerError(res.status, body, '查询任务失败', res.headers);
   const out = (body && body.output) || {};
   const status = out.task_status || 'UNKNOWN';
   const urls = [];
@@ -288,7 +301,7 @@ export async function synthesizeTts({ key, baseUrl, model = 'qwen-tts-latest', t
     body: JSON.stringify({ model, input: { text, voice } })
   });
   const body = await readJson(res);
-  if (!res.ok) throw providerError(res.status, body, '合成失败');
+  if (!res.ok) throw providerError(res.status, body, '合成失败', res.headers);
   const audio = body && body.output && body.output.audio;
   const url = audio && (audio.url || audio.audio_url);
   const b64 = audio && typeof audio.data === 'string' ? audio.data : null;
@@ -306,36 +319,171 @@ export async function openAiGenerateImage({ key, baseUrl, model, prompt, size =
     body: JSON.stringify({ model, prompt, size, n: Number(n) || 1 })
   });
   const body = await readJson(res);
-  if (!res.ok) throw providerError(res.status, body, '生成失败');
+  if (!res.ok) throw providerError(res.status, body, '生成失败', res.headers);
   const items = (body && Array.isArray(body.data) && body.data) || [];
   const out = [];
   for (const it of items) {
     if (it && typeof it.b64_json === 'string') out.push({ b64: it.b64_json });
     else if (it && typeof it.url === 'string') out.push({ url: it.url });
   }
-  if (!out.length) throw new Error('生成完成但未返回图片数据');
+  if (!out.length) throw imageResponseError('生成响应未返回图片数据');
   return out;
 }
 
-/* ---------------- 模型发现（OpenAI 兼容 GET /models，各家通用） ---------------- */
+function imageResponseError(message) {
+  return new ProviderContractError(message, {
+    stage: 'response', category: 'protocol', acceptance: 'unknown'
+  });
+}
+
+function imageBase64Item(value, mediaType, label) {
+  const b64 = typeof value === 'string' ? value.replace(/\s/g, '') : '';
+  const bytes = Buffer.from(b64, 'base64');
+  if (!bytes.length || bytes.toString('base64').replace(/=+$/, '') !== b64.replace(/=+$/, '')) {
+    throw imageResponseError(label + '响应包含无效的图片 base64');
+  }
+  return { b64: bytes.toString('base64'), ...(mediaType ? { mediaType } : {}) };
+}
+
+/** 网关扩展：图片 Markdown/data URL、image_url 内容块或 message.images。 */
+function chatImageItems(body, label = '聊天生图') {
+  const items = [], seen = new Set();
+  function add(source) {
+    if (typeof source !== 'string') return;
+    const value = source.trim();
+    if (seen.has(value)) return;
+    const data = /^data:(image\/[a-z0-9.+-]+);base64,([\s\S]+)$/i.exec(value);
+    if (data) {
+      items.push(imageBase64Item(data[2], data[1].toLowerCase(), label));
+    } else if (/^https?:\/\//i.test(value)) {
+      items.push({ url: value });
+    } else return;
+    seen.add(value);
+  }
+  function text(content) {
+    for (const match of content.matchAll(/!\[[^\]]*\]\(([^)]+)\)/g)) add(match[1]);
+    for (const match of content.matchAll(/data:image\/[a-z0-9.+-]+;base64,[^\s)"<>]+/gi)) add(match[0]);
+  }
+  function part(item) {
+    if (item?.type === 'text' && typeof item.text === 'string') text(item.text);
+    else if (item?.image_url) add(typeof item.image_url === 'string' ? item.image_url : item.image_url.url);
+  }
+  for (const choice of Array.isArray(body?.choices) ? body.choices : []) {
+    const message = choice?.message;
+    if (typeof message?.content === 'string') text(message.content);
+    else if (Array.isArray(message?.content)) message.content.forEach(part);
+    if (Array.isArray(message?.images)) message.images.forEach(part);
+  }
+  if (!items.length) throw imageResponseError(label + '响应未返回图片；受理结果未知，禁止自动重提');
+  return items;
+}
+
+export async function openAiChatGenerateImage({ key, baseUrl, model, prompt, image, size, n = 1, timeoutMs = T_SYNC_GEN, signal }) {
+  if (typeof size === 'string' && size.trim()) {
+    throw new ProviderContractError('聊天生图协议不支持 size 参数；请在提示词中描述所需尺寸', {
+      stage: 'validate', category: 'invalid_request', acceptance: 'not_accepted'
+    });
+  }
+  const base = String(baseUrl || '').replace(/\/+$/, '');
+  const content = image ? [
+    { type: 'text', text: prompt },
+    { type: 'image_url', image_url: { url: 'data:' + image.mediaType + ';base64,' + Buffer.from(image.bytes).toString('base64') } }
+  ] : prompt;
+  const res = await fetch(`${base}/chat/completions`, {
+    method: 'POST', headers: authHeaders(key), signal: timeoutSignal(timeoutMs, signal),
+    body: JSON.stringify({ model, stream: false, messages: [{ role: 'user', content }],
+      ...(Number(n) > 1 ? { n: Number(n) } : {}) })
+  });
+  const body = await readJson(res);
+  if (!res.ok) throw providerError(res.status, body, '聊天生图失败', res.headers);
+  return chatImageItems(body);
+}
+
+/** 同步 Responses 生图：主模型由 model 指定，图片工具模型沿用服务端默认。 */
+export async function openAiResponsesGenerateImage({ key, baseUrl, model, prompt, size, n = 1, timeoutMs = T_SYNC_GEN, signal }) {
+  if (Number(n) !== 1) {
+    throw new ProviderContractError('Responses 生图当前只支持 n=1', {
+      stage: 'validate', category: 'invalid_request', acceptance: 'not_accepted'
+    });
+  }
+  const base = String(baseUrl || '').replace(/\/+$/, '');
+  const res = await fetch(`${base}/responses`, {
+    method: 'POST', headers: authHeaders(key), signal: timeoutSignal(timeoutMs, signal),
+    body: JSON.stringify({ model, input: prompt, stream: false, store: false, background: false,
+      tools: [{ type: 'image_generation', action: 'generate', ...(size ? { size: size.replace('*', 'x') } : {}) }],
+      tool_choice: { type: 'image_generation' } })
+  });
+  const body = await readJson(res);
+  if (!res.ok) throw providerError(res.status, body, 'Responses 生图失败', res.headers);
+  if (body?.status !== 'completed') throw imageResponseError('Responses 生图未返回同步完成结果；禁止自动重提');
+  const output = Array.isArray(body.output) ? body.output : [];
+  const images = output.filter(item => item?.type === 'image_generation_call');
+  if (images.length) return images.map(item => {
+    if (item.status !== 'completed') throw imageResponseError('Responses 图片工具未完成；禁止自动重提');
+    return imageBase64Item(item.result, undefined, 'Responses 生图');
+  });
+  // 实测网关将图片作为 output_text 返回；这不证明执行了官方图片工具。
+  const messages = output.filter(item => item?.type === 'message');
+  if (messages.some(item => item.status !== 'completed')) throw imageResponseError('Responses 图片消息未完成；禁止自动重提');
+  return chatImageItems({ choices: messages.map(item => ({ message: {
+    content: (Array.isArray(item.content) ? item.content : []).map(part => part?.type === 'output_text'
+      ? { type: 'text', text: part.text } : part)
+  } })) }, 'Responses 生图');
+}
+
+/* ---------------- 模型发现（OpenAI GET /models + DashScope GET /api/v1/models） ---------------- */
 /**
- * 拉取 provider 可用模型 id 列表。OpenAI 标准端点，DashScope compatible-mode 亦支持。
- * 免费只读；返回 [{ id }] 原样（分类由 models.js 规则负责）。
- * @returns {Promise<string[]>}
+ * 拉取供应商模型目录。DashScope 官方端点分页读取并保留 capabilities；
+ * 普通 OpenAI 兼容端点维持 GET /models 与字符串 id 返回形状。
+ * @returns {Promise<Array<string|{id:string,capabilities?:string[]}>>}
  */
 export async function listModels({ key, baseUrl, timeoutMs = T_SUBMIT, signal }) {
   const base = String(baseUrl || '').trim().replace(/\/+$/, '');
   if (!base) throw new Error('iris: 供应商缺 baseUrl，无法发现模型');
-  const res = await fetch(`${base}/models`, { headers: authHeaders(key), signal: timeoutSignal(timeoutMs, signal) });
-  const body = await readJson(res);
-  if (!res.ok) throw providerError(res.status, body, '模型发现失败');
-  const items = (body && Array.isArray(body.data) && body.data) || (Array.isArray(body && body.models) ? body.models : []);
-  const ids = [];
-  for (const it of items) {
-    const id = typeof it === 'string' ? it : it && it.id;
-    if (typeof id === 'string' && id && !ids.includes(id)) ids.push(id);
+  const dashscope = isDashScopeBaseUrl(base);
+  const endpoint = dashscope ? dashscopeApiBase(base) + '/models' : base + '/models';
+  const found = new Map();
+  const maxPages = dashscope ? 50 : 1;
+  let loaded = 0;
+  for (let page = 1; page <= maxPages; page++) {
+    const url = new URL(endpoint);
+    if (dashscope) {
+      url.searchParams.set('page_no', String(page));
+      url.searchParams.set('page_size', '100');
+    }
+    const res = await fetch(url, { headers: authHeaders(key), signal: timeoutSignal(timeoutMs, signal) });
+    const body = await readJson(res);
+    if (!res.ok) throw providerError(res.status, body, '模型发现失败', res.headers);
+    const output = body && body.output;
+    const items = (output && Array.isArray(output.models) && output.models)
+      || (body && Array.isArray(body.data) && body.data)
+      || (Array.isArray(body && body.models) ? body.models : []);
+    loaded += items.length;
+    for (const item of items) {
+      const id = String(typeof item === 'string' ? item : item?.id || item?.model || '').trim();
+      if (!id || found.has(id)) continue;
+      const capabilities = Array.isArray(item?.capabilities)
+        ? item.capabilities.filter((value) => typeof value === 'string' && value)
+        : [];
+      const requestModalities = Array.isArray(item?.inference_metadata?.request_modality)
+        ? item.inference_metadata.request_modality.map((value) => String(value).toLowerCase()) : [];
+      const responseModalities = Array.isArray(item?.inference_metadata?.response_modality)
+        ? item.inference_metadata.response_modality.map((value) => String(value).toLowerCase()) : [];
+      if (responseModalities.includes('image')) capabilities.push('IG');
+      if (responseModalities.includes('video')) capabilities.push('VG');
+      if (requestModalities.includes('audio') && responseModalities.includes('text')) capabilities.push('ASR');
+      if (requestModalities.includes('text') && responseModalities.includes('audio')) capabilities.push('TTS');
+      if (requestModalities.includes('image') && responseModalities.includes('text')) capabilities.push('VU');
+      const normalizedCapabilities = [...new Set(capabilities)];
+      found.set(id, normalizedCapabilities.length ? { id, capabilities: normalizedCapabilities } : id);
+    }
+    if (!dashscope) break;
+    const statedTotal = Number(output?.total);
+    const total = Number.isFinite(statedTotal) && statedTotal >= 0 ? statedTotal : null;
+    if (!items.length || (total !== null && loaded >= total) || items.length < 100) break;
+    if (page === maxPages) throw new Error('iris: 模型目录超过安全分页上限，已保留原模型池');
   }
-  return ids;
+  return [...found.values()];
 }
 
 /* ---------------- 视觉理解（OpenAI 兼容 SSE 流式） ---------------- */
@@ -374,7 +522,7 @@ export async function visionStream({ key, baseUrl, model = 'qwen-vl-plus', promp
     const text = await res.text().catch(() => '');
     let body = null;
     try { body = JSON.parse(text); } catch (_) { /* keep null */ }
-    throw providerError(res.status, body, '视觉理解失败');
+    throw providerError(res.status, body, '视觉理解失败', res.headers);
   }
   let full = '';
   const decoder = new TextDecoder();
@@ -451,7 +599,7 @@ export async function submitTranscription({ key, baseUrl, model = 'qwen-audio-3.
     body: JSON.stringify({ model, input })
   });
   const body = await readJson(res);
-  if (!res.ok) throw providerError(res.status, body, '提交转写失败');
+  if (!res.ok) throw providerError(res.status, body, '提交转写失败', res.headers);
   const taskId = body && body.output && body.output.task_id;
   if (!taskId) throw new Error('提交成功但未返回 task_id');
   return taskId;
@@ -483,7 +631,7 @@ export async function pollTranscriptionTask({ key, baseUrl, remoteTaskId, timeou
     signal: timeoutSignal(timeoutMs, signal)
   });
   const body = await readJson(res);
-  if (!res.ok) throw providerError(res.status, body, '查询转写任务失败');
+  if (!res.ok) throw providerError(res.status, body, '查询转写任务失败', res.headers);
   const out = (body && body.output) || {};
   const status = out.task_status || 'UNKNOWN';
   let text = '';