Update state.py

state.py

@@ -68,8 +68,19 @@ def init_session_state():
 # ---------------------------------------------------------------------------
 
 def get_display_name(speaker, fileName):
-    """Return the user-assigned display name for a speaker, or the original label."""
-    return st.session_state.speakerRenames.get(fileName, {}).get(speaker, speaker)
+    """Return the best display name for a speaker, in priority order:
+    1. Explicit rename (speakerRenames) — set by rename sidebar or rename tab
+    2. Role assignment (categorySelect) — e.g. "Instructor" or "Students"
+    3. Original raw label — e.g. "SPEAKER_00"
+    """
+    explicit = st.session_state.speakerRenames.get(fileName, {}).get(speaker)
+    if explicit:
+        return explicit
+    token = f"{fileName}: {speaker}"
+    for i, tokens in enumerate(st.session_state.categorySelect):
+        if token in tokens:
+            return st.session_state.categories[i]
+    return speaker
 
 
 def apply_speaker_renames_to_df(df, fileName, column="task"):
@@ -118,25 +129,8 @@ def updateCategoryOptions():
     for i, category in enumerate(st.session_state.categories):
         ms_key = f"multiselect_{category}"
         new_val = list(st.session_state.get(ms_key, []))
-        prev_val = list(st.session_state.categorySelect[i]) if i < len(st.session_state.categorySelect) else []
         st.session_state.categorySelect[i] = new_val
         st.session_state[ms_key] = new_val
-
-        # Tokens newly added to this role → write the role name into speakerRenames
-        added   = set(new_val) - set(prev_val)
-        removed = set(prev_val) - set(new_val)
-        for token in added:
-            _write_rename(token, category)
-        # Tokens removed from this role → revert their display name, but only if
-        # it was still set to this role's name (don't clobber a rename sidebar name)
-        for token in removed:
-            if ": " not in token:
-                continue
-            fname, raw_sp = token.split(": ", 1)
-            current = st.session_state.speakerRenames.get(fname, {}).get(raw_sp, "")
-            if current == category:
-                _write_rename(token, "")
-
     # Recompute unusedSpeakers for all files
     all_assigned_tokens = {
         token