Improve Streamlit dashboard layout and constants reuse

zzhfz · zzhfz · commit 2ba42736aad0 · 2026-02-24T07:57:42.000Z
diff --git a/dashboard/app.py b/dashboard/app.py
@@ -6,6 +6,7 @@
 from pathlib import Path
 import sys
 from datetime import datetime
+from infinimetrics.common.constants import AcceleratorType
 
 # Add project root to path
 project_root = Path(__file__).parent
@@ -53,18 +54,23 @@ def main():
         st.markdown("---")
         st.markdown("## 🧠 筛选条件")
 
+        # Base accelerator types from constants.py
+        ACCELERATOR_OPTIONS = ["cpu"] + [a.value for a in AcceleratorType]
+
+        # UI display names (only labels live here)
         ACCELERATOR_LABELS = {
-            "nvidia": "NVIDIA",
             "cpu": "CPU",
-            "mlu": "寒武纪 MLU",
-            "npu": "昇腾 NPU",
-            "musa": "摩尔线程 MUSA",
+            AcceleratorType.NVIDIA.value: "NVIDIA",
+            AcceleratorType.AMD.value: "AMD",
+            AcceleratorType.ASCEND.value: "昇腾 NPU",
+            AcceleratorType.CAMBRICON.value: "寒武纪 MLU",
+            AcceleratorType.GENERIC.value: "Generic",
         }
 
         selected_accs = st.multiselect(
             "加速卡类型",
-            options=list(ACCELERATOR_LABELS.keys()),
-            default=list(ACCELERATOR_LABELS.keys()),
+            options=ACCELERATOR_OPTIONS,
+            default=ACCELERATOR_OPTIONS,
             format_func=lambda x: ACCELERATOR_LABELS.get(x, x),
         )
         st.session_state.selected_accelerators = selected_accs
@@ -263,11 +269,11 @@ def _latest(lst):
 
         col1, col2, col3 = st.columns(3)
         if col1.button("🔗 通信测试分析", use_container_width=True):
-            st.switch_page("pages/1_comm.py")
+            st.switch_page("pages/communication.py")
         if col2.button("⚡ 算子测试分析", use_container_width=True):
-            st.switch_page("pages/2_ops.py")
+            st.switch_page("pages/operator.py")
         if col3.button("🤖 推理测试分析", use_container_width=True):
-            st.switch_page("pages/3_infer.py")
+            st.switch_page("pages/inference.py")
 
     except Exception as e:
         st.error(f"Dashboard 加载失败: {e}")
diff --git a/dashboard/common.py b/dashboard/common.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+"""Common utilities for dashboard pages."""
+
+import streamlit as st
+import sys
+from pathlib import Path
+
+
+def init_page(page_title: str, page_icon: str):
+    """
+    通用页面初始化：
+    - 设置 Streamlit 页面配置
+    - 初始化 DataLoader
+    - 设置项目路径
+    """
+
+    # Add project root to Python path
+    project_root = Path(__file__).parent.parent
+    if str(project_root) not in sys.path:
+        sys.path.append(str(project_root))
+
+    # Page configuration
+    st.set_page_config(page_title=page_title, page_icon=page_icon, layout="wide")
+
+    # Initialize DataLoader
+    if "data_loader" not in st.session_state:
+        from utils.data_loader import InfiniMetricsDataLoader
+
+        st.session_state.data_loader = InfiniMetricsDataLoader()
diff --git a/dashboard/pages/communication.py b/dashboard/pages/communication.py
@@ -1,32 +1,23 @@
 #!/usr/bin/env python3
 """Communication tests analysis page."""
 
-import sys
 import streamlit as st
 import pandas as pd
-from pathlib import Path
-from utils.metrics import extract_core_metrics
-
-# Add parent directory to path
-project_root = Path(__file__).parent.parent
-sys.path.append(str(project_root))
 
+from common import init_page
 from components.header import render_header
-from utils.data_loader import InfiniMetricsDataLoader, get_friendly_size
+from utils.data_loader import get_friendly_size
+from utils.metrics import extract_core_metrics
 from utils.visualizations import (
-    plot_bandwidth_vs_size,
-    plot_latency_vs_size,
+    plot_metric_vs_size,
     plot_comparison_matrix,
-    create_summary_table,
     create_gauge_chart,
+    create_summary_table,
+    plot_timeseries_auto,
+    create_summary_table_infer,
 )
 
-# Page configuration
-st.set_page_config(page_title="通信测试分析 | InfiniMetrics", page_icon="🔗", layout="wide")
-
-# Initialize session state
-if "data_loader" not in st.session_state:
-    st.session_state.data_loader = InfiniMetricsDataLoader()
+init_page("推理测试分析 | InfiniMetrics", "🔗")
 
 
 def main():
@@ -90,7 +81,7 @@ def main():
         # Run selector
         st.markdown("### 选择测试运行")
 
