feat: merge

.gitattributes

@@ -33,3 +33,4 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
 *tfevents* filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text

.streamlit/config.toml

@@ -1,6 +1,17 @@
 [theme]
-primaryColor="#F39C12"
-backgroundColor="#2E86C1"
-secondaryBackgroundColor="#7F8C8D"
-textColor="#FFFFFF"
-font="monospace"
+base = "light"
+baseFontSize = 15
+primaryColor = "#FF5F7E"
+backgroundColor = "#F9FAFB"
+secondaryBackgroundColor = "#F0F4F8"
+textColor = "#1F2937"
+linkColor = "#2563EB"
+borderColor = "#D1D5DB"
+showWidgetBorder = false
+baseRadius = "0.3rem"
+font = "Poppins"
+
+[theme.sidebar]
+backgroundColor = "#FFFFFF"
+secondaryBackgroundColor = "#F3F4F6"
+borderColor = "#D1D5DB"

.streamlit/theme.toml

@@ -0,0 +1,2 @@
+theme_name = "花明 (Flowers Bright) 🌸"
+theme_poem = "🌸「浅色但不苍白，明亮而不过曝，柔和中有力量」"

.streamlit/themes/antropic.toml

@@ -0,0 +1,20 @@
+theme_name = "Antropic"
+
+[theme]
+primaryColor = "#bb5a38"
+backgroundColor = "#f4f3ed"
+secondaryBackgroundColor = "#ecebe3"
+textColor = "#3d3a2a"
+linkColor = "#3d3a2a"
+borderColor = "#d3d2ca"
+showWidgetBorder = true
+baseRadius = "0.6rem"
+font = "SpaceGrotesk"
+headingFont = "SpaceGroteskHeader"
+codeFont = "SpaceMono"
+codeBackgroundColor = "#ecebe4"
+showSidebarBorder = true
+
+[theme.sidebar]
+backgroundColor = "#e8e7dd"
+secondaryBackgroundColor = "#ecebe3"

.streamlit/themes/flowers_bright.toml

@@ -0,0 +1,20 @@
+theme_name = "花明 (Flowers Bright) 🌸"
+theme_poem = "🌸「浅色但不苍白，明亮而不过曝，柔和中有力量」"
+
+[theme]
+base = "light"
+baseFontSize = 15
+primaryColor = "#FF5F7E"                 # 樱花粉
+backgroundColor = "#F9FAFB"              # 轻柔灰白
+secondaryBackgroundColor = "#F0F4F8"     # 卡片淡蓝灰
+textColor = "#1F2937"                    # 蓝黑灰
+linkColor = "#2563EB"                    # 浅蓝色链接
+borderColor = "#D1D5DB"                  # 卡片分界线
+showWidgetBorder = false
+baseRadius = "0.3rem"
+font = "Poppins"                         # 保持现代圆润感
+
+[theme.sidebar]
+backgroundColor = "#FFFFFF"
+secondaryBackgroundColor = "#F3F4F6"
+borderColor = "#D1D5DB"

.streamlit/themes/spotify.toml

@@ -0,0 +1,19 @@
+theme_name = "Spotify"
+
+[theme]
+base = "dark"
+baseFontSize = 15
+primaryColor = "#1ED760"
+backgroundColor = "#121212"
+secondaryBackgroundColor = "#333333"
+textColor = "#FFFFFF"
+linkColor = "#9D9D9D"
+borderColor = "#7F7F7F"
+showWidgetBorder = false
+baseRadius = "0.3rem"
+font = "Poppins"
+
+[theme.sidebar]
+backgroundColor = "#000000"
+secondaryBackgroundColor = "#333333"
+borderColor = "#696969"

.streamlit/themes/willows_dark.toml

@@ -0,0 +1,20 @@
+theme_name = "柳暗 (Willows Dark) 🌒"
+theme_poem = "🌒「深而不死黑，蓝而不夺目，静而不沉闷」柳影婆娑之下，代码悄然生长。"
+
+[theme]
+base = "dark"
+baseFontSize = 15
+primaryColor = "#6EA8FE"                # 柔和的蓝色光感
+backgroundColor = "#0D1117"             # 深夜蓝黑
+secondaryBackgroundColor = "#1A1F2B"    # 柔和灰蓝
+textColor = "#D1D5DB"                   # 清晰柔白
+linkColor = "#B8C0FF"                   # 柔紫蓝
+borderColor = "#2E3440"                 # 北极灰边
+showWidgetBorder = false
+baseRadius = "0.3rem"
+font = "JetBrains Mono"                 # 强科技感
+
+[theme.sidebar]
+backgroundColor = "#0A0A0A"
+secondaryBackgroundColor = "#1A1A1A"
+borderColor = "#2E3440"

