Update ui.py

ui.py

@@ -13,9 +13,9 @@ import plotly.express as px
 import utils
 from state import (
     updateCategoryOptions, removeCategory, addCategory,
-    applyGlobalRenames, enforceGlobalRenameExclusivity,
     addGlobalRename, removeGlobalRename,
-    _global_rename_key, randomize_speaker_clip, apply_inline_rename,
+    _global_rename_key, on_grename_change,
+    randomize_speaker_clip, apply_inline_rename,
 )
 
 
@@ -51,20 +51,31 @@ def render_chart(fig, tab, pdf_path, svg_path, pdf_name, svg_name, pdf_key, svg_
 # Sidebar — categories section
 # ---------------------------------------------------------------------------
 
-def render_categories_sidebar(currFile, categorySelections, all_speakers_display,
-                               raw_to_display):
-    """Render category multiselects, remove buttons, and Add role input."""
+def render_categories_sidebar(all_speaker_tokens):
+    """Render cross-file role multiselects using speaker tokens, matching the rename sidebar pattern."""
+    st.sidebar.subheader("Add Speaker's Role")
     st.sidebar.markdown(
         "<p style='font-size:0.85rem; color:gray; margin-bottom:2px;'>"
-        "Create roles (instructor, students, etc.) and add speakers.</p>",
+        "Add speaker(s) into the Instructor or Students role. You can also add a new role "
+        "by typing in the \"Add custom role\" textbox.</p>",
         unsafe_allow_html=True,
     )
+    st.sidebar.divider()
+
     for i, category in enumerate(st.session_state.categories):
-        ms_key       = f"multiselect_{category}"
-        speakerSet   = categorySelections[i]
-        default_disp = [raw_to_display.get(sp, sp) for sp in speakerSet]
+        ms_key = f"multiselect_{category}"
         if ms_key not in st.session_state:
-            st.session_state[ms_key] = default_disp
+            st.session_state[ms_key] = list(st.session_state.categorySelect[i]) if i < len(st.session_state.categorySelect) else []
+
+    # Build claimed set from widget keys (source of truth for what's displayed)
+    all_claimed = {
+        token
+        for i, category in enumerate(st.session_state.categories)
+        for token in st.session_state.get(f"multiselect_{category}", [])
+    }
+
+    for i, category in enumerate(st.session_state.categories):
+        ms_key = f"multiselect_{category}"
         label_col, trash_col = st.sidebar.columns([5, 1])
         label_col.markdown(f"**{category}**")
         trash_col.button(
@@ -72,12 +83,17 @@ def render_categories_sidebar(currFile, categorySelections, all_speakers_display
             on_click=removeCategory, args=(i,),
             help=f"Remove {category}",
         )
+        this_role_tokens = set(st.session_state.get(ms_key, []))
+        available_tokens = [
+            t for t in all_speaker_tokens
+            if t not in all_claimed or t in this_role_tokens
+        ]
         st.sidebar.multiselect(
-            category, all_speakers_display,
-            key=ms_key, on_change=updateCategoryOptions, args=(currFile,),
+            category, available_tokens,
+            key=ms_key, on_change=updateCategoryOptions,
             label_visibility="collapsed",
         )
-    st.sidebar.text_input("Add role", key="categoryInput", on_change=addCategory)
+    st.sidebar.text_input("Add custom role", key="categoryInput", on_change=addCategory)
 
 
 # ---------------------------------------------------------------------------
@@ -97,17 +113,11 @@ def render_rename_sidebar(currFile, speakerNames, all_speaker_tokens):
 
     st.sidebar.divider()
 
-    def _on_grename_change(idx):
-        st.session_state.globalRenames[idx]["speakers"] = list(
-            st.session_state[_global_rename_key(idx)]
-        )
-        enforceGlobalRenameExclusivity(idx)
-
-    # Build a set of every token already claimed by some entry, for fast lookup
+    # Build claimed set from the data model (entry["speakers"]) as canonical truth.
     all_claimed = {
         token
-        for e in st.session_state.globalRenames
-        for token in e["speakers"]
+        for entry in st.session_state.globalRenames
+        for token in entry["speakers"]
     }
 
     for idx, entry in enumerate(st.session_state.globalRenames):
@@ -121,7 +131,6 @@ def render_rename_sidebar(currFile, speakerNames, all_speaker_tokens):
             on_click=removeGlobalRename, args=(idx,),
             help=f"Remove '{entry['name']}'",
         )
-        # Options = tokens owned by this entry + tokens not claimed by anyone
         this_entry_tokens = set(entry["speakers"])
         available_tokens = [
             t for t in all_speaker_tokens
@@ -129,7 +138,7 @@ def render_rename_sidebar(currFile, speakerNames, all_speaker_tokens):
         ]
         st.sidebar.multiselect(
             f"Speakers for {entry['name']}", options=available_tokens,
-            key=grkey, on_change=_on_grename_change, args=(idx,),
+            key=grkey, on_change=on_grename_change, args=(idx,),
             label_visibility="collapsed",
         )
 
@@ -177,8 +186,15 @@ def render_speaker_samples_tab(speakerNames, raw_to_display, currFile):
 
     if "inline_rename_active" not in st.session_state:
         st.session_state.inline_rename_active = {}
+
+    # Build the history list from all confirmed names: start from whatever was
+    # saved from past sessions, then merge in any names already in globalRenames
+    # so that sidebar-added names show up as history options in the tab too.
     if "inline_rename_history" not in st.session_state:
         st.session_state.inline_rename_history = []
+    for entry in st.session_state.globalRenames:
+        if entry["name"] not in st.session_state.inline_rename_history:
+            st.session_state.inline_rename_history.append(entry["name"])
 
     # Header
     header_cols = st.columns([3, 3, 1])
@@ -205,7 +221,10 @@ def render_speaker_samples_tab(speakerNames, raw_to_display, currFile):
             cancel_key  = f"inline_rename_cancel_{currFile}_{sp}"
 
             history     = st.session_state.inline_rename_history
-            current_val = display_name if display_name != sp else ""
+            # Read the saved rename directly from speakerRenames so that
+            # current_val is "" when no rename exists, even if display_name
+            # happens to equal the raw speaker label for some other reason.
+            current_val = st.session_state.speakerRenames.get(currFile, {}).get(sp, "")
 
             _NEW_OPTION = "＋ Enter a new name"
 
@@ -251,10 +270,9 @@ def render_speaker_samples_tab(speakerNames, raw_to_display, currFile):
                 btn_col1, btn_col2 = st.columns(2)
                 if btn_col1.button("✓", key=confirm_key, help="Confirm rename"):
                     confirmed = (new_name or "").strip()
-                    if confirmed:
-                        apply_inline_rename(currFile, sp, confirmed)
-                        if confirmed not in st.session_state.inline_rename_history:
-                            st.session_state.inline_rename_history.append(confirmed)
+                    apply_inline_rename(currFile, sp, confirmed)
+                    if confirmed and confirmed not in st.session_state.inline_rename_history:
+                        st.session_state.inline_rename_history.append(confirmed)
                     st.session_state.inline_rename_active[edit_key] = False
                     st.session_state.pop(select_key, None)
                     st.session_state.pop(input_key, None)