Update tab_timeline.py
This commit is contained in:
@@ -2,7 +2,6 @@ import streamlit as st
|
|||||||
import json
|
import json
|
||||||
from history_tree import HistoryTree
|
from history_tree import HistoryTree
|
||||||
from utils import save_json
|
from utils import save_json
|
||||||
# NEW IMPORTS
|
|
||||||
from streamlit_agraph import agraph, Node, Edge, Config
|
from streamlit_agraph import agraph, Node, Edge, Config
|
||||||
|
|
||||||
def render_timeline_tab(data, file_path):
|
def render_timeline_tab(data, file_path):
|
||||||
@@ -13,108 +12,104 @@ def render_timeline_tab(data, file_path):
|
|||||||
|
|
||||||
htree = HistoryTree(tree_data)
|
htree = HistoryTree(tree_data)
|
||||||
|
|
||||||
# 1. STATUS INDICATOR
|
|
||||||
if 'restored_indicator' in st.session_state and st.session_state.restored_indicator:
|
if 'restored_indicator' in st.session_state and st.session_state.restored_indicator:
|
||||||
st.info(f"📍 Editing Restored Version: **{st.session_state.restored_indicator}**")
|
st.info(f"📍 Editing Restored Version: **{st.session_state.restored_indicator}**")
|
||||||
|
|
||||||
# 2. CONVERT TREE TO AGRAPH FORMAT
|
# --- 1. BUILD NODES & EDGES ---
|
||||||
nodes = []
|
nodes = []
|
||||||
edges = []
|
edges = []
|
||||||
|
|
||||||
# Sort for consistent processing
|
|
||||||
sorted_nodes = sorted(htree.nodes.values(), key=lambda x: x["timestamp"])
|
sorted_nodes = sorted(htree.nodes.values(), key=lambda x: x["timestamp"])
|
||||||
|
|
||||||
for n in sorted_nodes:
|
for n in sorted_nodes:
|
||||||
nid = n["id"]
|
nid = n["id"]
|
||||||
note = n.get('note', 'Step')
|
note = n.get('note', 'Step')
|
||||||
|
# Shorten note for the visual bubble
|
||||||
short_note = (note[:15] + '..') if len(note) > 15 else note
|
short_note = (note[:15] + '..') if len(note) > 15 else note
|
||||||
|
|
||||||
# Colors
|
# Styles
|
||||||
color = "#ffffff" # Default White
|
color = "#ffffff" # White background
|
||||||
border = "#cccccc"
|
border = "#666666" # Grey border
|
||||||
shape = "box"
|
|
||||||
|
|
||||||
# Highlight HEAD (Current)
|
# Current Head
|
||||||
if nid == htree.head_id:
|
if nid == htree.head_id:
|
||||||
color = "#fff6cd" # Yellow
|
color = "#fff6cd" # Yellow
|
||||||
border = "#eebb00"
|
border = "#eebb00"
|
||||||
|
|
||||||
# Highlight Branch Tips
|
# Branch Tips
|
||||||
if nid in htree.branches.values():
|
if nid in htree.branches.values():
|
||||||
if color == "#ffffff":
|
if color == "#ffffff":
|
||||||
color = "#e6ffe6" # Green
|
color = "#e6ffe6" # Green
|
||||||
border = "#99cc99"
|
border = "#44aa44"
|
||||||
|
|
||||||
# Create Node
|
|
||||||
nodes.append(Node(
|
nodes.append(Node(
|
||||||
id=nid,
|
id=nid,
|
||||||
label=f"{short_note}\n{nid[:4]}",
|
label=f"{short_note}\n({nid[:4]})",
|
||||||
size=25,
|
size=25,
|
||||||
shape=shape,
|
shape="box",
|
||||||
color=color,
|
color=color,
|
||||||
borderWidth=1,
|
borderWidth=1,
|
||||||
borderColor=border,
|
borderColor=border,
|
||||||
font={'color': 'black', 'face': 'Arial', 'size': 12}
|
# Force black text so it's visible on light nodes
|
||||||
|
font={'color': 'black', 'face': 'Arial', 'size': 14}
|
||||||
))
|
))
|
||||||
|
|
||||||
# Create Edge
|
|
||||||
if n["parent"] and n["parent"] in htree.nodes:
|
if n["parent"] and n["parent"] in htree.nodes:
|
||||||
edges.append(Edge(
|
edges.append(Edge(
|
||||||
source=n["parent"],
|
source=n["parent"],
|
||||||
target=nid,
|
target=nid,
|
||||||
color="#aaaaaa",
|
color="#aaaaaa",
|
||||||
type="STRAIGHT" # Keeps timeline looking clean
|
|
||||||
))
|
))
|
||||||
|
|
||||||
# 3. CONFIGURE GRAPH VISUALS
|
# --- 2. CONFIGURATION (THE FIX) ---
|
||||||
config = Config(
|
config = Config(
|
||||||
width="100%",
|
width="100%",
|
||||||
height=300, # Fixed height! Solves "Way too big" issue.
|
height="500px", # FIXED: Must be a string with 'px'
|
||||||
directed=True,
|
directed=True,
|
||||||
physics=False, # Disable physics for a rigid timeline structure
|
physics=False, # Keep False for rigid timeline
|
||||||
hierarchical=True, # Force Tree Layout
|
hierarchical=True,
|
||||||
direction="LR", # Left to Right
|
# Detailed Hierarchy Settings to prevent layout collapse
|
||||||
sortMethod="directed",
|
layout={
|
||||||
levelSeparation=150, # Space between time steps
|
"hierarchical": {
|
||||||
nodeSpacing=100
|
"enabled": True,
|
||||||
|
"levelSeparation": 150,
|
||||||
|
"nodeSpacing": 100,
|
||||||
|
"treeSpacing": 100,
|
||||||
|
"direction": "LR", # Left to Right
|
||||||
|
"sortMethod": "directed"
|
||||||
|
}
|
||||||
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
st.subheader("🕰️ Interactive Timeline")
|
st.subheader("🕰️ Interactive Timeline")
|
||||||
st.caption("Scroll to Zoom • Drag to Pan • Click to Inspect")
|
st.caption("Scroll to Zoom • Drag to Pan • Click to Inspect")
|
||||||
|
|
||||||
# 4. RENDER & CAPTURE CLICK
|
# 3. RENDER
|
||||||
# agraph returns the 'id' of the clicked node, or None
|
# If this still shows black, try changing physics=True briefly
|
||||||
clicked_node_id = agraph(nodes=nodes, edges=edges, config=config)
|
clicked_node_id = agraph(nodes=nodes, edges=edges, config=config)
|
||||||
|
|
||||||
st.markdown("---")
|
st.markdown("---")
|
||||||
|
|
||||||
# 5. DETERMINE INSPECTION TARGET
|
# 4. INSPECTION LOGIC
|
||||||
# Priority: Clicked Node > Dropdown > Head
|
|
||||||
|
|
||||||
# Helper list for dropdown
|
# Helper list for dropdown
|
||||||
all_nodes_list = list(htree.nodes.values())
|
all_nodes_list = list(htree.nodes.values())
|
||||||
all_nodes_list.sort(key=lambda x: x["timestamp"], reverse=True)
|
all_nodes_list.sort(key=lambda x: x["timestamp"], reverse=True)
|
||||||
|
|
||||||
target_node_id = None
|
target_node_id = None
|
||||||
|
|
||||||
# If user clicked graph, use that
|
|
||||||
if clicked_node_id:
|
if clicked_node_id:
|
||||||
target_node_id = clicked_node_id
|
target_node_id = clicked_node_id
|
||||||
else:
|
else:
|
||||||
# Fallback to current HEAD
|
|
||||||
target_node_id = htree.head_id
|
target_node_id = htree.head_id
|
||||||
|
|
||||||
# 6. INSPECTOR UI
|
|
||||||
if target_node_id and target_node_id in htree.nodes:
|
if target_node_id and target_node_id in htree.nodes:
|
||||||
selected_node = htree.nodes[target_node_id]
|
selected_node = htree.nodes[target_node_id]
|
||||||
node_data = selected_node["data"]
|
node_data = selected_node["data"]
|
||||||
|
|
||||||
# Header
|
|
||||||
c_h1, c_h2 = st.columns([3, 1])
|
c_h1, c_h2 = st.columns([3, 1])
|
||||||
c_h1.markdown(f"### 🔎 Inspecting: {selected_node.get('note', 'Step')}")
|
c_h1.markdown(f"### 🔎 Inspecting: {selected_node.get('note', 'Step')}")
|
||||||
c_h1.caption(f"ID: {target_node_id}")
|
c_h1.caption(f"ID: {target_node_id}")
|
||||||
|
|
||||||
# --- A. DIFF VIEWER ---
|
|
||||||
with st.expander(f"Compare with Current State", expanded=True):
|
with st.expander(f"Compare with Current State", expanded=True):
|
||||||
diffs = []
|
diffs = []
|
||||||
all_keys = set(data.keys()) | set(node_data.keys())
|
all_keys = set(data.keys()) | set(node_data.keys())
|
||||||
@@ -136,7 +131,6 @@ def render_timeline_tab(data, file_path):
|
|||||||
dc2.markdown(f"🔴 `{str(v_now)[:30]}`")
|
dc2.markdown(f"🔴 `{str(v_now)[:30]}`")
|
||||||
dc3.markdown(f"🟢 `{str(v_then)[:30]}`")
|
dc3.markdown(f"🟢 `{str(v_then)[:30]}`")
|
||||||
|
|
||||||
# --- B. ACTIONS ---
|
|
||||||
with c_h2:
|
with c_h2:
|
||||||
st.write("")
|
st.write("")
|
||||||
if st.button("⏪ Restore Version", type="primary", use_container_width=True):
|
if st.button("⏪ Restore Version", type="primary", use_container_width=True):
|
||||||
@@ -154,7 +148,6 @@ def render_timeline_tab(data, file_path):
|
|||||||
st.toast(f"Restored {target_node_id}!", icon="🔄")
|
st.toast(f"Restored {target_node_id}!", icon="🔄")
|
||||||
st.rerun()
|
st.rerun()
|
||||||
|
|
||||||
# --- C. RENAME ---
|
|
||||||
rn_col1, rn_col2 = st.columns([3, 1])
|
rn_col1, rn_col2 = st.columns([3, 1])
|
||||||
new_label = rn_col1.text_input("Rename Label", value=selected_node.get("note", ""))
|
new_label = rn_col1.text_input("Rename Label", value=selected_node.get("note", ""))
|
||||||
if rn_col2.button("Update"):
|
if rn_col2.button("Update"):
|
||||||
|
|||||||
Reference in New Issue
Block a user