-        # ✅ Run ID 模糊搜索（真正生效）
+        # Run ID Fuzzy search (really works)
         run_id_kw = st.text_input(
             "🔎 Run ID 模糊搜索（支持前缀 / 子串）",
             placeholder="例如：20240109 / abcd1234",
@@ -149,8 +140,11 @@ def main():
                             and metric.get("data") is not None
                         ):
                             df = metric["data"]
-                            fig = plot_bandwidth_vs_size(
-                                df, f"带宽分析 - {run['operation']}", y_log_scale
+                            fig = plot_metric_vs_size(
+                                df=df,
+                                metric_type="bandwidth",
+                                title=f"带宽分析 - {run['operation']}",
+                                y_log_scale=y_log_scale,
                             )
                             st.plotly_chart(fig, use_container_width=True)
                             break
@@ -172,8 +166,11 @@ def main():
                             and metric.get("data") is not None
                         ):
                             df = metric["data"]
-                            fig = plot_latency_vs_size(
-                                df, f"延迟分析 - {run['operation']}", y_log_scale
+                            fig = plot_metric_vs_size(
+                                df=df,
+                                metric_type="latency",
+                                title=f"延迟分析 - {run['operation']}",
+                                y_log_scale=y_log_scale,
                             )
                             st.plotly_chart(fig, use_container_width=True)
                             break
@@ -201,9 +198,9 @@ def main():
                     f"{core['latency_us']:.2f} μs" if core["latency_us"] else "-",
                 )
                 c3.metric(
-                    "TTFT", f"{core['ttft_ms']:.2f} ms" if core["ttft_ms"] else "-"
+                    "测试耗时",
+                    f"{core['duration_ms']:.2f} ms" if core["duration_ms"] else "-",
                 )
-
             # Gauge charts for key metrics
             if len(selected_runs) == 1:
                 st.markdown("#### 关键指标")
diff --git a/dashboard/pages/inference.py b/dashboard/pages/inference.py
@@ -3,23 +3,16 @@
 
 import streamlit as st
 import pandas as pd
-from pathlib import Path
-import sys
-
-project_root = Path(__file__).parent.parent
-sys.path.append(str(project_root))
 
+from common import init_page
 from components.header import render_header
 from utils.data_loader import InfiniMetricsDataLoader, get_friendly_size
 from utils.visualizations import (
     plot_timeseries_auto,
     create_summary_table_infer,
 )
 
-st.set_page_config(page_title="推理测试分析 | InfiniMetrics", page_icon="🤖", layout="wide")
-
-if "data_loader" not in st.session_state:
-    st.session_state.data_loader = InfiniMetricsDataLoader()
+init_page("推理测试分析 | InfiniMetrics", "🤖")
 
 
 def main():
diff --git a/dashboard/pages/operator.py b/dashboard/pages/operator.py
@@ -3,23 +3,15 @@
 
 import streamlit as st
 import pandas as pd
-from pathlib import Path
-import sys
-
-project_root = Path(__file__).parent.parent
-sys.path.append(str(project_root))
 
+from common import init_page
 from components.header import render_header
-from utils.data_loader import InfiniMetricsDataLoader
 from utils.visualizations import (
     create_summary_table_ops,
     plot_timeseries_auto,
 )
 
-st.set_page_config(page_title="算子测试分析 | InfiniMetrics", page_icon="⚡", layout="wide")
-
-if "data_loader" not in st.session_state:
-    st.session_state.data_loader = InfiniMetricsDataLoader()
+init_page("算子测试分析 | InfiniMetrics", "⚡")
 
 
 def main():
diff --git a/dashboard/utils/metrics.py b/dashboard/utils/metrics.py
@@ -10,18 +10,36 @@ def extract_core_metrics(run: dict) -> dict:
         "latency_ms": None,
         "ttft_ms": None,
         "throughput": None,
+        "duration_ms": None,
     }
 
     for m in metrics:
         name = m.get("name", "")
         val = m.get("value")
+        df = m.get("data")
 
-        if "bandwidth" in name and val is not None:
+        # Process bandwidth
+        if name == "comm.bandwidth" and df is not None:
+            if hasattr(df, "columns") and "bandwidth_gbs" in df.columns:
+                out["bandwidth_gbps"] = df["bandwidth_gbs"].max()
+
+        # Process communication delay
+        elif name == "comm.latency" and df is not None:
+            if hasattr(df, "columns") and "latency_us" in df.columns:
+                out["latency_us"] = df["latency_us"].mean()
+
+        # Process duration
+        elif name == "comm.duration" and val is not None:
+            out["duration_ms"] = val
+
+        elif "bandwidth" in name and val is not None:
             out["bandwidth_gbps"] = val
         elif "latency_us" in name:
             out["latency_us"] = val
         elif "latency_ms" in name:
             out["latency_ms"] = val
+        elif "duration" in name:
+            out["duration_ms"] = val
         elif "ttft" in name:
             out["ttft_ms"] = val
         elif "throughput" in name:
diff --git a/dashboard/utils/visualizations.py b/dashboard/utils/visualizations.py