src/streamlit_app.py

@@ -1,4 +1,7 @@
 import streamlit as st
+# --- Page Configuration ---
+st.set_page_config(layout="wide", page_title="柳暗花明 (flowillower)", page_icon=":sunrise_over_mountains:", initial_sidebar_state="expanded")
+
 from pathlib import Path
 import plotly.graph_objects as go
 import plotly.express as px
@@ -6,14 +9,18 @@ from plotly.subplots import make_subplots
 import pandas as pd
 import time
 
+# --- Logo ---
+st.logo("logo.png", icon_image="logo.png")
+
 # 导入重构后的模块
 try:
     from utils import DATA_ROOT_PATH, AppMode
     from data_models import Study, Trial # Study, Trial will be used
     from data_loader import discover_studies_cached, ensure_data_directory_exists
+    from theme_selector import render_theme_selector  # 新增：导入主题选择器
 except ImportError as e:
     st.error(
-        f"导入模块失败，请确保 utils.py, data_models.py, data_loader.py 文件存在于正确的位置: {e}"
+        f"导入模块失败，请确保 utils.py, data_models.py, data_loader.py, theme_selector.py 文件存在于正确的位置: {e}"
     )
     st.stop()
 
@@ -40,14 +47,13 @@ if "auto_play_speed" not in st.session_state:
 if "auto_play_needs_rerun" not in st.session_state:
     st.session_state.auto_play_needs_rerun = False
 
-# --- Page Configuration ---
-st.set_page_config(layout="wide", page_title="柳暗花明 (flowillower)")
+
 
 
 # --- UI Rendering ---
 
 # --- Header ---
-header_cols = st.columns([2, 3, 1.5, 0.5, 0.5, 0.5])
+header_cols = st.columns([2, 3, 1.5, 0.5, 0.5, 0.5, 1])  # 新增一列用于主题选择器
 with header_cols[0]:
     st.markdown("## 柳暗花明")
     st.caption("flowillower")
@@ -87,6 +93,10 @@ else:
 with header_cols[3]: st.button("➕", help="添加 (Add)", disabled=True)
 with header_cols[4]: st.button("⚙️", help="设置 (Settings)", disabled=True)
 with header_cols[5]: st.button("👤", help="用户 (User)", disabled=True)
+with header_cols[6]:  # 新增：主题选择器列
+    with st.container():
+        # st.markdown("**主题**")
+        render_theme_selector()
 st.markdown("---")
 
 # --- Sidebar ---
@@ -175,7 +185,8 @@ if current_study and current_trial:
             with control_cols[0]:
                 # 滑动条
                 if st.session_state.shared_selected_global_step is None:
-                    st.session_state.shared_selected_global_step = min_step
+                    # 默认选择最后一个step
+                    st.session_state.shared_selected_global_step = max_step
                 
                 # 确保当前选中的步骤在有效范围内
                 if st.session_state.shared_selected_global_step not in all_global_steps:
@@ -273,6 +284,105 @@ if current_study and current_trial:
                         
                         with st.container(border=True):
                             st.subheader(metric_name)
