@wwkit/llmproxy 1.0.4 → 1.0.5

package/src/providers/qianwen-web/tools.js

@@ -0,0 +1,36 @@
+// providers/qianwen-web/tools.js — 千问 Web 消息格式化
+//
+// 将 OpenAI 消息数组转为千问请求体的 messages 格式。
+// Tool 注入/解析由 openai-tool-bridge 通用层处理。
+
+/**
+ * 构建千问 messages 数组（从 OpenAI messages 转换）
+ * 千问格式：{ mime_type, content, meta_data, status }
+ */
+export function buildMessages(messages) {
+  if (!Array.isArray(messages) || messages.length === 0) return [];
+
+  return messages
+    .filter((m) => m.role === "user" || m.role === "assistant" || m.role === "system")
+    .map((m) => {
+      const content = extractContent(m.content);
+      if (!content) return null;
+      return {
+        mime_type: "text/plain",
+        content,
+        meta_data: { ori_query: content },
+        status: "complete",
+      };
+    })
+    .filter(Boolean);
+}
+
+function extractContent(content) {
+  if (typeof content === "string") return content;
+  if (Array.isArray(content)) {
+    return content
+      .map((p) => (typeof p === "string" ? p : p?.text || ""))
+      .join("\n");
+  }
+  return "";
+}

package/src/server.js

@@ -29,7 +29,6 @@ import {
   buildSignProvider,
   buildErrorPatterns,
   buildClient,
-  getBenefitModels,
 } from './core/factory.js'
 import {
   streamSSE,
@@ -53,8 +52,7 @@ async function getProviderBundle(providerId) {
   const signProvider = await buildSignProvider(providerId, null)  // 从模块 SIGN_CONFIG 加载
   const errorPatterns = await buildErrorPatterns(providerId, null)  // 从模块 ERROR_CONFIG 加载
   const client = await buildClient(providerId, providerConfig, { authProvider, signProvider })
-  const benefitModels = await getBenefitModels(providerId)
-  const bundle = { providerConfig, authProvider, signProvider, errorPatterns, client, benefitModels }
+  const bundle = { providerConfig, authProvider, signProvider, errorPatterns, client }
   providerRegistry.set(providerId, bundle)
   return bundle
 }
@@ -62,19 +60,16 @@ async function getProviderBundle(providerId) {
 // ---- 全局状态 ----
 let inflight = 0
 let reqSeq = 0
-const retryState = { cooldownUntil: 0 }
-
-// ---- benefit 模型判断 ----
-function isBenefitModel(benefitModels, modelId) {
-  return benefitModels.map(m => m.toLowerCase()).includes(String(modelId).toLowerCase())
-}
+// 每个 provider 独立的冷却状态（避免一个 provider 失败阻塞其它 provider）
+const retryState = {} // providerId -> { cooldownUntil }
+const getRetryState = (id) => (retryState[id] ??= { cooldownUntil: 0 })
 
 async function handleProviderModels(res, providerId) {
   const bundle = await getProviderBundle(providerId)
   const data = bundle.providerConfig.models.map((id, i) => ({
     id,
     object: 'model',
-    owned_by: isBenefitModel(bundle.benefitModels, id) ? `${providerId}-benefit` : providerId,
+    owned_by: providerId,
     sort: i,
   }))
   json(res, 200, { object: 'list', data })
@@ -114,24 +109,21 @@ async function handleChat(req, res, providerId) {
   // 客户端断开信号
   const clientGone = clientGoneSignal(res)
 
-  // benefit 头
-  const extraHeaders = isBenefitModel(bundle.benefitModels, model) ? { 'maas_type': 'benefit' } : {}
-
   body.stream = stream
 
   try {
-    // 全局冷却：acquireUpstream 等 cooldownUntil
-    await waitForCooldown(retryState)
+    // 冷却等待：仅当前 provider 的冷却（互不阻塞）
+    const state = getRetryState(providerId)
+    await waitForCooldown(state)
 
     // 重试循环
     const result = await retryLoop({
       attemptFn: () => bundle.client.chatCompletions(body, {
-        headers: extraHeaders,
         signal: clientGone.signal,
       }),
       errorPatterns: bundle.errorPatterns,
       config: config.retry,
-      state: retryState,
+      state,
       clientGone,
       chatId: id,
     })
@@ -238,7 +230,8 @@ async function warmupProvider(id) {
   const shouldAutoLogin = process.env.LLMPROXY_LOGIN === id
   try {
     const cred = await bundle.authProvider.getCredentials({ autoLogin: shouldAutoLogin })
-    log(`[${id}] 鉴权就绪 AK=${cred.accessKeyId?.slice(0, 4)}****${cred.accessKeyId?.slice(-3)} expires=${new Date(cred.expiresAt).toISOString()}`)
+    const label = cred.accessKeyId || cred.token || cred.cookie ? '凭证就绪' : '凭证就绪'
+    log(`[${id}] ${label} expires=${cred.expiresAt ? new Date(cred.expiresAt).toISOString() : 'N/A'}`)
   } catch (e) {
     log(`[${id}] 鉴权未就绪: ${e.message}（请执行 llmproxy login --provider ${id}）`)
   }