dag增加紧凑度变量配置；增加活跃信息统计

backend/access_log.py

@@ -6,11 +6,18 @@ from urllib.parse import unquote
 from flask import request
 import threading
 
+
 # 全局请求计数器和锁
 _request_counter = 0
 _request_counter_lock = threading.Lock()
 
 
+def _hit_api(kind: str) -> None:
+    from backend.visit_stats import bump_api
+
+    bump_api(kind)
+
+
 def _get_client_ip():
     """获取请求来源IP"""
     try:
@@ -81,7 +88,8 @@ def log_analyze_request(text: str, stream_mode: bool = False, client_ip: str = N
 
     details = f"req_id={request_id}, text='{text_preview}', chars={char_count}, bytes={byte_count}"
     _log_request(f"📥 收到请求{mode_str}", details, client_ip)
-    
+
+    _hit_api("analyze")
     return request_id
 
 
@@ -138,6 +146,8 @@ def log_analyze_semantic_request(query: str, text: str, client_ip: str = None):
     t_preview = text[:preview] + "..." if len(text) > preview else text
     details = f"req_id={request_id}, query='{q_preview}', text='{t_preview}', chars={len(text)}"
     _log_request("📥 semantic 分析请求", details, client_ip)
+
+    _hit_api("analyze_semantic")
     return request_id
 
 
@@ -207,6 +217,8 @@ def log_prediction_attribute_request(
         f"context_chars={len(context)}"
     )
     _log_request("📥 prediction_attribute 请求", details, client_ip)
+
+    _hit_api("prediction_attribute")
     return request_id
 
 

backend/api/client_activity.py

@@ -0,0 +1,47 @@
+from urllib.parse import unquote
+
+from backend.access_log import _log_request, get_client_ip
+from backend.visit_stats import record_page_active
+
+
+def _sparse_page_activity_log_cum(cum: int) -> bool:
+    """无服务端状态：累计秒为 2、10、20（前 20s 内与前端档位一致）或 40、80、160…（40·2^k）时打访问日志。"""
+    if cum in (2, 10, 20):
+        return True
+    if cum < 40 or cum % 40:
+        return False
+    q = cum // 40
+    return q > 0 and (q & (q - 1)) == 0
+
+
+def client_activity_report(activity_body=None):
+    d = activity_body if isinstance(activity_body, dict) else {}
+    p = str(d.get("page_path") or "")[:512].strip()
+    try:
+        cum = int(d.get("total_active_sec"))
+        dlt = int(d.get("delta_active_sec"))
+        if not p or cum < 1 or dlt < 0:
+            return {"ok": True}
+    except (TypeError, ValueError):
+        return {"ok": True}
+    path_only = p.split("?", 1)[0].split("#", 1)[0].strip()
+    page_key = path_only.rstrip("/").split("/")[-1] or path_only
+    if not page_key:
+        return {"ok": True}
+    if "?" in p:
+        qs = p.split("?", 1)[1].split("#", 1)[0]
+        log_path = f"{page_key}?{unquote(qs)}" if qs else page_key
+    else:
+        log_path = page_key
+
+    raw_os = d.get("client_os")
+    client_os = str(raw_os).strip() if raw_os is not None else None
+
+    ip = get_client_ip()
+    record_page_active(ip, page_key, dlt, cum, client_os)
+    if _sparse_page_activity_log_cum(cum):
+        _log_request(
+            "📄 页面活跃",
+            f"path={log_path!r} total_sec={cum} delta_sec={dlt}",
+        )
+    return {"ok": True}

backend/api/demo.py

@@ -15,6 +15,7 @@ from backend.api.utils import (
     validate_admin_token,
 )
 from backend.access_log import log_check_admin
+from backend.visit_stats import print_visit_summary
 
 
 def list_demos(path: str = ""):
@@ -158,23 +159,15 @@ def rename_demo(rename_request):
 
 
 def check_admin(check_request):
-    """
-    检查管理员token是否有效
-    请求格式: { token: string }
-    """
     from flask import request
-    
-    # 从请求体或请求头获取token
+
     request_token = check_request.get('token') or request.headers.get('X-Admin-Token')
-    
-    # 验证token
     is_valid, error_message = validate_admin_token(request_token)
-    
-    # 记录管理员权限检查
     log_check_admin(is_valid, token=request_token)
 
     if is_valid:
-        return {'success': True}
+        print_visit_summary()
+        return {"success": True}
     else:
         return {
             'success': False,

backend/visit_stats.py

@@ -0,0 +1,88 @@
+import threading
+import time
+from collections import defaultdict
+
+from flask import request
+
+from backend.access_log import get_client_ip
+
+_LOCK = threading.Lock()
+_t0 = time.monotonic()
+_seen: set = set()
+_active: set = set()
+_page_sec = defaultdict(int)
+_api = defaultdict(int)
+_ip_os: dict[str, str] = {}
+_VALID_CLIENT_OS = frozenset({"ios", "android", "windows", "macos", "linux", "unknown"})
+
+
+def _is_page_route_request() -> bool:
+    """与 static 中首页重定向、HTML 页面下发一致，不把 /api、静态 js/css 等算进访问 IP。"""
+    if request.method != "GET":
+        return False
+    path = request.path or ""
+    if path == "/":
+        return True
+    if path.startswith("/client/"):
+        return path.endswith(".html")
+    return False
+
+
+def record_incoming_ip():
+    with _LOCK:
+        _seen.add(get_client_ip())
+
+
+def record_page_active(ip: str, page_key: str, delta: int, cum: int, client_os: str | None = None):
+    if cum < 1 or delta < 0 or not ip:
+        return
+    with _LOCK:
+        _active.add(ip)
+        if delta > 0:
+            _page_sec[page_key] += delta
+        if ip not in _ip_os and client_os is not None:
+            key = client_os.strip().lower()
+            _ip_os[ip] = key if key in _VALID_CLIENT_OS else "unknown"
+
+
+def bump_api(kind: str):
+    with _LOCK:
+        _api[kind] += 1
+
+
+def print_visit_summary():
+    with _LOCK:
+        h = (time.monotonic() - _t0) / 3600
+        n_ip, n_act = len(_seen), len(_active)
+        pg = [f"  {k}: {v}" for k, v in sorted(_page_sec.items(), key=lambda kv: (-kv[1], kv[0]))]
+        apis = dict(_api)
+        os_cnt = defaultdict(int)
+        for aip in _active:
+            o = _ip_os.get(aip)
+            if o:
+                os_cnt[o] += 1
+    os_order = ("ios", "android", "windows", "macos", "linux", "unknown")
+    os_pg = [f"  {k}: {os_cnt[k]}" for k in os_order if os_cnt[k]]
+
+    body = ["========== [访问统计] ==========",
+            f"进程约 {h:.2f}h | 页面访问IP:{n_ip} | 真实活跃IP:{n_act}", "--- 活跃IP中OS统计 ---",
+            *(os_pg or ["  （尚无）"]), "--- 页面活跃时间统计(秒) ---",
+            *(pg or ["  （尚无）"]), "--- 分析API调用统计 ---",
+            *[f"  {k}: {apis.get(k, 0)}" for k in ("analyze", "analyze_semantic", "prediction_attribute")],
+            "=" * 42]
+    print("\n".join(body), flush=True)
+
+
+def _hourly():
+    while True:
+        time.sleep(3600)
+        print_visit_summary()
+
+
+def register_visit_stats(app):
+    @app.app.before_request
+    def _():
+        if _is_page_route_request():
+            record_incoming_ip()
+
+    threading.Thread(target=_hourly, daemon=True).start()

client/src/css/gen_attribute.scss

@@ -77,9 +77,11 @@
   // 初始 d3.zoom 缩放为 1/本变量，抵消 display-scale 在屏上的整体缩小感（见 genAttributeDagView）
   // 边色：`--dag-normal-line-color`、`--dag-highlight-line-color-in` / `out` 与节点描边 `--token-hover-outline` 同在 start.scss（见 genAttributeDagView）。
   #results.gen-attr-results-surface.LMF .gen-attr-dag-stack {
-    // display-scale：节点框大小相对测量几何的缩放；节点标签字号在此基础上再乘 node-text-font-scale（略小于 1 即自带左右留白感）
-    --gen-attr-dag-display-scale: 0.5;
+    // compactness：dag界面紧凑程度，范围 [0, 1]；1时和普通文本排版一致，最紧凑；0.5为默认。
+    --gen-attr-dag-compactness: 0.5;
+    --gen-attr-dag-display-scale: var(--gen-attr-dag-compactness);
     --gen-attr-dag-node-text-font-scale: 0.9;
+    --gen-attr-dag-link-stroke-width: calc(2px * var(--gen-attr-dag-compactness));
     // --gen-attr-dag-prompt-node-fill: rgba(221, 179, 120, 0.29);
     // #99BFD1 浅蓝
     --gen-attr-dag-prompt-node-fill: rgba(0, 255, 225, 0.28);

client/src/ts/appInitializer.ts

@@ -8,6 +8,7 @@ import { SimpleEventHandler } from './utils/SimpleEventHandler';
 import { TextAnalysisAPI } from './api/GLTR_API';
 import { initForceNarrowFromStorage } from './utils/responsive';
 import { getTokenSurprisalColor, getByteSurprisalColor, HISTOGRAM_MIN_ALPHA } from './utils/SurprisalColorConfig';
+import { initClientActivityPing } from './utils/clientActivityPing';
 
 /**
  * 公共初始化返回对象
@@ -28,6 +29,7 @@ export interface CommonAppContext {
  */
 export function initializeCommonApp(apiPrefix: string = '', element?: Element): CommonAppContext {
     initForceNarrowFromStorage();
+    initClientActivityPing(apiPrefix);
 
     // 使用传入的元素或默认 body 元素
     const targetElement = element || document.body;

client/src/ts/attribution/genAttributeDagView.ts

@@ -125,10 +125,12 @@ function stackLayoutViewportPx(stackEl: HTMLElement): { w: number; h: number } {
 }
 
 /** 在「抵消 display-scale」的基准上再放大，作为 DAG 默认初始视图（d3 zoom 的 k） */
-const DAG_INITIAL_ZOOM_BOOST = 1.25;
+const DAG_INITIAL_ZOOM_BOOST = 1.5;
 
 /** 与 {@link gen_attribute.scss} `.gen-attr-dag-stack` 中 `--gen-attr-dag-display-scale` 一致 */
 const CSS_VAR_DISPLAY_SCALE = '--gen-attr-dag-display-scale';
+/** 与 {@link gen_attribute.scss} `.gen-attr-dag-stack` 中 `--gen-attr-dag-link-stroke-width` 一致 */
+const CSS_VAR_DAG_LINK_STROKE_WIDTH = '--gen-attr-dag-link-stroke-width';
 
 /** 与 {@link start.scss} `--dag-normal-line-color` 一致（普通边：线 stroke + 箭头 marker stroke） */
 const CSS_VAR_DAG_NORMAL_LINE_COLOR = '--dag-normal-line-color';
@@ -137,9 +139,6 @@ const CSS_VAR_DAG_HIGHLIGHT_LINE_IN = '--dag-highlight-line-color-in';
 /** 与 {@link start.scss} `--dag-highlight-line-color-out` 一致（出边：从焦点出发） */
 const CSS_VAR_DAG_HIGHLIGHT_LINE_OUT = '--dag-highlight-line-color-out';
 
-/** 可见边与开放箭头描边宽度（px，与 marker 中 `vector-effect: non-scaling-stroke` 配合） */
-const DAG_LINK_STROKE_WIDTH = 1;
-
 /** 弱化：未排除的 prompt 无出边，或（prompt/生成区）邻域外且存在悬停/选中焦点时 */
 const DAG_NODE_WEAKEN_OPACITY = 0.5;
 /** 隐藏：节点 span 完全落在 exclude 规则命中区间内（prompt 与生成区各一套模式） */
@@ -373,7 +372,7 @@ export type InitGenAttributeDagViewOptions = {
     onDagRefresh?: () => void;
     /**
      * 写入 `.gen-attr-dag-stack` 的 `--gen-attr-dag-display-scale`（矩形与节点文字同时缩放）。
-     * 未设置时仅用样式表中的变量（默认 1，与测量层同字号、同框比例）。
+     * 未设置时沿用样式表（`--gen-attr-dag-display-scale` 与 `--gen-attr-dag-compactness` 同源）。
      */
     displayScale?: number;
     /**
@@ -715,7 +714,7 @@ export function initGenAttributeDagView(
                     .attr('d', 'M0,-5 L10,0 L0,5')
                     .attr('fill', 'none')
                     .attr('stroke', `var(${CSS_VAR_DAG_NORMAL_LINE_COLOR})`)
-                    .attr('stroke-width', DAG_LINK_STROKE_WIDTH)
+                    .attr('stroke-width', `var(${CSS_VAR_DAG_LINK_STROKE_WIDTH})`)
                     .attr('vector-effect', 'non-scaling-stroke')
                     .attr('stroke-linecap', 'round')
                     .attr('stroke-linejoin', 'round');
@@ -734,7 +733,7 @@ export function initGenAttributeDagView(
                     el.append('line')
                         .attr('class', 'gen-attr-dag-link-visible')
                         .attr('stroke', `var(${CSS_VAR_DAG_NORMAL_LINE_COLOR})`)
-                        .attr('stroke-width', DAG_LINK_STROKE_WIDTH)
+                        .attr('stroke-width', `var(${CSS_VAR_DAG_LINK_STROKE_WIDTH})`)
                         .attr('pointer-events', 'stroke')
                         .attr('marker-end', `url(#${mkId})`);
                 });

client/src/ts/utils/clientActivityPing.ts

@@ -0,0 +1,53 @@
+import URLHandler from './URLHandler';
+import { AdminManager } from './adminManager';
+
+const S = 10, FIRST = 2;
+
+export type ReportedClientOs = 'ios' | 'android' | 'windows' | 'macos' | 'linux' | 'unknown';
+
+/** UA 粗略归类；仅在首轮心跳（cum === FIRST）顺带上报一次。 */
+function detectInitialClientOs(): ReportedClientOs {
+    const ua = typeof navigator !== 'undefined' ? navigator.userAgent || '' : '';
+    if (/iPad|iPhone|iPod/i.test(ua)) return 'ios';
+    if (/Android/i.test(ua)) return 'android';
+    const nav = typeof navigator !== 'undefined' ? navigator : undefined;
+    const p = nav?.platform ?? '';
+    const tp = nav && typeof nav.maxTouchPoints === 'number' ? nav.maxTouchPoints : 0;
+    // iPadOS 13+ 桌面 UA 常为 Macintosh
+    if (p === 'MacIntel' && tp > 1) return 'ios';
+    if (/Win/i.test(ua)) return 'windows';
+    if (/Mac/i.test(ua)) return 'macos';
+    if (/Linux/i.test(ua)) return 'linux';
+    return 'unknown';
+}
+
+export function initClientActivityPing(apiPrefix: string | null | undefined): void {
+    if (typeof window === 'undefined') return;
+    if (AdminManager.getInstance().isInAdminMode()) return;
+    const u = `${apiPrefix || URLHandler.basicURL()}/api/client-activity`;
+    let n = 0, reportedTotal = 0, id: number | undefined;
+    const vis = () => document.visibilityState === 'visible';
+    const tick = () => {
+        if (!vis()) return;
+        n += 1;
+        if (n !== FIRST && n % S !== 0) return;
+        const cum = n;
+        const delta_active_sec = Math.max(cum - reportedTotal, 0);
+        const payload: Record<string, unknown> = {
+            page_path: location.pathname + location.search,
+            total_active_sec: cum,
+            delta_active_sec,
+        };
+        if (cum === FIRST) payload.client_os = detectInitialClientOs();
+        const body = JSON.stringify(payload);
+        void fetch(u, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body, keepalive: true })
+            .then((r) => { if (r.ok) reportedTotal = cum; })
+            .catch(() => {});
+    };
+    const sync = () => {
+        if (id !== undefined) { clearInterval(id); id = undefined; }
+        if (vis()) id = window.setInterval(tick, 1000);
+    };
+    document.addEventListener('visibilitychange', sync);
+    sync();
+}

server.py

@@ -16,6 +16,7 @@ os.environ["TOKENIZERS_PARALLELISM"] = "false"
 import connexion
 from backend.logging_config import configure_logging
 from backend.api.static import register_static_routes
+from backend.visit_stats import register_visit_stats
 
 # 导入 API 函数供 server.yaml 使用
 from backend.api.analyze import analyze  # noqa: F401
@@ -34,6 +35,7 @@ from backend.api.folder import (  # noqa: F401
     create_folder_api,
 )
 from backend.api.fetch_url import fetch_url  # noqa: F401
+from backend.api.client_activity import client_activity_report  # noqa: F401
 from backend.api.analyze_semantic import analyze_semantic  # noqa: F401
 from backend.api.prediction_attribute import prediction_attribute  # noqa: F401
 from backend.api.model_switch import (  # noqa: F401
@@ -55,6 +57,7 @@ app = connexion.App(__name__)
 
 # 配置日志
 configure_logging(app)
+register_visit_stats(app)
 
 # 注册路由
 register_static_routes(app)

server.yaml

@@ -374,6 +374,38 @@ paths:
         500:
           description: failed to fetch or extract text from URL
 
+  /client-activity:
+    post:
+      tags:
+        - all
+      summary: anonymous client activity heartbeat
+      operationId: server.client_activity_report
+      parameters:
+        - in: body
+          name: activity_body
+          required: false
+          schema:
+            type: object
+            properties:
+              page_path:
+                type: string
+                description: pathname+search；汇总按去掉 ?/# 的路径末段，逐条日志里 path 仍带 query（unquote）
+              total_active_sec:
+                type: integer
+              delta_active_sec:
+                type: integer
+              client_os:
+                type: string
+                description: 首轮心跳附带；ios / android / windows / macos / linux / unknown
+      responses:
+        200:
+          description: acknowledged
+          schema:
+            type: object
+            properties:
+              ok:
+                type: boolean
+
   /check_admin:
     post:
       tags: