coding-proxy 0.2.3a3__tar.gz → 0.2.3a4__tar.gz

{coding_proxy-0.2.3a3 → coding_proxy-0.2.3a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coding-proxy
-Version: 0.2.3a3
+Version: 0.2.3a4
 Summary: A High-Availability, Transparent, and Smart Multi-Vendor Proxy for Claude Code. Support Claude Plans, GitHub Copilot, Google Antigravity, ZAI/GLM, MiniMax, Qwen, Xiaomi, Kimi, Doubao...
 Project-URL: Source Code, https://github.com/ThreeFish-AI/coding-proxy
 Project-URL: User Guide, https://github.com/ThreeFish-AI/coding-proxy/blob/master/docs/user-guide.md

{coding_proxy-0.2.3a3 → coding_proxy-0.2.3a4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "coding-proxy"
-version = "0.2.3a3"
+version = "0.2.3a4"
 description = "A High-Availability, Transparent, and Smart Multi-Vendor Proxy for Claude Code. Support Claude Plans, GitHub Copilot, Google Antigravity, ZAI/GLM, MiniMax, Qwen, Xiaomi, Kimi, Doubao..."
 readme = "README.md"
 requires-python = ">=3.12"

{coding_proxy-0.2.3a3 → coding_proxy-0.2.3a4}/src/coding/proxy/config/config.default.yaml

@@ -58,7 +58,7 @@ vendors:
       probe_interval_seconds: 300
     weekly_quota_guard:
       enabled: true
-      token_budget: 250000000 # 一周 token 预算（根据订阅计划调整）
+      token_budget: 500000000 # 一周 token 预算（根据订阅计划调整）
       window_hours: 168.0 # 7 天滑动窗口
       threshold_percent: 99.0
       probe_interval_seconds: 1800 # 每 30 分钟探测一次

{coding_proxy-0.2.3a3 → coding_proxy-0.2.3a4}/src/coding/proxy/logging/db.py

@@ -497,7 +497,7 @@ class TokenLogger:
             return 0
         cutoff_iso = _hours_ago_utc_iso(window_hours)
         cursor = await self._db.execute(
-            """SELECT COALESCE(SUM(input_tokens + output_tokens), 0) AS total
+            """SELECT COALESCE(SUM(input_tokens + output_tokens + cache_creation_tokens + cache_read_tokens), 0) AS total
                FROM usage_log
                WHERE vendor = ? AND success = 1
                  AND ts >= ?""",

{coding_proxy-0.2.3a3 → coding_proxy-0.2.3a4}/src/coding/proxy/routing/executor.py

@@ -276,7 +276,12 @@ class _RouteExecutor:
                         tier.name,
                         usage,
                     )
-                tier.record_success(info.input_tokens + info.output_tokens)
+                tier.record_success(
+                    info.input_tokens
+                    + info.output_tokens
+                    + info.cache_creation_tokens
+                    + info.cache_read_tokens
+                )
                 duration = int((time.monotonic() - start) * 1000)
                 model = body.get("model", "unknown")
                 model_served = usage.get("model_served") or tier.vendor.map_model(model)

{coding_proxy-0.2.3a3 → coding_proxy-0.2.3a4}/src/coding/proxy/routing/quota_guard.py

@@ -197,6 +197,7 @@ class QuotaGuard:
                 if self._budget > 0
                 else 0,
                 "threshold_percent": self._threshold * 100,
+                "window_hours": self.window_hours,
             }
 
     def _expire(self) -> None:

{coding_proxy-0.2.3a3 → coding_proxy-0.2.3a4}/src/coding/proxy/server/dashboard.py

@@ -19,14 +19,20 @@ def _build_favicon() -> bytes:
 
     width, height = 16, 16
     pixel_rows: list[bytes] = []
+    cx, cy = width / 2.0, height / 2.0
     for y in range(height - 1, -1, -1):  # BMP bottom-up
         row = bytearray()
         for x in range(width):
-            t = (x + (height - 1 - y)) / (width + height - 2)
-            r = int(88 + (188 - 88) * t)
-            g = int(166 + (140 - 166) * t)
-            b = 255
-            row.extend([b, g, r, 255])  # BGRA
+            dx = x - cx + 0.5
+            dy = y - cy + 0.5
+            if dx * dx + dy * dy > (width / 2.0) ** 2:
+                row.extend([0, 0, 0, 0])  # 圆外透明
+            else:
+                t = (x + (height - 1 - y)) / (width + height - 2)
+                r = int(88 + (188 - 88) * t)
+                g = int(166 + (140 - 166) * t)
+                b = 255
+                row.extend([b, g, r, 255])  # BGRA
         pixel_rows.append(bytes(row))
 
     bmp_hdr = struct.pack(
@@ -114,7 +120,7 @@ _DASHBOARD_HTML = """<!DOCTYPE html>
     .logo {
       width: 30px; height: 30px;
       background: linear-gradient(135deg, var(--accent-blue), var(--accent-purple));
-      border-radius: 8px;
+      border-radius: 50%;
       display: flex; align-items: center; justify-content: center;
       font-size: 15px; font-weight: 700; color: #fff;
       box-shadow: 0 2px 8px rgba(88,166,255,.3);
@@ -148,7 +154,7 @@ _DASHBOARD_HTML = """<!DOCTYPE html>
     /* ── KPI 卡片 ── */
     .kpi-grid {
       display: grid;
-      grid-template-columns: repeat(auto-fit, minmax(190px, 1fr));
+      grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
       gap: 12px;
       margin-bottom: 18px;
     }
@@ -189,7 +195,7 @@ _DASHBOARD_HTML = """<!DOCTYPE html>
       font-family: 'JetBrains Mono', monospace;
       letter-spacing: -0.5px;
     }
-    .kpi-sub { font-size: 11px; color: var(--text-tertiary); margin-top: 5px; }
+    .kpi-sub { font-size: 11px; color: var(--text-tertiary); margin-top: 5px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; max-width: 100%; }
     .color-blue { color: var(--accent-blue); }
     .color-green { color: var(--accent-green); }
     .color-yellow { color: var(--accent-yellow); }
@@ -446,33 +452,32 @@ _DASHBOARD_HTML = """<!DOCTYPE html>
     </div>
   </div>
 
-  <!-- 故障转移明细表 -->
-  <div class="card">
-    <div class="card-title">故障转移明细</div>
-    <div class="ft-table-wrap">
-      <table>
-        <thead>
-          <tr>
-            <th>来源供应商</th>
-            <th>目标供应商</th>
-            <th>次数</th>
-          </tr>
-        </thead>
-        <tbody id="ft-tbody">
-          <tr><td colspan="3" class="empty">加载中…</td></tr>
-        </tbody>
-      </table>
-    </div>
-  </div>
 </main>
 
 <script>
 // ── 颜色配置 ──────────────────────────────────────────────
+// 调色盘参考 Tailwind CSS 400-level，深色背景高区分度最佳实践
 const VENDOR_COLORS = [
-  '#58a6ff','#bc8cff','#3fb950','#ffa657','#f85149',
-  '#79c0ff','#d2a8ff','#56d364','#ffb77c','#ff7b72',
-  '#39d353','#e3b341','#a5d6ff','#f0a9eb','#7ee787',
-  '#ffa198','#cae8ff','#dbedff','#b6e3ff','#54aeff',
+  '#60A5FA',  // blue-400
+  '#FB923C',  // orange-400
+  '#34D399',  // emerald-400
+  '#A78BFA',  // violet-400
+  '#F87171',  // red-400
+  '#38BDF8',  // sky-400
+  '#FBBF24',  // amber-400
+  '#F472B6',  // pink-400
+  '#4ADE80',  // green-400
+  '#E879F9',  // fuchsia-400
+  '#818CF8',  // indigo-400
+  '#2DD4BF',  // teal-400
+  '#FB7185',  // rose-400
+  '#FCD34D',  // yellow-300
+  '#6EE7B7',  // emerald-300
+  '#C4B5FD',  // violet-300
+  '#7DD3FC',  // sky-300
+  '#FED7AA',  // orange-200
+  '#FECDD3',  // rose-200
+  '#BBF7D0',  // green-200
 ];
 
 // ── 工具函数 ──────────────────────────────────────────────
@@ -505,9 +510,68 @@ Chart.defaults.font.size = 11;
 
 const COMMON_SCALE_X = { grid: { display: false }, ticks: { maxTicksLimit: 10 } };
 const COMMON_SCALE_Y = { grid: { color: 'rgba(255,255,255,.04)' }, beginAtZero: true };
-const COMMON_LEGEND = { position: 'bottom', labels: { boxWidth: 8, padding: 14, usePointStyle: true, pointStyleWidth: 8, font: { size: 11 } } };
+const COMMON_LEGEND = {
+  position: 'bottom',
+  labels: {
+    boxWidth: 8,
+    padding: 14,
+    usePointStyle: true,
+    pointStyle: 'circle',
+    pointStyleWidth: 8,
+    font: { size: 11 },
+    generateLabels: chart => {
+      const items = Chart.defaults.plugins.legend.labels.generateLabels(chart);
+      items.forEach(item => { item.pointStyle = 'circle'; item.lineWidth = 0; });
+      return items;
+    },
+  },
+};
 const COMMON_LINE_DATASET = { tension: .35, pointRadius: 0, pointHoverRadius: 5, borderWidth: 2 };
 
+// ── Legend 点击交互：单击=仅选该项，Ctrl/Meta+单击=多选追加，Shift+单击=排除 ──
+function legendOnClick(e, legendItem, legend) {
+  const chart = legend.chart;
+  const isShift = e.native.shiftKey;
+  const isCtrl  = e.native.ctrlKey || e.native.metaKey;
+  if (chart.config.type === 'doughnut' || chart.config.type === 'pie') {
+    const idx = legendItem.index;
+    const dataLen = chart.data.labels.length;
+    if (isShift) {
+      chart.toggleDataVisibility(idx);
+    } else if (isCtrl) {
+      if (!chart.getDataVisibility(idx)) chart.toggleDataVisibility(idx);
+    } else {
+      const allOthersHidden = [...Array(dataLen).keys()].filter(i => i !== idx).every(i => !chart.getDataVisibility(i));
+      if (allOthersHidden) {
+        for (let i = 0; i < dataLen; i++) { if (!chart.getDataVisibility(i)) chart.toggleDataVisibility(i); }
+      } else {
+        for (let i = 0; i < dataLen; i++) {
+          const vis = chart.getDataVisibility(i);
+          if (i === idx && !vis) chart.toggleDataVisibility(i);
+          if (i !== idx && vis)  chart.toggleDataVisibility(i);
+        }
+      }
+    }
+  } else {
+    const idx = legendItem.datasetIndex;
+    const datasets = chart.data.datasets;
+    if (isShift) {
+      const meta = chart.getDatasetMeta(idx);
+      meta.hidden = !meta.hidden;
+    } else if (isCtrl) {
+      chart.getDatasetMeta(idx).hidden = false;
+    } else {
+      const allOthersHidden = datasets.every((_, i) => i === idx || !!chart.getDatasetMeta(i).hidden);
+      if (allOthersHidden) {
+        datasets.forEach((_, i) => { chart.getDatasetMeta(i).hidden = false; });
+      } else {
+        datasets.forEach((_, i) => { chart.getDatasetMeta(i).hidden = (i !== idx); });
+      }
+    }
+  }
+  chart.update();
+}
+
 // ── 图表实例 ──────────────────────────────────────────────
 let chartTimeline = null;
 let chartVendorDist = null;
@@ -529,28 +593,29 @@ async function fetchJSON(url) {
 
 // ── KPI 更新 ──────────────────────────────────────────────
 function updateKPI(summary) {
-  const t = summary.today, w = summary.week;
+  const t = summary.today, r = summary.range;
+  const lbl = currentRangeLabel;
 
   document.getElementById('kpi-req-today').textContent = fmtNum(t.requests);
-  document.getElementById('kpi-req-week').textContent = '本周 ' + fmtNum(w.requests);
+  document.getElementById('kpi-req-week').textContent = lbl + ' ' + fmtNum(r.requests);
 
-  const tokT = t.tokens, tokW = w.tokens;
+  const tokT = t.tokens, tokR = r.tokens;
   const totalT = tokT.input + tokT.output + tokT.cache_creation + tokT.cache_read;
-  const totalW = tokW.input + tokW.output + tokW.cache_creation + tokW.cache_read;
+  const totalR = tokR.input + tokR.output + tokR.cache_creation + tokR.cache_read;
   document.getElementById('kpi-tok-today').textContent = fmtTokens(totalT);
-  document.getElementById('kpi-tok-week').textContent = '本周 ' + fmtTokens(totalW);
+  document.getElementById('kpi-tok-week').textContent = lbl + ' ' + fmtTokens(totalR);
 
   document.getElementById('kpi-out-today').textContent = fmtTokens(tokT.output);
-  document.getElementById('kpi-out-week').textContent = '本周 ' + fmtTokens(tokW.output);
+  document.getElementById('kpi-out-week').textContent = lbl + ' ' + fmtTokens(tokR.output);
 
   document.getElementById('kpi-cost-today').textContent = t.cost || '–';
-  document.getElementById('kpi-cost-week').textContent = '本周 ' + (w.cost || '–');
+  document.getElementById('kpi-cost-week').textContent = lbl + ' ' + (r.cost || '–');
 
   document.getElementById('kpi-fo-today').textContent = fmtNum(t.failovers);
-  document.getElementById('kpi-fo-week').textContent = '本周 ' + fmtNum(w.failovers);
+  document.getElementById('kpi-fo-week').textContent = lbl + ' ' + fmtNum(r.failovers);
 
   document.getElementById('kpi-lat-today').textContent = t.avg_duration_ms ? t.avg_duration_ms + 'ms' : '–';
-  document.getElementById('kpi-lat-week').textContent = '本周 ' + (w.avg_duration_ms ? w.avg_duration_ms + 'ms' : '–');
+  document.getElementById('kpi-lat-week').textContent = lbl + ' ' + (r.avg_duration_ms ? r.avg_duration_ms + 'ms' : '–');
 }
 
 // ── 供应商状态 ────────────────────────────────────────────
@@ -578,6 +643,21 @@ function quotaBarColor(pct) {
   if (pct >= 70) return 'var(--accent-yellow)';
   return 'var(--accent-green)';
 }
+function quotaWindowLabel(wh) {
+  if (!wh) return '配额';
+  const h = parseFloat(wh);
+  if (h >= 24) return Math.round(h / 24) + 'd配额';
+  return Math.round(h) + 'h配额';
+}
+function renderQuotaBar(qg) {
+  if (!qg || qg.usage_percent == null) return '';
+  const pct = Math.round(qg.usage_percent);
+  const label = quotaWindowLabel(qg.window_hours);
+  return `<span class="status-badge ${quotaClass(pct)}">${label} ${pct}%</span>` +
+    `<div class="quota-bar-wrap"><div class="quota-bar-bg">` +
+    `<div class="quota-bar-fill" style="width:${Math.min(pct,100)}%;background:${quotaBarColor(pct)}"></div>` +
+    `</div></div>`;
+}
 
 function updateVendorStatus(status) {
   const tiers = status.tiers || [];
@@ -588,25 +668,13 @@ function updateVendorStatus(status) {
   }
   list.innerHTML = tiers.map(tier => {
     const cb = tier.circuit_breaker || {};
-    const qg = tier.quota_guard || {};
-    const wqg = tier.weekly_quota_guard || {};
     const cbClass = cbStateClass(cb.state);
     const cbLabel = cbStateLabel(cb.state);
-    const pct = qg.usage_percent != null ? Math.round(qg.usage_percent) : null;
-    const wpct = wqg.usage_percent != null ? Math.round(wqg.usage_percent) : null;
     const initial = (tier.name || '?').charAt(0).toUpperCase();
 
     let quotaHTML = '';
-    if (pct != null) {
-      quotaHTML += `
-        <span class="status-badge ${quotaClass(pct)}">日配 ${pct}%</span>
-        <div class="quota-bar-wrap">
-          <div class="quota-bar-bg"><div class="quota-bar-fill" style="width:${Math.min(pct,100)}%;background:${quotaBarColor(pct)}"></div></div>
-        </div>`;
-    }
-    if (wpct != null) {
-      quotaHTML += `<span class="status-badge ${quotaClass(wpct)}">周配 ${wpct}%</span>`;
-    }
+    if (tier.quota_guard) quotaHTML += renderQuotaBar(tier.quota_guard);
+    if (tier.weekly_quota_guard) quotaHTML += renderQuotaBar(tier.weekly_quota_guard);
 
     const rlInfo = tier.rate_limit || {};
     const rlHtml = rlInfo.limited ? `<span class="status-badge sb-warn">限速中</span>` : '';
@@ -659,7 +727,10 @@ function buildTimeline(rows) {
     options: {
       responsive: true, maintainAspectRatio: false,
       interaction: { mode: 'index', intersect: false },
-      plugins: { legend: COMMON_LEGEND },
+      plugins: {
+        legend: { ...COMMON_LEGEND, onClick: legendOnClick },
+        tooltip: { itemSort: (a, b) => (b.raw || 0) - (a.raw || 0) },
+      },
       scales: {
         x: COMMON_SCALE_X,
         y: { ...COMMON_SCALE_Y, ticks: { precision: 0 } },
@@ -699,7 +770,7 @@ function buildVendorDist(rows) {
     options: {
       responsive: true, maintainAspectRatio: false,
       plugins: {
-        legend: COMMON_LEGEND,
+        legend: { ...COMMON_LEGEND, onClick: legendOnClick },
         tooltip: { callbacks: { label: c => ` ${c.label}: ${c.raw.toLocaleString()} 次` } },
       },
     },
@@ -748,8 +819,11 @@ function buildTokenTimeline(rows) {
       responsive: true, maintainAspectRatio: false,
       interaction: { mode: 'index', intersect: false },
       plugins: {
-        legend: COMMON_LEGEND,
-        tooltip: { callbacks: { label: c => ` ${c.dataset.label}: ${fmtTokens(c.raw)}` } },
+        legend: { ...COMMON_LEGEND, onClick: legendOnClick },
+        tooltip: {
+          itemSort: (a, b) => (b.raw || 0) - (a.raw || 0),
+          callbacks: { label: c => ` ${c.dataset.label}: ${fmtTokens(c.raw)}` },
+        },
       },
       scales: {
         x: COMMON_SCALE_X,
@@ -811,16 +885,21 @@ function buildModelTokenTimeline(rows) {
       plugins: {
         legend: {
           position: keys.length > 8 ? 'right' : 'bottom',
+          onClick: legendOnClick,
           labels: {
             ...COMMON_LEGEND.labels,
-            generateLabels: chart => Chart.defaults.plugins.legend.labels.generateLabels(chart).map(item => {
+            generateLabels: chart => {
+              const items = COMMON_LEGEND.labels.generateLabels(chart);
               const maxLen = 32;
-              if (item.text.length > maxLen) item.text = item.text.slice(0, maxLen) + '…';
-              return item;
-            }),
+              items.forEach(item => {
+                if (item.text.length > maxLen) item.text = item.text.slice(0, maxLen) + '…';
+              });
+              return items;
+            },
           },
         },
         tooltip: {
+          itemSort: (a, b) => (b.raw || 0) - (a.raw || 0),
           callbacks: {
             label: c => ` ${c.dataset.label}: ${fmtTokens(c.raw)}`,
             footer: items => {
@@ -842,26 +921,14 @@ function buildModelTokenTimeline(rows) {
   });
 }
 
-// ── 故障转移明细表 ────────────────────────────────────────
-function updateFtTable(failoverStats) {
-  const tbody = document.getElementById('ft-tbody');
-  if (!failoverStats || !failoverStats.length) {
-    tbody.innerHTML = '<tr><td colspan="3" class="empty"><div class="empty-icon">✅</div>暂无故障转移记录</td></tr>';
-    return;
-  }
-  tbody.innerHTML = failoverStats.map(r => `
-    <tr>
-      <td><span class="tag-vendor">${r.failover_from || 'unknown'}</span></td>
-      <td><span class="tag-vendor">${r.vendor || ''}</span></td>
-      <td><span style="font-family:'JetBrains Mono',monospace">${fmtNum(r.count)}</span></td>
-    </tr>`).join('');
-}
-
 // ── 时间区间控制 ──────────────────────────────────────────
 let currentDays = 7;
+let currentRangeLabel = '本周';
 
 function setTimeRange(days, btn) {
   currentDays = days;
+  if (days === 7) currentRangeLabel = '本周';
+  else if (days === 30) currentRangeLabel = '本月';
   document.querySelectorAll('.range-btn').forEach(b => b.classList.remove('active'));
   if (btn) btn.classList.add('active');
   const customEl = document.getElementById('range-custom');
@@ -887,6 +954,7 @@ function applyCustomRange() {
   const endMs = new Date(e).getTime();
   if (endMs < startMs) return;
   currentDays = Math.ceil((endMs - startMs) / 86400000) + 1;
+  currentRangeLabel = s + '—' + e;
   refresh();
 }
 
@@ -911,7 +979,7 @@ async function refresh() {
   try {
     const days = currentDays > 0 ? currentDays : 7;
     const [summary, timeline, status] = await Promise.all([
-      fetchJSON('/api/dashboard/summary'),
+      fetchJSON('/api/dashboard/summary?days=' + days),
       fetchJSON('/api/dashboard/timeline?days=' + days),
       fetchJSON('/api/status'),
     ]);
@@ -930,8 +998,6 @@ async function refresh() {
     buildTokenTimeline(rows);
     buildModelTokenTimeline(rows);
 
-    updateFtTable(summary.failover_stats || []);
-
     document.getElementById('refresh-time').textContent = '上次刷新: ' + now();
   } catch (e) {
     console.error('Dashboard refresh error:', e);
@@ -1030,8 +1096,8 @@ def register_dashboard_routes(app: Any) -> None:
         return HTMLResponse(content=_DASHBOARD_HTML)
 
     @app.get("/api/dashboard/summary")
-    async def dashboard_summary(request: Request) -> Response:
-        """返回 Dashboard 汇总数据（今日 / 本周 / 本月）."""
+    async def dashboard_summary(request: Request, days: int = 7) -> Response:
+        """返回 Dashboard 汇总数据（今日 / 所选区间）."""
         token_logger = getattr(request.app.state, "token_logger", None)
         pricing_table = getattr(request.app.state, "pricing_table", None)
 
@@ -1042,15 +1108,17 @@ def register_dashboard_routes(app: Any) -> None:
                 media_type="application/json",
             )
 
+        days = max(1, min(days, 90))  # 限制范围 1~90 天
+
         try:
             # 今日（最近 1 天）
             today_rows = await token_logger.query_usage(period=TimePeriod.DAY, count=1)
-            # 本周（最近 7 天）
-            week_rows = await token_logger.query_usage(period=TimePeriod.DAY, count=7)
-            # 本月（最近 30 天）
-            month_rows = await token_logger.query_usage(period=TimePeriod.DAY, count=30)
-            # 故障转移（最近 7 天）
-            failover_stats = await token_logger.query_failover_stats(days=7)
+            # 所选区间
+            range_rows = await token_logger.query_usage(
+                period=TimePeriod.DAY, count=days
+            )
+            # 故障转移（所选区间）
+            failover_stats = await token_logger.query_failover_stats(days=days)
         except Exception as exc:
             logger.error("dashboard_summary query error: %s", exc, exc_info=True)
             return Response(
@@ -1060,18 +1128,15 @@ def register_dashboard_routes(app: Any) -> None:
             )
 
         today = _sum_rows(today_rows)
-        week = _sum_rows(week_rows)
-        month = _sum_rows(month_rows)
+        range_stat = _sum_rows(range_rows)
 
         today["cost"] = _compute_cost_str(today_rows, pricing_table)
-        week["cost"] = _compute_cost_str(week_rows, pricing_table)
-        month["cost"] = _compute_cost_str(month_rows, pricing_table)
+        range_stat["cost"] = _compute_cost_str(range_rows, pricing_table)
 
         result = {
             "version": __version__,
             "today": today,
-            "week": week,
-            "month": month,
+            "range": range_stat,
             "failover_stats": failover_stats,
         }
         return Response(

{coding_proxy-0.2.3a3 → coding_proxy-0.2.3a4}/uv.lock

@@ -65,7 +65,7 @@ wheels = [
 
 [[package]]
 name = "coding-proxy"
-version = "0.2.3a3"
+version = "0.2.3a4"
 source = { editable = "." }
 dependencies = [
     { name = "aiosqlite" },