Update app.py

app.py

@@ -178,12 +178,17 @@ def updateCategoryOptions(fileName):
     if st.session_state.resetResult:
         return
     currAnnotation, _ = st.session_state.results[fileName]
-    speakerNames = currAnnotation.labels()
+    speakerNames = list(currAnnotation.labels())
+    # Build reverse map: display name -> original SPEAKER_## label
+    renames = st.session_state.speakerRenames.get(fileName, {})
+    display_to_raw = {v: k for k, v in renames.items()}
     unusedSpeakers = copy.deepcopy(speakerNames)
     for i, category in enumerate(st.session_state['categories']):
-        category_choices = copy.deepcopy(st.session_state[f'multiselect_{category}'])
-        st.session_state["categorySelect"][fileName][i] = category_choices
-        for sp in category_choices:
+        # Widget stores display names; reverse-map back to SPEAKER_## for storage
+        display_choices = copy.deepcopy(st.session_state[f'multiselect_{category}'])
+        raw_choices = [display_to_raw.get(d, d) for d in display_choices]
+        st.session_state["categorySelect"][fileName][i] = raw_choices
+        for sp in raw_choices:
             try:
                 unusedSpeakers.remove(sp)
             except:
@@ -193,8 +198,12 @@ def updateCategoryOptions(fileName):
 def updateMultiSelect():
     fileName = st.session_state["select_currFile"]
     st.session_state.resetResult = True
+    renames = st.session_state.speakerRenames.get(fileName, {})
     for i, category in enumerate(st.session_state['categories']):
-        st.session_state[f'multiselect_{category}'] = st.session_state['categorySelect'][fileName][i]
+        # categorySelect stores SPEAKER_## — convert to display names for the widget
+        raw_choices = st.session_state['categorySelect'][fileName][i]
+        display_choices = [renames.get(sp, sp) for sp in raw_choices]
+        st.session_state[f'multiselect_{category}'] = display_choices
     
 def analyze(inFileName):
     try:
@@ -584,13 +593,17 @@ try:
 
         unusedSpeakers = st.session_state.unusedSpeakers[currFile]
         categorySelections = st.session_state["categorySelect"][currFile]
+        renames = st.session_state.speakerRenames.get(currFile, {})
+        # All speaker labels as display names for the multiselect options
+        all_speakers_raw = speakerNames  # always SPEAKER_## from annotations
+        all_speakers_display = [renames.get(sp, sp) for sp in all_speakers_raw]
         for i,category in enumerate(st.session_state.categories):
-            speakerSet = categorySelections[i]
+            speakerSet = categorySelections[i]  # stored as SPEAKER_##
+            default_display = [renames.get(sp, sp) for sp in speakerSet]
             st.sidebar.multiselect(category,
-                                    speakerSet+unusedSpeakers,
-                                    default=speakerSet,
+                                    all_speakers_display,
+                                    default=default_display,
                                     key=f"multiselect_{category}",
-                                    format_func=lambda sp: get_display_name(sp, currFile),
                                     on_change=updateCategoryOptions,
                                     args=(currFile,))
             st.sidebar.button(f"Remove {category}",key=f"remove_{category}",on_click=removeCategory,args=(i,))