feat: 面板日志页(实时tail+过滤+高亮) + 生图链路耗时埋点(image_gen 每轮耗时/fence/换号)

app/adapters/openai_images.py

@@ -11,12 +11,15 @@ from __future__ import annotations
 
 import base64
 import json
+import logging
 import re
 import time
 import uuid
 from pathlib import Path
 from typing import Any
 
+logger = logging.getLogger(__name__)
+
 from fastapi import APIRouter, Depends, HTTPException, Request
 from pydantic import BaseModel
 
@@ -138,6 +141,10 @@ async def _collect(client: Any, prompt: str, model_id: str | None,
     """
     max_switches = getattr(client, "max_switches", 5) or 1
     full = ""
+    t_start = time.perf_counter()
+    acc_name = getattr(client, "_account", None).name if getattr(client, "_account", None) else "?"
+    logger.info("[image] attempt 0/%d start account=%s image_model=%s",
+                max_switches, acc_name, image_model)
     for attempt in range(max_switches):
         parts: list[str] = []
         kw: dict[str, Any] = {}
@@ -145,6 +152,7 @@ async def _collect(client: Any, prompt: str, model_id: str | None,
             kw["image_model"] = image_model
         if image_inputs:
             kw["image_inputs"] = image_inputs
+        t_attempt = time.perf_counter()
         try:
             agen = stream_with_retry(client, prompt, None, model_id=model_id, **kw)
             try:
@@ -168,10 +176,10 @@ async def _collect(client: Any, prompt: str, model_id: str | None,
                         raise HTTPException(status_code=502, detail=ir.error)
                     if ir.kind == "text" and ir.text:
                         parts.append(ir.text)
-                    # finish 不 break：图片 markdown 在它之后的 output_text.done 里
+                    # finish 不 break：图片 markdown 在它的之后的 output_text.done 里
             except TimeoutError:
                 # httpx 总超时（request_timeout=120s）掐断：上游超时/挂死，非账号级。
-                # 交给 _RetryingClient 换号兜底，这里原样 502 不烧号。
+                # 交给 _RetryingClient 换账号兜底，这里原样 502 不烧号。
                 raise HTTPException(status_code=502, detail="image upstream timeout")
         except HTTPException:
             raise
@@ -179,16 +187,26 @@ async def _collect(client: Any, prompt: str, model_id: str | None,
             raise HTTPException(status_code=502, detail=getattr(e, "detail", None) or str(e)) from e
         full = "".join(parts)
         urls = _extract_image_urls(parts)
+        dt = time.perf_counter() - t_attempt
         if urls or "<tool_call>" not in full:
+            logger.info("[image_gen] attempt %d/%d DONE dt=%.1fs account=%s urls=%d chars=%d elapsed_total=%.1fs",
+                        attempt, max_switches, dt, acc_name, len(urls), len(full),
+                        time.perf_counter() - t_start)
             return full, urls
         # fence：换号重试（当前账号标记冷却）。下次循环用新账号的 provider。
+        logger.warning("[image_gen] attempt %d/%d FENCED (no media url) dt=%.1fs account=%s chars=%d",
+                       attempt, max_switches, dt, acc_name, len(full))
         if hasattr(client, "switch_account_and_mark_failed"):
-            client.switch_account_and_mark_failed()
+            new_acc = client.switch_account_and_mark_failed()
+            acc_name = getattr(new_acc, "name", None) or "?"
+            logger.info("[image_gen] attempt %d/%d switch to account=%s",
+                        attempt + 1, max_switches, acc_name)
         else:
             break  # 非 _RetryingClient（测试/直连）不换号，直接失败
     # 全部账号 fence / 挂起：前面每次超时已把账号换掉并标记冷却，这里统一 502
-    # （不再 UnboundLocalError：full 初始化为空串，慢吐型 fence 也可能根本没文本）
-    raise HTTPException(status_code=502, detail=f"all accounts fenced/stalled, no image url: {full[:400]}")
+    logger.warning("[image_gen] ALL attempts exhausted (%.1fs total, accounts fenced/stalled)",
+                   time.perf_counter() - t_start)
+    raise HTTPException(status_code=502, detail=f"all accounts fenced/stalled, no image_url: {full[:400]}")
 
 
 @router.get("/v1/images/models")

app/admin.py

@@ -171,6 +171,26 @@ async def usage(
     return usage_store.aggregate(window)
 
 
+@router.get("/logs")
+async def logs(
+    request: Request,
+    lines: int = Query(300, ge=1, le=2000, description="返回日志尾部行数"),
+    _: None = Depends(verify_admin_key),
+) -> dict[str, Any]:
+    """返回网关日志文件尾部（面板「日志」页实时查看；含生图耗时埋点）。"""
+    settings = _settings(request)
+    log_path = Path(settings.log_dir) / settings.log_filename
+    if not log_path.is_file():
+        return {"file": str(log_path), "lines": [], "exists": False}
+    try:
+        with log_path.open("r", encoding="utf-8", errors="replace") as f:
+            # 只读尾部 N 行（文件可能很大）
+            tail = f.readlines()[-lines:]
+    except OSError:
+        return {"file": str(log_path), "lines": [], "exists": True, "error": "read failed"}
+    return {"file": str(log_path), "lines": tail, "exists": True, "count": len(tail)}
+
+
 @router.get("/accounts/{name}")
 async def get_account(request: Request, name: str, _: None = Depends(verify_admin_key)) -> Account:
     """获取单个账号完整信息（含凭据，需 admin 鉴权）。"""

app/static/admin.html

@@ -115,6 +115,16 @@
   .filter-bar select:focus, .filter-bar input[type="search"]:focus { border-color: var(--accent); }
   .filter-count { color: var(--muted); font-size: 12px; white-space: nowrap; }
 
+  .log-box {
+    background: #0f1420; border: 1px solid var(--border); border-radius: var(--radius);
+    padding: 12px 14px; overflow: auto; max-height: 70vh;
+  }
+  .log-box pre {
+    margin: 0; color: #c7d1e0; font: 12px/1.6 Consolas, "JetBrains Mono", monospace;
+    white-space: pre-wrap; word-break: break-all;
+  }
+  .log-box .lg-warn { color: #e6b84c; }
+  .log-box .lg-err  { color: #f07474; }
   .table-wrap { background: var(--panel); border: 1px solid var(--border); border-radius: var(--radius); overflow: hidden; }
   .table-scroll { overflow-x: auto; }
   table { width: 100%; border-collapse: collapse; min-width: 860px; }
@@ -212,6 +222,7 @@
       <button class="tab active" data-tab="accounts">账号管理</button>
       <button class="tab" data-tab="usage">用量统计</button>
       <button class="tab" data-tab="apikeys">API Key</button>
+      <button class="tab" data-tab="logs">日志</button>
     </div>
 
     <!-- ===== 账号管理视图 ===== -->
@@ -326,6 +337,25 @@
       </div>
       <p class="muted" style="font-size:12px;margin-top:10px">生成的 Key 用于客户端（Cherry Studio 等）连接 <code>/v1/*</code> 的 <code>Authorization: Bearer &lt;key&gt;</code>；config 里的 <code>[gateway] api_key</code> 兼容并存。</p>
     </div><!-- /view-apikeys -->
+
+    <!-- ===== 日志视图 ===== -->
+    <div id="view-logs" style="display:none">
+      <div class="toolbar">
+        <div class="bulk-bar">
+          <span class="bulk-info">网关日志（尾部 <b id="lg-count">–</b> 行）</span>
+          <button class="sm" id="lg-refresh">↻ 刷新</button>
+          <label class="muted" style="font-size:12px;display:flex;align-items:center;gap:4px">
+            <input type="checkbox" id="lg-auto" checked> 自动刷新
+          </label>
+        </div>
+        <div class="filter-bar">
+          <input type="search" id="lg-search" placeholder="🔍 过滤关键字（image/fence/error…）" autocomplete="off">
+        </div>
+      </div>
+      <div class="log-box">
+        <pre id="lg-pre">加载中…</pre>
+      </div>
+    </div><!-- /view-logs -->
   </div>
 </div>
 
@@ -652,6 +682,38 @@
     }
   });
 
+  // ---- 日志 ----
+  let logTimer = null;
+  let logLines = [];
+  let logFilter = '';
+  function lgHighlight(line) {
+    const escL = esc(line);
+    if (/WARNING|WARN|FENCED|fenced|超时|timeout/i.test(line)) return '<span class="lg-warn">'+escL+'</span>';
+    if (/ERROR|error|Traceback|502|failed/i.test(line)) return '<span class="lg-err">'+escL+'</span>';
+    return escL;
+  }
+  function lgRender() {
+    const rows = logFilter ? logLines.filter(l => l.toLowerCase().includes(logFilter)) : logLines;
+    el('lg-count').textContent = rows.length;
+    el('lg-pre').innerHTML = rows.map(lgHighlight).join('\n');
+    el('lg-pre').scrollTop = el('lg-pre').scrollHeight;
+  }
+  async function loadLogs() {
+    try {
+      const d = await api('/admin/logs?lines=300');
+      logLines = d.lines || [];
+      lgRender();
+    } catch (e) { if (e.message!=='key 无效或已失效') { el('lg-pre').textContent = e.message; } }
+  }
+  function stopLogAuto() { if (logTimer) { clearInterval(logTimer); logTimer = null; } }
+  function startLogAuto() {
+    stopLogAuto();
+    if (el('lg-auto').checked && curTab === 'logs') logTimer = setInterval(loadLogs, 5000);
+  }
+  el('lg-refresh').addEventListener('click', loadLogs);
+  el('lg-search').addEventListener('input', e => { logFilter = e.target.value.trim().toLowerCase(); lgRender(); });
+  el('lg-auto').addEventListener('change', startLogAuto);
+
   async function uploadFiles() {
     const inp = el('upload-file');
     const files = inp.files;
@@ -793,8 +855,11 @@
     el('view-accounts').style.display = curTab === 'accounts' ? '' : 'none';
     el('view-usage').style.display = curTab === 'usage' ? '' : 'none';
     el('view-apikeys').style.display = curTab === 'apikeys' ? '' : 'none';
+    el('view-logs').style.display = curTab === 'logs' ? '' : 'none';
     if (curTab === 'usage') loadUsage();
     if (curTab === 'apikeys') loadApiKeys();
+    if (curTab === 'logs') { loadLogs(); startLogAuto(); }
+    else stopLogAuto();
   }));
   el('usage-window').addEventListener('change', loadUsage);
   el('usage-refresh').addEventListener('click', loadUsage);