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,
 )
 
 
@@ -113,36 +113,7 @@ def render_rename_sidebar(currFile, speakerNames, all_speaker_tokens):
 
     st.sidebar.divider()
 
-    def _on_grename_change(idx):
-        # Determine which tokens were just added (not which ones are currently held)
-        # so exclusivity enforcement only removes newly claimed tokens from other entries.
-        prev_speakers = set(st.session_state.globalRenames[idx]["speakers"])
-        new_speakers  = list(st.session_state[_global_rename_key(idx)])
-        newly_added   = set(new_speakers) - prev_speakers
-
-        # Write the widget's new value into the data model
-        st.session_state.globalRenames[idx]["speakers"] = new_speakers
-        # Pop widget key so it re-seeds cleanly on the next render pass
-        st.session_state.pop(_global_rename_key(idx), None)
-
-        if newly_added:
-            # Record these tokens in the graveyard so applyGlobalRenames can
-            # revert them if they are later removed from all globalRenames entries.
-            st.session_state.globally_tracked_tokens.update(newly_added)
-            # Only enforce exclusivity for tokens that were just added
-            for other_idx, entry in enumerate(st.session_state.globalRenames):
-                if other_idx == idx:
-                    continue
-                cleaned = [t for t in entry["speakers"] if t not in newly_added]
-                if cleaned != entry["speakers"]:
-                    entry["speakers"] = cleaned
-                    st.session_state.pop(_global_rename_key(other_idx), None)
-
-        applyGlobalRenames()
-
-    # Build claimed set from the data model (entry["speakers"]) as the canonical
-    # source of truth.  Widget keys may be absent after a mutation (we pop them
-    # intentionally), so falling back to them can produce a stale claimed set.
+    # Build claimed set from the data model (entry["speakers"]) as canonical truth.
     all_claimed = {
         token
         for entry in st.session_state.globalRenames
@@ -151,7 +122,7 @@ def render_rename_sidebar(currFile, speakerNames, all_speaker_tokens):
 
     for idx, entry in enumerate(st.session_state.globalRenames):
         grkey = _global_rename_key(idx)
-        # Seed the widget key from entry["speakers"] if it was cleared by a mutation
+        # Seed widget key from entry["speakers"] if cleared by a mutation
         if grkey not in st.session_state:
             st.session_state[grkey] = list(entry["speakers"])
         label_col, trash_col = st.sidebar.columns([5, 1])
@@ -161,9 +132,6 @@ def render_rename_sidebar(currFile, speakerNames, all_speaker_tokens):
             on_click=removeGlobalRename, args=(idx,),
             help=f"Remove '{entry['name']}'",
         )
-        # Use entry["speakers"] (the data model) as this entry's owned tokens.
-        # Widget keys are popped during mutations, so using them here would give
-        # a stale empty set and incorrectly exclude tokens from available_tokens.
         this_entry_tokens = set(entry["speakers"])
         available_tokens = [
             t for t in all_speaker_tokens
@@ -171,7 +139,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",
         )
 
@@ -303,14 +271,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)
-                    else:
-                        # Empty name = revert this speaker back to SPEAKER_##
-                        apply_inline_rename(currFile, sp, "")
-                        st.toast(f"Reverted {sp} to original label")
+                    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)