+                            
+                            # 添加metric组件 - 显示当前值和增量
+                            try:
+                                current_step = st.session_state.shared_selected_global_step
+                                
+                                # 获取所有可能的track
+                                all_tracks = df_metric['track'].unique() if 'track' in df_metric.columns else [None]
+                                
+                                # 为每个track创建metric组件
+                                if len(all_tracks) > 1:
+                                    metric_cols = st.columns(len(all_tracks))
+                                else:
+                                    metric_cols = [st]  # 使用整个容器
+                                
+                                for idx, track in enumerate(all_tracks):
+                                    # 查找当前步骤的数据
+                                    if track is not None:
+                                        current_step_data = df_metric[
+                                            (df_metric['global_step'] == current_step) & 
+                                            (df_metric['track'] == track)
+                                        ]
+                                    else:
+                                        current_step_data = df_metric[df_metric['global_step'] == current_step]
+                                    
+                                    current_value = None
+                                    delta_value = None
+                                    
+                                    # 如果当前步骤没有该track的数据，向前查找最近的步骤
+                                    if current_step_data.empty:
+                                        # 向前查找最近的有该track数据的步骤
+                                        current_index = all_global_steps.index(current_step)
+                                        for search_idx in range(current_index - 1, -1, -1):
+                                            search_step = all_global_steps[search_idx]
+                                            if track is not None:
+                                                search_data = df_metric[
+                                                    (df_metric['global_step'] == search_step) & 
+                                                    (df_metric['track'] == track)
+                                                ]
+                                            else:
+                                                search_data = df_metric[df_metric['global_step'] == search_step]
+                                            
+                                            if not search_data.empty:
+                                                current_value = search_data['value'].iloc[0]
+                                                current_step_found = search_step
+                                                break
+                                    else:
+                                        current_value = current_step_data['value'].iloc[0]
+                                        current_step_found = current_step
+                                    
+                                    # 计算增量：查找比当前找到的步骤更早的数据
+                                    if current_value is not None:
+                                        current_found_index = all_global_steps.index(current_step_found)
+                                        for prev_idx in range(current_found_index - 1, -1, -1):
+                                            prev_step = all_global_steps[prev_idx]
+                                            if track is not None:
+                                                prev_step_data = df_metric[
+                                                    (df_metric['global_step'] == prev_step) & 
+                                                    (df_metric['track'] == track)
+                                                ]
+                                            else:
+                                                prev_step_data = df_metric[df_metric['global_step'] == prev_step]
+                                            
+                                            if not prev_step_data.empty:
+                                                prev_value = prev_step_data['value'].iloc[0]
+                                                delta_value = current_value - prev_value
+                                                break
+                                    
+                                    # 显示metric组件
+                                    with metric_cols[idx] if len(all_tracks) > 1 else metric_cols[0]:
+                                        if current_value is not None:
+                                            # 确定label
+                                            if track is not None:
+                                                if current_step_found != current_step:
+                                                    label = f"{track} (Step {current_step_found})"
+                                                else:
+                                                    label = f"{track}"
+                                            else:
+                                                if current_step_found != current_step:
+                                                    label = f"当前值 (Step {current_step_found})"
+                                                else:
+                                                    label = f"当前值 (Step {current_step})"
+                                            
+                                            st.metric(
+                                                label=label,
+                                                value=f"{current_value:.4f}",
+                                                delta=f"{delta_value:.4f}" if delta_value is not None else None
+                                            )
+                                        else:
+                                            # 没有找到任何数据
+                                            track_label = track if track is not None else "数据"
+                                            st.metric(
+                                                label=f"{track_label}",
+                                                value="无数据",
+                                                delta=None
+                                            )
+                                            
+                            except Exception as e:
+                                st.warning(f"计算指标值时出错: {e}")
+
                             try:
                                 # 创建 Plotly 图表
                                 fig = go.Figure()
@@ -358,7 +468,7 @@ if current_study and current_trial:
                                             
                             except Exception as e:
                                 st.error(f"为指标 '{metric_name}' 生成图表时出错: {e}")
-                                st.dataframe(df_metric)
+                            st.dataframe(df_metric)
                                 # raise e
 
 

src/theme_selector.py

@@ -0,0 +1,153 @@
+import streamlit as st
+import toml
+from pathlib import Path
+import os
+import time
+
+class ThemeSelector:
+    def __init__(self, themes_dir=".streamlit/themes", config_path=".streamlit/config.toml"):
+        self.themes_dir = Path(themes_dir)
+        self.config_path = Path(config_path)
+        self.themes = {}
+        self.load_themes()
+    
+    def load_themes(self):
+        """加载所有主题文件"""
+        self.themes = {}
+        if not self.themes_dir.exists():
+            return
+        
+        for theme_file in self.themes_dir.glob("*.toml"):
+            try:
+                theme_data = toml.load(theme_file)
+                
+                # 从根级别获取theme_name和theme_poem
+                theme_name = theme_data.get("theme_name", theme_file.stem)
+                theme_poem = theme_data.get("theme_poem", "")
+                theme_config = theme_data.get("theme", {})
+                
+                self.themes[theme_name] = {
+                    "file": theme_file,
+                    "name": theme_name,
+                    "poem": theme_poem,
+                    "config": theme_config
+                }
+            except Exception as e:
+                st.warning(f"读取主题文件 {theme_file} 失败: {e}")
+    
+    def get_current_theme(self):
+        """获取当前主题名称"""
+        if not self.config_path.exists():
+            return None
+        
+        try:
+            # config = toml.load(self.config_path)
+            # # 从根级别读取theme_name
+            # current_theme_name = config.get("theme") or {}
+            # current_theme_name = current_theme_name.get("theme_name")
+            # return current_theme_name
+            theme_toml = self.config_path.parent/"theme.toml"
+            theme = toml.load(theme_toml)
+            return theme.get("theme_name")
+
+        except Exception:
+            return None
+    
+    def apply_theme(self, theme_name):
+        """应用选定的主题"""
+        if theme_name not in self.themes:
+            st.error(f"主题 '{theme_name}' 不存在")
+            return False
+        
+        try:
+            # 确保配置目录存在
+            self.config_path.parent.mkdir(parents=True, exist_ok=True)
+            
+            # 读取现有配置或创建新配置
+            config = {}
+            if self.config_path.exists():
+                try:
+                    config = toml.load(self.config_path)
+                except Exception:
+                    config = {}
+            
+            # 添加根级别的theme_name和theme_poem
+            # config["theme_name"] = self.themes[theme_name]["name"]
+            # config["theme_poem"] = self.themes[theme_name]["poem"]
+            
+            # 更新主题配置
+            theme_config = self.themes[theme_name]["config"].copy()
+            # theme_config["theme_name"] = self.themes[theme_name]["name"]
+            # theme_config["theme_poem"] = self.themes[theme_name]["poem"]
+            config["theme"] |= theme_config
+            
+            # 写入配置文件
+            with open(self.config_path, "w", encoding="utf-8") as f:
+                toml.dump(config, f)
+
+            theme_toml = self.config_path.parent/"theme.toml"
+            with open(theme_toml, "w", encoding="utf-8") as f:
+                toml.dump(dict(
+                    theme_name = self.themes[theme_name]["name"],
+                    theme_poem = self.themes[theme_name]["poem"]
+                ), f)
+            
+            return True
+            
+        except Exception as e:
+            st.error(f"应用主题失败: {e}")
+            return False
+    
+    def render_theme_selector(self):
+        """渲染主题选择器UI"""
+        if not self.themes:
+            st.warning("未找到可用主题")
+            return
+        
+        theme_names = list(self.themes.keys())
+        current_theme = self.get_current_theme()
+        
+        # 确定当前选中的索引
+        current_index = 0
+        if current_theme and current_theme in theme_names:
+            current_index = theme_names.index(current_theme)
+        
+        # 主题选择下拉菜单
+        selected_theme = st.selectbox(
+            "选择主题",
+            options=theme_names,
+            index=current_index,
+            format_func=lambda x: self.themes[x]["name"],
+            key="theme_selector_widget",
+            label_visibility="collapsed"
+        )
+        
+        # 如果选择了新主题
+        if selected_theme != current_theme:
+            if self.apply_theme(selected_theme):
+                # 显示主题诗句
+                theme_poem = self.themes[selected_theme]["poem"]
+                if theme_poem:
+                    st.toast(f"✨ {theme_poem}", icon="🎨")
+                else:
+                    st.toast(f"已切换到主题: {selected_theme}", icon="🎨")
+                
+                time.sleep(3)
+                # 延迟重新运行以应用主题
+                st.rerun()
+        
+        return selected_theme
+
+# 全局主题选择器实例
+_theme_selector = None
+
+def get_theme_selector():
+    """获取全局主题选择器实例"""
+    global _theme_selector
+    if _theme_selector is None:
+        _theme_selector = ThemeSelector()
+    return _theme_selector
+
+def render_theme_selector():
+    """便捷函数：渲染主题选择器"""
+    return get_theme_selector().render_theme_selector()